[IMP] base_wamas_ubl sub-transfer

Author: santostelmo

base_wamas_ubl/README.rst

@@ -64,6 +64,7 @@ Contributors
 
 * Jacques-Etienne Baudoux <je@bcim.be>
 * Tuan Tran <anhtuan@trobz.com>
+* Telmo Santos <telmo.santos@camptocamp.com>
 
 Other credits
 ~~~~~~~~~~~~~

base_wamas_ubl/lib/wamas/wamas2ubl.py

@@ -3,6 +3,7 @@
 
 import argparse
 import logging
+from collections import OrderedDict
 from pprint import pformat
 
 from freezegun import freeze_time
@@ -45,29 +46,44 @@ def get_head(self, telegram_type, key_name, head=None):
                     key,
                 )
 
-    def get_line(self, telegram_type, transfer_key_name, package_key_name=False):
+    def get_line(
+        self,
+        telegram_type,
+        transfer_key1_name,
+        transfer_key2_name=False,
+        package_key_name=False,
+    ):
         """Process a list of dict as lines of the transfers
 
         Parameters:
             telegram_type: the key to get the list out of data
-            transfer_key_name: the key in the dict that serves to identify the
+            transfer_key1_name: the key in the dict that serves to identify the
                                parent in transfers
+            transfer_key2_name: the key in the dict that serves to identify a sub-transfer
             package_key_name: the key in the dict that serves to identify the
                               related package
         """
+        transfers = {}
         if telegram_type not in self.data:
             raise ValueError("Missing telegram: %s" % telegram_type)
 
         for line in self.data[telegram_type]:
-            key = line[transfer_key_name]
+            key = line[transfer_key1_name]
             if key not in self.transfers:
                 _logger.debug(
                     "Found %s (line) record for unknown transfer, ignoring: %s",
                     telegram_type,
                     key,
                 )
                 continue
-            self.transfers[key].setdefault("lines", []).append(line)
+
+            # Create a key for the sub-transfer
+            if transfer_key2_name:
+                key = key + line[transfer_key2_name]
+            if key not in transfers:
+                # Copy parent transfer data
+                transfers[key] = OrderedDict(self.transfers[line[transfer_key1_name]])
+            transfers[key].setdefault("lines", []).append(line)
             if not package_key_name:
                 continue
             package_id = line[package_key_name]
@@ -80,7 +96,7 @@ def get_line(self, telegram_type, transfer_key_name, package_key_name=False):
                 )
                 continue
             line["package"] = package
-            self.transfers[key].setdefault("packages", []).append(package)
+            transfers[key].setdefault("packages", []).append(package)
 
 
 def wamas2dict(msg):
@@ -121,7 +137,7 @@ def dict2ubl(msg_type, data, extra_data=False):
 
     if msg_type == "ReceptionResponse":
         extractor.get_head("WEAKQ", "IvWevk_WevId_WevNr")
-        extractor.get_line("WEAPQ", "IvWevp_WevId_WevNr")
+        extractor.get_line("WEAPQ", "IvWevp_WevId_WevNr", "IvWevp_WEAP_WeaId_WeaNr")
     elif msg_type == "ReturnResponse":
         extractor.get_head("KRETKQ", "IvKretk_KretId_KretNr")
         extractor.get_line("KRETPQ", "IvKretp_KretId_KretNr")
@@ -131,7 +147,9 @@ def dict2ubl(msg_type, data, extra_data=False):
             extractor.get_line("AUSPQ", "IvAusp_UrAusId_AusNr")
         else:
             extractor.get_head("WATEKQ", "IvTek_TeId", extractor.packages)
-            extractor.get_line("WATEPQ", "IvAusp_UrAusId_AusNr", "IvTep_TeId")
+            extractor.get_line(
+                "WATEPQ", "IvAusp_UrAusId_AusNr", package_key_name="IvTep_TeId"
+            )
     else:
         raise Exception("Invalid message type: %s" % msg_type)
 

base_wamas_ubl/readme/CONTRIBUTORS.rst

@@ -1,2 +1,3 @@
 * Jacques-Etienne Baudoux <je@bcim.be>
 * Tuan Tran <anhtuan@trobz.com>
+* Telmo Santos <telmo.santos@camptocamp.com>

base_wamas_ubl/static/description/index.html

@@ -8,11 +8,10 @@
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
-Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -275,7 +274,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: gray; } /* line numbers */
+pre.code .ln { color: grey; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -301,7 +300,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic, pre.problematic {
+span.problematic {
   color: red }
 
 span.section-subtitle {
@@ -412,6 +411,7 @@ <h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
 <ul class="simple">
 <li>Jacques-Etienne Baudoux &lt;<a class="reference external" href="mailto:je&#64;bcim.be">je&#64;bcim.be</a>&gt;</li>
 <li>Tuan Tran &lt;<a class="reference external" href="mailto:anhtuan&#64;trobz.com">anhtuan&#64;trobz.com</a>&gt;</li>
+<li>Telmo Santos &lt;<a class="reference external" href="mailto:telmo.santos&#64;camptocamp.com">telmo.santos&#64;camptocamp.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="other-credits">
@@ -421,9 +421,7 @@ <h2><a class="toc-backref" href="#toc-entry-5">Other credits</a></h2>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org">
-<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
-</a>
+<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>