From 561829849f2c354136390bf9da2c487c4bddcac7 Mon Sep 17 00:00:00 2001
From: Ravi Gadhia <rga@odoo.com>
Date: Fri, 21 Jun 2019 09:22:21 +0000
Subject: [PATCH] [IMP] purchase: add section and note on order line

---
 .../views/report_purchase_order.xml           | 25 +++++--
 addons/purchase/models/account_invoice.py     |  2 +-
 addons/purchase/models/purchase.py            | 30 ++++++--
 .../report/purchase_order_templates.xml       | 75 +++++++++++++------
 .../report/purchase_quotation_templates.xml   | 33 +++++---
 addons/purchase/views/portal_templates.xml    | 28 ++++++-
 addons/purchase/views/purchase_views.xml      | 69 +++++++++++------
 7 files changed, 194 insertions(+), 68 deletions(-)

diff --git a/addons/l10n_in_purchase/views/report_purchase_order.xml b/addons/l10n_in_purchase/views/report_purchase_order.xml
index 398e9fcf068..f2ffc0844ff 100644
--- a/addons/l10n_in_purchase/views/report_purchase_order.xml
+++ b/addons/l10n_in_purchase/views/report_purchase_order.xml
@@ -2,15 +2,30 @@
 <odoo>
 
     <template id="gst_report_purchaseorder_document_inherit" inherit_id="purchase.report_purchaseorder_document">
-        <xpath expr="//tr[@t-foreach='o.order_line']/td[1]" position="replace">
-
-            <td><span t-field="line.name"/><t t-if="line.product_id.l10n_in_hsn_code and o.company_id.country_id.code == 'IN'"><h6><strong class="ml16">HSN/SAC Code:</strong> <span t-field="line.product_id.l10n_in_hsn_code"/></h6></t></td>
+        <xpath expr="//t[@t-foreach='o.order_line']//td[@id='product']" position="replace">
+            <td>
+                <span t-field="line.name"/>
+                <t t-if="line.product_id.l10n_in_hsn_code and o.company_id.country_id.code == 'IN'">
+                    <h6>
+                        <strong class="ml16">HSN/SAC Code:</strong>
+                        <span t-field="line.product_id.l10n_in_hsn_code"/>
+                    </h6>
+                </t>
+            </td>
         </xpath>
     </template>
 
     <template id="gst_report_purchasequotation_document_inherit" inherit_id="purchase.report_purchasequotation_document">
-        <xpath expr="//tr[@t-foreach='o.order_line']/td[1]" position="replace">
-            <td><span t-field="order_line.name"/><t t-if="order_line.product_id.l10n_in_hsn_code and o.company_id.country_id.code == 'IN'"><h6><strong class="ml16">HSN/SAC Code:</strong> <span t-field="order_line.product_id.l10n_in_hsn_code"/></h6></t></td>
+        <xpath expr="//t[@t-foreach='o.order_line']//td[@id='product']" position="replace">
+            <td>
+                <span t-field="order_line.name"/>
+                <t t-if="order_line.product_id.l10n_in_hsn_code and o.company_id.country_id.code == 'IN'">
+                    <h6>
+                        <strong class="ml16">HSN/SAC Code:</strong>
+                        <span t-field="order_line.product_id.l10n_in_hsn_code"/>
+                    </h6>
+                </t>
+            </td>
         </xpath>
     </template>
 
diff --git a/addons/purchase/models/account_invoice.py b/addons/purchase/models/account_invoice.py
index 9e1f867a7ea..18fb4b4f9de 100644
--- a/addons/purchase/models/account_invoice.py
+++ b/addons/purchase/models/account_invoice.py
@@ -45,7 +45,7 @@ class AccountMove(models.Model):
         # Copy purchase lines.
         po_lines = self.purchase_id.order_line - self.line_ids.mapped('purchase_line_id')
         new_lines = self.env['account.move.line']
