From 3820f001828848e7227c2c53471e90580cb41b87 Mon Sep 17 00:00:00 2001 From: laurentbarontini Date: Sun, 18 Jan 2026 21:07:55 +0100 Subject: [PATCH] 18.01.26 --- modules/automation/freight_booking.py | 30 +++++++++---------- .../view/freight_booking_info_tree.xml | 6 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/automation/freight_booking.py b/modules/automation/freight_booking.py index d9b17db..a2e86dc 100644 --- a/modules/automation/freight_booking.py +++ b/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 diff --git a/modules/automation/view/freight_booking_info_tree.xml b/modules/automation/view/freight_booking_info_tree.xml index c9ad5df..af17ef3 100644 --- a/modules/automation/view/freight_booking_info_tree.xml +++ b/modules/automation/view/freight_booking_info_tree.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file