18.01.26

modules/automation/freight_booking.py

@@ -9,15 +9,15 @@ class FreightBookingInfo(ModelSQL, ModelView):
 
     booking_number = fields.Char("Booking Number")
     agent = fields.Char("Agent")
-    customer = fields.Char("Customer")
+    controller = fields.Char("Customer")
     origin = fields.Char("Origin")
     destination = fields.Char("Destination")
     etd = fields.Date("ETD")
-    eta = fields.Date("ETA")
+    bl_date = fields.Date("ETA")
     carrier = fields.Char("Carrier")
     vessel = fields.Char("Vessel")
     container_count = fields.Integer("Containers")
-    gross_weight = fields.Float("Gross Weight")
+    quantity = fields.Float("Gross Weight")
 
     @classmethod
     def table_query(cls):
@@ -28,18 +28,18 @@ class FreightBookingInfo(ModelSQL, ModelView):
             CurrentTimestamp().as_('create_date'),
             Literal(None).as_('write_uid'),
             Literal(None).as_('write_date'),
-            t.booking_number.as_('id'),
-            t.booking_number,
-            t.agent,
-            t.customer,
-            t.origin,
-            t.destination,
-            t.etd,
-            t.eta,
-            t.carrier,
-            t.vessel,
-            t.container_count,
-            t.gross_weight
+            t.FintradeBookingKey.as_('id'),
+            t.ShippingInstructionNumber.as_('booking_number'),
+            t.BookingAgent.as_('agent'),
+            t.ExpectedController.as_('controller'),
+            t.Loading.as_('origin'),
+            t.Destination.as_('destination'),
+            t.ETD_Date.as_('etd'),
+            t.BL_date.as_('bl_date'),
+            t.Carrier.as_('carrier'),
+            t.Vessel.as_('vessel'),
+            t.NumberOfContainers.as_('container_count'),
+            t.ShippingInstructionQuantity.as_('quantity')
         )
 
     @classmethod

modules/automation/view/freight_booking_info_tree.xml

@@ -1,13 +1,13 @@
 <tree>
     <field name="booking_number"/>
     <field name="agent"/>
-    <field name="customer"/>
+    <field name="controller"/>
     <field name="origin"/>
     <field name="destination"/>
     <field name="etd"/>
-    <field name="eta"/>
+    <field name="bl_date"/>
     <field name="carrier"/>
     <field name="vessel"/>
     <field name="container_count"/>
-    <field name="gross_weight"/>
+    <field name="quantity"/>
 </tree>