diff options
| author | Tiffany Chang (tic) <tic@odoo.com> | 2020-04-27 08:03:16 +0000 |
|---|---|---|
| committer | Tiffany Chang (tic) <tic@odoo.com> | 2020-07-03 11:54:08 +0000 |
| commit | a952829c1645a2fcc40ef9e43ba04549c5913d0c (patch) | |
| tree | d2ec7551a41b106aa55953a4a4aaaab3de86addd /addons | |
| parent | a60527bde7f2bc4c614ac35fff3b28e11b0a6211 (diff) | |
[IMP] sale,sale_stock: use "attributes" instead of "replace" position
Minor update to task 2041853 specification 10: hide "Expected date" if
delivery took place. Replace the position="replace" with the more
long term maintainable position="attributes".
Updates Task: 2041853
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/sale/views/sale_views.xml | 3 | ||||
| -rw-r--r-- | addons/sale_stock/views/sale_order_views.xml | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml index 2dc95eef0b6..0d7a0bb1005 100644 --- a/addons/sale/views/sale_views.xml +++ b/addons/sale/views/sale_views.xml @@ -677,7 +677,8 @@ <group name="sale_shipping"> <label for="commitment_date" string="Delivery Date"/> <div name="commitment_date_div" class="o_row"> - <field name="commitment_date"/> <span class="text-muted">Expected: <field name="expected_date" widget="date"/></span> + <field name="commitment_date"/> + <span name="expected_date_span" class="text-muted">Expected: <field name="expected_date" widget="date"/></span> </div> </group> <group string="Reporting" name="sale_reporting" groups="base.group_no_one"> diff --git a/addons/sale_stock/views/sale_order_views.xml b/addons/sale_stock/views/sale_order_views.xml index 6a071b18457..88d5d56bb70 100644 --- a/addons/sale_stock/views/sale_order_views.xml +++ b/addons/sale_stock/views/sale_order_views.xml @@ -25,6 +25,11 @@ <field name="incoterm" widget="selection" groups="sale_stock.group_display_incoterm"/> <field name="picking_policy" required="True"/> </xpath> + <xpath expr="//span[@name='expected_date_span']" position="attributes"> + <attribute name="attrs"> + {'invisible': [('effective_date', '!=', False), ('commitment_date', '!=', False)]} + </attribute> + </xpath> <xpath expr="//div[@name='commitment_date_div']" position="replace"> <div class="o_row"> <field name="commitment_date"/> |