diff options
| author | Yannick Tivisse <yti@odoo.com> | 2020-08-13 09:25:21 +0000 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2020-08-13 10:53:00 +0000 |
| commit | a37a746b4e0060c834dd700a511ff61350831d1d (patch) | |
| tree | ac8714035df66e8a54871df25c9a496607bef839 /addons/sale_expense | |
| parent | a89b68e7b5d50b750fadae8fb2a006225bec5d4a (diff) | |
[IMP] hr_expense: Improve global UX (back2basics)
closes odoo/odoo#55852
Taskid: 2303951
Related: odoo/enterprise#12394
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Diffstat (limited to 'addons/sale_expense')
| -rw-r--r-- | addons/sale_expense/models/hr_expense.py | 2 | ||||
| -rw-r--r-- | addons/sale_expense/models/sale_order.py | 2 | ||||
| -rw-r--r-- | addons/sale_expense/views/hr_expense_views.xml | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/addons/sale_expense/models/hr_expense.py b/addons/sale_expense/models/hr_expense.py index 8a6d2c0c351..fc88dcbbff1 100644 --- a/addons/sale_expense/models/hr_expense.py +++ b/addons/sale_expense/models/hr_expense.py @@ -7,7 +7,7 @@ from odoo import api, fields, models class Expense(models.Model): _inherit = "hr.expense" - sale_order_id = fields.Many2one('sale.order', compute='_compute_sale_order_id', store=True, string='Reinvoice Customer', readonly=False, tracking=True, + sale_order_id = fields.Many2one('sale.order', compute='_compute_sale_order_id', store=True, string='Customer to Reinvoice', readonly=False, tracking=True, states={'approved': [('readonly', True)], 'done': [('readonly', True)], 'refused': [('readonly', True)]}, # NOTE: only confirmed SO can be selected, but this domain in activated throught the name search with the `sale_expense_all_order` # context key. So, this domain is not the one applied. diff --git a/addons/sale_expense/models/sale_order.py b/addons/sale_expense/models/sale_order.py index ccd3c1d1627..fef55214523 100644 --- a/addons/sale_expense/models/sale_order.py +++ b/addons/sale_expense/models/sale_order.py @@ -22,7 +22,7 @@ class SaleOrder(models.Model): @api.depends('expense_ids') def _compute_expense_count(self): - expense_data = self.env['hr.expense'].read_group([('sale_order_id', 'in', self.ids), ('state', '=', 'done')], ['sale_order_id'], ['sale_order_id']) + expense_data = self.env['hr.expense'].read_group([('sale_order_id', 'in', self.ids)], ['sale_order_id'], ['sale_order_id']) mapped_data = dict([(item['sale_order_id'][0], item['sale_order_id_count']) for item in expense_data]) for sale_order in self: sale_order.expense_count = mapped_data.get(sale_order.id, 0) diff --git a/addons/sale_expense/views/hr_expense_views.xml b/addons/sale_expense/views/hr_expense_views.xml index 68f442b7455..022c0cf9ac2 100644 --- a/addons/sale_expense/views/hr_expense_views.xml +++ b/addons/sale_expense/views/hr_expense_views.xml @@ -18,7 +18,7 @@ <field name="inherit_id" ref="hr_expense.view_expenses_tree"/> <field name="arch" type="xml"> <xpath expr="//field[@name='reference']" position="after"> - <field name="sale_order_id" optional="show" attrs="{'invisible': [('can_be_reinvoiced', '=', False)]}" options="{'no_create_edit': True, 'no_create': True, 'no_open': True}" context="{'sale_show_partner_name': True, 'sale_expense_all_order': True}" readonly="1"/> + <field name="sale_order_id" optional="hide" attrs="{'invisible': [('can_be_reinvoiced', '=', False)]}" options="{'no_create_edit': True, 'no_create': True, 'no_open': True}" context="{'sale_show_partner_name': True, 'sale_expense_all_order': True}" readonly="1"/> <field name="can_be_reinvoiced" invisible="1" readonly="1"/> </xpath> </field> @@ -64,7 +64,7 @@ <field name="name">Expenses</field> <field name="res_model">hr.expense</field> <field name="view_mode">tree,form</field> - <field name="domain">[('sale_order_id', '=', active_id), ('state', '=', 'done')]</field> + <field name="domain">[('sale_order_id', '=', active_id)]</field> <field name="context">{'default_sale_order_id': active_id}</field> </record> |