diff --git a/tailbone/views/batch/vendorcatalog.py b/tailbone/views/batch/vendorcatalog.py index 25eddd68..f7b5b15a 100644 --- a/tailbone/views/batch/vendorcatalog.py +++ b/tailbone/views/batch/vendorcatalog.py @@ -61,20 +61,21 @@ class VendorCatalogView(FileBatchMasterView): grid_columns = [ 'id', 'vendor', - 'effective', + 'description', 'filename', 'rowcount', 'created', - 'created_by', 'executed', ] form_fields = [ 'id', + 'description', 'vendor', 'filename', 'future', 'effective', + 'notes', 'created', 'created_by', 'rowcount', @@ -142,9 +143,6 @@ class VendorCatalogView(FileBatchMasterView): g.set_link('vendor') g.set_link('filename') - def get_instance_title(self, batch): - return six.text_type(batch.vendor) - def configure_form(self, f): super(VendorCatalogView, self).configure_form(f) @@ -176,6 +174,8 @@ class VendorCatalogView(FileBatchMasterView): 'parser_key', 'vendor_uuid', 'future', + 'description', + 'notes', ]) parser_values = [(p.key, p.display) for p in self.get_parsers()] @@ -233,6 +233,7 @@ class VendorCatalogView(FileBatchMasterView): def configure_row_form(self, f): super(VendorCatalogView, self).configure_row_form(f) f.set_renderer('product', self.render_product) + f.set_type('upc', 'gpc') f.set_type('discount_percent', 'percent') def template_kwargs_create(self, **kwargs):