From 018afad696415b2f2f9c86b6b1ba810819b60c8d Mon Sep 17 00:00:00 2001
From: sonal arora <sonal.arora@apagen.com>
Date: Wed, 23 Sep 2020 01:29:04 +0530
Subject: [PATCH] work on report

---
 .../fency_report_deliveryslip.xml             | 76 ++++++++++---------
 1 file changed, 39 insertions(+), 37 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 42146a5..afb8a4c 100644
--- a/bi_professional_reports_templates/delivery_report/fency_report_deliveryslip.xml
+++ b/bi_professional_reports_templates/delivery_report/fency_report_deliveryslip.xml
@@ -20,6 +20,41 @@
                 <t t-set="o" t-value="o.with_context({'lang':o.partner_id.lang})"/>
                     <div class="page">
                     <div class="oe_structure"/>
+                    
+                    <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;">
                             <span style="background-color:#3498DB;">Customer Address</span>
@@ -38,9 +73,9 @@
                             <br/>
                             <span t-field="o.partner_id.vat"/>
                             <br/>
-		                </div>
-            		    <div class="col-2">
-            		    </div>
+                        </div>
+                        <div class="col-2">
+                        </div>
                         <div class="col-5" 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">
@@ -77,40 +112,6 @@
                             </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/>
 
                     <table class="table table-sm" style="padding-top=50px; padding-bottom=50px;" t-if="not o.move_line_ids">
                         <thead>
@@ -240,6 +241,7 @@
                                     <span t-field="move_line.product_uom_id"/>
                                 </td>
                             </tr>
+                            <tr></tr>
                             <tr rowspan="2">
                                 <td colspan="6">Transport</td>
                                 <td colspan="3">Material Received by</td>