From 94d311825aa40c5400160a7fbd393fb915e2be43 Mon Sep 17 00:00:00 2001
From: sonal arora <sonal.arora@apagen.com>
Date: Mon, 14 Sep 2020 07:12:14 +0000
Subject: [PATCH] work on sales report

---
 .../fency_report_deliveryslip.xml             | 62 ++++++++++---------
 1 file changed, 33 insertions(+), 29 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 908172b..19d0e62 100644
--- a/bi_professional_reports_templates/delivery_report/fency_report_deliveryslip.xml
+++ b/bi_professional_reports_templates/delivery_report/fency_report_deliveryslip.xml
@@ -108,21 +108,22 @@
                             </h2>
                             <div>
 
-                                <div class="col-5">
-                                    <div>
-                                        <font color="#fff">Origin:
-                                        <t t-field="o.picking_type_id"/></font>
-                                    </div>
+                                <div class="col-12 text-right">
+                                    <span>
+                                        <font color="#fff">Origin       :
+						<span t-field="o.picking_type_id"/>
+					</font>
+                                    </span>
                                 </div>
-                                <div class="col-4">
-                                    <div>
-                                        <div>
-                                            <font color="#fff">Scheduled Date:<t t-field="o.scheduled_date"/>
+                                <div class="col-12 text:right">
+                                   
+                                        <span>
+                                            <font color="#fff">Scheduled Date:<span t-field="o.scheduled_date"/>
                                             </font>
 
-                                        </div>
+                                        </span>
                                         
-                                    </div>
+                                    
                                 </div>
                             </div>
                         </div>
@@ -133,45 +134,48 @@
                            t-if="not o.move_line_ids">
                         <thead>
                             <tr>
-                                <th style="background-color:#3498DB !important;color:#FFF !important;">No</th>
-                                <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>
+                                <th colspan="2" style="background-color:#3498DB !important;color:#FFF !important;">No</th>
+                                <th colspan="2" style="background-color:#3498DB !important;color:#FFF !important;">W/H</th>
+                                <th colspan="2" style="background-color:#3498DB !important;color:#FFF !important;">Code</th>
+                                <th colspan="3" style="background-color:#3498DB !important;color:#FFF !important;">Product</th>
+                                <th colspan="2" 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 colspan="2">
                                 </td>
-                                <td>
+                                <td colspan="2">
                                 </td>
-                                <td>
+                                <td colspan="2">
                                   <span t-field="move.product_id.default_code"/>  
                                 </td>
                                 
-                                <td>
+                                <td colspan="3">
                                     <span t-field="move.product_id"/>
                                 </td>
-                                <td>
+                                <td colspan="2">
                                     <span t-field="move.product_qty"/>
                                     <span t-field="move.product_uom"/>
-                                </td>
+			    	</td>
+			
+
                             </tr>
                             <tr rowspan="2">
-                                <td colspan="3">Transport</td>
+                                <td colspan="6">Transport</td>
                                 <td colspan="3">Material Received by</td>
-                                <td colspan="3">Deleivery Given by</td>
+                                <td colspan="2">Deleivery Given by</td>
                             </tr>
                             <tr rowspan="2">
-                                <td colspan="2">Deriver's Name</td>
-                                <td colspan="2">Signature</td>
+                                <td colspan="6">Deriver's Name</td>
+                                <td colspan="3">Signature</td>
                                 <td colspan="2">Signature</td>
                             </tr>
                             <tr rowspan="2">
-                                <td colspan="2">Truck No.</td>
-                                <td colspan="2">Date</td>
+                                <td colspan="6">Truck No.</td>
+                                <td colspan="3">Date</td>
                                 <td colspan="2">Date</td>
                             </tr>
                         </tbody>