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 51f1823..d550095 100644
--- a/bi_professional_reports_templates/delivery_report/fency_report_deliveryslip.xml
+++ b/bi_professional_reports_templates/delivery_report/fency_report_deliveryslip.xml
@@ -13,24 +13,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>
-                    <div class="col-6 text-right" style="font:12px lucida-console,sans-serif !important;">
-                        <span t-field="company.partner_id"/>
-                        <br/>
-                        <span t-field="company.partner_id.street"/>
-                        <br/>
-                        <span t-field="company.partner_id.street2"/>
-                        <br/>
-                        <span t-field="company.partner_id.city"/>
-                        <br/>
-                        <span t-field="company.partner_id.country_id"/>
-                        <br/>
-                        <span t-field="company.partner_id.vat"/>
-                        <br/>
-                    </div> -->
                 </div>
             </div>
 
@@ -59,43 +41,42 @@
 		    </div>
 		    <div class="col-4">
 		    </div>
-
-                        <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>
-                                    <div t-field="o.move_lines[0].partner_id"
-                                         t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": true}'/>
-                                    <div t-field="o.move_lines[0].partner_id.street"/>
-                                    <span t-field="o.move_lines[0].partner_id.street2"/>
-                                    <br/>
-                                    <span t-field="o.move_lines[0].partner_id.city"/>
-                                    <br/>
-                                    <span t-field="o.move_lines[0].partner_id.country_id"/>
-                                    <br/>
-                                    <span t-field="o.move_lines[0].partner_id.zip"/>
-                                    <br/>
-                                    <div t-field="o.move_lines[0].partner_id.vat"/>
-                                </div>
-                            </div>
-                            <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) or o.move_lines and not o.move_lines[0].partner_id">
-                                <span t-field="o.partner_id"/>
+                    <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>
+                                <div t-field="o.move_lines[0].partner_id"
+                                     t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": true}'/>
+                                <div t-field="o.move_lines[0].partner_id.street"/>
+                                <span t-field="o.move_lines[0].partner_id.street2"/>
                                 <br/>
-                                <span t-field="o.partner_id.street"/>
+                                <span t-field="o.move_lines[0].partner_id.city"/>
                                 <br/>
-                                <span t-field="o.partner_id.street2"/>
+                                <span t-field="o.move_lines[0].partner_id.country_id"/>
                                 <br/>
-                                <span t-field="o.partner_id.city"/>
-                                <br/>
-                                <span t-field="o.partner_id.state_id"/>
-                                <br/>
-                                <span t-field="o.partner_id.country_id"/>
-                                <br/>
-                                <span t-field="o.partner_id.vat"/>
+                                <span t-field="o.move_lines[0].partner_id.zip"/>
                                 <br/>
+                                <div t-field="o.move_lines[0].partner_id.vat"/>
                             </div>
                         </div>
+                        <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) or o.move_lines and not o.move_lines[0].partner_id">
+                            <span t-field="o.partner_id"/>
+                            <br/>
+                            <span t-field="o.partner_id.street"/>
+                            <br/>
+                            <span t-field="o.partner_id.street2"/>
+                            <br/>
+                            <span t-field="o.partner_id.city"/>
+                            <br/>
+                            <span t-field="o.partner_id.state_id"/>
+                            <br/>
+                            <span t-field="o.partner_id.country_id"/>
+                            <br/>
+                            <span t-field="o.partner_id.vat"/>
+                            <br/>
+                        </div>
                     </div>
+                </div>
 
                     <div class="row">
                         <!-- <div class="col-4"/> -->
@@ -109,8 +90,7 @@
                                 <br/>
                             </h2>
                             <div>
-
-                                <div class="col-12">
+                    <div class="col-12">
 				    <span>
 					<font color="#fff">
 					    <div class="row">
@@ -118,22 +98,20 @@
 						<div class="col-4"><span t-field="o.picking_type_id"/></div>
 					</div>
 					</font>
-                                    </span>
-                                </div>
-                                <div class="col-12">
-                                        <span>
+                    </span>
+                    </div>
+                    <div class="col-12">
+                    <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>
-                                        
-                                    
-                                </div>
+                            </span>
                             </div>
                         </div>
+                        </div>
                     </div>
                     <br/>
 
@@ -145,46 +123,44 @@
                                 <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 colspan="2">
-                                </td>
-                                <td colspan="2">
-                                </td>
-                                <td colspan="2">
-                                  <span t-field="move.product_id.default_code"/>  
-                                </td>
-                                
-                                <td colspan="3">
-                                    <span t-field="move.product_id"/>
-                                </td>
-                                <td colspan="2">
-                                    <span t-field="move.product_qty"/>
-                                    <span t-field="move.product_uom"/>
-			    	</td>
-			
-
-                            </tr>
-                            <tr rowspan="2">
-                                <td colspan="6">Transport</td>
-                                <td colspan="3">Material Received by</td>
-                                <td colspan="2">Deleivery Given by</td>
-                            </tr>
-                            <tr rowspan="2">
-                                <td colspan="6">Deriver's Name</td>
-                                <td colspan="3">Signature</td>
-                                <td colspan="2">Signature</td>
-                            </tr>
-                            <tr rowspan="2">
-                                <td colspan="6">Truck No.</td>
-                                <td colspan="3">Date</td>
-                                <td colspan="2">Date</td>
-                            </tr>
-                        </tbody>
+				        </th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                      <tr t-foreach="o.move_lines" t-as="move">
+                        <td colspan="2">
+                            <span t-field="move+1"/>  
+                        </td>
+                        <td colspan="2">
+                        </td>
+                        <td colspan="2">
+                          <span t-field="move.product_id.default_code"/>  
+                        </td>
+                        
+                        <td colspan="3">
+                            <span t-field="move.product_id"/>
+                        </td>
+                        <td colspan="2">
+                            <span t-field="move.product_qty"/>
+                            <span t-field="move.product_uom"/>
+			    	    </td>
+                        </tr>
+                        <tr rowspan="2">
+                            <td colspan="6">Transport</td>
+                            <td colspan="3">Material Received by</td>
+                            <td colspan="2">Deleivery Given by</td>
+                        </tr>
+                        <tr rowspan="2">
+                            <td colspan="6">Deriver's Name</td>
+                            <td colspan="3">Signature</td>
+                            <td colspan="2">Signature</td>
+                        </tr>
+                        <tr rowspan="2">
+                            <td colspan="6">Truck No.</td>
+                            <td colspan="3">Date</td>
+                            <td colspan="2">Date</td>
+                        </tr>
+                       </tbody>
                     </table>
                     <table class="table table-sm" style="padding-top=50px;" t-if="o.move_line_ids">
                         <t t-set="has_serial_number" t-value="o.move_line_ids.mapped('lot_id')"