-        for line in po_lines:
+        for line in po_lines.filtered(lambda l: not l.display_type):
             new_line = new_lines.new(line._prepare_account_move_line(self))
             new_line.account_id = new_line._get_computed_account()
             new_line._onchange_price_subtotal()
diff --git a/addons/purchase/models/purchase.py b/addons/purchase/models/purchase.py
index 3ab10e2d3b2..7c68c906954 100644
--- a/addons/purchase/models/purchase.py
+++ b/addons/purchase/models/purchase.py
@@ -36,7 +36,7 @@ class PurchaseOrder(models.Model):
         for order in self:
             min_date = False
             for line in order.order_line:
-                if not min_date or line.date_planned < min_date:
+                if not min_date or line.date_planned and line.date_planned < min_date:
                     min_date = line.date_planned
             if min_date:
                 order.date_planned = min_date
@@ -360,7 +360,7 @@ class PurchaseOrder(models.Model):
         for line in self.order_line:
             # Do not add a contact as a supplier
             partner = self.partner_id if not self.partner_id.parent_id else self.partner_id.parent_id
-            if partner not in line.product_id.seller_ids.mapped('name') and len(line.product_id.seller_ids) <= 10:
+            if line.product_id and partner not in line.product_id.seller_ids.mapped('name') and len(line.product_id.seller_ids) <= 10:
                 currency = partner.property_purchase_currency_id or self.env.company.currency_id
                 supplierinfo = {
                     'name': partner.id,
@@ -431,11 +431,11 @@ class PurchaseOrderLine(models.Model):
     sequence = fields.Integer(string='Sequence', default=10)
     product_qty = fields.Float(string='Quantity', digits='Product Unit of Measure', required=True)
     product_uom_qty = fields.Float(string='Total Quantity', compute='_compute_product_uom_qty', store=True)
-    date_planned = fields.Datetime(string='Scheduled Date', required=True, index=True)
+    date_planned = fields.Datetime(string='Scheduled Date', index=True)
     taxes_id = fields.Many2many('account.tax', string='Taxes', domain=['|', ('active', '=', False), ('active', '=', True)])
-    product_uom = fields.Many2one('uom.uom', string='Unit of Measure', required=True, domain="[('category_id', '=', product_uom_category_id)]")
+    product_uom = fields.Many2one('uom.uom', string='Unit of Measure', domain="[('category_id', '=', product_uom_category_id)]")
     product_uom_category_id = fields.Many2one(related='product_id.uom_id.category_id')
-    product_id = fields.Many2one('product.product', string='Product', domain=[('purchase_ok', '=', True)], change_default=True, required=True)
+    product_id = fields.Many2one('product.product', string='Product', domain=[('purchase_ok', '=', True)], change_default=True)
     product_type = fields.Selection(related='product_id.type', readonly=True)
     price_unit = fields.Float(string='Unit Price', required=True, digits='Product Price')
 
@@ -465,6 +465,19 @@ class PurchaseOrderLine(models.Model):
     currency_id = fields.Many2one(related='order_id.currency_id', store=True, string='Currency', readonly=True)
     date_order = fields.Datetime(related='order_id.date_order', string='Order Date', readonly=True)
 
+    display_type = fields.Selection([
+        ('line_section', "Section"),
+        ('line_note', "Note")], default=False, help="Technical field for UX purpose.")
+
+    _sql_constraints = [
+        ('accountable_required_fields',
+            "CHECK(display_type IS NOT NULL OR (product_id IS NOT NULL AND product_uom IS NOT NULL AND date_planned IS NOT NULL))",
+            "Missing required fields on accountable purchase order line."),
+        ('non_accountable_null_fields',
+            "CHECK(display_type IS NULL OR (product_id IS NULL AND price_unit = 0 AND product_uom_qty = 0 AND product_uom IS NULL AND date_planned is NULL))",
+            "Forbidden values on non-accountable purchase order line"),
+    ]
+
     @api.depends('product_qty', 'price_unit', 'taxes_id')
     def _compute_amount(self):
         for line in self:
@@ -545,6 +558,9 @@ class PurchaseOrderLine(models.Model):
 
     @api.model
     def create(self, values):
+        if values.get('display_type', self.default_get(['display_type'])['display_type']):
+            values.update(product_id=False, price_unit=0, product_uom_qty=0, product_uom=False, date_planned=False)
+
         line = super(PurchaseOrderLine, self).create(values)
         if line.order_id.state == 'purchase':
             msg = _("Extra line with %s ") % (line.product_id.display_name,)
@@ -553,6 +569,9 @@ class PurchaseOrderLine(models.Model):
 
     @api.multi
     def write(self, values):
+        if 'display_type' in values and self.filtered(lambda line: line.display_type != values.get('display_type')):
+            raise UserError("You cannot change the type of a purchase order line. Instead you should delete the current line and create a new line of the proper type.")
+
         if 'product_qty' in values:
             for line in self:
                 if line.order_id.state == 'purchase':
@@ -714,4 +733,5 @@ class PurchaseOrderLine(models.Model):
             'analytic_account_id': self.account_analytic_id.id,
             'analytic_tag_ids': [(6, 0, self.analytic_tag_ids.ids)],
             'tax_ids': [(6, 0, self.taxes_id.ids)],
+            'display_type': self.display_type,
         }
