From: Frederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com>
Date: Tue, 18 Nov 2014 15:11:18 +0000 (+0100)
Subject: [FIX] barcodes: some small fixes in the default barcode patterns
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=5130f5b9ed42209a78f4fc354b2c901221ff2fd0;p=odoo%2Fodoo.git

[FIX] barcodes: some small fixes in the default barcode patterns
---

diff --git a/addons/barcodes/barcodes.py b/addons/barcodes/barcodes.py
index 34c00ad..543d364 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 8d33995..b96be27 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 3eec05b..cf65ab8 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>