diff --git a/addons/pos_barcodes/__init__.py b/addons/barcodes/__init__.py
similarity index 100%
rename from addons/pos_barcodes/__init__.py
rename to addons/barcodes/__init__.py
diff --git a/addons/pos_barcodes/__openerp__.py b/addons/barcodes/__openerp__.py
similarity index 82%
rename from addons/pos_barcodes/__openerp__.py
rename to addons/barcodes/__openerp__.py
index 5463060ed63..733f323b153 100644
--- a/addons/pos_barcodes/__openerp__.py
+++ b/addons/barcodes/__openerp__.py
@@ -23,23 +23,23 @@
 {
     'name': 'Advanced Barcodes',
     'version': '1.0',
-    'category': 'Point of Sale',
+    'category': '',
     'sequence': 6,
-    'summary': 'Advanced Barcode Setup for the Point of Sale',
+    'summary': 'Advanced Barcode Setup',
     'description': """
 
 =======================
 
-This module unlocks several advanced barcode features for the point of sale:
+This module unlocks several advanced barcode features:
 
 - Barcode aliases allows you to identify the same product with different barcodes
-- Barcode patterns to identify customers, employees, weighted, discounted, and custom priced products
+- Barcode patterns to identify e.g. customers, employees, weighted, discounted and custom priced products
 - Unlimited barcode patterns and definitions. 
 
 """,
     'author': 'OpenERP SA',
     'depends': [],
-    'website': 'https://www.odoo.com/page/point-of-sale',
+    'website': '',
     'data': [
         'data/barcodes_data.xml',
         'barcodes_view.xml',
diff --git a/addons/pos_barcodes/barcodes.py b/addons/barcodes/barcodes.py
similarity index 100%
rename from addons/pos_barcodes/barcodes.py
rename to addons/barcodes/barcodes.py
diff --git a/addons/pos_barcodes/barcodes_view.xml b/addons/barcodes/barcodes_view.xml
similarity index 100%
rename from addons/pos_barcodes/barcodes_view.xml
rename to addons/barcodes/barcodes_view.xml
diff --git a/addons/pos_barcodes/data/barcodes_data.xml b/addons/barcodes/data/barcodes_data.xml
similarity index 97%
rename from addons/pos_barcodes/data/barcodes_data.xml
rename to addons/barcodes/data/barcodes_data.xml
index 0620c5db498..cee84980cc7 100644
--- a/addons/pos_barcodes/data/barcodes_data.xml
+++ b/addons/barcodes/data/barcodes_data.xml
@@ -2,8 +2,7 @@
 <openerp>
     <data>
     	<record id="default_barcode_nomenclature" model="barcode.nomenclature">
-            <field name="name">Default Nomenc04201
-                lature</field>
+            <field name="name">Default Nomenclature</field>
         </record>
 
         <record id="barcode_rule_product" model="barcode.rule">
diff --git a/addons/pos_barcodes/security/ir.model.access.csv b/addons/barcodes/security/ir.model.access.csv
similarity index 100%
rename from addons/pos_barcodes/security/ir.model.access.csv
rename to addons/barcodes/security/ir.model.access.csv
diff --git a/addons/pos_barcodes/views/templates.xml b/addons/barcodes/views/templates.xml
similarity index 72%
rename from addons/pos_barcodes/views/templates.xml
rename to addons/barcodes/views/templates.xml
index fdb8c85acc3..8e9c6b09145 100644
--- a/addons/pos_barcodes/views/templates.xml
+++ b/addons/barcodes/views/templates.xml
@@ -6,7 +6,7 @@
 
        <!-- <template id="assets_frontend" inherit_id="web.assets_common">
           <xpath expr="." position="inside">
-              <script type="text/javascript" src="/pos_barcodes/static/src/js/barcodes.js"></script>
+              <script type="text/javascript" src="/barcodes/static/src/js/barcodes.js"></script>
           </xpath>
         </template>-->
 
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 3db3183009d..91192feba67 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -48,7 +48,7 @@ Main Features
     """,
     'author': 'OpenERP SA',
     'images': ['images/pos_touch_screen.jpeg', 'images/pos_session.jpeg', 'images/pos_analysis.jpeg','images/sale_order_pos.jpeg','images/product_pos.jpeg'],
-    'depends': ['sale_stock', 'pos_barcodes'],
+    'depends': ['sale_stock', 'barcodes'],
     'data': [
         'data/report_paperformat.xml',
         'security/point_of_sale_security.xml',
diff --git a/addons/point_of_sale/point_of_sale_data.xml b/addons/point_of_sale/point_of_sale_data.xml
index 0590620c0ed..8124f69d5a7 100644
--- a/addons/point_of_sale/point_of_sale_data.xml
+++ b/addons/point_of_sale/point_of_sale_data.xml
@@ -30,7 +30,7 @@
         <record model="pos.config" id="pos_config_main">
             <field name="name">Main</field>
             <field name="picking_type_id" ref="picking_type_posout"/>
-            <field name="barcode_nomenclature_id" ref="pos_barcodes.default_barcode_nomenclature"/>
+            <field name="barcode_nomenclature_id" ref="barcodes.default_barcode_nomenclature"/>
         </record>
 
         <!-- notify all employees of module installation -->
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index ec33d639fae..5d2ebd8e459 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -1000,7 +1000,7 @@
         </record>
 
         <!-- Barcode Nomenclatures -->
-        <menuitem parent="menu_point_config_product" action="pos_barcodes.action_barcode_nomenclature_form" id="menu_pos_barcode_nomenclature_all"
+        <menuitem parent="menu_point_config_product" action="barcodes.action_barcode_nomenclature_form" id="menu_pos_barcode_nomenclature_all"
             sequence="30"/>
     </data>
 </openerp>
diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index a3547499f6e..4d831c7d9b1 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -58,7 +58,7 @@ access_pos_config_user,pos.config user,model_pos_config,group_pos_user,1,1,1,0
 access_ir_sequence_manager,ir.sequence manager,base.model_ir_sequence,group_pos_manager,1,1,1,1
 access_product_category_pos_manager,pos.category manager,model_pos_category,group_pos_manager,1,1,1,1
 access_product_category_pos_user,pos.category user,model_pos_category,group_pos_user,1,0,0,0
-access_barcode_nomenclature_pos_user,barcode.nomenclature.pos.user,pos_barcodes.model_barcode_nomenclature,group_pos_user,1,0,0,0
-access_barcode_nomenclature_pos_manager,barcode.nomenclature.pos.manager,pos_barcodes.model_barcode_nomenclature,group_pos_manager,1,1,1,1
-access_barcode_rule_pos_user,barcode.rule.pos.user,pos_barcodes.model_barcode_rule,group_pos_user,1,0,0,0
-access_barcode_rule_pos_manager,barcode.rule.pos.manager,pos_barcodes.model_barcode_rule,group_pos_manager,1,1,1,1
+access_barcode_nomenclature_pos_user,barcode.nomenclature.pos.user,barcodes.model_barcode_nomenclature,group_pos_user,1,0,0,0
+access_barcode_nomenclature_pos_manager,barcode.nomenclature.pos.manager,barcodes.model_barcode_nomenclature,group_pos_manager,1,1,1,1
+access_barcode_rule_pos_user,barcode.rule.pos.user,barcodes.model_barcode_rule,group_pos_user,1,0,0,0
+access_barcode_rule_pos_manager,barcode.rule.pos.manager,barcodes.model_barcode_rule,group_pos_manager,1,1,1,1
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 0576605d3dc..ed76de34d4a 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -52,7 +52,7 @@ Dashboard / Reports for Warehouse Management will include:
     """,
     'website': 'https://www.odoo.com/page/warehouse',
     'images': ['images/stock_forecast_report.png', 'images/delivery_orders.jpeg', 'images/inventory_analysis.jpeg','images/location.jpeg','images/moves_analysis.jpeg','images/physical_inventories.jpeg'],
-    'depends': ['product', 'procurement', 'board', 'web_kanban_gauge', 'web_kanban_sparkline', 'pos_barcodes'],
+    'depends': ['product', 'procurement', 'board', 'web_kanban_gauge', 'web_kanban_sparkline', 'barcodes'],
     'category': 'Warehouse Management',
     'sequence': 16,
     'demo': [
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 1e0eb8f359e..cbe1d652e4d 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -75,7 +75,7 @@ access_stock_move_operation_link_user,stock.move.operation.link user,model_stock
 access_stock_move_operation_link_all,stock.move.operation.link all users,model_stock_move_operation_link,base.group_user,1,0,0,0
 access_product_price_history_stock_user,prices.history stock user,product.model_product_price_history,stock.group_stock_user,1,0,1,0
 access_product_price_history_stock_manager,prices.history stock manager,product.model_product_price_history,stock.group_stock_manager,1,1,1,1
-access_barcode_nomenclature_stock_user,barcode.nomenclature.stock.user,pos_barcodes.model_barcode_nomenclature,stock.group_stock_user,1,0,0,0
-access_barcode_nomenclature_stock_manager,barcode.nomenclature.pos.manager,pos_barcodes.model_barcode_nomenclature,stock.group_stock_manager,1,1,1,1
-access_barcode_rule_stock_user,barcode.rule.stock.user,pos_barcodes.model_barcode_rule,stock.group_stock_user,1,0,0,0
-access_barcode_rule_stock_manager,barcode.rule.pos.manager,pos_barcodes.model_barcode_rule,stock.group_stock_manager,1,1,1,1
\ No newline at end of file
+access_barcode_nomenclature_stock_user,barcode.nomenclature.stock.user,barcodes.model_barcode_nomenclature,stock.group_stock_user,1,0,0,0
+access_barcode_nomenclature_stock_manager,barcode.nomenclature.stock.manager,barcodes.model_barcode_nomenclature,stock.group_stock_manager,1,1,1,1
+access_barcode_rule_stock_user,barcode.rule.stock.user,barcodes.model_barcode_rule,stock.group_stock_user,1,0,0,0
+access_barcode_rule_stock_manager,barcode.rule.stock.manager,barcodes.model_barcode_rule,stock.group_stock_manager,1,1,1,1
\ No newline at end of file
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 60077142cb7..ff68fba4574 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1332,6 +1332,7 @@ class stock_picking(osv.osv):
 
     @api.cr_uid_ids_context
     def do_transfer(self, cr, uid, picking_ids, context=None):
+        print "DO TRANSFER"
         """
             If no pack operation, we do simple action_done of the picking
             Otherwise, do the pack operations
@@ -1340,6 +1341,7 @@ class stock_picking(osv.osv):
             context = {}
         stock_move_obj = self.pool.get('stock.move')
         for picking in self.browse(cr, uid, picking_ids, context=context):
+            print picking
             if not picking.pack_operation_ids:
                 self.action_done(cr, uid, [picking.id], context=context)
                 continue
@@ -3929,7 +3931,6 @@ class stock_pack_operation(osv.osv):
                 op = self.copy(cr, uid, pack_op.id, {'product_qty': pack_op.qty_done, 'qty_done': pack_op.qty_done}, context=context)
                 self.write(cr, uid, [pack_op.id], {'product_qty': pack_op.product_qty - pack_op.qty_done, 'qty_done': 0, 'lot_id': False}, context=context)
             processed_ids.append(op)
-        print "Nb processed: " + str(len(processed_ids))
         self.write(cr, uid, processed_ids, {'processed': 'true'}, context=context)
 
     def create_and_assign_lot(self, cr, uid, id, name, context=None):
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 1c26e8643b5..dcdad735757 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1942,7 +1942,7 @@
         </record>
 
         <!-- Barcode Nomenclatures -->
-        <menuitem parent="menu_stock_configuration" action="pos_barcodes.action_barcode_nomenclature_form" id="menu_wms_barcode_nomenclature_all"
+        <menuitem parent="menu_stock_configuration" action="barcodes.action_barcode_nomenclature_form" id="menu_wms_barcode_nomenclature_all"
             sequence="50"/>
        
     </data>