diff --git a/addons/purchase/report/purchase_order_templates.xml b/addons/purchase/report/purchase_order_templates.xml
index 8351d401d8b..4a473309480 100644
--- a/addons/purchase/report/purchase_order_templates.xml
+++ b/addons/purchase/report/purchase_order_templates.xml
@@ -53,28 +53,59 @@
                     </tr>
                 </thead>
                 <tbody>
-                    <tr t-foreach="o.order_line" t-as="line">
-                        <td>
-                            <span t-field="line.name"/>
-                        </td>
-                        <td>
-                            <span t-esc="', '.join(map(lambda x: x.name, line.taxes_id))"/>
-                        </td>
-                        <td class="text-center">
-                            <span t-field="line.date_planned"/>
-                        </td>
-                        <td class="text-right">
-                            <span t-field="line.product_qty"/>
-                            <span t-field="line.product_uom.name" groups="uom.group_uom"/>
-                        </td>
-                        <td class="text-right">
-                            <span t-field="line.price_unit"/>
-                        </td>
-                        <td class="text-right">
-                            <span t-field="line.price_subtotal"
-                                t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
-                        </td>
-                    </tr>
+                    <t t-set="current_subtotal" t-value="0"/>
+                    <t t-foreach="o.order_line" t-as="line">
+                        <t t-set="current_subtotal" t-value="current_subtotal + line.price_subtotal" groups="account.group_show_line_subtotals_tax_excluded"/>
+                        <t t-set="current_subtotal" t-value="current_subtotal + line.price_total" groups="account.group_show_line_subtotals_tax_included"/>
+
+                        <tr t-att-class="'bg-200 font-weight-bold o_line_section' if line.display_type == 'line_section' else 'font-italic o_line_note' if line.display_type == 'line_note' else ''">
+                            <t t-if="not line.display_type">
+                                <td id="product">
+                                    <span t-field="line.name"/>
+                                </td>
+                                <td>
+                                    <span t-esc="', '.join(map(lambda x: x.name, line.taxes_id))"/>
+                                </td>
+                                <td class="text-center">
+                                    <span t-field="line.date_planned"/>
+                                </td>
+                                <td class="text-right">
+                                    <span t-field="line.product_qty"/>
+                                    <span t-field="line.product_uom.name" groups="uom.group_uom"/>
+                                </td>
+                                <td class="text-right">
+                                    <span t-field="line.price_unit"/>
+                                </td>
+                                <td class="text-right">
+                                    <span t-field="line.price_subtotal"
+                                        t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
+                                </td>
+                            </t>
+                            <t t-if="line.display_type == 'line_section'">
+                                <td colspan="99" id="section">
+                                    <span t-field="line.name"/>
+                                </td>
+                                <t t-set="current_section" t-value="line"/>
+                                <t t-set="current_subtotal" t-value="0"/>
+                            </t>
+                            <t t-if="line.display_type == 'line_note'">
+                                <td colspan="99" id="note">
+                                    <span t-field="line.name"/>
+                                </td>
+                            </t>
+                        </tr>
+                        <t t-if="current_section and (line_last or o.order_line[line_index+1].display_type == 'line_section')">
+                            <tr class="is-subtotal text-right">
+                                <td colspan="99" id="subtotal">
+                                    <strong class="mr16">Subtotal</strong>
+                                    <span
+                                        t-esc="current_subtotal"
+                                        t-options='{"widget": "monetary", "display_currency": o.currency_id}'
+                                    />
+                                </td>
+                            </tr>
+                        </t>
+                    </t>
                 </tbody>
             </table>
 
