From c652e846c8220b0d8a6b26c4e8dce7473e114e1e Mon Sep 17 00:00:00 2001
From: sonal arora <sonal.arora@apagen.com>
Date: Sun, 13 Sep 2020 15:04:54 +0530
Subject: [PATCH] work on sale order report

---
 .../sale_report/fency_report_saleorder.xml    | 12 ++---
 reports/views/sale_report.xml                 | 48 +++++++++++++++++--
 2 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/bi_professional_reports_templates/sale_report/fency_report_saleorder.xml b/bi_professional_reports_templates/sale_report/fency_report_saleorder.xml
index ebb4226..b9ed8be 100644
--- a/bi_professional_reports_templates/sale_report/fency_report_saleorder.xml
+++ b/bi_professional_reports_templates/sale_report/fency_report_saleorder.xml
@@ -44,25 +44,25 @@
                             <div class="row mt32 mb32">
                                 <div class="col-3">
                                     <font color="#fff">
-                                    <strong>Your Reference:</strong>
+                                    <strong>Your Reference</strong>
                                     <p t-field="o.client_order_ref"/></font>
                                 </div>
 
                                 <div class="col-3" t-if="o.date_order">
                                     <font color="#fff">
-                                    <strong>Order Date:</strong>
+                                    <strong>Order Date</strong>
                                     <p t-field="o.date_order"/></font>
                                 </div>
 
                                 <div class="col-3" t-if="o.payment_term_id">
                                     <font color="#fff">
-                                    <strong> Payment Term: </strong>
+                                    <strong> Payment Term</strong>
                                     <p t-field="o.payment_term_id"/></font>
                                 </div>
 
                                 <div class="col-3" t-if="o.user_id">
                                     <font color="#fff">
-                                    <strong>Sales Person:</strong>
+                                    <strong>Sales Person</strong>
                                     <p t-field="o.user_id"/></font>
                                 </div>
                             </div>
@@ -70,7 +70,7 @@
                     
                         <div class="row mt32 mb32">
                             <div class="col-6 ">
-                                <strong>Customer Address:</strong><br/>
+                                <strong>Customer Address</strong><br/>
                                     <span t-field="o.partner_id" /><br/>
                                     <span t-if="o.partner_id.street" 
                                         t-field="o.partner_id.street" /><br/>
@@ -85,7 +85,7 @@
                                     <span t-if="o.partner_id.zip" t-field="o.partner_id.zip" />
                             </div>
                             <div class="col-6 text-right">
-                                <strong>Shipping Address:</strong><br/>
+                                <strong>Shipping Address</strong><br/>
                                     <span t-field="o.partner_shipping_id" />
                                     <br/>
                                     <span t-field="o.partner_shipping_id.street" />
diff --git a/reports/views/sale_report.xml b/reports/views/sale_report.xml
index f3034ef..a998eba 100644
--- a/reports/views/sale_report.xml
+++ b/reports/views/sale_report.xml
@@ -2,9 +2,28 @@
 <odoo>
 	<template id="custom_sale_report" inherit_id="bi_professional_reports_templates.fency_report_saleorder_document">
 		<xpath expr="//t[@t-call='web.external_layout']/div/div[2]/div[1]" position="after">
-			<strong>Validity:</strong><br/>
-			<strong>Sales Code:</strong><br/>
-			<strong>RFQ</strong><br/>
+			<div class="row mt32 mb32">
+                <div class="col-3">
+                    <font color="#fff">
+                    <strong>Validity</strong>
+                    <p t-field="o.client_order_ref"/></font>
+                </div>
+
+                <div class="col-3" t-if="o.date_order">
+                    <font color="#fff">
+                    <strong>Sales Code</strong>
+                    <p t-field="o.date_order"/></font>
+                </div>
+
+                <div class="col-3" t-if="o.payment_term_id">
+                    <font color="#fff">
+                    <strong>RFQ</strong>
+                    <p t-field="o.payment_term_id"/></font>
+                </div>
+            </div>
+			<!-- <strong>Validity</strong><br/>
+			<strong></strong><br/>
+			<strong>RFQ</strong><br/> -->
 		</xpath>
 		<xpath expr="//t[@t-call='web.external_layout']/div/div[2]" position="after">
 			<span style="color:blue;">NOTE:</span><br/>
@@ -18,9 +37,28 @@
 	</template>
 	<template id="custom_sale_report1" inherit_id="bi_professional_reports_templates.classic_report_saleorder_document">
 		<xpath expr="//t[@t-call='web.external_layout']/div/div[2]/table[1]" position="after">
-			<strong>Validity:</strong><br/>
+			<div class="row mt32 mb32">
+                <div class="col-3">
+                    <font color="#fff">
+                    <strong>Validity</strong>
+                    <p t-field="o.client_order_ref"/></font>
+                </div>
+
+                <div class="col-3" t-if="o.date_order">
+                    <font color="#fff">
+                    <strong>Sales Code</strong>
+                    <p t-field="o.date_order"/></font>
+                </div>
+
+                <div class="col-3" t-if="o.payment_term_id">
+                    <font color="#fff">
+                    <strong>RFQ</strong>
+                    <p t-field="o.payment_term_id"/></font>
+                </div>
+            </div>
+			<!-- <strong>Validity:</strong><br/>
 			<strong>Sales Code:</strong><br/>
-			<strong>RFQ</strong><br/>
+			<strong>RFQ</strong><br/> -->
 		</xpath>
 		<xpath expr="//t[@t-call='web.external_layout']/div/div[2]/table[2]" position="after">
 			<span style="color:blue;">NOTE:</span><br/>