27.02.26

modules/purchase_trade/purchase.py

@@ -36,6 +36,7 @@ TRIGGERS = [
     ('discharge', 'Discharge NOR'),
     ('arrival', 'Arrival date'),
     ('delmonth', 'Delivery month'),
+    ('deldate', 'Delivery date'),
     ]
 
 class DocType(ModelSQL,ModelView):

modules/purchase_trade/sale.py

@@ -278,6 +278,16 @@ class Sale(metaclass=PoolMeta):
             return amount_to_currency_words(self.lines[0].unit_price)
         else:
             return ''
+    
+    @property
+    def report_delivery(self):
+        del_date = ''
+        if self.lines:
+            if self.estimated_date:
+                delivery_date = [dd.estimated_date for dd in self.estimated_date if dd.trigger=='deldate']
+                if delivery_date:
+                    del_date = delivery_date[0]
+        return del_date
         
     @property
     def report_shipment(self):
@@ -287,7 +297,15 @@ class Sale(metaclass=PoolMeta):
                 if shipment:
                     info = 'B/L ' + shipment.bl_number 
                     if shipment.container and shipment.container[0].container_no:
-                        info += ' ' + shipment.container[0].container_no
+                        id = 1
+                        for cont in shipment.container:
+                            if id == 1:
+                                info += ' Containers'
+                            if cont.container_no:
+                                info += ' ' + cont.container_no
+                            else:
+                                info += ' unnamed'
+                            id += 1
                     if shipment.note:
                         info += ' ' + shipment.note
                     return info