diff --git a/modules/automation/execution_automation.py b/modules/automation/execution_automation.py new file mode 100644 index 0000000..2e288cd --- /dev/null +++ b/modules/automation/execution_automation.py @@ -0,0 +1,72 @@ +from trytond.model import ModelSQL, fields + +class ExecutionFollowUp(ModelSQL): + "Execution Follow Up" + __name__ = 'execution.automation' + + port_of_loading = fields.Char("Port of Loading") + fb_loading = fields.Char("FB Loading") + warehouse = fields.Char("Warehouse") + origin = fields.Char("Origin") + agent = fields.Char("Agent") + operator = fields.Char("Operator") + + fintrade_lc_nb = fields.Char("Fintrade LC Nb") + lc_number = fields.Char("LC Number") + si = fields.Char("SI") + + port_of_destination = fields.Char("Port of Destination") + fb_destination = fields.Char("FB Destination") + status = fields.Char("Status") + + etd_date = fields.Date("ETD Date") + bl_date = fields.Date("BL Date") + etd_sob = fields.Date("ETD SOB") + + sale_contract_no = fields.Char("Sale Contract No") + customer = fields.Char("Customer") + elt_quantity = fields.Float("Elt Quantity") + + number_of_container = fields.Integer("Containers") + vessel = fields.Char("Vessel") + shipping_company = fields.Char("Shipping Company") + booking_ref = fields.Char("Booking Ref") + freight_forwarder = fields.Char("Freight Forwarder") + + instrument_status = fields.Char("Instrument Status") + ip_date = fields.Date("IP Date") + ip_status = fields.Char("IP Status") + latest_shipment_date = fields.Date("Latest Shipment Date") + + countersigned = fields.Boolean("Countersigned") + comments = fields.Text("Comments") + docs_internal_comments = fields.Text("Docs Internal Comments") + + alloc_quantity = fields.Float("Allocated Quantity") + si_comments = fields.Text("SI Comments") + is_archived = fields.Boolean("Archived") + + price_cont = fields.Numeric("Price / Cont") + price_cont_curr = fields.Char("Currency") + + ct_period_start = fields.Date("CT Start") + ct_period_end = fields.Date("CT End") + + lsd_check = fields.Char("LSD Check") + bl2lsd_delta = fields.Integer("BL → LSD Delta") + + fintrade_booking = fields.Char("Fintrade Booking") + alloc_unit_price = fields.Numeric("Alloc Unit Price") + alloc_price_curr = fields.Char("Alloc Price Curr") + alloc_price_unit = fields.Char("Alloc Price Unit") + + left_time = fields.Integer("Days Left") + + @classmethod + def table_query(cls): + return ( + "SELECT " + "row_number() OVER () AS id, " + "* " + "FROM singa_execution_follow_up" + ) diff --git a/modules/automation/execution_automation.xml b/modules/automation/execution_automation.xml new file mode 100644 index 0000000..cf9b3c7 --- /dev/null +++ b/modules/automation/execution_automation.xml @@ -0,0 +1,9 @@ + + + + execution.automation + tree + execution_automation_tree + + + \ No newline at end of file diff --git a/modules/automation/view/execution_automation_tree.xml b/modules/automation/view/execution_automation_tree.xml new file mode 100644 index 0000000..9c5b48a --- /dev/null +++ b/modules/automation/view/execution_automation_tree.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/purchase_trade/__init__.py b/modules/purchase_trade/__init__.py index 3e449b1..3a496c5 100755 --- a/modules/purchase_trade/__init__.py +++ b/modules/purchase_trade/__init__.py @@ -72,6 +72,7 @@ def register(): dashboard.News, dashboard.Demos, party.Party, + party.PartyExecution, payment_term.PaymentTerm, payment_term.PaymentTermLine, purchase.Purchase, diff --git a/modules/purchase_trade/party.py b/modules/purchase_trade/party.py index f0bb6c9..dcebfda 100755 --- a/modules/purchase_trade/party.py +++ b/modules/purchase_trade/party.py @@ -6,6 +6,14 @@ from trytond.modules.purchase_trade.purchase import (TRIGGERS) __all__ = ['Party'] __metaclass__ = PoolMeta +class PartyExecution(ModelSQL,ModelView): + "Party Execution" + __name__ = 'party.execution' + + party = fields.Many2One('party.party',"Party") + area = fields.Many2One('country.region',"Area") + percent = fields.Numeric("% targeted") + class Party(metaclass=PoolMeta): __name__ = 'party.party' @@ -13,5 +21,4 @@ class Party(metaclass=PoolMeta): tol_max = fields.Numeric("Tol + in %") wb = fields.Many2One('purchase.weight.basis',"Weight basis") association = fields.Many2One('purchase.association',"Association") - - + execution = fields.One2Many('party.execution','party',"") diff --git a/modules/purchase_trade/party.xml b/modules/purchase_trade/party.xml index f6200d3..d576412 100755 --- a/modules/purchase_trade/party.xml +++ b/modules/purchase_trade/party.xml @@ -1,5 +1,14 @@ - - party.party - - party_form - \ No newline at end of file + + + + party.party + + party_form + + + party.execution + tree + party_exec_tree + + + \ No newline at end of file diff --git a/modules/purchase_trade/view/party_exec_tree.xml b/modules/purchase_trade/view/party_exec_tree.xml new file mode 100644 index 0000000..96981a3 --- /dev/null +++ b/modules/purchase_trade/view/party_exec_tree.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/modules/purchase_trade/view/party_form.xml b/modules/purchase_trade/view/party_form.xml index 29091d9..4a052a6 100755 --- a/modules/purchase_trade/view/party_form.xml +++ b/modules/purchase_trade/view/party_form.xml @@ -12,5 +12,8 @@