[IMP] Consistent prices and subtotal in SO

Author: quentinDupont

grap_change_views_sale/__manifest__.py

@@ -15,6 +15,7 @@
         "delivery",
         "sale_margin",
         "product_margin_classification",
+        "grap_qweb_report",
     ],
     "data": [
         "views/menu.xml",

grap_change_views_sale/views/view_sale_order.xml

@@ -42,9 +42,22 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
             <xpath expr="//field[@name='order_line']/tree/field[@name='discount']" position="attributes">
                 <attribute name="string">Disc 1 (%)</attribute>
             </xpath>
-            <xpath expr="//field[@name='order_line']/tree/field[@name='price_subtotal']" position="attributes">
-                <attribute name="string">S.T.</attribute>
+
+            <field name="fiscal_position_id" position="after">
+                <field name="price_unit_include_taxes" invisible="1"/>
+            </field>
+            <!-- Reset annoying groups -->
+            <xpath expr="//field[@name='order_line']/tree/field[@name='price_total']" position="attributes">
+                <attribute name="groups">account.group_show_line_subtotals_tax_excluded</attribute>
+            </xpath>
+            <!--  Display the right column -->
+            <xpath expr="//field[@name='order_line']/tree/field[@name='price_subtotal']" position="replace">
+                <field name="price_subtotal" string="Sous-Total (HT)" attrs="{'column_invisible': [('parent.price_unit_include_taxes', '=', True)]}"/>
             </xpath>
+            <xpath expr="//field[@name='order_line']/tree/field[@name='price_total']" position="replace">
+                <field name="price_total" string="Sous-Total (TTC)" attrs="{'column_invisible': [('parent.price_unit_include_taxes', '=', False)]}"/>
+            </xpath>
+
             <xpath expr="//field[@name='order_line']/tree/field[@name='tax_id']" position="attributes">
                 <attribute name="attrs">{'readonly': 1}</attribute>
                 <attribute name="force_save">1</attribute>

grap_qweb_report/__manifest__.py

@@ -31,6 +31,7 @@
         "report/qweb_template_product_product_barcode.xml",
         "report/qweb_template_layout_standard.xml",
         "report/qweb_template_account_invoice.xml",
+        "report/qweb_template_sale_order.xml",
         "report/qweb_template_stock_deliveryslip.xml",
         "report/qweb_template_stock_inventory.xml",
         "report/qweb_pricetag_square_small.xml",

grap_qweb_report/models/sale_order.py

@@ -2,15 +2,37 @@
 # @author: Sylvain LE GAL (https://twitter.com/legalsylvain)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from odoo import models
+from odoo import api, fields, models
 
 
 class SaleOrder(models.Model):
     _inherit = "sale.order"
 
+    price_unit_include_taxes = fields.Boolean(
+        string="Subtotal w / wo taxes",
+        compute="_compute_price_unit_include_taxes",
+        default=False,
+    )
+
     def action_invoice_create(self, grouped=False, final=False):
         if not grouped and len(self) > 1:
             return super(
                 SaleOrder, self.with_context(add_picking_date=True)
             ).action_invoice_create(grouped=grouped, final=final)
         return super().action_invoice_create(grouped=grouped, final=final)
+
+    @api.depends("fiscal_position_id")
+    def _compute_price_unit_include_taxes(self):
+        # Check if fiscal_position is w ou wo taxes (just checking first line)
+        for invoice in self:
+            # Check if there is a fiscal_position
+            try:
+                tax_dest = invoice.fiscal_position_id.tax_ids[0].tax_dest_id
+            # No fiscal position → wo taxes
+            except IndexError:
+                invoice.price_unit_include_taxes = False
+            else:
+                if tax_dest.price_include:
+                    invoice.price_unit_include_taxes = True
+                else:
+                    invoice.price_unit_include_taxes = False

grap_qweb_report/report/qweb_template_sale_order.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) 2018 - Today: GRAP (http://www.grap.coop)
+@author: Sylvain LE GAL (https://twitter.com/legalsylvain)
+@author: Quentin DUPONT ([email protected])
+License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+-->
+<odoo>
+
+    <template id="template_sale_order" inherit_id="sale.report_saleorder_document">
+
+        <!-- Colonne Prix Unitaire : Pas de HT ou TTC dans le nom car ça depend des lignes -->
+        <xpath expr="//th[@name='th_priceunit']" position="replace">
+            <th name="th_priceunit" t-attf-class="text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}"><span>Prix&#160;unitaire</span></th>
+        </xpath>
+
+        <!-- Colonne Sous-Total : Choix HT ou TTC selon facture sur Odoo -->
+         <xpath expr="//th[@name='th_subtotal']" position="replace">
+            <th t-if="doc.price_unit_include_taxes" name="th_subtotal" class="text-right">
+                <span>S.T&#160;(TTC)</span>
+            </th>
+            <th t-else="" name="th_subtotal" class="text-right">
+                <span>S.T&#160;(HT)</span>
+            </th>
+        </xpath>
+        <xpath expr="//td[@name='td_subtotal']" position="replace">
+            <td t-if="doc.price_unit_include_taxes" class="text-right">
+                <span t-field="line.price_total"/>
+            </td>
+            <td t-else="" class="text-right">
+                <span t-field="line.price_subtotal"/>
+            </td>
+        </xpath>
+
+    </template>
+
+</odoo>