diff --git a/modules/purchase_trade/sale.py b/modules/purchase_trade/sale.py index 9d0a31d..4392c9d 100755 --- a/modules/purchase_trade/sale.py +++ b/modules/purchase_trade/sale.py @@ -257,6 +257,24 @@ class Sale(metaclass=PoolMeta): operator = fields.Many2One('party.party',"Operator") our_reference = fields.Char("Our Reference") + @property + def report_terms(self): + if self.lines: + return self.lines[0].note + else: + return '' + + @property + def report_shipment(self): + if self.lines: + if len(self.lines[0].lots)>1: + shipment = self.lines[0].lots[1].lot_shipment_in + if shipment: + info = 'B/L ' + shipment.bl_number + ' ' + shipment.note + return info + else: + return '' + @classmethod def default_viewer(cls): country_start = "Zobiland" diff --git a/modules/sale/sale.fodt b/modules/sale/sale.fodt index c0914fb..fe65531 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-26T20:21:19.6190000002025-12-17T14:25:00Z4PT15M18S + LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265Invoice nowillen2026-02-26T13:52:00Z2026-02-26T21:20:26.3510000002025-12-17T14:25:00Z6PT26M24S - 43349 + 35108 0 24236 11721 @@ -13,12 +13,12 @@ view2 - 11986 - 36936 + 8565 + 43921 0 - 43349 + 35108 24234 - 55069 + 46828 0 0 false @@ -91,7 +91,7 @@ false false false - 1972244 + 2008084 1846560 false false @@ -161,7 +161,7 @@ - + @@ -479,20 +479,29 @@ - - - - - + - + + + + + + + + + + + + + + @@ -501,11 +510,11 @@ - + - + @@ -514,10 +523,10 @@ - + - + @@ -533,11 +542,11 @@ - + - + @@ -545,7 +554,7 @@ - + @@ -557,20 +566,11 @@ - - - - - - - - - - + @@ -582,19 +582,19 @@ - + - - - - + + + + @@ -603,19 +603,19 @@ - + - - - - + + + + @@ -624,7 +624,7 @@ - + @@ -633,15 +633,9 @@ + - - - - - - - - + @@ -649,17 +643,41 @@ - + + + + + - + - + + + + + + + + + + + + + + + + + + + + + @@ -703,6 +721,12 @@ + + + + + + @@ -3753,8 +3777,8 @@ - <for each="sale in records"> - + <for each="sale in records"> + @@ -3766,7 +3790,7 @@ - + @@ -3776,184 +3800,181 @@ - + - Buyers + Buyers <sale.party.rec_name> ADDRESS:<sale.report_address> - + - Sellers + Sellers - ICT TRADING S.A. - VIA MAGAZZINI GENERALI, 3 + ICT TRADING S.A. + VIA MAGAZZINI GENERALI, 3 6828 BALERNA, SWITZERLAND - Agents + Agents - <sale.report_agent> + <sale.report_agent> - - + + - - Growth - + + Growth + - - <sale.lines[0].product.name if sale.lines and sale.lines[0].product else ''> + + <sale.lines[0].product.name if sale.lines and sale.lines[0].product else ''>CROP <sale.crop.name> - Quality - + Quality + - B/L <sale.lines[0].product.code if sale.lines and sale.lines[0].product else ''><sale.comment or ''> - + B/L <sale.report_shipment> - Quantity - + Quantity + - ABOUT <sum(line.quantity for line in sale.lines)><sale.lines[0].unit.rec_name.upper() if sale.lines and sale.lines[0].unit else ''> + ABOUT <sum(line.quantity for line in sale.lines)><sale.lines[0].unit.rec_name.upper() if sale.lines and sale.lines[0].unit else ''> - + - Price + Price - <format_currency(sale.lines[0].unit_price, sale.party.lang, sale.currency) if sale.lines else ''> + <format_currency(sale.lines[0].unit_price, sale.party.lang, sale.currency) if sale.lines else ''> - - + + - + Delivery - - <format_date(sale.sale_date, sale.party.lang) if sale.sale_date else 'PROMPT'> + + PROMPT - - - + + + - - Terms + + Terms - - <sale.delivery_full_address or ''> + + <sale.report_terms> + + + + + + + + + + + + + - CATGO WEIGHTS/QUALITY FINAL - 21 DAYS FREE STORAGE FROM DELIVERY ORDER DATE - WAREHOSUE EXIT FEES FOR SELLER’S ACCOUNT + Payment + + + <sale.payment_term.rec_name if sale.payment_term else '100% CASH AGAINST DOCUMENTS'> + + + - - - - Payment + Arbitration & Rules - <sale.payment_term.rec_name if sale.payment_term else '100% CASH AGAINST DOCUMENTS'> - - - - - - - - - - - - - Arbitration & Rules - - - - ALL DISPUTES RELATING TO THIS CONTRACT WILL BE RESOLVED THROUGH ARBITRATION IN ACCORDANCE WITH THE BYLAWS OF THE INTERNATIONAL COTTON ASSOCIATION, LIMITED. THIS AGREEMENT INCORPORATES THE BYLAWS WHICH SET OUT THE ASSOCIATION’S ARBITRATION PROCEDURE. - - EITHER PARTY MUST NOT TAKE ANY LEGAL ACTION OVER A DISPUTE SUITABLE FOR ARBITRATION, OTHER THAN TO OBTAIN SECURITY FOR ANY CLAIM, UNLESS THEY HAVE FIRST OBTAINED AN ARBITRATION AWARD FROM THE INTERNATIONAL COTTON ASSOCIATION, LIMITED AND EXHAUSTED ALL MEANS OF APPEAL ALLOWED BY THE ASSOCIATION’S BYLAWS. + - ALL DISPUTES RELATING TO THIS CONTRACT WILL BE RESOLVED THROUGH ARBITRATION IN ACCORDANCE WITH THE BYLAWS OF THE INTERNATIONAL COTTON ASSOCIATION, LIMITED. THIS AGREEMENT INCORPORATES THE BYLAWS WHICH SET OUT THE ASSOCIATION’S ARBITRATION PROCEDURE. + - EITHER PARTY MUST NOT TAKE ANY LEGAL ACTION OVER A DISPUTE SUITABLE FOR ARBITRATION, OTHER THAN TO OBTAIN SECURITY FOR ANY CLAIM, UNLESS THEY HAVE FIRST OBTAINED AN ARBITRATION AWARD FROM THE INTERNATIONAL COTTON ASSOCIATION, LIMITED AND EXHAUSTED ALL MEANS OF APPEAL ALLOWED BY THE ASSOCIATION’S BYLAWS. - + - - THE SELLERS + + THE SELLERS - - THE BUYERS + + THE BUYERS - ICT TRADING SA - + ICT TRADING SA + iVBORw0KGgoAAAANSUhEUgAAAQ8AAAEJCAIAAAAFFDV0AAAAAXNSR0IArs4c6QAA/8pJREFU eF7sfQeAXGd19etletned7Wr3VXvsootW+69gk2HQIAkJIEUElJ+SAKBhBJqEhICxEAcsDHF vcmybFlW72V7r7PT5/X2n++NJBsjxZZtjAx+DPKW2Zk37333u/eee+65tOu6lH84jsMwDL61 @@ -5580,12 +5601,12 @@ - <sale.party.rec_name> + <sale.party.rec_name> PC/AU/EL - </for> + </for> \ No newline at end of file