diff options
| author | Frederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com> | 2014-11-18 16:11:18 +0100 |
|---|---|---|
| committer | Frédéric van der Essen <fvdessen@gmail.com> | 2014-11-26 12:12:01 +0100 |
| commit | 5130f5b9ed42209a78f4fc354b2c901221ff2fd0 (patch) | |
| tree | 4b99670138ed98479aa9b4128065fa21c1389a01 | |
| parent | f486594c1abf4e1ad43e9e086c4ecb8792ec01b9 (diff) | |
[FIX] barcodes: some small fixes in the default barcode patterns
| -rw-r--r-- | addons/barcodes/barcodes.py | 2 | ||||
| -rw-r--r-- | addons/barcodes/data/barcodes_data.xml | 4 | ||||
| -rw-r--r-- | addons/point_of_sale/data/default_barcode_patterns.xml | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/addons/barcodes/barcodes.py b/addons/barcodes/barcodes.py index 34c00ad4ac1..543d364a218 100644 --- a/addons/barcodes/barcodes.py +++ b/addons/barcodes/barcodes.py @@ -195,4 +195,4 @@ class barcode_rule(models.Model): elif re.search("[{][}]", p): raise ValidationError(_("There is a syntax error in the barcode pattern ") + self.pattern + _(": empty braces.")) elif len(findall) != 0: - raise ValidationError(_("There is a syntax error in the barcode pattern ") + self.pattern + _(": a rule can only contain one pair of braces."))
\ No newline at end of file + raise ValidationError(_("There is a syntax error in the barcode pattern ") + self.pattern + _(": a rule can only contain one pair of braces.")) diff --git a/addons/barcodes/data/barcodes_data.xml b/addons/barcodes/data/barcodes_data.xml index 8d33995669a..b96be279fc9 100644 --- a/addons/barcodes/data/barcodes_data.xml +++ b/addons/barcodes/data/barcodes_data.xml @@ -10,8 +10,8 @@ <field name="barcode_nomenclature_id" ref="default_barcode_nomenclature"/> <field name="sequence">90</field> <field name="type">product</field> - <field name="encoding">ean13</field> + <field name="encoding">any</field> <field name="pattern">.</field> </record> </data> -</openerp>
\ No newline at end of file +</openerp> diff --git a/addons/point_of_sale/data/default_barcode_patterns.xml b/addons/point_of_sale/data/default_barcode_patterns.xml index 3eec05b1811..cf65ab87d19 100644 --- a/addons/point_of_sale/data/default_barcode_patterns.xml +++ b/addons/point_of_sale/data/default_barcode_patterns.xml @@ -7,7 +7,7 @@ <field name="sequence">50</field> <field name="type">cashier</field> <field name="encoding">any</field> - <field name="pattern">041</field> + <field name="pattern">041.</field> </record> <record id="barcode_rule_client" model="barcode.rule"> @@ -16,7 +16,7 @@ <field name="sequence">40</field> <field name="type">client</field> <field name="encoding">any</field> - <field name="pattern">042</field> + <field name="pattern">042.</field> </record> <record id="barcode_rule_discount" model="barcode.rule"> @@ -37,4 +37,4 @@ <field name="pattern">23.....{NNNDD}.</field> </record> </data> -</openerp>
\ No newline at end of file +</openerp> |