From 6018429369780e9f02e011b1634e758eb1eb5d4a Mon Sep 17 00:00:00 2001 From: laurentbarontini Date: Thu, 23 Apr 2026 12:34:15 +0200 Subject: [PATCH] COO --- modules/purchase_trade/sale.py | 18 +++++++++++++++--- modules/stock/coo.fodt | 2 ++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/modules/purchase_trade/sale.py b/modules/purchase_trade/sale.py index 62b9745..ae41c13 100755 --- a/modules/purchase_trade/sale.py +++ b/modules/purchase_trade/sale.py @@ -709,11 +709,23 @@ class Sale(metaclass=PoolMeta): purchase = getattr(getattr(self.lines[0].lots[1], 'line', None), 'purchase', None) purchase_number = getattr(purchase, 'number', None) - if purchase_number and self.number: - return purchase_number + ' ' + self.number - return purchase_number or self.number or '' + purchase_number = self._format_report_deal_number( + purchase_number, 'P') + sale_number = self._format_report_deal_number(self.number, 'S') + return ' '.join( + number for number in [purchase_number, sale_number] if number) return '' + @staticmethod + def _format_report_deal_number(number, prefix): + if not number: + return '' + number = str(number) + expected_prefix = prefix + '-' + if number.upper().startswith(expected_prefix): + return number + return expected_prefix + number + @property def report_melya_proforma_number(self): return self.report_deal or self.full_number or '' diff --git a/modules/stock/coo.fodt b/modules/stock/coo.fodt index 5d15c1e..26de255 100644 --- a/modules/stock/coo.fodt +++ b/modules/stock/coo.fodt @@ -4,7 +4,9 @@ xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" + xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"