Fix master view get_effective_data() for v3 grids

used when creating new batch from product results etc.

this also tweaks purchase credits view a bit

tailbone/views/master2.py

@@ -102,6 +102,18 @@ class MasterView2(MasterView):
         grid.load_settings()
         return grid
 
+    def get_effective_data(self, session=None, **kwargs):
+        """
+        Convenience method which returns the "effective" data for the master
+        grid, filtered and sorted to match what would show on the UI, but not
+        paged etc.
+        """
+        if session is None:
+            session = self.Session()
+        kwargs.setdefault('pageable', False)
+        grid = self.make_grid(session=session, **kwargs)
+        return grid.make_visible_data()
+
     def make_row_grid(self, factory=None, key=None, data=None, columns=None, **kwargs):
         """
         Make and return a new (configured) rows grid instance.

tailbone/views/purchases/credits.py

@@ -44,6 +44,8 @@ class PurchaseCreditView(MasterView):
 
     grid_columns = [
         'vendor',
+        'invoice_number',
+        'invoice_date',
         'upc',
         'brand_name',
         'description',
@@ -51,6 +53,7 @@ class PurchaseCreditView(MasterView):
         'cases_shorted',
         'units_shorted',
         'credit_type',
+        'mispick_upc',
         'date_received',
         'status',
     ]
@@ -58,20 +61,23 @@ class PurchaseCreditView(MasterView):
     def configure_grid(self, g):
         super(PurchaseCreditView, self).configure_grid(g)
 
-        g.joiners['vendor'] = lambda q: q.outerjoin(model.Vendor)
-        g.sorters['vendor'] = g.make_sorter(model.Vendor.name)
+        g.set_joiner('vendor', lambda q: q.outerjoin(model.Vendor))
+        g.set_sorter('vendor', model.Vendor.name)
 
         g.default_sortkey = 'date_received'
         g.default_sortdir = 'desc'
 
+        # g.set_type('upc', 'gpc')
         g.set_type('cases_shorted', 'quantity')
         g.set_type('units_shorted', 'quantity')
 
+        g.set_label('invoice_number', "Invoice No.")
         g.set_label('upc', "UPC")
         g.set_label('brand_name', "Brand")
         g.set_label('cases_shorted', "Cases")
         g.set_label('units_shorted', "Units")
         g.set_label('credit_type', "Type")
+        g.set_label('mispick_upc', "Mispick UPC")
         g.set_label('date_received', "Date")