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

Fix template/styles for v3 grid views, add purchasing batch status

Browse source
This commit is contained in:
Lance Edgar 2017-07-14 15:45:31 -05:00
parent c774d6c8e3
commit c18774e5e5
6 changed files with 62 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tailbone/views/batch/core2.py
View file

@ -52,6 +52,18 @@ class BatchMasterView2(MasterView2, BatchMasterView):
'executed_by',
]
def get_fallback_templates(self, template, mobile=False):
if mobile:
return [
'/mobile/newbatch/{}.mako'.format(template),
'/mobile/master/{}.mako'.format(template),
]
return [
'/newbatch/{}.mako'.format(template),
'/master2/{}.mako'.format(template),
'/master/{}.mako'.format(template),
]
def configure_grid(self, g):
super(BatchMasterView2, self).configure_grid(g)

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

@ -55,6 +55,7 @@ class PurchasingBatchView(BatchMasterView):
'date_ordered',
'created',
'created_by',
'status_code',
'executed',
]
@ -107,6 +108,10 @@ class PurchasingBatchView(BatchMasterView):
g.set_label('date_ordered', "Ordered")
g.set_label('date_received', "Received")
def grid_extra_class(self, batch, i):
if batch.status_code == batch.STATUS_UNKNOWN_PRODUCT:
return 'notice'
# def make_form(self, batch, **kwargs):
# if self.creating:
# kwargs.setdefault('id', 'new-purchase-form')
@ -174,6 +179,7 @@ class PurchasingBatchView(BatchMasterView):
fs.notes,
fs.created,
fs.created_by,
fs.status_code,
fs.complete,
fs.executed,
fs.executed_by,

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

@ -224,6 +224,7 @@ class ReceivingBatchView(PurchasingBatchView):
rows = self.Session.query(model.PurchaseBatchRow)\
.filter(model.PurchaseBatchRow.batch == batch)\
.filter(model.PurchaseBatchRow.upc.in_((provided, checked)))\
.filter(model.PurchaseBatchRow.removed == False)\
.all()
if rows:
@ -252,6 +253,7 @@ class ReceivingBatchView(PurchasingBatchView):
row.description = "(unknown product)"
batch.add_row(row)
self.handler.refresh_row(row)
self.handler.refresh_batch_status(batch)
self.Session.flush()
return self.redirect(self.mobile_row_route_url('view', uuid=row.uuid))