diff --git a/addons/purchase/report/purchase_quotation_templates.xml b/addons/purchase/report/purchase_quotation_templates.xml
index eec1465e0ca..536a7c50f77 100644
--- a/addons/purchase/report/purchase_quotation_templates.xml
+++ b/addons/purchase/report/purchase_quotation_templates.xml
@@ -29,18 +29,27 @@
                     </tr>
                 </thead>
                 <tbody>
-                    <tr t-foreach="o.order_line" t-as="order_line">
-                        <td>
-                            <span t-field="order_line.name"/>
-                        </td>
-                        <td class="text-center">
-                            <span t-field="order_line.date_planned"/>
-                        </td>
-                        <td class="text-right">
-                            <span t-field="order_line.product_qty"/>
-                            <span t-field="order_line.product_uom" groups="uom.group_uom"/>
-                        </td>
-                    </tr>
+                    <t t-foreach="o.order_line" t-as="order_line">
+                        <tr t-att-class="'bg-200 font-weight-bold o_line_section' if order_line.display_type == 'line_section' else 'font-italic o_line_note' if order_line.display_type == 'line_note' else ''">
+                            <t t-if="not order_line.display_type">
+                                <td id="product">
+                                    <span t-field="order_line.name"/>
+                                </td>
+                                <td class="text-center">
+                                    <span t-field="order_line.date_planned"/>
+                                </td>
+                                <td class="text-right">
+                                    <span t-field="order_line.product_qty"/>
+                                    <span t-field="order_line.product_uom" groups="uom.group_uom"/>
+                                </td>
+                            </t>
+                            <t t-else="">
+                                <td colspan="99" id="section">
+                                    <span t-field="order_line.name"/>
+                                </td>
+                            </t>
+                        </tr>
+                    </t>
                 </tbody>
             </table>
 
diff --git a/addons/purchase/views/portal_templates.xml b/addons/purchase/views/portal_templates.xml
index b6a9a0a0847..6d723766665 100644
--- a/addons/purchase/views/portal_templates.xml
+++ b/addons/purchase/views/portal_templates.xml
@@ -97,8 +97,11 @@
                   <strong>Subtotal</strong>
                 </div>
               </div>
+              <t t-set="current_subtotal" t-value="0"/>
               <t t-foreach="order.order_line" t-as="ol">
-                <div class="row purchases_vertical_align">
+                <t t-set="current_subtotal" t-value="current_subtotal + ol.price_subtotal" groups="account.group_show_line_subtotals_tax_excluded"/>
+                <t t-set="current_subtotal" t-value="current_subtotal + ol.price_total" groups="account.group_show_line_subtotals_tax_included"/>
+                <div t-if="not ol.display_type" class="row purchases_vertical_align">
                   <div class="col-lg-1 text-center">
                       <img t-att-src="image_data_uri(resize_to_48(ol.product_id.image))" alt="Product"/>
                   </div>
@@ -115,6 +118,29 @@
                     <span t-field="ol.price_subtotal" t-options='{"widget": "monetary", "display_currency": order.currency_id}'/>
                   </div>
                 </div>
