Refactor purchasing batch views per master4

tailbone/views/purchasing/ordering.py

@@ -38,7 +38,6 @@ from rattail.time import localtime
 
 from pyramid.response import FileResponse
 
-from tailbone import forms
 from tailbone.views.purchasing import PurchasingBatchView
 
 
@@ -55,6 +54,21 @@ class OrderingBatchView(PurchasingBatchView):
     rows_editable = True
     mobile_rows_editable = True
 
+    mobile_form_fields = [
+        'vendor',
+        'department',
+        'date_ordered',
+        'po_number',
+        'po_total',
+        'created',
+        'created_by',
+        'notes',
+        'status_code',
+        'complete',
+        'executed',
+        'executed_by',
+    ]
+
     row_grid_columns = [
         'sequence',
         'upc',
@@ -233,7 +247,9 @@ class OrderingBatchView(PurchasingBatchView):
             if cases_ordered or units_ordered:
                 row.cases_ordered = cases_ordered or None
                 row.units_ordered = units_ordered or None
-                row.removed = False
+                if row.removed:
+                    row.removed = False
+                    batch.rowcount += 1
                 self.handler.refresh_row(row)
             else:
                 row.removed = True
@@ -246,6 +262,7 @@ class OrderingBatchView(PurchasingBatchView):
             row.cases_ordered = cases_ordered or None
             row.units_ordered = units_ordered or None
             self.handler.refresh_row(row)
+            batch.rowcount += 1
 
         return {
             'row_cases_ordered': '' if not row or row.removed else int(row.cases_ordered or 0),
@@ -292,31 +309,6 @@ class OrderingBatchView(PurchasingBatchView):
         data['mode_title'] = self.enum.PURCHASE_BATCH_MODE[mode].capitalize()
         return self.render_to_response('create', data, mobile=True)
 
-    def preconfigure_mobile_fieldset(self, fs):
-        super(OrderingBatchView, self).preconfigure_mobile_fieldset(fs)
-        fs.vendor.set(attrs={'hyperlink': False})
-
-    def configure_mobile_fieldset(self, fs):
-        fields = [
-            fs.vendor,
-            fs.department,
-            fs.date_ordered,
-            fs.po_number,
-            fs.po_total,
-            fs.created,
-            fs.created_by,
-            fs.notes,
-            fs.status_code,
-            fs.complete,
-        ]
-        batch = fs.model
-        if (self.viewing or self.deleting) and batch.executed:
-            fields.extend([
-                fs.executed,
-                fs.executed_by,
-            ])
-        fs.configure(include=fields)
-
     def download_excel(self):
         """
         Download ordering batch as Excel spreadsheet.