From 8d65fcc3274e05643196d70794fbe68b084fbe6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=80ngel=20=C3=80lvarez?= <angel@nan-tic.com>
Date: Sat, 7 Nov 2020 16:50:44 +0100
Subject: [PATCH] add padding on purchase number and add some logs

---
 shipment.py | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/shipment.py b/shipment.py
index 9aa58b0..d80f6e9 100644
--- a/shipment.py
+++ b/shipment.py
@@ -14,10 +14,14 @@ from edifact.utils import (with_segment_check, validate_segment,
     separate_section, RewindIterator, DO_NOTHING, NO_ERRORS)
 from datetime import datetime
 from trytond.exceptions import UserError
+import logging
 
 
 __all__ = ['Move', 'StockConfiguration', 'ShipmentIn', 'Cron']
 
+
+logger = logging.getLogger('stock_shipment_in_edi')
+
 DEFAULT_FILES_LOCATION = '/tmp/'
 MODULE_PATH = os.path.dirname(os.path.abspath(__file__))
 DEFAULT_TEMPLATE = 'DESADV_ediversa.yml'
@@ -49,6 +53,21 @@ class Move(metaclass=PoolMeta):
         default.setdefault('edi_description')
         return super(Move, cls).copy(records, default=default)
 
+    def _get_new_lot(self, values, expiration):
+        pool = Pool()
+        Lot = pool.get('stock.lot')
+
+        today = datetime.today().date()
+        lot = Lot()
+        lot.number = values.get('lot') or today.isoformat()
+        lot.product = self.product
+        if ((not expiration or expiration != 'none')
+                and values.get('expiration_date', False)):
+            lot.expiration_date = values.get('expiration_date')
+        else:
+            lot.on_change_product()
+        return lot
+
 
 class ShipmentIn(EdifactMixin, metaclass=PoolMeta):
     __name__ = 'stock.shipment.in'
@@ -101,7 +120,10 @@ class ShipmentIn(EdifactMixin, metaclass=PoolMeta):
         # If there isn't a segment DESADV_D_96A_UN_EAN005
         # means the file readed it's not a order response.
         if not message.get_segment('DESADV_D_96A_UN_EAN005'):
+            logger.error("File %s processed is not shipment with header: "
+                "DESADV_D_96A_UN_EAN005")
             return DO_NOTHING, NO_ERRORS
+
         rffs = message.get_segments('RFF')
         rff, = [x for x in rffs if x.elements[0] == 'ON'] or [None]
         template_rff = template_header.get('RFF')
@@ -111,6 +133,12 @@ class ShipmentIn(EdifactMixin, metaclass=PoolMeta):
         if not purchase:
             return None, total_errors
 
+        if purchase and purchase.shipments:
+            logger.error("Purchase has a shipment, do not search for reference"
+                "on shipment")
+            return DO_NOTHING, NO_ERRORS
+
+
         shipment = cls()
         shipment.supplier = purchase.party
         shipment.on_change_supplier()
@@ -221,11 +249,28 @@ class ShipmentIn(EdifactMixin, metaclass=PoolMeta):
     def _process_RFF(cls, segment, template_segment, control_chars=None):
         pool = Pool()
         Purchase = pool.get('purchase.purchase')
+        Config = pool.get('purchase.configuration')
         purchase_num = segment.elements[1]
+
+        padding = (Config(1).purchase_sequence and
+        Config(1).purchase_sequence.padding - len(purchase_num))
+
+        if padding:
+            purchase_num = "0"*padding + purchase_num
+
         purchase, = Purchase.search([
                 ('number', '=', purchase_num),
                 ('state', 'in', ('processing', 'done'))
                 ], limit=1) or [None]
+
+        if not purchase:
+            purchases = Purchase.search([
+                ('reference', '=', purchase_num),
+                ('state', 'in', ('processing', 'done'))
+            ])
+            if len(purchases) == 1:
+                purchase = purchases[0]
+
         if not purchase:
             error_msg = 'Purchase number {} not found'.format(purchase_num)
             serialized_segment = Serializer(control_chars).serialize([segment])