diff options
| -rw-r--r-- | addons/account/models/account_invoice.py | 2 | ||||
| -rw-r--r-- | addons/account/views/account_invoice_view.xml | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/addons/account/models/account_invoice.py b/addons/account/models/account_invoice.py index 230d3e5df90..fe48cb54d1c 100644 --- a/addons/account/models/account_invoice.py +++ b/addons/account/models/account_invoice.py @@ -37,7 +37,7 @@ MAGIC_COLUMNS = ('id', 'create_uid', 'create_date', 'write_uid', 'write_date') class AccountInvoice(models.Model): _name = "account.invoice" - _inherit = ['mail.thread'] + _inherit = ['mail.thread', 'mail.activity.mixin'] _description = "Invoice" _order = "date_invoice desc, number desc, id desc" diff --git a/addons/account/views/account_invoice_view.xml b/addons/account/views/account_invoice_view.xml index 40feb8caa75..16e36a1c04c 100644 --- a/addons/account/views/account_invoice_view.xml +++ b/addons/account/views/account_invoice_view.xml @@ -335,6 +335,7 @@ </sheet> <div class="oe_chatter"> <field name="message_follower_ids" widget="mail_followers"/> + <field name="activity_ids" widget="mail_activity"/> <field name="message_ids" widget="mail_thread"/> </div> </form> @@ -523,6 +524,18 @@ <field name="date" string="Period"/> <separator/> <filter domain="[('user_id','=',uid)]" help="My Invoices"/> + <separator/> + <filter string="My Activities" name="activities_my" + domain="[('activity_ids.user_id', '=', uid)]"/> + <filter string="Today Activities" name="activities_today" + domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/> + <filter string="Upcoming Activities (7 days)" name="activities_week" + domain="['&', ('activity_ids.date_deadline', '>=', context_today().strftime('%Y-%m-%d')), + ('activity_ids.date_deadline', '<=', (context_today()+datetime.timedelta(days=7)).strftime('%Y-%m-%d')) + ]"/> + <filter string="Overdue Activities" name="activities_overdue" + domain="[('activity_ids.date_deadline', '<', context_today().strftime('%Y-%m-%d'))]" + help="Show all records which has next action date is before today"/> <group expand="0" string="Group By"> <filter name="group_by_partner_id" string="Partner" context="{'group_by':'commercial_partner_id'}"/> <filter string="Salesperson" context="{'group_by':'user_id'}"/> |