diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 53d380e20e7..121ebbe6e1d 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -664,8 +664,8 @@ class mrp_procurement(osv.osv): 'name': fields.char('Name', size=64, required=True), 'origin': fields.char('Origin', size=64), 'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority', required=True), - 'date_planned': fields.date('Scheduled date', required=True), - 'date_close': fields.date('Date Closed'), + 'date_planned': fields.datetime('Scheduled date', required=True), + 'date_close': fields.datetime('Date Closed'), 'product_id': fields.many2one('product.product', 'Product', required=True), 'product_qty': fields.float('Quantity', required=True), 'product_uom': fields.many2one('product.uom', 'Product UoM', required=True), diff --git a/addons/profile_manufacturing/profile_manufacturing.py b/addons/profile_manufacturing/profile_manufacturing.py index bb660552587..36bc2aa18c8 100644 --- a/addons/profile_manufacturing/profile_manufacturing.py +++ b/addons/profile_manufacturing/profile_manufacturing.py @@ -30,8 +30,8 @@ from osv import fields, osv import pooler -class config_install_extra_modules(osv.osv_memory): - _name='config.install_extra_modules.mrp' +class profile_manufacturing_config_install_modules_wizard(osv.osv_memory): + _name='profile.manufacturing.config.install_modules_wizard' _columns = { 'mrp_jit':fields.boolean('Just in Time Scheduling', help="The JIT module allows you to not run the scheduler "\ @@ -94,7 +94,7 @@ class config_install_extra_modules(osv.osv_memory): 'type': 'ir.actions.act_window', 'target':'new', } -config_install_extra_modules() +profile_manufacturing_config_install_modules_wizard() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 9a6b1c47076..2b243285d10 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -471,7 +471,7 @@ calendar - +