From 506d849a86cdb2ec059f9bd56974f67bf7d81cc7 Mon Sep 17 00:00:00 2001
From: sonal arora <sonal.arora@apagen.com>
Date: Wed, 23 Sep 2020 02:04:50 +0530
Subject: [PATCH] work on report

---
 .../fency_report_deliveryslip.xml             | 63 ++++++++-----------
 1 file changed, 25 insertions(+), 38 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 371bdbe..39d7ac4 100644
--- a/bi_professional_reports_templates/delivery_report/fency_report_deliveryslip.xml
+++ b/bi_professional_reports_templates/delivery_report/fency_report_deliveryslip.xml
@@ -24,13 +24,13 @@
                         <div style=" background-color:  #3498DB;">
                         <h2>
                             <span>
-                                <font color="#fff">Delivery Note #</font>
+                                &#160;<font color="#fff">Delivery Note #</font>
                             </span>
                         </h2>
                         <div class="row mt32 mb32">
                             <div class="col-5">
                                 <font color="#fff">
-                                <strong>Origin</strong>
+                                &#160;<strong>Origin</strong>
                                 <p t-field="o.picking_type_id"/></font>
                             </div>
                             <div class="col-5">
@@ -42,44 +42,11 @@
                             </div>
                         </div>
                     </div>
-                    
-                    
-                    <div class="row">
-                        <div class="col-12" style="font:13px lucida-console,sans-serif !important; background-color:  #3498DB;"><h2>
-                            <span><font color="#fff">Delivery Note #</font>
-                                <span style="color:#FFF !important;" t-field="o.name"/>
-                            </span><br/>
-                            </h2>
-                       </div>
-                    </div>
-                        <!-- <div class="col-12"> -->
-    				    <span>
-    					
-					    <div class="row">
-						<div class="col-12" style="font:13px lucida-console,sans-serif !important; background-color:  #3498DB;">
-						    <div class ="col-4"><span><font color="#fff">Origin</font></span>:
-							    <span style="color:#FFF !important;" t-field="o.picking_type_id"/></div>
-						    <div class ="col-4"><span><font color="#fff">Scheduled Date</font></span>:
-							    <span style="color:#FFF !important;" t-field="o.scheduled_date"/></div>
-					    </div>
-				           </div>
-    					
-                        </span>
-                        <!-- </div> 
-                        
-                            <span>
-                                <font color="#fff">
-                                    <div class="row">
-                                    <div class="col-3">Scheduled Date</div>:
-                                    <div class="col-4"><span t-field="o.scheduled_date"/></div>
-                                </div>
-                                </font> 
-			    </span>-->
                         
                      
                     <br/>
                     <div class="row">
-                        <div class="col-5" style="font:15px lucida-console,sans-serif !important;">
+                        <div class="col-4" style="font:15px lucida-console,sans-serif !important;">
                             <span style="background-color:#3498DB;">Customer Address</span>
                             <br/>
                             <span t-field="o.partner_id"/>
@@ -97,9 +64,9 @@
                             <span t-field="o.partner_id.vat"/>
                             <br/>
                         </div>
-                        <div class="col-2">
+                        <div class="col-4">
                         </div>
-                        <div class="col-5" style="font:15px lucida-console,sans-serif !important;  ">
+                        <div class="col-4" style="font:15px lucida-console,sans-serif !important;  ">
                             <span style="background-color:#3498DB;">Delivery Address</span>
                             <div t-if="o.move_lines and o.move_lines[0].partner_id and o.move_lines[0].partner_id.id != o.partner_id.id">
                                 <div>
@@ -283,6 +250,26 @@
                             </tr>
                         </tbody>
                     </table>
+                    <div class="row mt32 mb32">
+                            <div class="col-4">
+                                
+                                &#160;<strong>Transport</strong>
+                                &#160;<strong>Deriver's Name</strong>
+                                &#160;<strong>Truck No.</strong>
+                               
+                            </div>
+                            <div class="col-4">
+                                <strong>Material Received by</strong>
+                                <strong>Signature</strong>
+                                <strong>Date</strong>
+                                
+                            </div>
+                            <div class="col-4">
+                                <strong>Deleivery Given by</strong>
+                                <strong>Signature</strong>
+                                <strong>Date</strong>
+                            </div>
+                        </div>
              
                     <p t-if="o.backorder_id">
                         This shipment is a backorder of<t t-esc="o.backorder_id.name"/>.