Datalife/trytond-stock_shipment_in_edi
1
0
Fork 0
mirror of https://gitlab.com/datalifeit/trytond-stock_shipment_in_edi synced 2023-12-14 06:42:59 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:NaN-tic/trytond-stock_shipment_in_edi

Browse source
This commit is contained in:
Àngel Àlvarez 2020-11-07 16:54:53 +01:00
parent 8d65fcc327 0cf34802b7
commit 3a9f59406f
2 changed files with 36 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
shipment.py
View file

@ -74,14 +74,15 @@ class ShipmentIn(EdifactMixin, metaclass=PoolMeta):
@classmethod @classmethod
def import_edi_input(cls, response, template): def import_edi_input(cls, response, template):
def get_new_move(): def get_new_move():
move = None move = None
if product: if product:
move = Move() move = Move()
move.product = product move.product = product
move.on_change_product()
move.quantity = quantity move.quantity = quantity
move.uom = values.get('unit') if values.get('unit'):
move.uom = values.get('unit')
move.state = 'draft' move.state = 'draft'
move.company = purchase.company move.company = purchase.company
move.currency = purchase.currency move.currency = purchase.currency
@ -103,6 +104,7 @@ class ShipmentIn(EdifactMixin, metaclass=PoolMeta):
pool = Pool() pool = Pool()
ProductCode = pool.get('product.code') ProductCode = pool.get('product.code')
Template = pool.get('product.template')
Move = pool.get('stock.move') Move = pool.get('stock.move')
Lot = pool.get('stock.lot') Lot = pool.get('stock.lot')
@ -197,6 +199,8 @@ class ShipmentIn(EdifactMixin, metaclass=PoolMeta):
product = scannable_products.get(values.get('product')) product = scannable_products.get(values.get('product'))
quantity = values.get('quantity') quantity = values.get('quantity')
if not quantity:
continue
matching_moves = None matching_moves = None
if product: if product:
matching_moves = [m for m in shipment.pending_moves if matching_moves = [m for m in shipment.pending_moves if
@ -215,32 +219,31 @@ class ShipmentIn(EdifactMixin, metaclass=PoolMeta):
move = get_new_move() move = get_new_move()
move.edi_quantity = quantity move.edi_quantity = quantity
move.edi_description = values.get('description') move.edi_description = values.get('description')
if hasattr(Move, 'lot'): if hasattr(Template, 'lot_required') and product.lot_required:
lot, = Lot.search([ expiration = None
if hasattr(Template, 'expiration_state'):
expiration = product.expiration_state
lots = Lot.search([
('number', '=', values.get('lot')), ('number', '=', values.get('lot')),
('product', '=', move.product) ('product', '=', move.product)
], limit=1) or [None] ], limit=1)
if lot: if lots:
expiry_date = values.get('expiry_date') lot, = lots
if expiry_date and lot.expiry_date: if ((not expiration or expiration != 'none')
if expiry_date < lot.expiry_date: and values.get('expiration_date', False)):
lot.expiry_date = expiry_date expiration_date = values.get('expiration_date')
if expiration_date and lot.expiration_date:
if expiration_date < lot.expiration_date:
lot.expiration_date = expiration_date
else: else:
today = datetime.today().date() lot = move._get_new_lot(values, expiration)
lot = Lot() if lot:
lot.number = values.get('lot') or today.isoformat() lot.save()
lot.product = product move.lot = lot
lot.expiry_date = values.get('expiry_date')
lot.save()
move.lot = lot
to_save.append(move) to_save.append(move)
if to_save: if to_save:
try: Move.save(to_save)
Move.save(to_save)
except UserError as e:
total_errors.append(e.message)
return None, total_errors
return shipment, total_errors return shipment, total_errors
@ -271,6 +274,13 @@ class ShipmentIn(EdifactMixin, metaclass=PoolMeta):
if len(purchases) == 1: if len(purchases) == 1:
purchase = purchases[0] purchase = purchases[0]
if not purchase:
purchases = Purchase.search([
('reference', '=', purchase_num),
('state', 'in', ('processing', 'done'))
])
if len(purchases) == 1:
purchase = purchases[0]
if not purchase: if not purchase:
error_msg = 'Purchase number {} not found'.format(purchase_num) error_msg = 'Purchase number {} not found'.format(purchase_num)
serialized_segment = Serializer(control_chars).serialize([segment]) serialized_segment = Serializer(control_chars).serialize([segment])
@ -325,11 +335,12 @@ class ShipmentIn(EdifactMixin, metaclass=PoolMeta):
@with_segment_check @with_segment_check
def _process_PCILIN(cls, segment, template): def _process_PCILIN(cls, segment, template):
elements_lenght = len(segment.elements) elements_lenght = len(segment.elements)
expiry_date = (cls.get_datetime_obj_from_edi_date( expiration_date = (cls.get_datetime_obj_from_edi_date(
segment.elements[1]) if elements_lenght > 1 else None) segment.elements[1]) if elements_lenght > 1 else None)
lot = segment.elements[7] if elements_lenght > 6 else None lot = segment.elements[7] if elements_lenght > 6 else None
result = { result = {
'expiry_date': expiry_date.date() if expiry_date else None, 'expiration_date': (expiration_date.date() if expiration_date
else None),
'lot': lot 'lot': lot
} }
return result, NO_ERRORS return result, NO_ERRORS

1
tryton.cfg
View file

@ -7,5 +7,6 @@ depends:
stock_scanner stock_scanner
extras_depend: extras_depend:
stock_lot stock_lot
stock_lot_sled
xml: xml:
shipment.xml shipment.xml