[FIX] sale_layout_category_hide_detail: Improve interoperability, hid…

…e discounted price too
OCA · Nov 6, 2024 · 029be63 · 029be63
1 parent d3d0613
commit 029be63
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/sale_layout_category_hide_detail/views/invoice_report_templates.xml b/sale_layout_category_hide_detail/views/invoice_report_templates.xml
@@ -66,14 +66,14 @@
     <xpath expr="//span[@t-field='line.price_unit']" position="attributes">
         <attribute
                 name="t-if"
-                add="not current_section or current_section.show_line_amount"
+                add="(not current_section or current_section.show_line_amount)"
                 separator=" and "
             />
       </xpath>
       <xpath expr="//span[@t-field='line.price_subtotal']" position="attributes">
         <attribute
                 name="t-if"
-                add="not current_section or current_section.show_line_amount"
+                add="(not current_section or current_section.show_line_amount)"
                 separator=" and "
             />
       </xpath>
@@ -83,7 +83,7 @@
         >
         <attribute
                 name="t-if"
-                add="not current_section or current_section.show_line_amount"
+                add="(not current_section or current_section.show_line_amount)"
                 separator=" and "
             />
       </xpath>

diff --git a/sale_layout_category_hide_detail/views/sale_order_report_templates.xml b/sale_layout_category_hide_detail/views/sale_order_report_templates.xml
@@ -78,28 +78,28 @@
     <xpath expr="//td[@name='td_priceunit']/span" position="attributes">
       <attribute
                 name="t-if"
-                add="not current_section or current_section.show_line_amount"
+                add="(not current_section or current_section.show_line_amount)"
                 separator=" and "
             />
     </xpath>
     <xpath expr="//td[@name='td_taxes']/span" position="attributes">
       <attribute
                 name="t-if"
-                add="not current_section or current_section.show_line_amount"
+                add="(not current_section or current_section.show_line_amount)"
                 separator=" and "
             />
     </xpath>
     <xpath expr="//td[@name='td_subtotal']/span" position="attributes">
       <attribute
                 name="t-if"
-                add="not current_section or current_section.show_line_amount"
+                add="(not current_section or current_section.show_line_amount)"
                 separator=" and "
             />
     </xpath>
     <xpath expr="//td[@t-if='display_discount']/span" position="attributes">
       <attribute
                 name="t-if"
-                add="not current_section or current_section.show_line_amount"
+                add="(not current_section or current_section.show_line_amount)"
                 separator=" and "
             />
     </xpath>

diff --git a/sale_layout_category_hide_detail/views/sale_portal_templates.xml b/sale_layout_category_hide_detail/views/sale_portal_templates.xml
@@ -82,14 +82,21 @@
     <xpath expr="//div[@t-field='line.price_unit']" position="attributes">
         <attribute
                 name="t-if"
-                add="not current_section or current_section.show_line_amount"
+                add="(not current_section or current_section.show_line_amount)"
+                separator=" and "
+            />
+      </xpath>
+    <xpath expr="//t[contains(@t-out, 'line.price_unit')]" position="attributes">
+        <attribute
+                name="t-if"
+                add="(not current_section or current_section.show_line_amount)"
                 separator=" and "
             />
       </xpath>
       <xpath expr="//span[@t-field='line.price_subtotal']" position="attributes">
         <attribute
                 name="t-if"
-                add="not current_section or current_section.show_line_amount"
+                add="(not current_section or current_section.show_line_amount)"
                 separator=" and "
             />
       </xpath>
@@ -99,7 +106,7 @@
         >
         <attribute
                 name="t-if"
-                add="not current_section or current_section.show_line_amount"
+                add="(not current_section or current_section.show_line_amount)"
                 separator=" and "
             />
       </xpath>