From 87d6fd4ed17208434ac19d5f661622131fe2cdf5 Mon Sep 17 00:00:00 2001
From: sonal arora <sonal.arora@apagen.com>
Date: Mon, 14 Sep 2020 11:08:59 +0530
Subject: [PATCH] work on delivery report

---
 .../fency_report_deliveryslip.xml             | 40 ++++++++++---------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/bi_professional_reports_templates/delivery_report/fency_report_deliveryslip.xml b/bi_professional_reports_templates/delivery_report/fency_report_deliveryslip.xml
index 8d87464..908172b 100644
--- a/bi_professional_reports_templates/delivery_report/fency_report_deliveryslip.xml
+++ b/bi_professional_reports_templates/delivery_report/fency_report_deliveryslip.xml
@@ -10,7 +10,10 @@
             </t>
             <div class="header">
                 <div class="row mt32 mb32">
-                    <div class="col-6">
+                    <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 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>
@@ -27,7 +30,7 @@
                         <br/>
                         <span t-field="company.partner_id.vat"/>
                         <br/>
-                    </div>
+                    </div> -->
                 </div>
             </div>
 
@@ -93,9 +96,9 @@
                     </div>
 
                     <div class="row">
-                        <div class="col-4"/>
-                        <div class="col-8 text-right"
-                             style="font:15px lucida-console,sans-serif !important; background-color:  #3498DB;  ">
+                        <!-- <div class="col-4"/> -->
+                        <div class="col-12 text-right"
+                             style="font:15px lucida-console,sans-serif !important; background-color:  #3498DB;">
                             <h2>
                                 <span>
                                     <font color="#fff">Delivery Note #</font>
@@ -107,16 +110,18 @@
 
                                 <div class="col-5">
                                     <div>
-                                        <font color="#fff">Origin:</font>
+                                        <font color="#fff">Origin:
+                                        <t t-field="o.picking_type_id"/></font>
                                     </div>
-                                    <div style="color:#FFF !important;" t-field="o.picking_type_id"/>
                                 </div>
                                 <div class="col-4">
                                     <div>
                                         <div>
-                                            <font color="#fff">Scheduled Date:</font>
+                                            <font color="#fff">Scheduled Date:<t t-field="o.scheduled_date"/>
+                                            </font>
+
                                         </div>
-                                        <div style="color:#FFF !important;" t-field="o.scheduled_date"/>
+                                        
                                     </div>
                                 </div>
                             </div>
@@ -132,14 +137,13 @@
                                 <th style="background-color:#3498DB !important;color:#FFF !important;">W/H</th>
                                 <th style="background-color:#3498DB !important;color:#FFF !important;">Code</th>
                                 <th style="background-color:#3498DB !important;color:#FFF !important;">Product</th>
-                                <th style="background-color:#3498DB !important;color:#FFF !important;">Ordered
-                                    Quantity
+                                <th style="background-color:#3498DB !important;color:#FFF !important;">Ordered Quantity
                                 </th>
                             </tr>
                         </thead>
                         <tbody>
                             <tr t-foreach="o.move_lines" t-as="move">
-				 <td>
+                                <td>
                                 </td>
                                 <td>
                                 </td>
@@ -156,9 +160,9 @@
                                 </td>
                             </tr>
                             <tr rowspan="2">
-                                <td colspan="2">Transport</td>
-                                <td colspan="2">Material Received by</td>
-                                <td colspan="2">Deleivery Given by</td>
+                                <td colspan="3">Transport</td>
+                                <td colspan="3">Material Received by</td>
+                                <td colspan="3">Deleivery Given by</td>
                             </tr>
                             <tr rowspan="2">
                                 <td colspan="2">Deriver's Name</td>
@@ -250,9 +254,9 @@
                                 </td>
                             </tr>
                             <tr rowspan="2">
-                                <td colspan="2">Transport</td>
-                                <td colspan="2">Material Received by</td>
-                                <td colspan="2">Deleivery Given by</td>
+                                <td colspan="3">Transport</td>
+                                <td colspan="3">Material Received by</td>
+                                <td colspan="3">Deleivery Given by</td>
                             </tr>
                             <tr rowspan="2">
                                 <td colspan="2">Deriver's Name</td>