From cbb0d472f5378b059fe883744c54054569ccd8bf Mon Sep 17 00:00:00 2001
From: Mansi Trivedi <mtr@odoo.com>
Date: Wed, 17 Aug 2016 11:21:50 +0530
Subject: [PATCH] [IMP] sale: Added string for Quotation and Sales orders list
 view - Replaced order date by confirmation date in sales order list view -
 Added confirmation date in Sales order PDF report when it is not in 'draft'
 or 'sent' state - Calculation of expected delivery date should be based on
 sale order date

---
 addons/sale/models/sale.py                         | 2 +-
 addons/sale/report/sale_report_templates.xml       | 9 ++++++---
 addons/sale/views/sale_views.xml                   | 4 ++--
 addons/sale_order_dates/views/sale_order_views.xml | 2 +-
 addons/sale_stock/models/sale_order.py             | 2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py
index 72ed46d1c72..4720fb42a07 100644
--- a/addons/sale/models/sale.py
+++ b/addons/sale/models/sale.py
@@ -639,7 +639,7 @@ class SaleOrderLine(models.Model):
         return {
             'name': self.name,
             'origin': self.order_id.name,
-            'date_planned': datetime.strptime(self.order_id.date_order, DEFAULT_SERVER_DATETIME_FORMAT) + timedelta(days=self.customer_lead),
+            'date_planned': datetime.strptime(self.order_id.confirmation_date, DEFAULT_SERVER_DATETIME_FORMAT) + timedelta(days=self.customer_lead),
             'product_id': self.product_id.id,
             'product_qty': self.product_uom_qty,
             'product_uom': self.product_uom.id,
diff --git a/addons/sale/report/sale_report_templates.xml b/addons/sale/report/sale_report_templates.xml
index 22387694b4f..05bd9b16d13 100644
--- a/addons/sale/report/sale_report_templates.xml
+++ b/addons/sale/report/sale_report_templates.xml
@@ -40,9 +40,12 @@
                     <strong>Your Reference:</strong>
                     <p t-field="doc.client_order_ref"/>
                 </div>
-                <div t-if="doc.date_order" class="col-xs-3">
-                    <strong t-if="doc.state not in ['draft','sent']">Date Ordered:</strong>
-                    <strong t-if="doc.state in ['draft','sent']">Quotation Date:</strong>
+                <div t-if="doc.confirmation_date and doc.state not in ['draft','sent']" class="col-xs-3">
+                    <strong>Date Ordered:</strong>
+                    <p t-field="doc.confirmation_date"/>
+                </div>
+                <div t-if="doc.date_order and doc.state in ['draft','sent']" class="col-xs-3">
+                    <strong>Quotation Date:</strong>
                     <p t-field="doc.date_order"/>
                 </div>
                 <div t-if="doc.user_id.name" class="col-xs-3">
diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml
index 6853b573f7a..98b90236558 100644
--- a/addons/sale/views/sale_views.xml
+++ b/addons/sale/views/sale_views.xml
@@ -112,7 +112,7 @@
                 <tree string="Sales Orders" decoration-bf="message_needaction==True" decoration-muted="state=='cancel'">
                     <field name="message_needaction" invisible="1"/>
                     <field name="name" string="Order Number"/>
-                    <field name="date_order"/>
+                    <field name="confirmation_date" string="Order Date"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
                     <field name="amount_total" sum="Total Tax Included" widget="monetary"/>
@@ -130,7 +130,7 @@
                 <tree string="Quotation" class="o_sale_order" decoration-bf="message_needaction==True" decoration-muted="state=='cancel'">
                     <field name="message_needaction" invisible="1"/>
                     <field name="name" string="Quotation Number"/>
-                    <field name="date_order"/>
+                    <field name="date_order" string="Quotation Date"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
                     <field name="amount_total" sum="Total Tax Included" widget="monetary"/>
diff --git a/addons/sale_order_dates/views/sale_order_views.xml b/addons/sale_order_dates/views/sale_order_views.xml
index 26851848930..e2038b72a3b 100644
--- a/addons/sale_order_dates/views/sale_order_views.xml
+++ b/addons/sale_order_dates/views/sale_order_views.xml
@@ -16,7 +16,7 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_tree"/>
         <field name="arch" type="xml">
-            <field name="date_order" position="after">
+            <field name="confirmation_date" position="after">
                 <field name="requested_date"/>
                 <field name="commitment_date"/>
             </field>
diff --git a/addons/sale_stock/models/sale_order.py b/addons/sale_stock/models/sale_order.py
index 597e8aed1f6..f1a56a573b3 100644
--- a/addons/sale_stock/models/sale_order.py
+++ b/addons/sale_stock/models/sale_order.py
@@ -162,7 +162,7 @@ class SaleOrderLine(models.Model):
     @api.multi
     def _prepare_order_line_procurement(self, group_id=False):
         vals = super(SaleOrderLine, self)._prepare_order_line_procurement(group_id=group_id)
-        date_planned = datetime.strptime(self.order_id.date_order, DEFAULT_SERVER_DATETIME_FORMAT)\
+        date_planned = datetime.strptime(self.order_id.confirmation_date, DEFAULT_SERVER_DATETIME_FORMAT)\
             + timedelta(days=self.customer_lead or 0.0) - timedelta(days=self.order_id.company_id.security_lead)
         vals.update({
             'date_planned': date_planned.strftime(DEFAULT_SERVER_DATETIME_FORMAT),