diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py index 45b35d54605..58320ebfdf7 100644 --- a/addons/mrp/__openerp__.py +++ b/addons/mrp/__openerp__.py @@ -76,7 +76,7 @@ 'report/mrp_report_view.xml', 'report/mrp_production_order_view.xml', ], - 'demo_xml': ['mrp_demo.xml', 'mrp_order_point.xml'], + 'demo_xml': ['mrp_demo.xml'], 'test': [ 'test/mrp_phantom_bom.yml', 'test/mrp_production_order.yml', diff --git a/addons/mrp/mrp_data.xml b/addons/mrp/mrp_data.xml index a7db7109e55..64dd9f2c9e5 100644 --- a/addons/mrp/mrp_data.xml +++ b/addons/mrp/mrp_data.xml @@ -16,20 +16,5 @@ 1 - - - Stock orderpoint - mrp.warehouse.orderpoint - - - - Stock orderpoint - mrp.warehouse.orderpoint - OP/ - 5 - 1 - 1 - - diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py index 74847354b5e..8bd8d05c685 100644 --- a/addons/procurement/__openerp__.py +++ b/addons/procurement/__openerp__.py @@ -44,7 +44,7 @@ 'process/procurement_process.xml', "company_view.xml", ], -# 'demo_xml': [], + 'demo_xml': ['stock_orderpoint.xml'], 'installable': True, 'active': False, 'certificate': '', diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index e3156707d4d..a65ea449046 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -485,7 +485,7 @@ class stock_warehouse_orderpoint(osv.osv): 'active': lambda *a: 1, 'logic': lambda *a: 'max', 'qty_multiple': lambda *a: 1, - 'name': lambda x,y,z,c: x.pool.get('ir.sequence').get(y,z,'mrp.warehouse.orderpoint') or '', + 'name': lambda x,y,z,c: x.pool.get('ir.sequence').get(y,z,'stock.orderpoint') or '', 'product_uom': lambda sel, cr, uid, context: context.get('product_uom', False), 'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.warehouse.orderpoint', context=c) } @@ -519,7 +519,7 @@ class stock_warehouse_orderpoint(osv.osv): if not default: default = {} default.update({ - 'name': self.pool.get('ir.sequence').get(cr, uid, 'mrp.warehouse.orderpoint') or '', + 'name': self.pool.get('ir.sequence').get(cr, uid, 'stock.orderpoint') or '', }) return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context) diff --git a/addons/procurement/procurement_data.xml b/addons/procurement/procurement_data.xml index 9422e92c422..6a83d525c68 100644 --- a/addons/procurement/procurement_data.xml +++ b/addons/procurement/procurement_data.xml @@ -15,5 +15,18 @@ + + Stock orderpoint + stock.orderpoint + + + + Stock orderpoint + stock.orderpoint + OP/ + 5 + 1 + 1 + \ No newline at end of file diff --git a/addons/mrp/mrp_order_point.xml b/addons/procurement/stock_orderpoint.xml similarity index 100% rename from addons/mrp/mrp_order_point.xml rename to addons/procurement/stock_orderpoint.xml