From cbc760acb8fdcad26317a42d17f51e82ce4b06fc Mon Sep 17 00:00:00 2001
From: dut-odoo <dut@odoo.com>
Date: Mon, 5 Sep 2016 15:57:59 +0530
Subject: [PATCH] [IMP] sale,purchase,website: Harmonize the product
 name/description in reports and views

- sale: Improvement in quotation/so line's description
Currently, quotation/so line's description shows product's name with description.
It should show only description of product if description is there else show name of the product in backend views.

- sale: show product with description in sale report
Due to change in description of quotation/SO line, sale report is affected. Fixed it.

- website_sale: show only description in cart lines
Due to previous commit, cart lines shown with product and it's description as a quotation/so line's name.
When we create order from frontend, quotation/so lines' name field takes product name and it's description.
It should only take description if description is there else product name. Fixed it.

- purchase: Improvement in RFQ/PO line's description
Currently, RFQ/PO line's description shows product's name with description.
It should show only description of product if description is there else show name of the product in backend views.

- purchase: show product with description in purchase report
Due to change in description of RFQ/PO line, purchase reports are affected. Fixed it.
---
 addons/delivery/models/sale_order.py           |  2 +-
 addons/purchase/models/purchase.py             |  4 +---
 .../report/purchase_order_templates.xml        |  3 ++-
 .../report/purchase_quotation_templates.xml    |  3 ++-
 addons/sale/models/sale.py                     |  5 +----
 addons/sale/report/sale_report_templates.xml   |  5 ++++-
 .../views/website_quote_templates.xml          |  3 ++-
 addons/website_sale/models/sale_order.py       |  5 +----
 addons/website_sale/views/templates.xml        | 18 ++++++++++--------
 9 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/addons/delivery/models/sale_order.py b/addons/delivery/models/sale_order.py
index 7b742f3c37c..f013540203a 100644
--- a/addons/delivery/models/sale_order.py
+++ b/addons/delivery/models/sale_order.py
@@ -85,7 +85,7 @@ class SaleOrder(models.Model):
         # Create the sale order line
         values = {
             'order_id': self.id,
-            'name': carrier.name,
+            'name': carrier.description_sale or carrier.name,
             'product_uom_qty': 1,
             'product_uom': carrier.product_id.uom_id.id,
             'product_id': carrier.product_id.id,
diff --git a/addons/purchase/models/purchase.py b/addons/purchase/models/purchase.py
index 2b5080ce1d1..d9fcfd55cf9 100644
--- a/addons/purchase/models/purchase.py
+++ b/addons/purchase/models/purchase.py
@@ -701,9 +701,7 @@ class PurchaseOrderLine(models.Model):
             'lang': self.partner_id.lang,
             'partner_id': self.partner_id.id,
         })
-        self.name = product_lang.display_name
-        if product_lang.description_purchase:
-            self.name += '\n' + product_lang.description_purchase
+        self.name = product_lang.description_purchase or product_lang.display_name
 
         fpos = self.order_id.fiscal_position_id
         if self.env.uid == SUPERUSER_ID:
diff --git a/addons/purchase/report/purchase_order_templates.xml b/addons/purchase/report/purchase_order_templates.xml
index 51387d29c9e..eb4bf530e9c 100644
--- a/addons/purchase/report/purchase_order_templates.xml
+++ b/addons/purchase/report/purchase_order_templates.xml
@@ -58,7 +58,8 @@
                 <tbody>
                     <tr t-foreach="o.order_line" t-as="line">
                         <td>
-                            <span t-field="line.name"/>
+                            <span t-field="line.product_id"/><br/>
+                            <span t-if="line.name != line.product_id.display_name" t-field="line.name"/>
                         </td>
                         <td>
                             <span t-esc="', '.join(map(lambda x: x.name, line.taxes_id))"/>
diff --git a/addons/purchase/report/purchase_quotation_templates.xml b/addons/purchase/report/purchase_quotation_templates.xml
index d2855ccc023..08505d9cdc7 100644
--- a/addons/purchase/report/purchase_quotation_templates.xml
+++ b/addons/purchase/report/purchase_quotation_templates.xml
@@ -39,7 +39,8 @@
                 <tbody>
                     <tr t-foreach="o.order_line" t-as="order_line">
                         <td>
-                            <span t-field="order_line.name"/>
+                            <span t-field="order_line.product_id"/><br/>
+                            <span t-if="order_line.name != order_line.product_id.display_name" t-field="order_line.name"/>
                         </td>
                         <td class="text-center">
                             <span t-field="order_line.date_planned"/>
diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py
index 0040778ee1f..2918cf35e0e 100644
--- a/addons/sale/models/sale.py
+++ b/addons/sale/models/sale.py
@@ -848,10 +848,7 @@ class SaleOrderLine(models.Model):
             uom=self.product_uom.id
         )
 
