From e0c1db3a68b9662e70e0cc99e95f521792bc2d79 Mon Sep 17 00:00:00 2001 From: Aaron Bohy Date: Thu, 6 Nov 2014 14:57:33 +0100 Subject: [PATCH] [FIX] stock, point_of_sale: default patterns loaded --- addons/barcodes/barcodes.py | 5 ----- addons/point_of_sale/__openerp__.py | 2 +- addons/stock/__openerp__.py | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/addons/barcodes/barcodes.py b/addons/barcodes/barcodes.py index 8e9004aea78..b74e60280dd 100644 --- a/addons/barcodes/barcodes.py +++ b/addons/barcodes/barcodes.py @@ -157,10 +157,6 @@ class barcode_nomenclature(osv.osv): class barcode_rule(models.Model): _name = 'barcode.rule' _order = 'sequence asc' - - def _get_type_selection(self, cr, uid, context=None): - # return [('product','Unit Product'),('weight','Weighted Product'),('price','Priced Product'),('discount','Discounted Product'),('client','Client'),('cashier','Cashier'),('location','Location'),('lot','Lot'),('package','Package')] - return [('product','Unit Product')] _columns = { 'name': fields.char('Rule Name', size=32, required=True, help='An internal identification for this barcode nomenclature rule'), @@ -172,7 +168,6 @@ class barcode_rule(models.Model): 'pattern': fields.char('Barcode Pattern', size=32, help="The barcode matching pattern"), #'alias': fields.char('Alias',size=32,help='The matched pattern will alias to this barcode'), } - #type = openerp.fields.Selection([('product','Unit Product')],'Type', required=True) _defaults = { 'type': 'product', diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py index 85907b40ee6..40a98b1888c 100644 --- a/addons/point_of_sale/__openerp__.py +++ b/addons/point_of_sale/__openerp__.py @@ -51,7 +51,7 @@ Main Features 'depends': ['sale_stock', 'barcodes'], 'data': [ 'data/report_paperformat.xml', - #'data/default_barcode_patterns.xml', + 'data/default_barcode_patterns.xml', 'security/point_of_sale_security.xml', 'security/ir.model.access.csv', 'wizard/pos_box.xml', diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py index a77aca9b774..35aa355f420 100644 --- a/addons/stock/__openerp__.py +++ b/addons/stock/__openerp__.py @@ -66,7 +66,7 @@ Dashboard / Reports for Warehouse Management will include: 'stock_location_demo_cpu3.yml', ], 'data': [ - #'data/default_barcode_patterns.xml', + 'data/default_barcode_patterns.xml', 'security/stock_security.xml', 'security/ir.model.access.csv', 'stock_data.xml',