From dbcaa16527a22734ca86c1a2fd4bcb2c07f1b764 Mon Sep 17 00:00:00 2001
From: sonal arora <sonal.arora@apagen.com>
Date: Tue, 15 Sep 2020 05:48:32 +0000
Subject: [PATCH] work on payment report

---
 reports/views/.report_payment_receipt.xml.swo | Bin 0 -> 12288 bytes
 reports/views/.report_payment_receipt.xml.swp | Bin 0 -> 16384 bytes
 reports/views/report_payment_receipt.xml      |  33 +++++++++++-------
 3 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 reports/views/.report_payment_receipt.xml.swo
 create mode 100644 reports/views/.report_payment_receipt.xml.swp

diff --git a/reports/views/.report_payment_receipt.xml.swo b/reports/views/.report_payment_receipt.xml.swo
new file mode 100644
index 0000000000000000000000000000000000000000..71c3481c0e755f4c465b2c8f870fd4d2bf5c4c3d
GIT binary patch
literal 12288
zcmeI%u}%Up9LMoL>;{8z2c4lHiz6$8qpnBc{s~0x+VmQQNnV4IN8$;56g>!z7nzT5
zlcxDMZIj<8>CkjGc$>U*p8EqS+pWlcJWUR}d)baff^+dW{a@3y&HPGx3s=P4W?Hr0
zI3JBmog0o!3^tkB`Mc(+3F=*lh51<OXK}6)Z#S9dF$p@?rH}n}wyHXpc?1x+MBqk7
zPs7tye|+e6?%J=HY+?-p2q1s}0tg_000IcqL?HTxe3e<6=RA#yu_keefdB#sAb<b@
z2q1s}0tg_0z*P#^ROGuQ@>BNX|Nr0n|5RV42%!-`009ILKmY**5I_I{1Q4j7z%Qa_
BE^Gh*

literal 0
HcmV?d00001

diff --git a/reports/views/.report_payment_receipt.xml.swp b/reports/views/.report_payment_receipt.xml.swp
new file mode 100644
index 0000000000000000000000000000000000000000..333f9c950487578b616399a160cfba4177e0868d
GIT binary patch
literal 16384
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

literal 0
HcmV?d00001

diff --git a/reports/views/report_payment_receipt.xml b/reports/views/report_payment_receipt.xml
index 59fa37d..15f18c9 100644
--- a/reports/views/report_payment_receipt.xml
+++ b/reports/views/report_payment_receipt.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <template id="report_payment_receipt_view_documents">
-        <div class="header">
+	    <div class="header">
+		<t t-if="o and 'company_id' in o">
+		    <t t-set="company" t-value="o.company_id"></t>
+		</t>
+		<t t-if="not o or not 'company_id' in o">
+		    <t t-set="company" t-value="res_company"></t>
+		 </t>
                 <div class="row mt32 mb32">
                     <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>
@@ -15,15 +21,16 @@
                 <table class="table table-sm">
                     <tr>
                         <th style="border:1px solid;width:50%;top:2px">
-                            <strong>Code:</strong></br>
-                            <strong>Address:</strong></br>
-                            <strong>Telephone Number:</strong></br>
-                            <strong>Account Payee:</strong></br>
+				<strong>Code:</strong><br/>
+				<strong>Address:</strong><br/>
+				<strong>Telephone Number:</strong><br/>
+				<strong>Account Payee:</strong><br/>
                         </th>
                         <th style="width:5%;"></th>
                         <th style="border:1px solid;width:45%">
-                            <strong>Receipt Number: </strong>:<span t-field="o.name"/><br/>
-                            <strong>Date: </strong>:<span t-field="o.payment_date"/><br/>
+				<strong>Receipt Number: </strong>:<span t-field="o.name"/><br/>
+				<strong>Date: </strong><span t-field="o.payment_date"/><br/>
+
                         </th>
                     </tr>
                     <tr>
@@ -36,20 +43,20 @@
                         </th>
                         <th style="width:5%;"></th>
                         <th style="border:1px solid;width:45%">
-                            <strong>Cheque Number: </strong><br/>
+				<strong>Cheque Number: </strong><br/>
                         </th>
                     </tr>
                 </table>
                 <table class="table table-sm">
                     <tr>
                         <th style="border:1px solid;width:50%">
-                            <strong>Bank Account</strong></br>
-                            <strong>Bank Account Number: </strong></br>>:
+				<strong>Bank Account</strong><br/>
+				<strong>Bank Account Number:</strong><br/>
                         </th>
                         <th style="width:5%;"></th>
                         <th style="border:1px solid;width:45%">
-                            <strong>Currency</strong><span t-field="o.currency_id.name"/></br>
-                            <strong>Exchange Rate</strong></br>
+				<strong>Currency</strong><span t-field="o.currency_id.name"/><br/>
+				<strong>Exchange Rate</strong><br/>
                         </th>
                     </tr>
                     <!-- <div class="row mt64">
@@ -73,7 +80,7 @@
                 <table class="table table-sm">
                     <tr>
                         <th style="border:1px solid;width:100%;">
-                            <strong>Description: </strong><br/><br/>
+                            <strong>Description:</strong><br/><br/>
                         </th>
                     </tr>
                 </table>