From cf10fe19e8b6f8c3d7970e80cc1b90a2d36f36cf Mon Sep 17 00:00:00 2001
From: Lance Edgar <lance@edbob.org>
Date: Wed, 29 Aug 2012 11:37:17 -0700
Subject: [PATCH] extensive commit (see note)

The following changes are included:

- Added support for GPC data type.

- Added eager import of ``rattail.sil`` in ``before_render`` hook.

- Removed ``rattail.pyramid.util`` module.

- Added initial batch support: views, templates, creation from Product grid.

- Added batch params template for ``PrintLabels`` provider.

- Added support for ``rattail.LabelProfile`` class.

- Improved Product grid to include filter/sort on Vendor.
---
 rattail/pyramid/forms.py                      |   67 +-
 rattail/pyramid/subscribers.py                |    3 +
 rattail/pyramid/templates/batches/base.mako   |    2 -
 rattail/pyramid/templates/batches/batch.mako  |   14 -
 .../pyramid/templates/batches/columns.mako    |    9 -
 rattail/pyramid/templates/batches/crud.mako   |    8 +
 .../pyramid/templates/batches/details.mako    |   12 -
 .../templates/batches/dictionaries.mako       |   11 -
 .../pyramid/templates/batches/dictionary.mako |    9 -
 .../templates/batches/dictionary_columns.mako |    8 -
 rattail/pyramid/templates/batches/index.mako  |   35 +-
 rattail/pyramid/templates/batches/params.mako |   42 +
 .../batches/params/print_labels.mako          |   19 +
 rattail/pyramid/templates/batches/read.mako   |   40 +
 .../pyramid/templates/batches/rows/crud.mako  |    8 +
 .../pyramid/templates/batches/rows/index.mako |   46 +
 .../pyramid/templates/batches/sil_column.mako |    9 -
 .../templates/batches/sil_columns.mako        |   10 -
 .../templates/batches/supported_fields.mako   |   24 -
 .../pyramid/templates/batches/terminal.mako   |    9 -
 .../pyramid/templates/batches/terminals.mako  |   11 -
 .../templates/labels/profiles/crud.mako       |   26 +
 .../templates/labels/profiles/index.mako      |   11 +
 .../templates/labels/profiles/printer.mako    |   48 +
 .../templates/labels/profiles/read.mako       |   32 +
 rattail/pyramid/templates/products/batch.mako |   27 +
 rattail/pyramid/templates/products/index.mako |   32 +-
 rattail/pyramid/util.py                       |   96 --
 rattail/pyramid/views/batches.py              | 1033 -----------------
 rattail/pyramid/views/batches/__init__.py     |   35 +
 rattail/pyramid/views/batches/core.py         |  174 +++
 .../pyramid/views/batches/params/__init__.py  |   52 +
 .../pyramid/views/batches/params/labels.py    |   51 +
 rattail/pyramid/views/batches/rows.py         |  219 ++++
 rattail/pyramid/views/labels.py               |  172 +++
 rattail/pyramid/views/products.py             |  291 ++---
 36 files changed, 1166 insertions(+), 1529 deletions(-)
 delete mode 100644 rattail/pyramid/templates/batches/base.mako
 delete mode 100644 rattail/pyramid/templates/batches/batch.mako
 delete mode 100644 rattail/pyramid/templates/batches/columns.mako
 create mode 100644 rattail/pyramid/templates/batches/crud.mako
 delete mode 100644 rattail/pyramid/templates/batches/details.mako
 delete mode 100644 rattail/pyramid/templates/batches/dictionaries.mako
 delete mode 100644 rattail/pyramid/templates/batches/dictionary.mako
 delete mode 100644 rattail/pyramid/templates/batches/dictionary_columns.mako
 create mode 100644 rattail/pyramid/templates/batches/params.mako
 create mode 100644 rattail/pyramid/templates/batches/params/print_labels.mako
 create mode 100644 rattail/pyramid/templates/batches/read.mako
 create mode 100644 rattail/pyramid/templates/batches/rows/crud.mako
 create mode 100644 rattail/pyramid/templates/batches/rows/index.mako
 delete mode 100644 rattail/pyramid/templates/batches/sil_column.mako
 delete mode 100644 rattail/pyramid/templates/batches/sil_columns.mako
 delete mode 100644 rattail/pyramid/templates/batches/supported_fields.mako
 delete mode 100644 rattail/pyramid/templates/batches/terminal.mako
 delete mode 100644 rattail/pyramid/templates/batches/terminals.mako
 create mode 100644 rattail/pyramid/templates/labels/profiles/crud.mako
 create mode 100644 rattail/pyramid/templates/labels/profiles/index.mako
 create mode 100644 rattail/pyramid/templates/labels/profiles/printer.mako
 create mode 100644 rattail/pyramid/templates/labels/profiles/read.mako
 create mode 100644 rattail/pyramid/templates/products/batch.mako
 delete mode 100644 rattail/pyramid/util.py
 delete mode 100644 rattail/pyramid/views/batches.py
 create mode 100644 rattail/pyramid/views/batches/__init__.py
 create mode 100644 rattail/pyramid/views/batches/core.py
 create mode 100644 rattail/pyramid/views/batches/params/__init__.py
 create mode 100644 rattail/pyramid/views/batches/params/labels.py
 create mode 100644 rattail/pyramid/views/batches/rows.py
 create mode 100644 rattail/pyramid/views/labels.py

diff --git a/rattail/pyramid/forms.py b/rattail/pyramid/forms.py
index c768327b..f0f23e74 100644
--- a/rattail/pyramid/forms.py
+++ b/rattail/pyramid/forms.py
@@ -29,39 +29,23 @@
 from webhelpers.html import literal
 
 import formalchemy
-# from formalchemy.fields import SelectFieldRenderer
 
-import edbob
-from edbob.pyramid import Session
 from edbob.pyramid.forms import pretty_datetime
 
 import rattail
 
 
-__all__ = ['PriceFieldRenderer', 'RegularPriceFieldRenderer', 'UpcFieldRenderer']
-
-
-class BatchIdFieldRenderer(formalchemy.FieldRenderer):
+class GPCFieldRenderer(formalchemy.TextFieldRenderer):
     """
-    Renders the :attr:`rattail.Batch.batch_id` field.
+    Renderer for :class:`rattail.barcodes.GPC` fields.
     """
 