+                <t t-if="ol.display_type == 'line_section'">
+                    <div class="col-lg-12 bg-200">
+                        <strong t-esc="ol.name"/>
+                    </div>
+                    <t t-set="current_section" t-value="ol"/>
+                    <t t-set="current_subtotal" t-value="0"/>
+                </t>
+                <t t-elif="ol.display_type == 'line_note'">
+                    <div class="col-lg-12 font-italic">
+                        <span t-esc="ol.name"/>
+                    </div>
+                </t>
+                <t t-if="current_section and (ol_last or order.order_line[ol_index+1].display_type == 'line_section')">
+                  <div class="row">
+                    <div class="col-lg-10 text-right">Subtotal</div>
+                    <div class="col-lg-2 text-right">
+                      <span
+                            t-esc="current_subtotal"
+                            t-options='{"widget": "monetary", "display_currency": order.currency_id}'
+                          />
+                    </div>
+                  </div>
+                </t>
               </t>
 
               <hr/>
diff --git a/addons/purchase/views/purchase_views.xml b/addons/purchase/views/purchase_views.xml
index d5b320c6d33..04735497d18 100644
--- a/addons/purchase/views/purchase_views.xml
+++ b/addons/purchase/views/purchase_views.xml
@@ -181,16 +181,31 @@
                     </group>
                     <notebook>
                         <page string="Products">
-                            <field name="order_line" attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}">
-                                 <tree string="Purchase Order Lines" editable="bottom">
+                            <field name="order_line"
+                                widget="section_and_note_one2many"
+                                attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}">
+                                <tree string="Purchase Order Lines" editable="bottom">
+                                    <control>
+                                        <create name="add_product_control" string="Add a product"/>
+                                        <create name="add_section_control" string="Add a section" context="{'default_display_type': 'line_section'}"/>
+                                        <create name="add_note_control" string="Add a note" context="{'default_display_type': 'line_note'}"/>
+                                    </control>
+                                    <field name="display_type" invisible="1"/>
                                     <field name="currency_id" invisible="1"/>
                                     <field name="state" invisible="1"/>
                                     <field name="product_type" invisible="1"/>
                                     <field name="product_uom_category_id" invisible="1"/>
                                     <field name="sequence" widget="handle"/>
-                                    <field name="product_id" attrs="{'readonly': [('state', 'in', ('purchase', 'to approve','done', 'cancel'))]}" context="{'partner_id':parent.partner_id, 'quantity':product_qty,'uom':product_uom, 'company_id': parent.company_id}" force_save="1"/>
-                                    <field name="name" optional="show"/>
-                                    <field name="date_planned" optional="hide"/>
+                                    <field
+                                        name="product_id"
+                                        attrs="{
+                                            'readonly': [('state', 'in', ('purchase', 'to approve','done', 'cancel'))],
+                                            'required': [('display_type', '=', False)],
+                                        }"
+                                        context="{'partner_id':parent.partner_id, 'quantity':product_qty,'uom':product_uom, 'company_id': parent.company_id}"
+                                        force_save="1"/>
+                                    <field name="name" widget="section_and_note_text"/>
+                                    <field name="date_planned" optional="hide" attrs="{'required': [('display_type', '=', False)]}"/>
                                     <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
                                     <field name="account_analytic_id" optional="hide" context="{'default_partner_id':parent.partner_id}" groups="analytic.group_analytic_accounting"/>
                                     <field name="analytic_tag_ids" optional="hide" groups="analytic.group_analytic_tags" widget="many2many_tags" options="{'color_field': 'color'}"/>
@@ -199,25 +214,31 @@
                                     <field name="qty_received_method" invisible="1"/>
                                     <field name="qty_received" string="Received" attrs="{'column_invisible': [('parent.state', 'not in', ('purchase', 'done'))], 'readonly': [('qty_received_method', '!=', 'manual')]}" optional="show"/>
                                     <field name="qty_invoiced" string="Billed" attrs="{'column_invisible': [('parent.state', 'not in', ('purchase', 'done'))]}" optional="show"/>
