From e850064089d61d5d481c0ac32a07c93735ffe546 Mon Sep 17 00:00:00 2001
From: sonal arora <sonal.arora@apagen.com>
Date: Tue, 15 Sep 2020 00:33:22 +0530
Subject: [PATCH] work on invoice report

---
 .../invoice_report/fency_report_invoice.xml   | 25 ++-----
 reports/views/invoice_report.xml              | 71 ++++++++++++-------
 2 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/bi_professional_reports_templates/invoice_report/fency_report_invoice.xml b/bi_professional_reports_templates/invoice_report/fency_report_invoice.xml
index c63c994..b7cc9b2 100644
--- a/bi_professional_reports_templates/invoice_report/fency_report_invoice.xml
+++ b/bi_professional_reports_templates/invoice_report/fency_report_invoice.xml
@@ -10,23 +10,8 @@
             </t>
             <div class="header">
                 <div class="row mt32 mb32">
-                    <div class="col-6">
-                        <img t-if="company.logo" t-att-src="'data:image/png;base64,%s' % to_text(company.logo)"
-                             style="max-height: 50px;"/>
-                    </div>
-                    <div class="col-6 text-right" style="font:12px lucida-console,sans-serif !important;">
-                        <span t-field="company.partner_id"/>
-                        <br/>
-                        <span t-field="company.partner_id.street"/>
-                        <br/>
-                        <span t-field="company.partner_id.street2"/>
-                        <br/>
-                        <span t-field="company.partner_id.city"/>
-                        <br/>
-                        <span t-field="company.partner_id.country_id"/>
-                        <br/>
-                        <span t-field="company.partner_id.vat"/>
-                        <br/>
+                    <div class="col-12">
+                        <font color="#fff"><img t-att-src="'data:image/png;base64,%s' % to_text(company.logo)" style="max-height: 250px;"/></font>
                     </div>
                 </div>
             </div>
@@ -66,7 +51,7 @@
 
                             <div class="col-3" t-if="o.invoice_date">
                                 <font color="#fff">
-                                    <strong>Invoice Date:</strong>
+                                    <strong>Invoice Date</strong>
                                     <p t-field="o.invoice_date"/>
                                 </font>
                             </div>
@@ -74,13 +59,13 @@
                             <div class="col-3"
                                  t-if="o.invoice_date_due and o.type == 'out_invoice' and (o.state == 'draft' or o.state == 'posted')">
                                 <font color="#fff">
-                                    <strong>Due Date:</strong>
+                                    <strong>Due Date</strong>
                                     <p t-field="o.invoice_date_due"/>
                                 </font>
                             </div>
                             <div class="col-3" t-if="o.invoice_payment_term_id">
                                 <font color="#fff">
-                                    <strong>Payment Term:</strong>
+                                    <strong>Payment Term</strong>
                                     <p t-field="o.invoice_payment_term_id"/>
                                 </font>
                             </div>
diff --git a/reports/views/invoice_report.xml b/reports/views/invoice_report.xml
index d0a254c..cdd3669 100644
--- a/reports/views/invoice_report.xml
+++ b/reports/views/invoice_report.xml
@@ -20,25 +20,37 @@
 			<span t-esc="o.txn_id"/><br/>
 		</xpath>
 		<xpath expr="//t[@t-call='web.external_layout']/div/div[2]" position="before">
-			<strong>TRN#</strong>
-			<span t-esc="o.txn_id"/><br/>
-			<strong>YOUR ORDER NO:</strong><br/>
-			<span t-if="o.type == 'out_invoice'">
-				<div class="text-right"><strong>D.O.NOS</strong><br/></div>
-				<div class="text-right"><strong>M.R.V NO.</strong><br/></div>
-			</span>
-			<span t-if="o.type == 'out_refund'">
-				<div class="text-right"><strong>Our D.O.NOS</strong><br/></div>
-				<div class="text-right"><strong>Our M.R.V NO.</strong><br/></div>
-			</span>
-			<strong>Sale Code:</strong>
-			<span t-esc="o.invoice_origin"/><br/>
-			<span t-if="o.type == 'out_refund'">
-				<strong>Cost Code:</strong>
-			</span>
+			<!-- <strong>TRN#</strong>
+			<span t-esc="o.txn_id"/><br/> -->
+			<div class="row">
+				<div class="col-4">
+					<strong>YOUR ORDER NO:</strong><br/>
+				</div>
+				<div class="col-4">
+				</div>
+				<div class="col-4"> 
+					<span t-if="o.type == 'out_invoice'">
+						<div class="text-right"><strong>D.O.NOS</strong><br/></div>
+						<div class="text-right"><strong>M.R.V NO.</strong><br/></div>
+					</span>
+					<span t-if="o.type == 'out_refund'">
+						<div class="text-right"><strong>Our D.O.NOS</strong><br/></div>
+						<div class="text-right"><strong>Our M.R.V NO.</strong><br/></div>
+					</span>
+				</div>
+			</div>
+			<div class="row">
+				<div class="col-6">
+					<strong>Sale Code:</strong>
+					<span t-esc="o.invoice_origin"/><br/>
+					<span t-if="o.type == 'out_refund'">
+						<strong>Cost Code:</strong>
+					</span>
+				</div>
+			</div>
 		</xpath>
 		<xpath expr="//div[@style='padding-top:50px;']" position="after">
-			<span>NOTE:</span><br/>
+			<span>NOTE</span><br/>
 			<span t-esc="o.note"/>
 		</xpath>
 		<xpath expr="//table[@class='table table-sm']/thead/tr/th[1]" position="before">
@@ -46,7 +58,7 @@
 			<th style="background-color:#3498DB !important;color:#FFF">Code</th>
 		</xpath>
 		<xpath expr="//table[@class='table table-sm']/tbody/tr/td[1]" position="before">
-			<td><span t-esc="i"/></td>
+			<td><span t-esc="i+1"/></td>
 			<td><span t-esc="l.product_id.default_code"/></td>
 		</xpath>
 		<xpath expr="//t[@t-call='web.external_layout']/div/p[last()]" position="after">
@@ -61,13 +73,22 @@
 			<span t-esc="o.txn_id"/><br/>
 		</xpath>
 		<xpath expr="//t[@t-call='web.external_layout']/div/div[2]" position="before">
-			<strong>TRN#</strong>
-			<span t-esc="o.txn_id"/><br/>
-			<strong>YOUR ORDER NO:</strong><br/>
-			<div class="text-right"><strong>D.O.NOS</strong><br/></div>
-			<div class="text-right"><strong>M.R.V NO.</strong><br/></div>
-			<strong>Sale Code:</strong>
-			<span t-esc="o.invoice_origin"/>
+			<div class="row">
+				<div class="col-4">
+					<strong>YOUR ORDER NO:</strong><br/>
+				</div>
+				<div class="col-4">
+				</div>
+				<div class="col-4"> 
+					<div class="text-right"><strong>D.O.NOS</strong><br/></div>
+					<div class="text-right"><strong>M.R.V NO.</strong><br/></div>
+				</div>
+			</div>
+			<div class="row">
+				<div class="col-6">
+					<strong>Sale Code:</strong>
+				</div>
+			</div>
 		</xpath>
 		<xpath expr="//t[@t-call='web.external_layout']/div/p[last()]" position="after">
 			<p>E &amp; OE</p><br/>