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

Honor view logic when displaying Delete Row button for mobile receiving

Browse source 
also do not allow quick receive if receiving from scratch
This commit is contained in:
Lance Edgar 2018-08-17 12:41:48 -05:00
parent f0d8f79676
commit a6a7d22ec1
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tailbone/templates/mobile/receiving/view_row.mako
View file

@ -133,7 +133,7 @@
${h.hidden('quick_receive', value='false')} ${h.hidden('quick_receive', value='false')}
${h.end_form()} ${h.end_form()}
% if master.mobile_rows_deletable and request.has_perm('{}.delete_row'.format(permission_prefix)): % if master.mobile_rows_deletable and master.row_deletable(row) and request.has_perm('{}.delete_row'.format(permission_prefix)):
${h.form(url('mobile.{}.delete_row'.format(route_prefix), uuid=batch.uuid, row_uuid=row.uuid), class_='receiving-update')} ${h.form(url('mobile.{}.delete_row'.format(route_prefix), uuid=batch.uuid, row_uuid=row.uuid), class_='receiving-update')}
${h.csrf_token(request)} ${h.csrf_token(request)}
${h.submit('submit', "Delete this Row")} ${h.submit('submit', "Delete this Row")}

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

@ -254,8 +254,22 @@ class ReceivingBatchView(PurchasingBatchView):
def row_deletable(self, row): def row_deletable(self, row):
batch = row.batch batch = row.batch
# can always delete rows from truck dump parent
if batch.is_truck_dump_parent(): if batch.is_truck_dump_parent():
return True return True
# can never delete rows from truck dump child
elif batch.is_truck_dump_child():
return False
else: # okay, normal batch
if batch.order_quantities_known:
return False
else: # allow delete if receiving rom scratch
return True
# cannot delete row by default
return False return False
def get_instance_title(self, batch): def get_instance_title(self, batch):
@ -1113,10 +1127,16 @@ class ReceivingBatchView(PurchasingBatchView):
'form': form, 'form': form,
'allow_expired': self.handler.allow_expired_credits(), 'allow_expired': self.handler.allow_expired_credits(),
'allow_cases': self.handler.allow_cases(), 'allow_cases': self.handler.allow_cases(),
'quick_receive': self.rattail_config.getbool('rattail.batch', 'purchase.mobile_quick_receive', default=True), 'quick_receive': False,
'quick_receive_all': self.rattail_config.getbool('rattail.batch', 'purchase.mobile_quick_receive_all', default=False) 'quick_receive_all': False,
} }
if batch.order_quantities_known:
context['quick_receive'] = self.rattail_config.getbool('rattail.batch', 'purchase.mobile_quick_receive',
default=True)
context['quick_receive_all'] = self.rattail_config.getbool('rattail.batch', 'purchase.mobile_quick_receive_all',
default=False)
if self.request.has_perm('{}.create_row'.format(permission_prefix)): if self.request.has_perm('{}.create_row'.format(permission_prefix)):
schema = MobileReceivingForm().bind(session=self.Session()) schema = MobileReceivingForm().bind(session=self.Session())
update_form = forms.Form(schema=schema, request=self.request) update_form = forms.Form(schema=schema, request=self.request)