[FIX] barcodes,point_of_sale,stock,base: minor changes from code review

6 files changed, 15 insertions, 18 deletions

diff --git a/addons/barcodes/__openerp__.py b/addons/barcodes/__openerp__.py
index 53a4773b65f..c4a74f38037 100644
--- a/addons/barcodes/__openerp__.py
+++ b/addons/barcodes/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Advanced Barcodes',
+    'name': 'Barcodes',
     'version': '1.0',
     'category': '',
     'sequence': 6,
diff --git a/addons/barcodes/barcodes.py b/addons/barcodes/barcodes.py
index ab0e7bac6ab..4f192403501 100644
--- a/addons/barcodes/barcodes.py
+++ b/addons/barcodes/barcodes.py
@@ -33,7 +33,6 @@ class barcode_nomenclature(osv.osv):
     _name = 'barcode.nomenclature'
     _columns = {
         'name':             fields.char('Nomenclature Name', size=32, required=True, help='An internal identification of the barcode nomenclature'),
-        #'convert_to_ean13': fields.boolean('Convert to EAN-13',help='Numerical Barcodes shorter than EAN-13 will be automatically converted to EAN-13'),
         'rule_ids':        fields.one2many('barcode.rule','barcode_nomenclature_id','Rules', help='The list of barcode rules'),
     }
 
@@ -166,15 +165,15 @@ class barcode_rule(models.Model):
         'name':     fields.char('Rule Name', size=32, required=True, help='An internal identification for this barcode nomenclature rule'),
         'barcode_nomenclature_id':     fields.many2one('barcode.nomenclature','Barcode Nomenclature'),
         'sequence': fields.integer('Sequence', help='Used to order rules such that rules with a smaller sequence match first'),
-        #'encoding': fields.selection([('any','Any'),('ean13','EAN-13'),('ean8','EAN-8'),('codabar','Codabar'),('upca','UPC-A'),('upce','UPC-E')],'Encoding',help='This rule will apply only if the barcode is encoded with the specified encoding'),
         'encoding': fields.selection([('any','Any'),('ean13','EAN-13')],'Encoding',required=True,help='This rule will apply only if the barcode is encoded with the specified encoding'),
         'type':     fields.selection([('alias','Alias'),('product','Unit Product')],'Type', required=True),
         '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'),      
+        'alias':    fields.char('Alias',size=32,help='The matched pattern will alias to this barcode',required=True),      
     }
 
     _defaults = {
         'type': 'product',
         'pattern': '*',
         'encoding': 'any',
+        'alias': "0",
     }
diff --git a/addons/barcodes/barcodes_view.xml b/addons/barcodes/barcodes_view.xml
index efc940475de..e799ab43563 100644
--- a/addons/barcodes/barcodes_view.xml
+++ b/addons/barcodes/barcodes_view.xml
@@ -58,8 +58,8 @@
                     <group col="4">
                         <field name="name" />
                         <field name="sequence" />
-                        <field name="type" />
-                        <field name="encoding"/>
+                        <field name="type"/>  
+                        <field name="encoding" attrs="{'invisible': [('type','=', 'alias')]}"/> 
                         <field name="pattern" />
                         <field name="alias" attrs="{'invisible': [('type','!=', 'alias')]}"/>   
                     </group>
diff --git a/addons/barcodes/static/src/js/barcode_parser.js b/addons/barcodes/static/src/js/barcode_parser.js
index e3b9ae3fd4e..8a8c2ff5399 100644
--- a/addons/barcodes/static/src/js/barcode_parser.js
+++ b/addons/barcodes/static/src/js/barcode_parser.js
@@ -1,10 +1,18 @@
-function openerp_barcode_parser(instance,module){
+openerp.barcodes = function(instance) {
+    "use strict";
+
+    instance.barcodes = {};
+    var module = instance.barcodes;
 
     module.BarcodeParser = instance.web.Class.extend({
         init: function(attributes) {
             var self = this;
             this.nomenclature_id = attributes.nomenclature_id;
-            this.load_server_data();
+            this.loaded = this.load_server_data();
+        },
+
+        is_loaded: function() {
+            return self.loaded;
         },
 
         models: [
diff --git a/addons/barcodes/static/src/js/main.js b/addons/barcodes/static/src/js/main.js
deleted file mode 100644
index 69e702ebe74..00000000000
--- a/addons/barcodes/static/src/js/main.js
+++ /dev/null
@@ -1,9 +0,0 @@
-
-openerp.barcodes = function(instance) {
-    "use strict";
-
-    instance.barcode_parser = {};
-    var module = instance.barcode_parser;
-
-    openerp_barcode_parser(instance,module);         // import barcodes.js
-};
diff --git a/addons/barcodes/views/templates.xml b/addons/barcodes/views/templates.xml
index 965eab7e221..9e255e57290 100644
--- a/addons/barcodes/views/templates.xml
+++ b/addons/barcodes/views/templates.xml
@@ -7,7 +7,6 @@
        <template id="assets_backend" name="barcodes assets" inherit_id="web.assets_backend">
             <xpath expr="." position="inside">
                 <script type="text/javascript" src="/barcodes/static/src/js/barcode_parser.js"></script>
-                <script type="text/javascript" src="/barcodes/static/src/js/main.js"></script>
             </xpath>
         </template>