Fix bug when take lot from edi file. If lot is created, us the lot number send by the supplier.

edi_shipment.py

@@ -105,7 +105,6 @@ class EdiShipmentReference(ModelSQL, ModelView):
         res = Model.search([('number', '=', self.reference)], limit=1)
         self.origin = res[0] if res else None
 
-
 # class EdiShipmentInTransport(ModelSQL, ModelView):
 #     'Edi Shipment in Transport'
 #     __name__ = 'edi.shipment.in.transport'
@@ -153,6 +152,7 @@ class EdiShipmentReference(ModelSQL, ModelView):
 #     qualifier = fields.Char('Qualifier', readonly=True)
 #     identity = fields.Char('Identity', readonly=True)
 
+
 class EdiShipmentInLine(ModelSQL, ModelView):
     'Edi Shipment in Line'
     __name__ = 'edi.shipment.in.line'
@@ -218,8 +218,18 @@ class EdiShipmentInLine(ModelSQL, ModelView):
         self.purchaser_code = message.pop(0) if message else ''
         if message:
             self.supplier_code = message.pop(0)
+        if message:
+            message.pop(0)
+        if message:
+            message.pop(0)
+        if message:
+            message.pop(0)
+        if message:
+            message.pop(0)
         if message:
             self.serial_number = message.pop(0)
+        if message:
+            message.pop(0)
         if message:
             self.lot_number = message.pop(0)
 
@@ -270,8 +280,16 @@ class EdiShipmentInLine(ModelSQL, ModelView):
         self.marking_instructions = message.pop(0) if message else ''
         if message:
             self.expiration_date = to_date(message.pop(0))
+        if message:
+            message.pop(0)
+        if message:
+            message.pop(0)
         if message:
             self.packing_date = to_date(message.pop(0))
+        if message:
+            message.pop(0)
+        if message:
+            message.pop(0)
         if message:
             self.lot_number = message.pop(0)
 
@@ -586,6 +604,8 @@ class EdiShipmentIn(ModelSQL, ModelView):
             lot.product = line.product
             lot.expiration_date = line.expiration_date
             lot.on_change_product()
+            if line.lot_number:
+                lot.number = line.lot_number
             return lot
 
     @classmethod