diff --git a/modules/commission/sale.py b/modules/commission/sale.py index aac5c98..09fe9c9 100755 --- a/modules/commission/sale.py +++ b/modules/commission/sale.py @@ -27,6 +27,14 @@ class Sale(metaclass=PoolMeta): invoice.save() return invoice + @property + def report_agent(self): + if self.agent: + return self.agent.party.address_get( + type='invoice') + else: + return '' + @classmethod @ModelView.button @Workflow.transition('quotation') diff --git a/modules/sale/sale.fodt b/modules/sale/sale.fodt index 9c9b39a..c0914fb 100755 --- a/modules/sale/sale.fodt +++ b/modules/sale/sale.fodt @@ -1,10 +1,10 @@ - LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265Invoice nowillen2026-02-26T13:52:00Z2026-02-26T16:37:50.6560000002025-12-17T14:25:00Z3PT4M15S + LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265Invoice nowillen2026-02-26T13:52:00Z2026-02-26T20:21:19.6190000002025-12-17T14:25:00Z4PT15M18S - 35761 + 43349 0 24236 11721 @@ -13,12 +13,12 @@ view2 - 7430 - 44697 + 11986 + 36936 0 - 35761 + 43349 24234 - 47480 + 55069 0 0 false @@ -91,7 +91,7 @@ false false false - 1920244 + 1972244 1846560 false false @@ -161,7 +161,7 @@ - + @@ -271,7 +271,7 @@ - + @@ -357,19 +357,19 @@ - + - + - + - + @@ -414,10 +414,10 @@ - + - + @@ -641,9 +641,26 @@ - + + + + + + + + + + + + + + + + + + @@ -3737,7 +3754,7 @@ <for each="sale in records"> - + @@ -3789,9 +3806,7 @@ Agents - ALLLUCK COTTON CO. LTD. - FALT/RM A 12/F ZJ 300, - 300 LOCKHART ROAD, WAN CHAI, HONG KONG + <sale.report_agent> @@ -3900,8 +3915,7 @@ Payment - <sale.payment_term.rec_name if sale.payment_term else '100% CASH AGAINST DOCUMENTS'> - BEFORE 5TH JANUARY 2026 BY CABLE TRANSFER AT BUYER’S EXPENSES IN SELLER’S FAVOUR. + <sale.payment_term.rec_name if sale.payment_term else '100% CASH AGAINST DOCUMENTS'>