27.02.26

modules/purchase_trade/sale.py

@@ -279,25 +279,28 @@ class Sale(metaclass=PoolMeta):
         else:
             return ''
     
-    @property
-    def report_del(self):
-        return 'PROMPT'
-    
     @property
     def report_delivery(self):
         del_date = 'PROMPT'
         if self.lines:
-            if self.estimated_date:
-                delivery_date = [dd.estimated_date for dd in self.estimated_date if dd.trigger=='deldate']
+            if self.lines[0].estimated_date:
+                delivery_date = [dd.estimated_date for dd in self.lines[0].estimated_date if dd.trigger=='deldate']
                 if delivery_date:
                     del_date = delivery_date[0]
         return del_date
+    
+    @property
+    def report_payment_date(self):
+        if self.lines:
+            Date = Pool().get('ir.date')
+            return self.lines[0].sale.payment_term.lines[0].get_date(Date.today(),self.lines[0])
         
     @property
     def report_shipment(self):
         if self.lines:
             if len(self.lines[0].lots)>1:
                 shipment = self.lines[0].lots[1].lot_shipment_in
+                lot = self.lines[0].lots[1].lot_name
                 if shipment:
                     info = 'B/L ' + shipment.bl_number 
                     if shipment.container and shipment.container[0].container_no:
@@ -310,6 +313,7 @@ class Sale(metaclass=PoolMeta):
                             else:
                                 info += ' unnamed'
                             id += 1
+                    info += ' (LOT ' + lot + ')'
                     if shipment.note:
                         info += ' ' + shipment.note
                     return info