diff options
| author | Laurent Stukkens (LTU) <ltu@odoo.com> | 2020-12-08 22:41:52 +0100 |
|---|---|---|
| committer | Xavier BOL (xbo) <xbo@odoo.com> | 2020-12-21 15:35:12 +0100 |
| commit | 659418a695b9e8ae32ed1ab4aa88b9ebe2b9c665 (patch) | |
| tree | 994b8f09388737facf19f65fa5d2b52fef5513f4 | |
| parent | e23b1f229cfff348d21abc3a579570ac6249a078 (diff) | |
[IMP] sale_timesheet: move timesheet SOL before duration
task-2409761
| -rw-r--r-- | addons/sale_timesheet/views/project_task_views.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/addons/sale_timesheet/views/project_task_views.xml b/addons/sale_timesheet/views/project_task_views.xml index f26821d651b..c7673fc887c 100644 --- a/addons/sale_timesheet/views/project_task_views.xml +++ b/addons/sale_timesheet/views/project_task_views.xml @@ -134,9 +134,11 @@ <field name="timesheet_product_id" invisible="1"/> <field name="non_allow_billable" attrs="{'invisible': ['|', '|', '|', ('allow_billable', '=', False), ('allow_timesheets', '=', False), ('pricing_type', '!=', 'employee_rate'), ('bill_type', '=', 'customer_task')]}" invisible="1"/> </xpath> - <xpath expr="//field[@name='timesheet_ids']/tree" position="inside"> + <xpath expr="//field[@name='timesheet_ids']/tree/field[@name='unit_amount']" position="before"> <field name="timesheet_invoice_id" invisible="1"/> <field name="so_line" readonly="1" attrs="{'column_invisible': [('parent.allow_billable', '=', False)]}" context="{'with_remaining_hours': True}" optional="hide"/> + </xpath> + <xpath expr="//field[@name='timesheet_ids']/tree" position="inside"> <field name="non_allow_billable" attrs="{'column_invisible': ['|', '&', '&', '|', ('parent.bill_type', '!=', 'customer_project'), ('parent.pricing_type', '!=', 'employee_rate'), ('parent.timesheet_product_id', '=', False), ('parent.sale_line_id', '=', False), '&', ('parent.bill_type', '=', 'customer_project'), ('parent.pricing_type', '=', 'employee_rate')]}" invisible="1"/> </xpath> </field> |