COO

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:
+            purchase_number = self._format_report_deal_number(
-                return purchase_number + ' ' + self.number
+                purchase_number, 'P')
-            return purchase_number or self.number or ''
+            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 ''

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"