-    def render_readonly(self, **kwargs):
-        value = self.raw_value
-        if value is None:
-            return ''
-        return '%08u' % int(value)
+    @property
+    def length(self):
+        # Hm, should maybe consider hard-coding this...?
+        return len(str(rattail.GPC(0)))
 
 
-# class BatchTerminalFieldRenderer(SelectFieldRenderer):
-#     """
-#     Renders a field whose value is a relationship to a
-#     :class:`rattail.BatchTerminal` instance.
-#     """
-
-#     def render(self, options, **kwargs):
-        
-
 class PriceFieldRenderer(formalchemy.FieldRenderer):
     """
     Renderer for fields which reference a :class:`ProductPrice` instance.
@@ -98,42 +82,3 @@ class PriceWithExpirationFieldRenderer(PriceFieldRenderer):
             if price.ends:
                 res += '&nbsp; (%s)' % pretty_datetime(price.ends, from_='utc')
         return res
-
-
-class UpcFieldRenderer(formalchemy.TextFieldRenderer):
-    """
-    Handles rendering for the product UPC field.
-    """
-
-    def render_readonly(self, **kwargs):
-        value = self.raw_value
-        if not value:
-            return ''
-        if isinstance(value, basestring):
-            if value.isdigit():
-                value = int(value)
-        if isinstance(value, (int, long)):
-            return '%013u' % value
-        return self.stringify_value(value, as_html=True)
-
-
-def unique_batch_terminal_id(value, field=None):
-    """
-    .. highlight:: python
-
-    Validator for the :class:`rattail.BatchTerminal` class to ensure that SIL
-    IDs are not duplicated.  For example::
-
-       from rattail.pyramid.forms import unique_batch_terminal_id
-
-       # fieldset = some_batch_terminal_fieldset_factory()
-       fieldset.sil_id.set(validate=unique_batch_terminal_id)
-    """
-
-    if value:
-        q = Session.query(rattail.BatchTerminal)
-        q = q.filter(rattail.BatchTerminal.sil_id == value)
-        if field.parent.edit:
-            q = q.filter(rattail.BatchTerminal.uuid != field.parent.model.uuid)
-        if q.count():
-            raise formalchemy.ValidationError("SIL ID value must be unique within the system")
diff --git a/rattail/pyramid/subscribers.py b/rattail/pyramid/subscribers.py
index d2219dba..b28ab180 100644
--- a/rattail/pyramid/subscribers.py
+++ b/rattail/pyramid/subscribers.py
@@ -41,6 +41,9 @@ def before_render(event):
     # Import labels module so it's available if/when needed.
     import rattail.labels
 
+    # Import SIL module so it's available if/when needed.
+    import rattail.sil
+
     request = event.get('request') or threadlocal.get_current_request()
 
     renderer_globals = event
diff --git a/rattail/pyramid/templates/batches/base.mako b/rattail/pyramid/templates/batches/base.mako
deleted file mode 100644
index 27f7dd90..00000000
--- a/rattail/pyramid/templates/batches/base.mako
+++ /dev/null
@@ -1,2 +0,0 @@
-<%inherit file="/base.mako" />
-${parent.body()}
diff --git a/rattail/pyramid/templates/batches/batch.mako b/rattail/pyramid/templates/batches/batch.mako
deleted file mode 100644
index 3997c7e5..00000000
--- a/rattail/pyramid/templates/batches/batch.mako
+++ /dev/null
@@ -1,14 +0,0 @@
-<%inherit file="/batches/base.mako" />
-<%inherit file="/crud.mako" />
-
-<%def name="crud_name()">Batch</%def>
-
-<%def name="menu()">
-  <p>${h.link_to("Back to Batches", url('batches.list'))}</p>
-  % if fieldset.edit:
-      <p>${h.link_to("View Batch Details", url('batch.details', uuid=fieldset.model.uuid))}</p>
-      <p>${h.link_to("Execute this Batch", url('batch.execute', uuid=fieldset.model.uuid))}</p>
-  % endif
-</%def>
-
-${parent.body()}
diff --git a/rattail/pyramid/templates/batches/columns.mako b/rattail/pyramid/templates/batches/columns.mako
deleted file mode 100644
index 332298ca..00000000
--- a/rattail/pyramid/templates/batches/columns.mako
+++ /dev/null
@@ -1,9 +0,0 @@
-
-<table class="fieldset">
-  <tr>
-    <td class="label">Columns</td>
-    <td>
-      ${columns|n}
-    </td>
-  </tr>
-</table>
diff --git a/rattail/pyramid/templates/batches/crud.mako b/rattail/pyramid/templates/batches/crud.mako
new file mode 100644
index 00000000..165b02be
--- /dev/null
+++ b/rattail/pyramid/templates/batches/crud.mako
@@ -0,0 +1,8 @@
+<%inherit file="/crud.mako" />
+
+<%def name="context_menu_items()">
+  <li>${h.link_to("Back to Batches", url('batches'))}</li>
+  <li>${h.link_to("View Batch Rows", url('batch.rows', uuid=form.fieldset.model.uuid))}</li>
+</%def>
+
+${parent.body()}
diff --git a/rattail/pyramid/templates/batches/details.mako b/rattail/pyramid/templates/batches/details.mako
deleted file mode 100644
index db8d7e15..00000000
--- a/rattail/pyramid/templates/batches/details.mako
+++ /dev/null
@@ -1,12 +0,0 @@
-<%inherit file="/batches/base.mako" />
-<%inherit file="/index.mako" />
-
-<%def name="title()">Batch : ${batch.name}</%def>
-
-<%def name="menu()">
-  <p>${h.link_to("Back to Batches", url('batches.list'))}</p>
-  <p>${h.link_to("View Batch Properties", url('batch.edit', uuid=batch.uuid))}</p>
-  <p>${h.link_to("Execute this Batch", url('batch.execute', uuid=batch.uuid))}</p>
-</%def>
-
-${parent.body()}
diff --git a/rattail/pyramid/templates/batches/dictionaries.mako b/rattail/pyramid/templates/batches/dictionaries.mako
deleted file mode 100644
index b1b8899b..00000000
--- a/rattail/pyramid/templates/batches/dictionaries.mako
+++ /dev/null
@@ -1,11 +0,0 @@
-<%inherit file="/batches/base.mako" />
-<%inherit file="/index.mako" />
-
-<%def name="title()">Batch Dictionaries</%def>
-
-<%def name="menu()">
-  <p>${h.link_to("Back to Batches", url('batches.list'))}</p>
-##  <p>${h.link_to("Create a New Dictionary", url('batch_dictionary'))}</p>
-</%def>
-
-${parent.body()}
diff --git a/rattail/pyramid/templates/batches/dictionary.mako b/rattail/pyramid/templates/batches/dictionary.mako
deleted file mode 100644
index 90ddf9be..00000000
--- a/rattail/pyramid/templates/batches/dictionary.mako
+++ /dev/null
@@ -1,9 +0,0 @@
-<%inherit file="/batches/base.mako" />
-<%inherit file="/crud.mako" />
-
-<%def name="menu()">
-  <p>${h.link_to("Back to Batches", url('batches.list'))}</p>
-  <p>${h.link_to("Back to Dictionaries", url('batch_dictionaries'))}</p>
-</%def>
-
-${parent.body()}
diff --git a/rattail/pyramid/templates/batches/dictionary_columns.mako b/rattail/pyramid/templates/batches/dictionary_columns.mako
deleted file mode 100644
index 78f353e5..00000000
--- a/rattail/pyramid/templates/batches/dictionary_columns.mako
+++ /dev/null
@@ -1,8 +0,0 @@
-<table class="fieldset">
-  <tr class="columns">
-    <td class="label">Supported Columns</td>
-    <td>
-      ${grid|n}
-    </td>
-  </tr>
-</table>
\ No newline at end of file
diff --git a/rattail/pyramid/templates/batches/index.mako b/rattail/pyramid/templates/batches/index.mako
index 6e568008..8b426e03 100644
--- a/rattail/pyramid/templates/batches/index.mako
+++ b/rattail/pyramid/templates/batches/index.mako
@@ -1,38 +1,5 @@
-<%inherit file="/batches/base.mako" />
-<%inherit file="/index.mako" />
+<%inherit file="/grid.mako" />
 
 <%def name="title()">Batches</%def>
 
-<%def name="head_tags()">
-  <style type="text/css">
-
-  div.grid table tbody td.rowcount {
-      text-align: right;
-  }
-
-  </style>
-  <script language="javascript" type="text/javascript">
-
-  $(function() {
-      $('div.grid table tbody td.action.execute a').live('click', function() {
-	  var tr = $(this).parents('tr:first');
-	  var desc = tr.find('td.description').text();
-	  if (confirm("Do you really wish to execute this batch?\n\n" + desc)) {
-	      var url = '${url('batch.execute', uuid='{uuid}')}';
-	      location.href = url.replace(/%7Buuid%7D/, get_uuid(this));
-	  }
-	  return false;
-      });
-  });
-
-  </script>
-</%def>
-
-<%def name="menu()">
-##  <p>${h.link_to("Create a New Batch", url('batch.new'))}</p>
-  <p>${h.link_to("Manage Terminals", url('batch_terminals'))}</p>
-  <p>${h.link_to("View Dictionaries", url('batch_dictionaries'))}</p>
-  <p>${h.link_to("SIL Columns", url('sil_columns'))}</p>
-</%def>
-
 ${parent.body()}
diff --git a/rattail/pyramid/templates/batches/params.mako b/rattail/pyramid/templates/batches/params.mako
new file mode 100644
index 00000000..48a494fa
--- /dev/null
+++ b/rattail/pyramid/templates/batches/params.mako
@@ -0,0 +1,42 @@
+<%inherit file="/base.mako" />
+
+<%def name="title()">Batch Parameters</%def>
+
+<%def name="head_tags()">
+  ${parent.head_tags()}
+  <script language="javascript" type="text/javascript">
+
+    $(function() {
+
+        $('#create-batch').click(function() {
+            disable_button(this, "Creating batch");
+            disable_button('#cancel');
+            $('form').submit();
+        });
+
+    });
+
+  </script>
+</%def>
+
+<%def name="batch_params()"></%def>
+
+<p>Please provide the following values for your new batch:</p>
+<br />
+
+<div class="form">
+
+  ${h.form(request.get_referrer())}
+  ${h.hidden('provider', value=provider)}
+  ${h.hidden('params', value='True')}
+
+  ${self.batch_params()}
+
+  <div class="buttons">
+    <button type="button" id="create-batch">Create Batch</button>
+    <button type="button" id="cancel" onclick="location.href = '${request.get_referrer()}';">Cancel</button>
+  </div>
+
+  ${h.end_form()}
+
+</div>
diff --git a/rattail/pyramid/templates/batches/params/print_labels.mako b/rattail/pyramid/templates/batches/params/print_labels.mako
new file mode 100644
index 00000000..c559c767
--- /dev/null
+++ b/rattail/pyramid/templates/batches/params/print_labels.mako
@@ -0,0 +1,19 @@
+<%inherit file="/batches/params.mako" />
+
+<%def name="batch_params()">
+
+  <div class="field-wrapper">
+    <label for="profile">Label Type</label>
+    <div class="field">
+      ${h.select('profile', None, label_profiles)}
+    </div>
+  </div>
+
+  <div class="field-wrapper">
+    <label for="quantity">Quantity</label>
+    <div class="field">${h.text('quantity', value=1)}</div>
+  </div>
+
+</%def>
+
+${parent.body()}
diff --git a/rattail/pyramid/templates/batches/read.mako b/rattail/pyramid/templates/batches/read.mako
new file mode 100644
index 00000000..3ce97fea
--- /dev/null
+++ b/rattail/pyramid/templates/batches/read.mako
@@ -0,0 +1,40 @@
+<%inherit file="/batches/crud.mako" />
+
+<%def name="context_menu_items()">
+  ${parent.context_menu_items()}
+  <li>${h.link_to("Edit this Batch", url('batch.update', uuid=form.fieldset.model.uuid))}</li>
+  <li>${h.link_to("Delete this Batch", url('batch.delete', uuid=form.fieldset.model.uuid))}</li>
+</%def>
+
+${parent.body()}
+
+<% batch = form.fieldset.model %>
+
+<h2>Columns</h2>
+
+<div class="grid full hoverable">
+  <table>
+    <thead>
+      <tr>
+        <th>Name</th>
+        <th>SIL Name</th>
+        <th>Display Name</th>
+        <th>Description</th>
+        <th>Data Type</th>
+        <th>Visible</th>
+      </tr>
+    </thead>
+    <tbody>
+      % for i, column in enumerate(batch.columns, 1):
+          <tr class="${'odd' if i % 2 else 'even'}">
+            <td>${column.name}</td>
+            <td>${column.sil_name}</td>
+            <td>${column.display_name}</td>
+            <td>${column.description}</td>
+            <td>${column.data_type}</td>
+            <td>${column.visible}</td>
+          </tr>
+      % endfor
+    </tbody>
+  </table>
+</div>
diff --git a/rattail/pyramid/templates/batches/rows/crud.mako b/rattail/pyramid/templates/batches/rows/crud.mako
new file mode 100644
index 00000000..c5a0daf0
--- /dev/null
+++ b/rattail/pyramid/templates/batches/rows/crud.mako
@@ -0,0 +1,8 @@
+<%inherit file="/crud.mako" />
+
+<%def name="context_menu_items()">
+  <li>${h.link_to("Back to Batch", url('batch', uuid=form.fieldset.model.batch.uuid))}</li>
+  <li>${h.link_to("Back to Batch Rows", url('batch.rows', uuid=form.fieldset.model.batch.uuid))}</li>
+</%def>
+
+${parent.body()}
diff --git a/rattail/pyramid/templates/batches/rows/index.mako b/rattail/pyramid/templates/batches/rows/index.mako
new file mode 100644
index 00000000..17c72786
--- /dev/null
+++ b/rattail/pyramid/templates/batches/rows/index.mako
@@ -0,0 +1,46 @@
+<%inherit file="/grid.mako" />
+
+<%def name="title()">Batch Rows : ${batch.description}</%def>
+
+<%def name="head_tags()">
+  ${parent.head_tags()}
+  <script language="javascript" type="text/javascript">
+
+    $(function() {
+
+        $('#delete-results').click(function() {
+            var msg = "This will delete all rows matching the current search.\n\n"
+                + "PLEASE NOTE that this may include some rows which are not visible "
+                + "on your screen.\n(I.e., if there is more than one \"page\" of results.)\n\n"
+                + "Are you sure you wish to delete these rows?";
+            if (confirm(msg)) {
+                disable_button(this, "Deleting rows");
+                location.href = '${url('batch.rows.delete', uuid=batch.uuid)}';
+            }
+        });
+
+        $('#execute-batch').click(function() {
+            if (confirm("Are you sure you wish to execute this batch?")) {
+                disable_button(this, "Executing batch");
+                location.href = '${url('batch.execute', uuid=batch.uuid)}';
+            }
+        });
+
+    });
+
+  </script>
+</%def>
+
+<%def name="context_menu_items()">
+  <li>${h.link_to("Back to Batches", url('batches'))}</li>
+  <li>${h.link_to("Back to Batch", url('batch', uuid=batch.uuid))}</li>
+</%def>
+
+<%def name="tools()">
+  <div class="buttons">
+    <button type="button" id="delete-results">Delete Results</button>
+    <button type="button" id="execute-batch">Execute Batch</button>
+  </div>
+</%def>
+
+${parent.body()}
diff --git a/rattail/pyramid/templates/batches/sil_column.mako b/rattail/pyramid/templates/batches/sil_column.mako
deleted file mode 100644
index 95eac5e4..00000000
--- a/rattail/pyramid/templates/batches/sil_column.mako
+++ /dev/null
@@ -1,9 +0,0 @@
-<%inherit file="/batches/base.mako" />
-<%inherit file="/crud.mako" />
-
-<%def name="menu()">
-  <p>${h.link_to("Back to Batches", url('batches.list'))}</p>
-  <p>${h.link_to("Back to SIL Columns", url('sil_columns'))}</p>
-</%def>
-
-${parent.body()}
diff --git a/rattail/pyramid/templates/batches/sil_columns.mako b/rattail/pyramid/templates/batches/sil_columns.mako
deleted file mode 100644
index ab8a6a64..00000000
--- a/rattail/pyramid/templates/batches/sil_columns.mako
+++ /dev/null
@@ -1,10 +0,0 @@
-<%inherit file="/batches/base.mako" />
-<%inherit file="/index.mako" />
-
-<%def name="title()">SIL Columns</%def>
-
-<%def name="menu()">
-  <p>${h.link_to("Back to Batches", url('batches.list'))}</p>
-</%def>
-
-${parent.body()}
diff --git a/rattail/pyramid/templates/batches/supported_fields.mako b/rattail/pyramid/templates/batches/supported_fields.mako
deleted file mode 100644
index aba8b077..00000000
--- a/rattail/pyramid/templates/batches/supported_fields.mako
+++ /dev/null
@@ -1,24 +0,0 @@
-
-<table class="wrapper">
-
-  <tr>
-    <td><h2>Supported Fields</h2></td>
-##    <td class="right">${h.link_to("Update Field List", '#', id='update-fields')}</td>
-  </tr>
-
-</table>
-
-${grid|n}
-
-##<script language="javascript" type="text/javascript">
-##
-##$(function() {
-##
-##    $('#update-fields').click(function() {
-##	$('div.grid').load('${url('batches', action='update_terminal')}?uuid=${fieldset.model.uuid}');
-##	return false;
-##    });
-##
-##});
-##
-##</script>
diff --git a/rattail/pyramid/templates/batches/terminal.mako b/rattail/pyramid/templates/batches/terminal.mako
deleted file mode 100644
index 4f5d4697..00000000
--- a/rattail/pyramid/templates/batches/terminal.mako
+++ /dev/null
@@ -1,9 +0,0 @@
-<%inherit file="/batches/base.mako" />
-<%inherit file="/crud.mako" />
-
-<%def name="menu()">
-  <p>${h.link_to("Back to Batches", url('batches.list'))}</p>
-  <p>${h.link_to("Back to Batch Terminals", url('batch_terminals'))}</p>
-</%def>
-
-${parent.body()}
diff --git a/rattail/pyramid/templates/batches/terminals.mako b/rattail/pyramid/templates/batches/terminals.mako
deleted file mode 100644
index a579c556..00000000
--- a/rattail/pyramid/templates/batches/terminals.mako
+++ /dev/null
@@ -1,11 +0,0 @@
-<%inherit file="/batches/base.mako" />
-<%inherit file="/index.mako" />
-
-<%def name="title()">Batch Terminals</%def>
-
-<%def name="menu()">
-  <p>${h.link_to("Back to Batches", url('batches.list'))}</p>
-  <p>${h.link_to("Create a New Terminal", url('batch_terminal.new'))}</p>
-</%def>
-
-${parent.body()}
diff --git a/rattail/pyramid/templates/labels/profiles/crud.mako b/rattail/pyramid/templates/labels/profiles/crud.mako
new file mode 100644
index 00000000..e394346b
--- /dev/null
+++ b/rattail/pyramid/templates/labels/profiles/crud.mako
@@ -0,0 +1,26 @@
+<%inherit file="/crud.mako" />
+
+<%def name="head_tags()">
+  ${parent.head_tags()}
+  <style type="text/css">
+
+    div.form div.field-wrapper.format textarea {
+        width: auto;
+    }
+
+  </style>
+</%def>
+
+<%def name="context_menu_items()">
+  <li>${h.link_to("Back to Label Profiles", url('label_profiles'))}</li>
+  % if form.updating:
+      <% profile = form.fieldset.model %>
+      <% printer = profile.get_printer() %>
+      % if printer.required_settings:
+          <li>${h.link_to("Edit Printer Settings", url('label_profile.printer_settings', uuid=profile.uuid))}</li>
+      % endif
+      <li>${h.link_to("View this Label Profile", url('label_profile.read', uuid=profile.uuid))}</li>
+  % endif
+</%def>
+
+${parent.body()}
diff --git a/rattail/pyramid/templates/labels/profiles/index.mako b/rattail/pyramid/templates/labels/profiles/index.mako
new file mode 100644
index 00000000..a5383fbe
--- /dev/null
+++ b/rattail/pyramid/templates/labels/profiles/index.mako
@@ -0,0 +1,11 @@
+<%inherit file="/grid.mako" />
+
+<%def name="title()">Label Profiles</%def>
+
+<%def name="context_menu_items()">
+  % if request.has_perm('label_profiles.create'):
+      <li>${h.link_to("Create a new Label Profile", url('label_profile.create'))}</li>
+  % endif
+</%def>
+
+${parent.body()}
diff --git a/rattail/pyramid/templates/labels/profiles/printer.mako b/rattail/pyramid/templates/labels/profiles/printer.mako
new file mode 100644
index 00000000..9b1c5545
--- /dev/null
+++ b/rattail/pyramid/templates/labels/profiles/printer.mako
@@ -0,0 +1,48 @@
+<%inherit file="/base.mako" />
+
+<%def name="title()">Printer Settings</%def>
+
+<%def name="context_menu_items()">
+  <li>${h.link_to("Back to Label Profiles", url('label_profiles'))}</li>
+  <li>${h.link_to("View this Label Profile", url('label_profile.read', uuid=profile.uuid))}</li>
+  <li>${h.link_to("Edit this Label Profile", url('label_profile.update', uuid=profile.uuid))}</li>
+</%def>
+
+<div class="form-wrapper">
+
+  <ul class="context-menu">
+    ${self.context_menu_items()}
+  </ul>
+
+  <div class="form">
+
+    <div class="field-wrapper">
+      <label>Label Profile</label>
+      <div class="field">${profile.description}</div>
+    </div>
+
+    <div class="field-wrapper">
+      <label>Printer Spec</label>
+      <div class="field">${profile.printer_spec}</div>
+    </div>
+
+    ${h.form(request.current_route_url())}
+
+    % for name, display in printer.required_settings.iteritems():
+        <div class="field-wrapper">
+          <label for="${name}">${display}</label>
+          <div class="field">
+            ${h.text(name, value=profile.get_printer_setting(name))}
+          </div>
+        </div>
+    % endfor
+
+    <div class="buttons">
+      ${h.submit('update', "Update")}
+      <button type="button" onclick="location.href = '${url('label_profile.read', uuid=profile.uuid)}';">Cancel</button>
+    </div>
+
+    ${h.end_form()}
+  </div>
+
+</div>
diff --git a/rattail/pyramid/templates/labels/profiles/read.mako b/rattail/pyramid/templates/labels/profiles/read.mako
new file mode 100644
index 00000000..c3e2cec7
--- /dev/null
+++ b/rattail/pyramid/templates/labels/profiles/read.mako
@@ -0,0 +1,32 @@
+<%inherit file="/labels/profiles/crud.mako" />
+
+<%def name="context_menu_items()">
+  <li>${h.link_to("Back to Label Profiles", url('label_profiles'))}</li>
+  % if form.readonly and request.has_perm('label_profiles.update'):
+      <% profile = form.fieldset.model %>
+      <% printer = profile.get_printer() %>
+      <li>${h.link_to("Edit this Label Profile", url('label_profile.update', uuid=form.fieldset.model.uuid))}</li>
+      % if printer.required_settings:
+          <li>${h.link_to("Edit Printer Settings", url('label_profile.printer_settings', uuid=profile.uuid))}</li>
+      % endif
+  % endif
+</%def>
+
+${parent.body()}
+
+<% profile = form.fieldset.model %>
+<% printer = profile.get_printer() %>
+
+% if printer.required_settings:
+    <h2>Printer Settings</h2>
+
+    <div class="form">
+      % for name, display in printer.required_settings.iteritems():
+          <div class="field-wrapper">
+            <label>${display}</label>
+            <div class="field">${profile.get_printer_setting(name) or ''}</div>
+          </div>
+      % endfor
+    </div>
+
+% endif
diff --git a/rattail/pyramid/templates/products/batch.mako b/rattail/pyramid/templates/products/batch.mako
new file mode 100644
index 00000000..335c8574
--- /dev/null
+++ b/rattail/pyramid/templates/products/batch.mako
@@ -0,0 +1,27 @@
+<%inherit file="/base.mako" />
+
+<%def name="title()">Create Products Batch</%def>
+
+<%def name="context_menu_items()">
+  <li>${h.link_to("Back to Products", url('products'))}</li>
+</%def>
+
+<div class="form">
+
+  ${h.form(request.current_route_url())}
+
+  <div class="field-wrapper">
+    <label for="provider">Batch Type</label>
+    <div class="field">
+      ${h.select('provider', None, providers)}
+    </div>
+  </div>
+
+  <div class="buttons">
+    ${h.submit('create', "Create Batch")}
+    <button type="button" onclick="location.href = '${url('products')}';">Cancel</button>
+  </div>
+
+  ${h.end_form()}
+
+</div>
diff --git a/rattail/pyramid/templates/products/index.mako b/rattail/pyramid/templates/products/index.mako
index 36992e85..dc09241c 100644
--- a/rattail/pyramid/templates/products/index.mako
+++ b/rattail/pyramid/templates/products/index.mako
@@ -33,7 +33,7 @@
     }
     
   </style>
-  % if edbob.config.getboolean('rattail.labels', 'enabled', default=False):
+  % if label_profiles and request.has_perm('products.print_labels'):
       <script language="javascript" type="text/javascript">
 
         $(function() {
@@ -45,18 +45,22 @@
                     $('#label-quantity').focus();
                 } else {
                     $.ajax({
-                        url: '${url('products.print_label')}',
+                        url: '${url('products.print_labels')}',
                         data: {
-                            'uuid': get_uuid(this),
+                            'product': get_uuid(this),
                             'profile': $('#label-profile').val(),
                             'quantity': quantity,
                         },
+                        success: function(data) {
+                            if (data.error) {
+                                alert("An error occurred while attempting to print:\n\n" + data.error);
+                            } else if (quantity == '1') {
+                                alert("1 label has been printed.");
+                            } else {
+                                alert(quantity + " labels have been printed.");
+                            }
+                        },
                     });
-                    if (quantity == '1') {
-                        alert("1 label has been printed.");
-                    } else {
-                        alert(quantity + " labels have been printed.");
-                    }
                 }
                 return false;
             });
@@ -67,7 +71,7 @@
 </%def>
 
 <%def name="tools()">
-  % if edbob.config.getboolean('rattail.labels', 'enabled', default=False):
+  % if label_profiles and request.has_perm('products.print_labels'):
       <table>
         <thead>
           <tr>
@@ -78,8 +82,8 @@
         <tbody>
           <td>
             <select name="label-profile" id="label-profile">
-              % for profile in rattail.labels.iter_profiles():
-                  <option value="${profile.name}">${profile.display_name}</option>
+              % for profile in label_profiles:
+                  <option value="${profile.uuid}">${profile.description}</option>
               % endfor
             </select>
           </td>
@@ -91,4 +95,10 @@
   % endif
 </%def>
 
+<%def name="context_menu_items()">
+  % if request.has_perm('batches.create'):
+      <li>${h.link_to("Create Batch from Results", url('products.create_batch'))}</li>
+  % endif
+</%def>
+
 ${parent.body()}
diff --git a/rattail/pyramid/util.py b/rattail/pyramid/util.py
deleted file mode 100644
index 6975dc2a..00000000
--- a/rattail/pyramid/util.py
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8  -*-
-################################################################################
-#
-#  Rattail -- Retail Software Framework
-#  Copyright © 2010-2012 Lance Edgar
-#
-#  This file is part of Rattail.
-#
-#  Rattail is free software: you can redistribute it and/or modify it under the
-#  terms of the GNU Affero General Public License as published by the Free
-#  Software Foundation, either version 3 of the License, or (at your option)
-#  any later version.
-#
-#  Rattail is distributed in the hope that it will be useful, but WITHOUT ANY
-#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-#  FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for
-#  more details.
-#
-#  You should have received a copy of the GNU Affero General Public License
-#  along with Rattail.  If not, see <http://www.gnu.org/licenses/>.
-#
-################################################################################
-
-"""
-``rattail.pyramid.util`` -- Utilities
-"""
-
-from pyramid import threadlocal
-from webhelpers.html import tags
-
-import edbob
-from edbob.pyramid import Session
-
-import rattail
-
-
-def get_column(sil_name):
-    """
-    Returns the :class:`rattail.SilColumn` instance with the given SIL name.
-    """
-
-    q = Session.query(rattail.SilColumn)
-    q = q.filter(rattail.SilColumn.sil_name == sil_name)
-    if q.count() == 1:
-        return q.one()
-
-
-def get_dictionary(name, flash=False):
-    """
-    Returns the :class:`rattail.BatchDictionary` instance with the given name.
-    """
-
-    q = Session.query(rattail.BatchDictionary)
-    q = q.filter(rattail.BatchDictionary.name == name)
-    if q.count() == 1:
-        return q.one()
-        
-    if flash:
-        request = threadlocal.get_current_request()
-        dct = tags.link_to("Batch Dictionary", request.route_url('batch_dictionaries'))
-        request.session.flash("Hm, I couldn't find the '%s' %s." % (name, dct))
-
-
-def get_terminal(key=None, default='rattail', title="Rattail"):
-    """
-    Returns the :class:`rattail.BatchTerminal` instance with the given SIL ID.
-
-    If ``key`` is specified, it will be used to obtain the SIL ID from config.
-    If no key is given, or config contains no appropriate value, then
-    ``default`` will be used as the SIL ID.
-
-    ``title`` is used for a flash message, should no such terminal be found.
-
-    .. highlight:: ini
-
-    Given a ``key`` value of ``'products'``, a SIL ID of ``'rattail.locsms'``
-    should be configured like this::
-
-       [rattail.pyramid]
-       batch_terminal.products = rattail.locsms
-    """
-
-    if key:
-        sil_id = edbob.config.get('rattail.pyramid', 'batch_terminal.%s' % key,
-                                  default=default)
-    assert sil_id
-
-    q = Session.query(rattail.BatchTerminal)
-    q = q.filter(rattail.BatchTerminal.sil_id == sil_id)
-    if q.count() == 1:
-        return q.one()
-
-    request = threadlocal.get_current_request()
-    terminal = tags.link_to("Batch Terminal", request.route_url('batch_terminals'))
-    request.session.flash("Hm, I couldn't find a %s for %s." % (terminal, title))
diff --git a/rattail/pyramid/views/batches.py b/rattail/pyramid/views/batches.py
deleted file mode 100644
index 468a0cf5..00000000
--- a/rattail/pyramid/views/batches.py
+++ /dev/null
@@ -1,1033 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8  -*-
-################################################################################
-#
-#  Rattail -- Retail Software Framework
-#  Copyright © 2010-2012 Lance Edgar
-#
-#  This file is part of Rattail.
-#
-#  Rattail is free software: you can redistribute it and/or modify it under the
-#  terms of the GNU Affero General Public License as published by the Free
-#  Software Foundation, either version 3 of the License, or (at your option)
-#  any later version.
-#
-#  Rattail is distributed in the hope that it will be useful, but WITHOUT ANY
-#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-#  FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for
-#  more details.
-#
-#  You should have received a copy of the GNU Affero General Public License
-#  along with Rattail.  If not, see <http://www.gnu.org/licenses/>.
-#
-################################################################################
-
-"""
-``rattail.pyramid.views.batches`` -- Batch (et al.) Views
-"""
-
-import formalchemy
-from sqlalchemy import and_, or_
-from sqlalchemy.orm import joinedload
-
-import transaction
-from pyramid.httpexceptions import HTTPFound
-from pyramid.renderers import render
-from pyramid.response import Response
-from pyramid.view import view_config
-
-from edbob.exceptions import LoadSpecError
-from edbob.pyramid import filters
-from edbob.pyramid import forms
-from edbob.pyramid import grids
-from edbob.pyramid import Session
-# from edbob.pyramid.views.crud import crud
-from edbob.util import prettify
-
-import rattail
-from rattail import sil
-from rattail.batches import next_batch_id
-from rattail.pyramid import util
-from rattail.pyramid.forms import (
-    BatchIdFieldRenderer,
-    unique_batch_terminal_id,
-    )
-
-
-@view_config(route_name='sil_columns', renderer='/batches/sil_columns.mako')
-def sil_columns(context, request):
-    """
-    Index page for SIL columns (:class:`rattail.SilColumn`).
-    """
-
-    fmap = filters.get_filter_map(
-        rattail.SilColumn,
-        exact=['sil_name'],
-        ilike=['display'])
-
-    config = filters.get_search_config(
-        'sil_columns', request, fmap,
-        include_filter_sil_name=True,
-        filter_type_sil_name='eq',
-        include_filter_display=True,
-        filter_type_display='lk')
-
-    search = filters.get_search_form(
-        config, sil_name="SIL Name")
-
-    config = grids.get_grid_config(
-        'sil_columns', request, search,
-        filter_map=fmap, sort='sil_name')
-
-    smap = grids.get_sort_map(
-        rattail.SilColumn,
-        ['sil_name', 'display', 'data_type'])
-
-    def query(config):
-        q = Session.query(rattail.SilColumn)
-        q = filters.filter_query(q, config)
-        q = grids.sort_query(q, config, smap)
-        return q
-
-    columns = grids.get_pager(query, config)
-    g = forms.AlchemyGrid(
-        rattail.SilColumn, columns, config,
-        gridurl=request.route_url('sil_columns'),
-        objurl='sil_column', delurl='sil_column')
-
-    g.configure(
-        include=[
-            g.sil_name.label("SIL Name"),
-            g.display,
-            g.data_type,
-            ])
-
-    g.readonly = True
-    grid = g.render(class_='clickable batch-columns')
-    return grids.render_grid(request, grid, search)
-
-
-@view_config(route_name='sil_column', renderer='/batches/sil_column.mako')
-def sil_column(context, request):
-
-    def fieldset(column):
-        fs = forms.make_fieldset(
-            column, crud_title="Batch Column",
-            url_action=request.route_url('sil_column'),
-            url_cancel=request.route_url('sil_columns'))
-        
-        fs.configure(
-            include=[
-                fs.sil_name.label("SIL Name"),
-                fs.display,
-                fs.data_type,
-                ])
-
-        if fs.edit:
-            fs.sil_name.set(readonly=True)
-        return fs
-
-
-    return crud(
-        request, rattail.SilColumn, fieldset,
-        home=request.route_url('sil_columns'),
-        delete=request.route_url('sil_columns'))
-
-
-@view_config(route_name='batch_dictionaries', renderer='/batches/dictionaries.mako')
-def batch_dictionaries(context, request):
-    """
-    Index page for batch dictionaries (:class:`rattail.BatchDictionary`).
-    """
-
-    fmap = filters.get_filter_map(
-        rattail.BatchDictionary,
-        exact=['name'],
-        ilike=['description'])
-
-    config = filters.get_search_config(
-        'batch_dictionaries', request, fmap,
-        include_filter_name=True,
-        filter_type_name='eq',
-        include_filter_description=True,
-        filter_type_description='lk')
-
-    search = filters.get_search_form(config)
-
-    config = grids.get_grid_config(
-        'batch_dictionaries', request, search,
-        filter_map=fmap, sort='description')
-
-    smap = grids.get_sort_map(
-        rattail.BatchDictionary,
-        ['name', 'description'])
-
-    def query(config):
-        q = Session.query(rattail.BatchDictionary)
-        q = filters.filter_query(q, config)
-        q = grids.sort_query(q, config, smap)
-        return q
-
-    dictionaries = grids.get_pager(query, config)
-    g = forms.AlchemyGrid(
-        rattail.BatchDictionary, dictionaries, config,
-        gridurl=request.route_url('batch_dictionaries'),
-        objurl='batch_dictionary', delurl='batch_dictionary')
-
-    g.configure(
-        include=[
-            g.name,
-            g.description,
-            ])
-
-    g.readonly = True
-    grid = g.render(class_='clickable batch-dictionaries')
-    return grids.render_grid(request, grid, search)
-
-
-def _dictionary_columns(request, uuid=None):
-    """
-    Returns a rendered grid of columns for a batch dictionary.
-    """
-
-    if not uuid:
-        uuid = request.params.get('uuid')
-    dictionary = Session.query(rattail.BatchDictionary).get(uuid) if uuid else None
-    assert dictionary
-
-    fmap = filters.get_filter_map(
-        rattail.BatchDictionaryColumn,
-        exact=['key'])
-    fmap['column'] = filters.filter_exact(rattail.SilColumn.sil_name)
-    fmap['display'] = filters.filter_ilike(rattail.SilColumn.display)
-
-    config = grids.get_grid_config(
-        'batch_dictionary.columns', request,
-        filter_map=fmap, sort='column')
-
-    smap = grids.get_sort_map(
-        rattail.BatchDictionaryColumn,
-        ['key'])
-    smap['column'] = grids.sorter(rattail.SilColumn.sil_name)
-    smap['display'] = grids.sorter(rattail.SilColumn.display)
-
-    def query(config):
-        q = Session.query(rattail.BatchDictionaryColumn)
-        q = q.join(rattail.SilColumn)
-        q = filters.filter_query(q, config)
-        q = grids.sort_query(q, config, smap)
-        return q
-
-    columns = query(config)
-    url = (request.route_url('batch_dictionary.columns')
-           + '?uuid=' + dictionary.uuid)
-    g = forms.AlchemyGrid(
-        rattail.BatchDictionaryColumn, columns, config, url)
-
-    g.append(
-        formalchemy.Field(
-            'display',
-            value=lambda x: x.sil_column.display))
-
-    g.configure(
-        include=[
-            g.sil_column.label("SIL Name"),
-            g.display,
-            g.key,
-            ])
-
-    g.readonly = True
-    return g.render(class_='hoverable batch-dictionary-columns')
-
-
-@view_config(route_name='batch_dictionary.columns')
-def batch_dictionary_columns(context, request):
-    return Response(body=_dictionary_columns(request),
-                    content_type='text/html')
-
-
-@view_config(route_name='batch_dictionary', renderer='/batches/dictionary.mako')
-def batch_dictionary(context, request):
-
-    def fieldset(dictionary):
-        fs = forms.make_fieldset(
-            dictionary, crud_title="Batch Dictionary",
-            url_action=request.route_url('batch_dictionary'),
-            url_cancel=request.route_url('batch_dictionaries'))
-        
-        fs.configure(
-            include=[
-                fs.name,
-                fs.description,
-                ])
-
-        fs.readonly = True
-        return fs
-
-
-    def pre_render(fs):
-        if fs.edit:
-            g = _dictionary_columns(request, fs.model.uuid)
-            return {'columns':
-                        render('/batches/dictionary_columns.mako', {'grid':g})}
-
-    return crud(
-        request, rattail.BatchDictionary, fieldset,
-        home=request.route_url('batch_dictionaries'),
-        delete=request.route_url('batch_dictionaries'),
-        pre_render=pre_render)
-
-
-def _terminal_columns(request, terminal):
-    """
-    Returns a rendered grid of :class:`rattail.BatchTerminalColumn` instances,
-    depending on ``terminal``.
-    """
-
-    config = grids.get_grid_config(
-        'batch_terminal.columns', request, sort='dictionary')
-
-    smap = grids.get_sort_map(
-        rattail.BatchTerminalColumn,
-        ['source', 'target'],
-        dictionary=grids.sorter(rattail.BatchDictionary.name),
-        sil_column=grids.sorter(rattail.SilColumn.sil_name),
-        display=grids.sorter(rattail.SilColumn.display))
-
-    jmap = dict(
-        dictionary=lambda q: q.join(rattail.BatchDictionary),
-        sil_column=lambda q: q.join(rattail.SilColumn),
-        display=lambda q: q.join(rattail.SilColumn))
-
-    def query(config):
-        q = Session.query(rattail.BatchTerminalColumn)
-        q = q.options(joinedload(rattail.BatchTerminalColumn.dictionary))
-        q = q.options(joinedload(rattail.BatchTerminalColumn.sil_column))
-        q = q.filter(rattail.BatchTerminalColumn.terminal_uuid == terminal.uuid)
-        q = grids.sort_query(q, config, smap, jmap)
-        return q
-
-    columns = query(config)
-    g = forms.AlchemyGrid(rattail.BatchTerminalColumn, columns, config,
-                          gridurl=request.route_url('batch_terminal.columns', uuid=terminal.uuid))
-
-    g.append(
-        formalchemy.Field(
-            'display',
-            value=lambda x: x.sil_column.display))
-
-    g.configure(
-        include=[
-            g.dictionary,
-            g.sil_column.label("SIL Name"),
-            g.display,
-            g.source,
-            g.target,
-            ])
-
-    g.readonly = True
-    return g.render(class_='hoverable batch-terminal-columns')
-
-
-@view_config(route_name='batch_terminal.columns')
-def terminal_columns(context, request):
-    uuid = request.matchdict['uuid']
-    terminal = Session.query(rattail.BatchTerminal).get(uuid) if uuid else None
-    assert terminal
-    return Response(
-        body=_terminal_columns(request, terminal),
-        content_type='text/html')
-
-
-def update_terminal_info(terminal):
-    """
-    This function updates a :class:`rattail.BatchTerminal` instance to reflect
-    the reality found by way of inspecting its underlying
-    :class:`rattail.batches.BatchTerminal` instance.
-    """
-
-    # Assume the worst.
-    terminal.functional = False
-    del terminal.columns[:]
-
-    # Fetch "real" terminal instance, if we can.
-    try:
-        true_terminal = terminal.get_terminal()
-    except LoadSpecError, err:
-        return err
-
-    # Spec was fine but still no terminal?  (This may not be needed?)
-    if not true_terminal:
-        return
-
-    # Okay, we have *something*.
-    terminal.functional = True
-
-    if true_terminal.source_columns:
-        terminal.source = True
-    for dct, cols in true_terminal.source_columns.iteritems():
-        dct = util.get_dictionary(dct)
-        for col in cols:
-            col = rattail.BatchTerminalColumn(
-                dictionary=dct,
-                sil_column=util.get_column(col),
-                source=True,
-                target=False)
-            terminal.columns.append(col)
-            Session.flush()
-
-    if true_terminal.target_columns:
-        terminal.target = True
-    for dct, cols in true_terminal.target_columns.iteritems():
-        dct = util.get_dictionary(dct)
-        for col in cols:
-            col = rattail.BatchTerminalColumn(
-                dictionary=dct,
-                sil_column=util.get_column(col),
-                source=False,
-                target=True)
-            terminal.columns.append(col)
-            Session.flush()
-
-    # Really, why?
-    return true_terminal
-    
-
-def terminal_fieldset(terminal, request):
-    fs = forms.make_fieldset(
-        terminal, crud_title="Batch Terminal",
-        url_action=request.current_route_url(),
-        url_cancel=request.route_url('batch_terminals'))
-
-    fs.configure(
-        include=[
-            fs.sil_id.label("SIL ID").validate(unique_batch_terminal_id),
-            fs.description,
-            fs.class_spec.validate(forms.required),
-            fs.functional.readonly(),
-            ])
-
-    if not fs.edit:
-        del fs.functional
-
-    return fs
-
-
-@view_config(route_name='batch_terminal.new', renderer='/batches/terminal.mako')
-def new_terminal(context, request):
-
-    fs = terminal_fieldset(rattail.BatchTerminal, request)
-    if not fs.readonly and request.POST:
-        fs.rebind(data=request.params)
-        if fs.validate():
-
-            with transaction.manager:
-                fs.sync()
-                terminal = update_terminal_info(fs.model)
-                if isinstance(terminal, LoadSpecError):
-                    request.session.flash(str(terminal))
-                elif terminal:
-                    if not fs.model.sil_id:
-                        fs.model.sil_id = terminal.name
-                    if not fs.model.description:
-                        fs.model.description = terminal.description
-
-                # fs.model = Session.merge(fs.model)
-                Session.add(fs.model)
-                Session.flush()
-                request.session.flash("%s \"%s\" has been %s." % (
-                        fs.crud_title, fs.get_display_text(),
-                        'updated' if fs.edit else 'created'))
-                home = request.route_url('batch_terminal.edit', uuid=fs.model.uuid)
-
-            return HTTPFound(location=home)
-
-    data = {'fieldset': fs, 'crud': True}
-    return data
-
-
-@view_config(route_name='batch_terminal.edit', renderer='/batches/terminal.mako')
-def edit_terminal(context, request):
-
-    uuid = request.matchdict['uuid']
-    terminal = Session.query(rattail.BatchTerminal).get(uuid) if uuid else None
-    assert terminal
-
-    fs = terminal_fieldset(terminal, request)
-    if request.POST:
-        fs.rebind(data=request.params)
-        if fs.validate():
-
-            with transaction.manager:
-                fs.sync()
-                terminal = update_terminal_info(fs.model)
-                if isinstance(terminal, LoadSpecError):
-                    request.session.flash(str(terminal))
-                elif terminal:
-                    if not fs.model.sil_id:
-                        fs.model.sil_id = terminal.name
-                    if not fs.model.description:
-                        fs.model.description = terminal.description
-
-                # fs.model = Session.merge(fs.model)
-                request.session.flash("%s \"%s\" has been %s." % (
-                        fs.crud_title, fs.get_display_text(),
-                        'updated' if fs.edit else 'created'))
-                home = request.route_url('batch_terminal.edit', uuid=fs.model.uuid)
-
-            return HTTPFound(location=home)
-
-    fs.append(forms.ChildGridField('columns', _terminal_columns(request, terminal)))
-
-    return {'fieldset': fs, 'crud': True}
-
-
-@view_config(route_name='batch_terminal.delete')
-def delete_terminal(context, request):
-    uuid = request.matchdict['uuid']
-    terminal = Session.query(rattail.BatchTerminal).get(uuid) if uuid else None
-    assert terminal
-    with transaction.manager:
-        Session.delete(terminal)
-    return HTTPFound(location=request.route_url('batch_terminals'))
-
-
-# @view_config(route_name='batch_terminal', renderer='/batches/terminal.mako')
-# def batch_terminal(context, request):
-
-#     uuid = request.matchdict.get('uuid')
-
-#     def fieldset(terminal):
-#         fs = forms.make_fieldset(
-#             terminal, crud_title="Batch Terminal",
-#             url_action=request.current_route_url(),
-#             url_cancel=request.route_url('batches.terminals'))
-        
-#         fs.configure(
-#             include=[
-#                 fs.sil_id.label("SIL ID").validate(unique_batch_terminal_id),
-#                 fs.description,
-#                 fs.class_spec.validate(forms.required),
-#                 fs.functional.readonly(),
-#                 fs.source_kwargs,
-#                 fs.target_kwargs,
-#                 ])
-
-#         if fs.edit:
-#             fs.sil_id.set(readonly=True)
-#         else:
-#             del fs.source_kwargs
-#             del fs.target_kwargs
-#         return fs
-
-#     def pre_render(fs):
-#         if fs.edit:
-#             data = {
-#                 'columns': _terminal_columns(request, fs.model),
-#                 }
-#             return {'terminal_columns':
-#                         render('/batches/terminal_columns.mako', data)}
-
-#     def post_sync(fs):
-#         terminal = update_terminal_info(fs.model)
-#         if isinstance(terminal, LoadSpecError):
-#             request.session.flash(str(terminal))
-#         elif terminal:
-#             if not fs.model.sil_id:
-#                 fs.model.sil_id = terminal.name
-#             if not fs.model.description:
-#                 fs.model.description = terminal.description
-
-#     return crud(
-#         request, rattail.BatchTerminal, fieldset,
-#         delete=request.route_url('batches.terminals'),
-#         pre_render=pre_render, post_sync=post_sync)
-
-
-@view_config(route_name='batch_terminals', renderer='/batches/terminals.mako')
-def terminals(context, request):
-
-    fmap = filters.get_filter_map(
-        rattail.BatchTerminal,
-        exact=['sil_id'],
-        ilike=['description'])
-
-    config = filters.get_search_config(
-        'batch_terminals', request, fmap,
-        include_filter_description=True,
-        filter_type_description='lk')
-
-    search = filters.get_search_form(
-        config, sil_id="SIL ID")
-
-    config = grids.get_grid_config(
-        'batch_terminals', request, search,
-        filter_map=fmap, sort='description', deletable=True)
-
-    smap = grids.get_sort_map(
-        rattail.BatchTerminal,
-        ['sil_id', 'description'])
-
-    def query(config):
-        q = Session.query(rattail.BatchTerminal)
-        q = filters.filter_query(q, config)
-        q = grids.sort_query(q, config, smap)
-        return q
-
-    terminals = grids.get_pager(query, config)
-    g = forms.AlchemyGrid(
-        rattail.BatchTerminal, terminals, config,
-        gridurl=request.route_url('batch_terminals'),
-        objurl='batch_terminal.edit',
-        delurl='batch_terminal.delete')
-
-    g.configure(
-        include=[
-            g.sil_id.label("SIL ID"),
-            g.description,
-            ])
-
-    g.readonly = True
-    grid = g.render(class_='clickable batch-terminals')
-    return grids.render_grid(request, grid, search)
-
-
-def batches(request):
-    """
-    Batch list/index view.
-    """
-
-    fmap = filters.get_filter_map(
-        rattail.Batch,
-        ilike=['description', 'source_description'],
-        target=filters.filter_ilike(rattail.BatchTerminal.description))
-
-    config = filters.get_search_config(
-        'batches.list', request, fmap,
-        include_filter_description=True,
-        filter_type_description='lk',
-        include_filter_source_description=True,
-        filter_type_source_description='lk',
-        include_filter_target=True,
-        filter_type_target='lk')
-
-    search = filters.get_search_form(
-        config, source_description="Source")
-
-    config = grids.get_grid_config(
-        'batches.list', request, search,
-        filter_map=fmap, deletable=True, sort='target',
-        actions=['Execute'])
-
-    smap = grids.get_sort_map(
-        rattail.Batch,
-        ['source_description', 'batch_id', 'action_type',
-         # 'description', 'rowcount', 'effective'],
-         'description', 'rowcount'],
-        target=grids.sorter(rattail.BatchTerminal.description))
-
-    def query(config):
-        q = Session.query(rattail.Batch)
-        q = q.outerjoin((rattail.BatchTerminal,
-                         rattail.BatchTerminal.uuid == rattail.Batch.target_uuid))
-        q = q.filter(or_(
-                rattail.Batch.deleted == None,
-                and_(
-                    rattail.Batch.deleted != None,
-                    rattail.Batch.deleted != True,
-                    ),
-                ))
-        q = filters.filter_query(q, config)
-        q = grids.sort_query(q, config, smap)
-        return q
-
-    batches = grids.get_pager(query, config)
-    g = forms.AlchemyGrid(
-        rattail.Batch, batches, config,
-        gridurl=request.route_url('batches.list'),
-        # url_object=request.route_url('batch'),
-        # url_delete=request.route_url('batch'))
-        objurl='batch.edit', delurl='batch.delete')
-
-    g.configure(
-        include=[
-            g.source_description.label("Source"),
-            g.batch_id.with_renderer(BatchIdFieldRenderer).label("Batch ID"),
-            g.target,
-            g.action_type.with_renderer(forms.EnumFieldRenderer(rattail.BATCH_ACTION_TYPE)).label("Action"),
-            g.description,
-            g.rowcount.label("Rows"),
-            # g.effective.with_renderer(forms.PrettyDateTimeFieldRenderer),
-            ])
-
-    g.readonly = True
-    grid = g.render(class_='clickable batches')
-    return grids.render_grid(request, grid, search)
-
-
-def _batch_columns(request, batch):
-    """
-    Returns a rendered grid of :class:`rattail.BatchColumn` instances for a
-    given :class:`rattail.Batch` instance.
-    """
-
-    config = grids.get_grid_config(
-        'batch.columns', request, sort='ordinal')
-
-    smap = grids.get_sort_map(
-        rattail.BatchColumn,
-        ['ordinal', 'targeted'])
-    smap['sil_column'] = grids.sorter(rattail.SilColumn.sil_name)
-    smap['display'] = grids.sorter(rattail.SilColumn.display)
-    smap['source'] = grids.sorter(rattail.BatchTerminal.description)
-
-    def query(config):
-        q = Session.query(rattail.BatchColumn)
-        q = q.join(rattail.SilColumn)
-        q = q.join(rattail.BatchTerminal)
-        q = q.filter(rattail.BatchColumn.batch == batch)
-        q = grids.sort_query(q, config, smap)
-        return q
-
-    url = request.route_url('batch.columns', uuid=batch.uuid)
-
-    columns = query(config)
-    g = forms.AlchemyGrid(rattail.BatchColumn, columns, config, url)
-
-    g.append(formalchemy.Field('display', value=lambda x: x.sil_column.display))
-
-    g.configure(
-        include=[
-            g.ordinal,
-            g.sil_column.label("SIL Name"),
-            g.display,
-            g.source,
-            g.targeted,
-            ])
-
-    g.readonly = True
-    return g.render(class_='hoverable batch-columns')
-
-
-@view_config(route_name='batch.columns')
-def batch_columns(context, request):
-    uuid = request.matchdict['uuid']
-    batch = Session.query(rattail.Batch).get(uuid) if uuid else None
-    assert batch
-    return Response(
-        body=_batch_columns(request, batch),
-        content_type='text/html')
-
-
-def batch_fieldset(batch, request):
-    fs = forms.make_fieldset(batch, url=request.route_url,
-                             url_action=request.current_route_url(),
-                             route_name='batches.list')
-
-    # Remove unsupported action types...for now.
-    enum = rattail.BATCH_ACTION_TYPE.copy()
-    del enum[rattail.BATCH_LOAD]
-
-    fs.configure(
-        include=[
-            fs.source.validate(forms.required),
-            fs.batch_id.with_renderer(BatchIdFieldRenderer).label("Batch ID").readonly(),
-            fs.target.validate(forms.required),
-            fs.dictionary.validate(forms.required),
-            fs.action_type.with_renderer(forms.EnumFieldRenderer(enum)).validate(forms.required).label("Action"),
-            fs.description,
-            # fs.effective.with_renderer(forms.PrettyDateTimeFieldRenderer),
-            fs.rowcount.label("Rows").readonly(),
-            ])
-
-    if fs.edit:
-        fs.source.set(readonly=True)
-        fs.dictionary.set(readonly=True)
-        # if fs.model.target:
-        #     fs.target.set(readonly=True)
-        # fs.action_type.set(readonly=True)
-        # fs.effective.set(readonly=True)
-        fs.append(forms.ChildGridField('columns', _batch_columns(request, fs.model)))
-    else:
-        del fs.batch_id
-        # del fs.effective
-        del fs.rowcount
-    return fs
-
-
-@view_config(route_name='batch.edit', renderer='/batches/batch.mako', permission='batches.edit')
-def edit_batch(request):
-    uuid = request.matchdict['uuid']
-    batch = Session.query(rattail.Batch).get(uuid) if uuid else None
-    assert batch
-
-    fs = batch_fieldset(batch, request)
-    if request.POST:
-        fs.rebind(data=request.params)
-        if fs.validate():
-
-            with transaction.manager:
-                fs.sync()
-                # fs.model = Session.merge(fs.model)
-                request.session.flash("%s \"%s\" has been %s." % (
-                        fs.crud_title, fs.get_display_text(),
-                        'updated' if fs.edit else 'created'))
-                home = request.route_url('batch.edit', uuid=fs.model.uuid)
-
-            return HTTPFound(location=home)
-
-    fs.append(forms.ChildGridField('columns', _batch_columns(request, batch)))
-
-    return {'fieldset': fs, 'crud': True}
-
-
-@view_config(route_name='batch.delete')
-def delete_batch(context, request):
-    uuid = request.matchdict['uuid']
-    batch = Session.query(rattail.Batch).get(uuid) if uuid else None
-    assert batch
-    with transaction.manager:
-        Session.delete(batch)
-    return HTTPFound(location=request.route_url('batches.list'))
-
-
-# @view_config(route_name='batch', renderer='/batches/batch.mako')
-# def batch(context, request):
-
-#     def fieldset(batch):
-#         fs = forms.make_fieldset(batch, url=request.route_url,
-#                                  url_action=request.route_url('batch'),
-#                                  route_name='batches')
-
-#         # Remove unsupported action types...for now.
-#         enum = rattail.BATCH_ACTION_TYPE.copy()
-#         del enum[rattail.BATCH_ADD_REPLACE]
-#         del enum[rattail.BATCH_CHANGE]
-#         del enum[rattail.BATCH_LOAD]
-#         del enum[rattail.BATCH_REMOVE]
-
-#         fs.configure(
-#             include=[
-#                 fs.source.validate(forms.required),
-#                 fs.batch_id.with_renderer(BatchIdFieldRenderer).label("Batch ID").readonly(),
-#                 fs.target.validate(forms.required),
-#                 fs.dictionary.validate(forms.required),
-#                 fs.action_type.with_renderer(forms.EnumFieldRenderer(enum)).validate(forms.required).label("Action"),
-#                 fs.description,
-#                 fs.effective.with_renderer(forms.PrettyDateTimeFieldRenderer),
-#                 fs.rowcount.label("Rows").readonly(),
-#                 ])
-#         if fs.edit:
-#             fs.source.set(readonly=True)
-#             fs.dictionary.set(readonly=True)
-#             if fs.model.target:
-#                 fs.target.set(readonly=True)
-#             fs.action_type.set(readonly=True)
-#             fs.effective.set(readonly=True)
-#             fs.append(forms.ChildGridField('columns', _batch_columns(request, fs.model)))
-#         else:
-#             del fs.batch_id
-#             del fs.effective
-#             del fs.rowcount
-#         return fs
-
-#     def post_sync(fs):
-#         if not fs.edit:
-#             source = Session.query(rattail.BatchTerminal).get(fs.model.source_uuid)
-#             target = Session.query(rattail.BatchTerminal).get(fs.model.target_uuid)
-#             assert source and target
-#             batch = fs.model
-#             batch.batch_id = next_batch_id(source.sil_id, consume=True,
-#                                            session=Session())
-#             batch.name = '%s.%08u' % (source.sil_id, batch.batch_id)
-#             batch.source_description = source.description
-
-#             for i, col in enumerate(source.source_columns, 1):
-#                 batch.columns.append(rattail.BatchColumn(
-#                         ordinal=i,
-#                         column=col.sil_column,
-#                         source=source,
-#                         targeted=True,
-#                         ))
-
-#     def pre_render(fs):
-#         if not fs.edit:
-
-#             for field in ('source', 'target'):
-#                 if not fs.render_fields[field].value:
-#                     q = Session.query(rattail.BatchTerminal)
-#                     q = q.filter(getattr(rattail.BatchTerminal, field) == True)
-#                     count = q.count()
-#                     if count == 1:
-#                         setattr(fs.model, field, q.first())
-#                         fs.render_fields[field].set(required=True) # hack to avoid null option
-#                     elif not count:
-#                         request.session.flash("You must create at least one %s Batch Terminal "
-#                                               "before you may create a Batch." % prettify(field))
-#                         return HTTPFound(location=request.route_url('batches'))
-
-#         # else:
-#         #     data = {'columns': _batch_columns(request, fs.model)}
-#         #     return {'columns': render('/batches/columns.mako', data)}
-
-#     # def delete(batch):
-#     #     # jct = batch.target_junction.display if batch.target_junction else batch.target
-#     #     # batch.table.drop()
-#     #     # self.request.session.flash("Batch was deleted: %s" % self.batch_display(batch))
-#     #     self.Session.delete(batch)
-#     #     # self.Session.flush()
-
-#     return crud(request, rattail.Batch, fieldset,
-#                 delete=request.route_url('batches'),
-#                 post_sync=post_sync, pre_render=pre_render)
-
-@view_config(route_name='batch.details', renderer='/batches/details.mako')
-def batch_details(context, request):
-    uuid = request.matchdict['uuid']
-    batch = Session.query(rattail.Batch).get(uuid) if uuid else None
-    assert batch
-    request.session['batches.uuid'] = batch.uuid
-    name = 'batches.%s' % batch.name
-
-    # def batch_search_form(batch, name):
-    #     """
-    #     Returns a dynamically-assembled search form, specific to the current
-    #     batch.
-    #     """
-
-    #     config = filters.get_search_config(name, request, batch_filter_map(batch))
-    #     labels = {}
-    #     form = filters.get_search_form(config, **labels)
-    #     return form        
-
-    # def batch_query(batch):
-
-    #     def query(config):
-    #         q = Session.query(batch.rowclass)
-    #         q = filters.filter_query(q, config, batch_filter_map(batch))
-    #         q = grids.sort_query(q, config, batch_sort_map(batch))
-    #         return q
-
-    #     return query
-
-    # def batch_grid(batch):
-
-    #     cls = batch.rowclass
-
-    #     def grid(query, config):
-    #         rows = grids.get_pager(query, config)
-    #         g = grids.get_grid(cls, rows, config)
-    #         include = [getattr(g, x.column.sil_name) for x in batch.columns]
-    #         # if batch.target_junction:
-    #         #     fnmap = batch.target_junction.fieldname_map_ui
-    #         #     for name in fnmap:
-    #         #         getattr(g, name).set(label=fnmap[name])
-    #         g.configure(include=include)
-    #         return g
-
-    #     return grid
-
-    cls = batch.rowclass
-
-    fmap = filters.get_filter_map(cls)
-    for col in batch.columns:
-        fmap.setdefault(col.sil_column.sil_name,
-                        filters.filter_ilike(getattr(cls, col.sil_column.sil_name)))
-
-    config = filters.get_search_config('batch.%s' % batch.name, request, fmap)
-
-    search = filters.get_search_form(config)
-    
-    config = grids.get_grid_config(
-        'batch.%s' % batch.name, request, search, filter_map=fmap,
-        url=request.route_url('batch.details', uuid=batch.uuid),
-        sort=batch.columns[0].sil_column.sil_name)
-
-    # url = request.route_url('batch.details')
-    # grid = forms.AlchemyGrid(name, batch_grid(batch), batch_query(batch),
-    #                          search, url=url, sort='F01', per_page=20)
-    # query = batch_query(batch)
-
-    smap = grids.get_sort_map(cls)
-    #     cls = batch.rowclass
-    #     # return {
-    #     #     'F01': util.sorter(cls.F01),
-    #     #     }
-    #     sort_map = {}
-    #     for name in batch.elements.split(','):
-    #         sort_map[name] = util.sorter(getattr(cls, name))
-
-    def query(config):
-        q = Session.query(batch.rowclass)
-        q = filters.filter_query(q, config)
-        q = grids.sort_query(q, config, smap)
-        return q
-
-    rows = grids.get_pager(query, config)
-    grid = forms.AlchemyGrid(
-        cls, rows, config,
-        request.route_url('batch.details', uuid=batch.uuid))
-    grid.readonly = True
-    grid = grid.render(class_='clickable batch-details')
-    return grids.render_grid(request, grid, search, batch=batch,
-                             pretty_datetime=forms.pretty_datetime)
-
-@view_config(route_name='batch.execute')
-def execute(context, request):
-    """
-    Executes a batch.
-    """
-
-    uuid = request.matchdict['uuid']
-    home = HTTPFound(location=request.route_url('batches.list'))
-
-    with transaction.manager:
-        batch = Session.query(rattail.Batch).get(uuid) if uuid else None
-        if not batch:
-            return home
-        batch.execute()
-
-    # table = batch.table
-    # rowclass = batch.rowclass
-    # # self.Session.delete(batch)
-    # batch.deleted = True
-    # self.Session.flush()
-    # print 'deleted batch'
-    # q = self.Session.query(rowclass)
-    # q.delete(synchronize_session=False)
-    # print 'deleted rows'
-    # # table.drop(bind=self.Session().bind, checkfirst=False)
-    # # print 'dropped table'
-
-        request.session.flash("The batch was executed: %s, %s" % (
-                batch.target, rattail.BATCH_ACTION_TYPE[batch.action_type]))                
-    return home
-
-
-def includeme(config):
-    config.add_route('sil_columns', '/batches/sil_columns')
-    config.add_route('sil_column', '/batches/sil_column')
-    config.add_route('batch_dictionaries', '/batches/dictionaries')
-    config.add_route('batch_dictionary', '/batches/dictionary')
-    config.add_route('batch_dictionary.columns', '/batches/dictionary-columns')
-
-    config.add_route('batch_terminals', '/batches/terminals')
-    config.add_route('batch_terminal.new', '/batches/terminal/new')
-    config.add_route('batch_terminal.edit', '/batches/terminal/{uuid}/edit')
-    config.add_route('batch_terminal.delete', '/batches/terminal/{uuid}/delete')
-    config.add_route('batch_terminal.columns', '/batches/terminal/{uuid}/columns')
-    # config.add_route('batch_terminal', '/batches/terminal/{uuid}')
-
-    config.add_route('batches.list', '/batches')
-    config.add_view(batches, route_name='batches.list', renderer='/batches/index.mako',
-                    permission='batches.list')
-
-    # config.add_route('batch', '/batch')
-    # config.add_route('batch.new', '/batches/new')
-    config.add_route('batch.edit', '/batches/{uuid}/edit')
-    config.add_route('batch.delete', '/batches/{uuid}/delete')
-    config.add_route('batch.columns', '/batch/{uuid}/columns')
-    config.add_route('batch.details', '/batch/{uuid}/details')
-    config.add_route('batch.execute', '/batch/{uuid}/execute')
-
-    config.scan(__name__)
diff --git a/rattail/pyramid/views/batches/__init__.py b/rattail/pyramid/views/batches/__init__.py
new file mode 100644
index 00000000..884fe329
--- /dev/null
+++ b/rattail/pyramid/views/batches/__init__.py
@@ -0,0 +1,35 @@
+#!/usr/bin/env python
+# -*- coding: utf-8  -*-
+################################################################################
+#
+#  Rattail -- Retail Software Framework
+#  Copyright © 2010-2012 Lance Edgar
+#
+#  This file is part of Rattail.
+#
+#  Rattail is free software: you can redistribute it and/or modify it under the
+#  terms of the GNU Affero General Public License as published by the Free
+#  Software Foundation, either version 3 of the License, or (at your option)
+#  any later version.
+#
+#  Rattail is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for
+#  more details.
+#
+#  You should have received a copy of the GNU Affero General Public License
+#  along with Rattail.  If not, see <http://www.gnu.org/licenses/>.
+#
+################################################################################
+
+"""
+``rattail.pyramid.views.batches`` -- Batch Views
+"""
+
+from rattail.pyramid.views.batches.params import *
+
+
+def includeme(config):
+    config.include('rattail.pyramid.views.batches.core')
+    config.include('rattail.pyramid.views.batches.params')
+    config.include('rattail.pyramid.views.batches.rows')
diff --git a/rattail/pyramid/views/batches/core.py b/rattail/pyramid/views/batches/core.py
new file mode 100644
index 00000000..5f255190
--- /dev/null
+++ b/rattail/pyramid/views/batches/core.py
@@ -0,0 +1,174 @@
+#!/usr/bin/env python
+# -*- coding: utf-8  -*-
+################################################################################
+#
+#  Rattail -- Retail Software Framework
+#  Copyright © 2010-2012 Lance Edgar
+#
+#  This file is part of Rattail.
+#
+#  Rattail is free software: you can redistribute it and/or modify it under the
+#  terms of the GNU Affero General Public License as published by the Free
+#  Software Foundation, either version 3 of the License, or (at your option)
+#  any later version.
+#
+#  Rattail is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for
+#  more details.
+#
+#  You should have received a copy of the GNU Affero General Public License
+#  along with Rattail.  If not, see <http://www.gnu.org/licenses/>.
+#
+################################################################################
+
+"""
+``rattail.pyramid.views.batches.core`` -- Core Batch Views
+"""
+
+import threading
+
+from pyramid.httpexceptions import HTTPFound
+from pyramid.renderers import render_to_response
+
+from webhelpers.html import tags
+
+import edbob
+from edbob.pyramid import Session
+from edbob.pyramid.forms import EnumFieldRenderer
+from edbob.pyramid.progress import SessionProgress
+from edbob.pyramid.views import SearchableAlchemyGridView, CrudView, View
+
+import rattail
+from rattail import batches
+
+
+class BatchesGrid(SearchableAlchemyGridView):
+
+    mapped_class = rattail.Batch
+    config_prefix = 'batches'
+    sort = 'id'
+
+    def filter_map(self):
+        return self.make_filter_map(
+            exact=['id'],
+            ilike=['source', 'destination', 'description'])
+
+    def filter_config(self):
+        return self.make_filter_config(
+            filter_label_id="ID")
+
+    def sort_map(self):
+        return self.make_sort_map('source', 'id', 'destination', 'description')
+
+    def query(self):
+        q = self.make_query()
+        q = q.filter(rattail.Batch.executed == None)
+        return q
+
+    def grid(self):
+        g = self.make_grid()
+        g.configure(
+            include=[
+                g.source,
+                g.id.label("ID"),
+                g.destination,
+                g.description,
+                g.rowcount.label("Row Count"),
+                ],
+            readonly=True)
+        if self.request.has_perm('batches.read'):
+            def rows(row):
+                return tags.link_to("View Rows", self.request.route_url(
+                        'batch.rows', uuid=row.uuid))
+            g.add_column('rows', "", rows)
+            g.clickable = True
+            g.click_route_name = 'batch'
+        if self.request.has_perm('batches.update'):
+            g.editable = True
+            g.edit_route_name = 'batch.update'
+        if self.request.has_perm('batches.delete'):
+            g.deletable = True
+            g.delete_route_name = 'batch.delete'
+        return g
+
+
+class BatchCrud(CrudView):
+
+    mapped_class = rattail.Batch
+    home_route = 'batches'
+
+    def fieldset(self, model):
+        fs = self.make_fieldset(model)
+        fs.action_type.set(renderer=EnumFieldRenderer(rattail.BATCH_ACTION))
+        fs.configure(
+            include=[
+                fs.source,
+                fs.id.label("ID"),
+                fs.destination,
+                fs.action_type,
+                fs.description,
+                fs.rowcount.label("Row Count").readonly(),
+                ])
+        return fs
+
+    def post_delete(self, batch):
+        batch.drop_table()
+
+
+class ExecuteBatch(View):
+
+    def execute_batch(self, batch):
+        session = edbob.Session()
+        batch = session.merge(batch)
+
+        progress = SessionProgress(self.request.session, 'batch.execute')
+        progress.session['success_msg'] = "Batch \"%s\" has been executed." % batch.description
+        progress.session['success_url'] = self.request.route_url('batches')
+
+        if batch.execute(progress):
+            session.commit()
+        else:
+            session.rollback()
+        session.close()
+
+    def __call__(self):
+        uuid = self.request.matchdict['uuid']
+        batch = Session.query(rattail.Batch).get(uuid) if uuid else None
+        if not batch:
+            return HTTPFound(location=self.request.route_url('batches'))
+
+        thread = threading.Thread(target=self.execute_batch, args=(batch,))
+        thread.start()
+        kwargs = {
+            'key': 'batch.execute',
+            'cancel_url': self.request.route_url('batch.rows', uuid=batch.uuid),
+            'cancel_msg': "Batch execution was cancelled.",
+            }
+        return render_to_response('/progress.mako', kwargs, request=self.request)
+
+
+def includeme(config):
+
+    config.add_route('batches', '/batches')
+    config.add_view(BatchesGrid, route_name='batches',
+                    renderer='/batches/index.mako',
+                    permission='batches.list')
+
+    config.add_route('batch', '/batches/{uuid}')
+    config.add_view(BatchCrud, attr='read', route_name='batch',
+                    renderer='/batches/read.mako',
+                    permission='batches.read')
+
+    config.add_route('batch.update', '/batches/{uuid}/edit')
+    config.add_view(BatchCrud, attr='update', route_name='batch.update',
+                    renderer='/batches/crud.mako',
+                    permission='batches.update')
+
+    config.add_route('batch.delete', '/batches/{uuid}/delete')
+    config.add_view(BatchCrud, attr='delete', route_name='batch.delete',
+                    permission='batches.delete')
+
+    config.add_route('batch.execute', '/batches/{uuid}/execute')
+    config.add_view(ExecuteBatch, route_name='batch.execute',
+                    permission='batches.execute')
diff --git a/rattail/pyramid/views/batches/params/__init__.py b/rattail/pyramid/views/batches/params/__init__.py
new file mode 100644
index 00000000..213a853e
--- /dev/null
+++ b/rattail/pyramid/views/batches/params/__init__.py
@@ -0,0 +1,52 @@
+#!/usr/bin/env python
+# -*- coding: utf-8  -*-
+################################################################################
+#
+#  Rattail -- Retail Software Framework
+#  Copyright © 2010-2012 Lance Edgar
+#
+#  This file is part of Rattail.
+#
+#  Rattail is free software: you can redistribute it and/or modify it under the
+#  terms of the GNU Affero General Public License as published by the Free
+#  Software Foundation, either version 3 of the License, or (at your option)
+#  any later version.
+#
+#  Rattail is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for
+#  more details.
+#
+#  You should have received a copy of the GNU Affero General Public License
+#  along with Rattail.  If not, see <http://www.gnu.org/licenses/>.
+#
+################################################################################
+
+"""
+``rattail.pyramid.views.batches.params`` -- Batch Parameter Views
+"""
+
+from edbob.pyramid.views import View
+
+
+__all__ = ['BatchParamsView']
+
+
+class BatchParamsView(View):
+
+    provider_name = None
+
+    def render_kwargs(self):
+        return {}
+
+    def __call__(self):
+        if self.request.POST:
+            if self.set_batch_params():
+                return HTTPFound(location=self.request.get_referer())
+        kwargs = self.render_kwargs()
+        kwargs['provider'] = self.provider_name
+        return kwargs
+
+
+def includeme(config):
+    config.include('rattail.pyramid.views.batches.params.labels')
diff --git a/rattail/pyramid/views/batches/params/labels.py b/rattail/pyramid/views/batches/params/labels.py
new file mode 100644
index 00000000..73a16d3b
--- /dev/null
+++ b/rattail/pyramid/views/batches/params/labels.py
@@ -0,0 +1,51 @@
+#!/usr/bin/env python
+# -*- coding: utf-8  -*-
+################################################################################
+#
+#  Rattail -- Retail Software Framework
+#  Copyright © 2010-2012 Lance Edgar
+#
+#  This file is part of Rattail.
+#
+#  Rattail is free software: you can redistribute it and/or modify it under the
+#  terms of the GNU Affero General Public License as published by the Free
+#  Software Foundation, either version 3 of the License, or (at your option)
+#  any later version.
+#
+#  Rattail is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for
+#  more details.
+#
+#  You should have received a copy of the GNU Affero General Public License
+#  along with Rattail.  If not, see <http://www.gnu.org/licenses/>.
+#
+################################################################################
+
+"""
+``rattail.pyramid.views.batches.params.printlabels`` -- Print Labels Batch
+"""
+
+from edbob.pyramid import Session
+
+import rattail
+from rattail.pyramid.views.batches.params import BatchParamsView
+
+
+class PrintLabels(BatchParamsView):
+
+    provider_name = 'print_labels'
+
+    def render_kwargs(self):
+        q = Session.query(rattail.LabelProfile)
+        q = q.order_by(rattail.LabelProfile.ordinal)
+        profiles = [(x.code, x.description) for x in q]
+        return {'label_profiles': profiles}
+
+
+def includeme(config):
+    
+    config.add_route('batch_params.print_labels', '/batches/params/print-labels')
+    config.add_view(PrintLabels, route_name='batch_params.print_labels',
+                    renderer='/batches/params/print_labels.mako',
+                    permission='batches.print_labels')
diff --git a/rattail/pyramid/views/batches/rows.py b/rattail/pyramid/views/batches/rows.py
new file mode 100644
index 00000000..ba6fb42c
--- /dev/null
+++ b/rattail/pyramid/views/batches/rows.py
@@ -0,0 +1,219 @@
+#!/usr/bin/env python
+# -*- coding: utf-8  -*-
+################################################################################
+#
+#  Rattail -- Retail Software Framework
+#  Copyright © 2010-2012 Lance Edgar
+#
+#  This file is part of Rattail.
+#
+#  Rattail is free software: you can redistribute it and/or modify it under the
+#  terms of the GNU Affero General Public License as published by the Free
+#  Software Foundation, either version 3 of the License, or (at your option)
+#  any later version.
+#
+#  Rattail is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for
+#  more details.
+#
+#  You should have received a copy of the GNU Affero General Public License
+#  along with Rattail.  If not, see <http://www.gnu.org/licenses/>.
+#
+################################################################################
+
+"""
+``rattail.pyramid.views.batches.rows`` -- Batch Row Views
+"""
+
+from pyramid.httpexceptions import HTTPFound
+
+from edbob.pyramid import Session
+from edbob.pyramid.views import SearchableAlchemyGridView, CrudView
+
+import rattail
+from rattail.pyramid.forms import GPCFieldRenderer
+
+
+def field_with_renderer(field, column):
+
+    if column.sil_name == 'F01': # UPC
+        field = field.with_renderer(GPCFieldRenderer)
+
+    elif column.sil_name == 'F95': # Shelf Tag Type
+        q = Session.query(rattail.LabelProfile)
+        q = q.order_by(rattail.LabelProfile.ordinal)
+        field = field.dropdown(options=[(x.description, x.code) for x in q])
+
+    return field
+
+
+def BatchRowsGrid(request):
+    uuid = request.matchdict['uuid']
+    batch = Session.query(rattail.Batch).get(uuid) if uuid else None
+    if not batch:
+        return HTTPFound(location=request.route_url('batches'))
+
+    class BatchRowsGrid(SearchableAlchemyGridView):
+
+        mapped_class = batch.rowclass
+        config_prefix = 'batch.%s' % batch.uuid
+        sort = 'ordinal'
+
+        def filter_map(self):
+            fmap = self.make_filter_map()
+            for column in batch.columns:
+                if column.visible:
+                    if column.data_type.startswith('CHAR'):
+                        fmap[column.name] = self.filter_ilike(
+                            getattr(batch.rowclass, column.name))
+                    else:
+                        fmap[column.name] = self.filter_exact(
+                            getattr(batch.rowclass, column.name))
+            return fmap
+
+        def filter_config(self):
+            config = self.make_filter_config()
+            for column in batch.columns:
+                if column.visible:
+                    config['filter_label_%s' % column.name] = column.display_name
+            return config
+
+        def grid(self):
+            g = self.make_grid()
+
+            include = [g.ordinal.label("Row")]
+            for column in batch.columns:
+                if column.visible:
+                    field = getattr(g, column.name)
+                    field = field_with_renderer(field, column)
+                    field = field.label(column.display_name)
+                    include.append(field)
+                    g.column_titles[field.key] = '%s - %s - %s' % (
+                        column.sil_name, column.description, column.data_type)
+
+            g.configure(include=include, readonly=True)
+
+            route_kwargs = lambda x: {'batch_uuid': x.batch.uuid, 'uuid': x.uuid}
+
+            if self.request.has_perm('batch_rows.read'):
+                g.clickable = True
+                g.click_route_name = 'batch_row.read'
+                g.click_route_kwargs = route_kwargs
+
+            if self.request.has_perm('batch_rows.update'):
+                g.editable = True
+                g.edit_route_name = 'batch_row.update'
+                g.edit_route_kwargs = route_kwargs
+
+            if self.request.has_perm('batch_rows.delete'):
+                g.deletable = True
+                g.delete_route_name = 'batch_row.delete'
+                g.delete_route_kwargs = route_kwargs
+
+            return g
+
+        def render_kwargs(self):
+            return {'batch': batch}
+
+    grid = BatchRowsGrid(request)
+    grid.batch = batch
+    return grid
+
+
+def batch_rows_grid(request):
+    grid = BatchRowsGrid(request)
+    return grid()
+
+
+def batch_rows_delete(request):
+    grid = BatchRowsGrid(request)
+    grid._filter_config = grid.filter_config()
+    rows = grid.make_query()
+    count = rows.count()
+    rows.delete(synchronize_session=False)
+    request.session.flash("Deleted %d rows from batch." % count)
+    return HTTPFound(location=request.route_url('batch.rows', uuid=grid.batch.uuid))
+
+
+def batch_row_crud(request, attr):
+    batch_uuid = request.matchdict['batch_uuid']
+    batch = Session.query(rattail.Batch).get(batch_uuid)
+    if not batch:
+        return HTTPFound(location=request.route_url('batches'))
+
+    row_uuid = request.matchdict['uuid']
+    row = Session.query(batch.rowclass).get(row_uuid)
+    if not row:
+        return HTTPFound(location=request.route_url('batch', uuid=batch.uuid))
+
+    class BatchRowCrud(CrudView):
+
+        mapped_class = batch.rowclass
+        pretty_name = "Batch Row"
+
+        @property
+        def home_url(self):
+            return self.request.route_url('batch.rows', uuid=batch.uuid)
+
+        @property
+        def cancel_url(self):
+            return self.home_url
+
+        def fieldset(self, model):
+            fs = self.make_fieldset(model)
+
+            include = [fs.ordinal.label("Row Number").readonly()]
+            for column in batch.columns:
+                field = getattr(fs, column.name)
+                field = field_with_renderer(field, column)
+                field = field.label(column.display_name)
+                include.append(field)
+
+            fs.configure(include=include)
+            return fs
+
+        def flash_delete(self, row):
+            self.request.session.flash("Batch Row %d has been deleted."
+                                       % row.ordinal)
+
+        def post_delete(self, model):
+            batch.rowcount -= 1
+
+    crud = BatchRowCrud(request)
+    return getattr(crud, attr)()
+
+def batch_row_read(request):
+    return batch_row_crud(request, 'read')
+
+def batch_row_update(request):
+    return batch_row_crud(request, 'update')
+
+def batch_row_delete(request):
+    return batch_row_crud(request, 'delete')
+
+
+def includeme(config):
+
+    config.add_route('batch.rows', '/batches/{uuid}/rows')
+    config.add_view(batch_rows_grid, route_name='batch.rows',
+                    renderer='/batches/rows/index.mako',
+                    permission='batches.read')
+
+    config.add_route('batch.rows.delete', '/batches/{uuid}/rows/delete')
+    config.add_view(batch_rows_delete, route_name='batch.rows.delete',
+                    permission='batch_rows.delete')
+
+    config.add_route('batch_row.read', '/batches/{batch_uuid}/{uuid}')
+    config.add_view(batch_row_read, route_name='batch_row.read',
+                    renderer='/batches/rows/crud.mako',
+                    permission='batch_rows.read')
+
+    config.add_route('batch_row.update', '/batches/{batch_uuid}/{uuid}/edit')
+    config.add_view(batch_row_update, route_name='batch_row.update',
+                    renderer='/batches/rows/crud.mako',
+                    permission='batch_rows.update')
+
+    config.add_route('batch_row.delete', '/batches/{batch_uuid}/{uuid}/delete')
+    config.add_view(batch_row_delete, route_name='batch_row.delete',
+                    permission='batch_rows.delete')
diff --git a/rattail/pyramid/views/labels.py b/rattail/pyramid/views/labels.py
new file mode 100644
index 00000000..9ff7849c
--- /dev/null
+++ b/rattail/pyramid/views/labels.py
@@ -0,0 +1,172 @@
+#!/usr/bin/env python
+# -*- coding: utf-8  -*-
+################################################################################
+#
+#  Rattail -- Retail Software Framework
+#  Copyright © 2010-2012 Lance Edgar
+#
+#  This file is part of Rattail.
+#
+#  Rattail is free software: you can redistribute it and/or modify it under the
+#  terms of the GNU Affero General Public License as published by the Free
+#  Software Foundation, either version 3 of the License, or (at your option)
+#  any later version.
+#
+#  Rattail is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for
+#  more details.
+#
+#  You should have received a copy of the GNU Affero General Public License
+#  along with Rattail.  If not, see <http://www.gnu.org/licenses/>.
+#
+################################################################################
+
+"""
+``rattail.pyramid.views.labels`` -- Label Views
+"""
+
+from pyramid.httpexceptions import HTTPFound
+
+import formalchemy
+
+from webhelpers.html import HTML
+
+from edbob.pyramid import Session
+from edbob.pyramid.views import SearchableAlchemyGridView, CrudView
+
+import rattail
+
+
+class ProfilesGrid(SearchableAlchemyGridView):
+
+    mapped_class = rattail.LabelProfile
+    config_prefix = 'label_profiles'
+    sort = 'ordinal'
+
+    def filter_map(self):
+        return self.make_filter_map(
+            exact=['code'],
+            ilike=['description'])
+
+    def sort_map(self):
+        return self.make_sort_map('ordinal', 'code', 'description')
+
+    def grid(self):
+        g = self.make_grid()
+        g.configure(
+            include=[
+                g.ordinal,
+                g.code,
+                g.description,
+                ],
+            readonly=True)
+        if self.request.has_perm('label_profiles.read'):
+            g.clickable = True
+            g.click_route_name = 'label_profile.read'
+        if self.request.has_perm('label_profiles.update'):
+            g.editable = True
+            g.edit_route_name = 'label_profile.update'
+        if self.request.has_perm('label_profiles.delete'):
+            g.deletable = True
+            g.delete_route_name = 'label_profile.delete'
+        return g
+
+
+class ProfileCrud(CrudView):
+
+    mapped_class = rattail.LabelProfile
+    home_route = 'label_profiles'
+    pretty_name = "Label Profile"
+    update_cancel_route = 'label_profile.read'
+
+    def fieldset(self, model):
+
+        class FormatFieldRenderer(formalchemy.TextAreaFieldRenderer):
+
+            def render_readonly(self, **kwargs):
+                value = self.raw_value
+                if not value:
+                    return ''
+                return HTML.tag('pre', c=value)
+
+            def render(self, **kwargs):
+                kwargs.setdefault('size', (80, 8))
+                return super(FormatFieldRenderer, self).render(**kwargs)
+
+        fs = self.make_fieldset(model)
+        fs.format.set(renderer=FormatFieldRenderer)
+        fs.configure(
+            include=[
+                fs.ordinal,
+                fs.code,
+                fs.description,
+                fs.printer_spec,
+                fs.formatter_spec,
+                fs.format,
+                ])
+        return fs
+
+    def post_save_url(self, form):
+        return self.request.route_url('label_profile.read',
+                                      uuid=form.fieldset.model.uuid)
+
+
+def printer_settings(request):
+    uuid = request.matchdict['uuid']
+    profile = Session.query(rattail.LabelProfile).get(uuid) if uuid else None
+    if not profile:
+        return HTTPFound(location=request.route_url('label_profiles'))
+
+    read_profile = HTTPFound(location=request.route_url(
+            'label_profile.read', uuid=profile.uuid))
+
+    printer = profile.get_printer()
+    if not printer:
+        request.session.flash("Label profile \"%s\" does not have a functional "
+                              "printer spec." % profile)
+        return read_profile
+    if not printer.required_settings:
+        request.session.flash("Printer class for label profile \"%s\" does not "
+                              "require any settings." % profile)
+        return read_profile
+
+    if request.POST:
+        for setting in printer.required_settings:
+            if setting in request.POST:
+                profile.save_printer_setting(setting, request.POST[setting])
+        return read_profile
+
+    return {'profile': profile, 'printer': printer}
+
+
+def includeme(config):
+
+    config.add_route('label_profiles', '/labels/profiles')
+    config.add_view(ProfilesGrid, route_name='label_profiles',
+                    renderer='/labels/profiles/index.mako',
+                    permission='label_profiles.list')
+
+    config.add_route('label_profile.create', '/labels/profiles/new')
+    config.add_view(ProfileCrud, attr='create', route_name='label_profile.create',
+                    renderer='/labels/profiles/crud.mako',
+                    permission='label_profiles.create')
+
+    config.add_route('label_profile.read', '/labels/profiles/{uuid}')
+    config.add_view(ProfileCrud, attr='read', route_name='label_profile.read',
+                    renderer='/labels/profiles/read.mako',
+                    permission='label_profiles.read')
+
+    config.add_route('label_profile.update', '/labels/profiles/{uuid}/edit')
+    config.add_view(ProfileCrud, attr='update', route_name='label_profile.update',
+                    renderer='/labels/profiles/crud.mako',
+                    permission='label_profiles.update')
+
+    config.add_route('label_profile.delete', '/labels/profiles/{uuid}/delete')
+    config.add_view(ProfileCrud, attr='delete', route_name='label_profile.delete',
+                    permission='label_profiles.delete')
+
+    config.add_route('label_profile.printer_settings', '/labels/profiles/{uuid}/printer')
+    config.add_view(printer_settings, route_name='label_profile.printer_settings',
+                    renderer='/labels/profiles/printer.mako',
+                    permission='label_profiles.update')
diff --git a/rattail/pyramid/views/products.py b/rattail/pyramid/views/products.py
index a32976ae..a39802b2 100644
--- a/rattail/pyramid/views/products.py
+++ b/rattail/pyramid/views/products.py
@@ -26,17 +26,27 @@
 ``rattail.pyramid.views.products`` -- Product Views
 """
 
+import threading
+
+from sqlalchemy import and_
+from sqlalchemy.orm import joinedload
+
 from webhelpers.html.tags import link_to
 
-from sqlalchemy.orm import joinedload
+from pyramid.httpexceptions import HTTPFound
+from pyramid.renderers import render_to_response
 
 import edbob
 from edbob.pyramid import Session
+from edbob.pyramid.progress import SessionProgress
 from edbob.pyramid.views import SearchableAlchemyGridView, CrudView
 
 import rattail
 import rattail.labels
-from rattail.pyramid.forms import UpcFieldRenderer, PriceFieldRenderer
+from rattail import sil
+from rattail import batches
+from rattail.exceptions import LabelPrintingError
+from rattail.pyramid.forms import GPCFieldRenderer, PriceFieldRenderer
 
 
 class ProductsGrid(SearchableAlchemyGridView):
@@ -47,6 +57,17 @@ class ProductsGrid(SearchableAlchemyGridView):
     clickable = True
 
     def join_map(self):
+
+        def join_vendor(q):
+            q = q.outerjoin(
+                rattail.ProductCost,
+                and_(
+                    rattail.ProductCost.product_uuid == rattail.Product.uuid,
+                    rattail.ProductCost.preference == 1,
+                    ))
+            q = q.outerjoin(rattail.Vendor)
+            return q
+
         return {
             'brand':
                 lambda q: q.outerjoin(rattail.Brand),
@@ -62,6 +83,8 @@ class ProductsGrid(SearchableAlchemyGridView):
             'current_price':
                 lambda q: q.outerjoin(rattail.ProductPrice,
                                       rattail.ProductPrice.uuid == rattail.Product.current_price_uuid),
+            'vendor':
+                join_vendor,
             }
 
     def filter_map(self):
@@ -70,7 +93,8 @@ class ProductsGrid(SearchableAlchemyGridView):
             ilike=['description', 'size'],
             brand=self.filter_ilike(rattail.Brand.name),
             department=self.filter_ilike(rattail.Department.name),
-            subdepartment=self.filter_ilike(rattail.Subdepartment.name))
+            subdepartment=self.filter_ilike(rattail.Subdepartment.name),
+            vendor=self.filter_ilike(rattail.Vendor.name))
 
     def filter_config(self):
         return self.make_filter_config(
@@ -82,7 +106,9 @@ class ProductsGrid(SearchableAlchemyGridView):
             include_filter_description=True,
             filter_type_description='lk',
             include_filter_department=True,
-            filter_type_department='lk')
+            filter_type_department='lk',
+            include_filter_vendor=True,
+            filter_type_vendor='lk')
 
     def sort_map(self):
         return self.make_sort_map(
@@ -91,7 +117,8 @@ class ProductsGrid(SearchableAlchemyGridView):
             department=self.sorter(rattail.Department.name),
             subdepartment=self.sorter(rattail.Subdepartment.name),
             regular_price=self.sorter(rattail.ProductPrice.price),
-            current_price=self.sorter(rattail.ProductPrice.price))
+            current_price=self.sorter(rattail.ProductPrice.price),
+            vendor=self.sorter(rattail.Vendor.name))
 
     def query(self):
         q = self.make_query()
@@ -100,11 +127,12 @@ class ProductsGrid(SearchableAlchemyGridView):
         q = q.options(joinedload(rattail.Product.subdepartment))
         q = q.options(joinedload(rattail.Product.regular_price))
         q = q.options(joinedload(rattail.Product.current_price))
+        q = q.options(joinedload(rattail.Product.vendor))
         return q
 
     def grid(self):
         g = self.make_grid()
-        g.upc.set(renderer=UpcFieldRenderer)
+        g.upc.set(renderer=GPCFieldRenderer)
         g.regular_price.set(renderer=PriceFieldRenderer)
         g.current_price.set(renderer=PriceFieldRenderer)
         g.configure(
@@ -114,6 +142,7 @@ class ProductsGrid(SearchableAlchemyGridView):
                 g.description,
                 g.size,
                 g.subdepartment,
+                g.vendor,
                 g.regular_price.label("Reg. Price"),
                 g.current_price.label("Cur. Price"),
                 ],
@@ -121,13 +150,19 @@ class ProductsGrid(SearchableAlchemyGridView):
 
         g.click_route_name = 'product.read'
 
-        if edbob.config.getboolean('rattail.labels', 'enabled', default=False):
+        q = Session.query(rattail.LabelProfile)
+        if q.count():
             def labels(row):
                 return link_to("Print", '#', class_='print-label')
             g.add_column('labels', "Labels", labels)
 
         return g
 
+    def render_kwargs(self):
+        q = Session.query(rattail.LabelProfile)
+        q = q.order_by(rattail.LabelProfile.ordinal)
+        return {'label_profiles': q.all()}
+
 
 class ProductCrud(CrudView):
 
@@ -136,7 +171,7 @@ class ProductCrud(CrudView):
 
     def fieldset(self, model):
         fs = self.make_fieldset(model)
-        fs.upc.set(renderer=UpcFieldRenderer)
+        fs.upc.set(renderer=GPCFieldRenderer)
         fs.regular_price.set(renderer=PriceFieldRenderer)
         fs.current_price.set(renderer=PriceFieldRenderer)
         fs.configure(
@@ -153,24 +188,90 @@ class ProductCrud(CrudView):
         return fs
 
 
-def print_label(request):
+def print_labels(request):
     profile = request.params.get('profile')
-    profile = rattail.labels.get_profile(profile) if profile else None
-    assert profile
+    profile = Session.query(rattail.LabelProfile).get(profile) if profile else None
+    if not profile:
+        return {'error': "Label profile not found"}
 
-    uuid = request.params.get('uuid')
-    product = Session.query(rattail.Product).get(uuid) if uuid else None
-    assert product
+    product = request.params.get('product')
+    product = Session.query(rattail.Product).get(product) if product else None
+    if not product:
+        return {'error': "Product not found"}
 
     quantity = request.params.get('quantity')
-    assert quantity.isdigit()
+    if not quantity.isdigit():
+        return {'error': "Quantity must be numeric"}
     quantity = int(quantity)
 
     printer = profile.get_printer()
-    printer.print_labels([(product, quantity)])
+    if not printer:
+        return {'error': "Couldn't get printer from label profile"}
+
+    try:
+        printer.print_labels([(product, quantity)])
+    except LabelPrintingError, error:
+        return {'error': str(error)}
     return {}
 
 
+class CreateProductsBatch(ProductsGrid):
+
+    def make_batch(self, provider):
+        session = edbob.Session()
+
+        self._filter_config = self.filter_config()
+        self._sort_config = self.sort_config()
+        products = self.make_query(session)
+
+        progress = SessionProgress(self.request.session, 'products.batch')
+        batch = provider.make_batch(session, products, progress)
+        if not batch:
+            session.rollback()
+            session.close()
+            return
+
+        session.commit()
+        session.refresh(batch)
+        session.close()
+
+        progress.session.load()
+        progress.session['success_url'] = self.request.route_url('batch', uuid=batch.uuid)
+        progress.session['success_msg'] = "Batch \"%s\" has been created." % batch.description
+        progress.session.save()
+
+    def __call__(self):
+        if self.request.POST:
+            provider = self.request.POST.get('provider')
+            if provider:
+                provider = batches.get_provider(provider)
+                if provider:
+
+                    if self.request.POST.get('params') == 'True':
+                        provider.set_params(Session(), **self.request.POST)
+
+                    else:
+                        try:
+                            url = self.request.route_url('batch_params.%s' % provider.name)
+                        except KeyError:
+                            pass
+                        else:
+                            self.request.session['referer'] = self.request.current_route_url()
+                            return HTTPFound(location=url)
+                    
+                    thread = threading.Thread(target=self.make_batch, args=(provider,))
+                    thread.start()
+                    kwargs = {
+                        'key': 'products.batch',
+                        'cancel_url': self.request.route_url('products'),
+                        'cancel_msg': "Batch creation was cancelled.",
+                        }
+                    return render_to_response('/progress.mako', kwargs, request=self.request)
+
+        providers = [(x.name, x.description) for x in batches.iter_providers()]
+        return {'providers': providers}
+
+
 def includeme(config):
 
     config.add_route('products', '/products')
@@ -178,158 +279,16 @@ def includeme(config):
                     renderer='/products/index.mako',
                     permission='products.list')
 
-    config.add_route('products.print_label', '/products/label')
-    config.add_view(print_label, route_name='products.print_label',
-                    renderer='json')
+    config.add_route('products.print_labels', '/products/labels')
+    config.add_view(print_labels, route_name='products.print_labels',
+                    renderer='json', permission='products.print_labels')
+
+    config.add_route('products.create_batch', '/products/batch')
+    config.add_view(CreateProductsBatch, route_name='products.create_batch',
+                    renderer='/products/batch.mako',
+                    permission='batches.create')
 
     config.add_route('product.read', '/products/{uuid}')
     config.add_view(ProductCrud, attr='read', route_name='product.read',
                     renderer='/products/read.mako',
                     permission='products.read')
-
-
-# from sqlalchemy.orm import joinedload
-
-# import transaction
-# from pyramid.httpexceptions import HTTPFound
-# from pyramid.view import view_config
-
-# from edbob.pyramid import filters
-# from edbob.pyramid import forms
-# from edbob.pyramid import grids
-# from edbob.pyramid import Session
-
-# import rattail
-# from rattail.batches import next_batch_id
-# from rattail.pyramid import util
-# from rattail.pyramid.forms import UpcFieldRenderer
-
-
-# def filter_map():
-#     return filters.get_filter_map(
-#         rattail.Product,
-#         exact=['upc'],
-#         ilike=['description', 'size'],
-#         department=filters.filter_ilike(rattail.Department.name),
-#         brand=filters.filter_ilike(rattail.Brand.name))
-
-# def search_config(request, fmap):
-#     return filters.get_search_config(
-#         'products.list', request, fmap,
-#         include_filter_brand=True,
-#         filter_type_brand='lk',
-#         include_filter_description=True,
-#         filter_type_description='lk',
-#         include_filter_department=True,
-#         filter_type_department='lk')
-
-# def search_form(config):
-#     return filters.get_search_form(
-#         config, upc="UPC")
-
-# def grid_config(request, search, fmap):
-#     return grids.get_grid_config(
-#         'products.list', request, search,
-#         filter_map=fmap, sort='description')
-
-# def sort_map():
-#     return grids.get_sort_map(
-#         rattail.Product,
-#         ['upc', 'description', 'size'],
-#         department=grids.sorter(rattail.Department.name),
-#         brand=grids.sorter(rattail.Brand.name))
-
-# def query(config):
-#     jmap = {
-#         'department':   lambda q: q.outerjoin(rattail.Department),
-#         'brand':        lambda q: q.outerjoin(rattail.Brand),
-#         }
-#     smap = sort_map()
-#     q = Session.query(rattail.Product)
-#     q = q.options(joinedload(rattail.Product.department))
-#     q = q.options(joinedload(rattail.Product.brand))
-#     q = filters.filter_query(q, config, jmap)
-#     q = grids.sort_query(q, config, smap, jmap)
-#     return q
-
-
-# @view_config(route_name='products.list', renderer='/products/index.mako')
-# def products(context, request):
-
-#     fmap = filter_map()
-#     config = search_config(request, fmap)
-#     search = search_form(config)
-#     config = grid_config(request, search, fmap)
-#     products = grids.get_pager(query, config)
-
-#     g = forms.AlchemyGrid(
-#         rattail.Product, products, config,
-#         gridurl=request.route_url('products.list'))
-
-#     g.configure(
-#         include=[
-#             g.upc.with_renderer(UpcFieldRenderer).label("UPC"),
-#             g.brand,
-#             g.description,
-#             g.size,
-#             g.department,
-#             ],
-#         readonly=True)
-
-#     grid = g.render(class_='clickable products')
-#     return grids.render_grid(request, grid, search)
-
-
-# @view_config(route_name='products.batch')
-# def batch(context, request):
-
-#     fmap = filter_map()
-#     config = search_config(request, fmap)
-#     search = search_form(config)
-#     config = grid_config(request, search, fmap)
-#     products = query(config)
-
-#     home = HTTPFound(location=request.route_url('products.list'))
-
-#     source = util.get_terminal('rattail')
-#     if not source:
-#         return home
-
-#     dct = util.get_dictionary('ITEM_DCT')
-#     if not dct:
-#         return home
-
-#     with transaction.manager:
-#         batch = rattail.Batch()
-#         Session.add(batch)
-
-#         batch.source = source
-#         batch.source_description = source.description
-#         batch.batch_id = next_batch_id(source.sil_id, consume=True,
-#                                        session=Session())
-#         batch.name = '%s.%08u' % (source.sil_id, batch.batch_id)
-#         batch.dictionary = dct
-#         batch.action_type = rattail.BATCH_ADD
-#         batch.description = "products from Rattail"
-
-#         for i, col in enumerate(source.source_columns(dct), 1):
-#             batch.columns.append(rattail.BatchColumn(
-#                     ordinal=i,
-#                     sil_column=col.sil_column,
-#                     source=source,
-#                     targeted=True,
-#                     ))
-
-#         batch.create_table()
-#         batch.add_rows(source, dct, query=products)
-#         batch.rowcount = products.count()
-
-#         url = request.route_url('batch.edit', uuid=batch.uuid)
-
-#     return HTTPFound(location=url)
-
-
-# def includeme(config):
-#     config.add_route('products.list', '/products')
-#     config.add_route('products.batch', '/products/batch')
-#     config.scan(__name__)