rattail/tailbone
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Don't aggregate product for mobile truck dump receiving

Browse source 
also sort batch rows by most recent, for receiver convenience
This commit is contained in:
Lance Edgar 2018-06-27 17:26:38 -05:00
parent da10c6503c
commit 0ccb6883f8
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tailbone/views/purchasing/batch.py
View file

@ -364,6 +364,10 @@ class PurchasingBatchView(BatchMasterView):
'vendor_contact', 'vendor_contact',
'status_code') 'status_code')
def get_mobile_row_data(self, parent):
query = self.get_row_data(parent)
return query.order_by(model.PurchaseBatchRow.sequence.desc())
def configure_mobile_form(self, f): def configure_mobile_form(self, f):
super(PurchasingBatchView, self).configure_mobile_form(f) super(PurchasingBatchView, self).configure_mobile_form(f)

10
tailbone/views/purchasing/receiving.py
View file

@ -593,11 +593,21 @@ class ReceivingBatchView(PurchasingBatchView):
.all() .all()
if rows: if rows:
aggregate_products = not bool(batch.truck_dump) # TODO: make this configurable?
if aggregate_products:
if len(rows) > 1: if len(rows) > 1:
log.warning("found multiple UPC matches for {} in batch {}: {}".format( log.warning("found multiple UPC matches for {} in batch {}: {}".format(
upc, batch.id_str, batch)) upc, batch.id_str, batch))
row = rows[0] row = rows[0]
else:
other_row = rows[0]
row = model.PurchaseBatchRow()
row.product = other_row.product
self.handler.add_row(batch, row)
# TODO: is this necessary here? is so, then what about further below?
# self.handler.refresh_batch_status(batch)
else: else:
# try to locate general product by UPC; add to batch if found # try to locate general product by UPC; add to batch if found