-                                    <field name="product_uom" string="UoM" groups="uom.group_uom" attrs="{'readonly': [('state', 'in', ('purchase', 'done', 'cancel'))]}" force_save="1" optional="show"/>
+                                    <field name="product_uom" string="UoM" groups="uom.group_uom"
+                                        attrs="{
+                                            'readonly': [('state', 'in', ('purchase', 'done', 'cancel'))],
+                                            'required': [('display_type', '=', False)]
+                                        }"
+                                        force_save="1" optional="show"/>
                                     <field name="price_unit"/>
                                     <field name="taxes_id" widget="many2many_tags" domain="[('type_tax_use','=','purchase')]" context="{'default_type_tax_use': 'purchase', 'search_view_ref': 'account.account_tax_view_search'}" options="{'no_create': True}" optional="show"/>
                                     <field name="price_subtotal" widget="monetary"/>
                                 </tree>
                                 <form string="Purchase Order Line">
-                                    <sheet>
                                         <field name="state" invisible="1"/>
-                                        <group>
+                                        <field name="display_type" invisible="1"/>
+                                        <group attrs="{'invisible': [('display_type', '!=', False)]}">
                                             <group>
                                                 <field name="product_uom_category_id" invisible="1"/>
                                                 <field name="product_id"
-                                                       context="{'partner_id': parent.partner_id}"
-                                                       widget="many2one_barcode"
+                                                    context="{'partner_id': parent.partner_id}"
+                                                    widget="many2one_barcode"
+                                                    attrs="{'required': [('display_type', '=', False)]}"
                                                 />
                                                 <label for="product_qty"/>
                                                 <div class="o_row">
                                                     <field name="product_qty"/>
-                                                    <field name="product_uom" groups="uom.group_uom"/>
+                                                    <field name="product_uom" groups="uom.group_uom" attrs="{'required': [('display_type', '=', False)]}"/>
                                                 </div>
                                                 <field name="qty_received_method" invisible="1"/>
                                                 <field name="qty_received" string="Received Quantity" attrs="{'invisible': [('parent.state', 'not in', ('purchase', 'done'))], 'readonly': [('qty_received_method', '!=', 'manual')]}"/>
@@ -226,22 +247,26 @@
                                                 <field name="taxes_id" widget="many2many_tags" domain="[('type_tax_use', '=', 'purchase')]" options="{'no_create': True}"/>
                                             </group>
                                             <group>
-                                                <field name="date_planned" widget="date"/>
+                                                <field name="date_planned" widget="date" attrs="{'required': [('display_type', '=', False)]}"/>
                                                 <field name="account_analytic_id" colspan="2" groups="analytic.group_analytic_accounting"/>
                                                 <field name="analytic_tag_ids" groups="analytic.group_analytic_accounting" widget="many2many_tags" options="{'color_field': 'color'}"/>
                                                 <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
                                             </group>
+                                            <group colspan="12">
+                                            <notebook>
+                                                <page string="Notes">
+                                                    <field name="name"/>
+                                                </page>
+                                                <page string="Invoices and Incoming Shipments">
+                                                    <field name="invoice_lines"/>
+                                                </page>
+                                            </notebook>
+                                            </group>
                                         </group>
-                                        <notebook>
-                                        <page string="Notes">
-                                            <field name="name"/>
-                                        </page>
-                                        <page string="Invoices and Incoming Shipments">
-                                            <field name="invoice_lines"/>
-                                        </page>
-                                        </notebook>
-                                    </sheet>
-                                </form>
+                                        <label for="name" string="Section Name (eg. Products, Services)" attrs="{'invisible': [('display_type', '!=', 'line_section')]}"/>
+                                        <label for="name" string="Note" attrs="{'invisible': [('display_type', '!=', 'line_note')]}"/>
+                                        <field name="name" nolabel="1"  attrs="{'invisible': [('display_type', '=', False)]}"/>
+                                 </form>
                             </field>
                             <group class="oe_subtotal_footer oe_right">
                                 <field name="amount_untaxed" widget="monetary" options="{'currency_field': 'currency_id'}"/>