diff --git a/setup.py b/setup.py index 4defa3a3..bbc93298 100644 --- a/setup.py +++ b/setup.py @@ -64,12 +64,6 @@ requires = [ # # package # low high - # For now, let's restrict FormEncode to 1.2 since the 1.3 release - # introduces some deprecation warnings. Once we're running 1.2 everywhere - # in production, we can start looking at adding 1.3 support. - # TODO: Remove this restriction. - 'FormEncode<=1.2.99', # 1.2.4 1.2.6 - # TODO: Pyramid 1.9 looks like it breaks us..? playing it safe for now.. 'pyramid<1.9', # 1.3b2 1.8.3 diff --git a/tailbone/views/purchasing/receiving.py b/tailbone/views/purchasing/receiving.py index d240b20e..1f882f70 100644 --- a/tailbone/views/purchasing/receiving.py +++ b/tailbone/views/purchasing/receiving.py @@ -36,7 +36,6 @@ from rattail.gpc import GPC from rattail.util import pretty_quantity, prettify import colander -import formencode as fe from webhelpers2.html import tags from tailbone import forms, grids @@ -398,22 +397,12 @@ class ReceivingForm(colander.MappingSchema): # 'mispick', ])) - # product = forms.validators.ValidProduct() - # upc = forms.validators.ValidGPC() - # brand_name = fe.validators.String() - # description = fe.validators.String() - # size = fe.validators.String() - # case_quantity = fe.validators.Number() - cases = colander.SchemaNode(colander.Decimal(), missing=colander.null) units = colander.SchemaNode(colander.Decimal(), missing=colander.null) expiration_date = colander.SchemaNode(colander.Date(), missing=colander.null) - # trash = fe.validators.Bool() - # ordered_product = forms.validators.ValidProduct() - def includeme(config): ReceivingBatchView.defaults(config)