-        name = product.name_get()[0][1]
-        if product.description_sale:
-            name += '\n' + product.description_sale
-        vals['name'] = name
+        vals['name'] = product.description_sale or product.name
 
         self._compute_tax_id()
 
diff --git a/addons/sale/report/sale_report_templates.xml b/addons/sale/report/sale_report_templates.xml
index 7f251f798df..7e6296f814f 100644
--- a/addons/sale/report/sale_report_templates.xml
+++ b/addons/sale/report/sale_report_templates.xml
@@ -81,7 +81,10 @@
                             <!-- Lines associated -->
                             <t t-foreach="layout_category['lines']" t-as="l">
                                 <tr>
-                                    <td><span t-field="l.name"/></td>
+                                    <td>
+                                        <span t-field="l.product_id"/><br/>
+                                        <span t-if="l.name != l.product_id.name" t-field="l.name"/>
+                                    </td>
                                     <td class="text-right">
                                         <span t-field="l.product_uom_qty"/>
                                         <span t-field="l.product_uom" groups="product.group_uom"/>
diff --git a/addons/website_quote/views/website_quote_templates.xml b/addons/website_quote/views/website_quote_templates.xml
index d9cff518c86..0d392cdc723 100644
--- a/addons/website_quote/views/website_quote_templates.xml
+++ b/addons/website_quote/views/website_quote_templates.xml
@@ -41,7 +41,8 @@
                         <t t-foreach="layout_category['lines']" t-as="line">
                             <tr>
                               <td>
-                                  <span t-field="line.name"/>
+                                  <span t-field="line.product_id"/><br/>
+                                  <span t-if="line.name != line.product_id.name" t-field="line.name"/>
                               </td>
                               <td>
                                   <div id="quote_qty">
diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index a8a25ee3bdb..1dd91154b11 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -86,7 +86,7 @@ class SaleOrder(models.Model):
         product_context.setdefault('lang', order.partner_id.lang)
         product = self.env['product.product'].with_context(product_context).browse(product_id)
 
-        name = product.display_name
+        name = product.description_sale or product.display_name
 
         # add untracked attributes in the name
         untracked_attributes = []
@@ -98,9 +98,6 @@ class SaleOrder(models.Model):
         if untracked_attributes:
             name += '\n%s' % (', '.join(untracked_attributes))
 
-        if product.description_sale:
-            name += '\n%s' % (product.description_sale)
-
         return name
 
     @api.multi
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 95a7e8f7225..f04a8814b19 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -859,8 +859,8 @@
                                     <strong t-esc="line.product_id.with_context(display_default_code=False).display_name" />
                                 </a>
                             </div>
-                            <div class="text-muted">
-                                <t t-foreach="line.name.splitlines()[1:]" t-as="name_line">
+                            <div t-if="line.name != line.product_id.name" t-attf-class="text-muted">
+                                <t t-foreach="line.name.splitlines()" t-as="name_line">
                                     <span><t t-esc="name_line"/></span><br/>
                                 </t>
                             </div>
@@ -1314,8 +1314,8 @@
                                             <div>
                                                 <strong t-field="line.product_id.with_context(display_default_code=False).display_name" />
                                             </div>
-                                            <div class="text-muted">
-                                                <t t-foreach="line.name.splitlines()[1:]" t-as="name_line">
+                                            <div t-if="line.name != line.product_id.name" t-attf-class="text-muted">
+                                                <t t-foreach="line.name.splitlines()" t-as="name_line">
                                                     <span><t t-esc="name_line"/></span><br/>
                                                 </t>
                                             </div>
@@ -1470,8 +1470,8 @@
                                                       <strong t-esc="line.product_id.with_context(display_default_code=False).display_name"/>
                                                   </a>
                                               </div>
-                                              <div class="text-muted">
-                                                  <t t-foreach="line.name.splitlines()[1:]" t-as="name_line">
+                                              <div t-if="line.name != line.product_id.name" t-attf-class="text-muted">
+                                                  <t t-foreach="line.name.splitlines()" t-as="name_line">
                                                       <span><t t-esc="name_line"/></span><br/>
                                                   </t>
                                               </div>
@@ -1756,10 +1756,12 @@
     <template id="orders_followup_products_links" name="Orders Followup Products Links" inherit_id="website_portal_sale.orders_followup">
         <xpath expr="//div[@id='product_name']/*" position="replace">
             <a t-if="ol.product_id.website_published" t-att-href="ol.product_id.website_url">
-                <span t-esc="ol.name" />
+                <span t-field="ol.product_id"/>
+                <span t-if="ol.name != ol.product_id.name" t-esc="ol.name"/>
             </a>
             <t t-if="not ol.product_id.website_published">
-                <span t-esc="ol.name" />
+                <span t-field="ol.product_id"/>
+                <span t-if="ol.name != ol.product_id.name" t-esc="ol.name"/>
             </t>
         </xpath>
     </template>