From 9b6c4820ebaec8ab0482f494ecf77014b89cef09 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Tue, 21 Sep 2010 18:44:39 +0530 Subject: [PATCH] [IMP] mrp_subproduct: Rename the date_planned to date in stock_move bzr revid: sbh@tinyerp.com-20100921131439-ovr5igac3gjwg9zi --- addons/mrp_repair/test/test_mrp_repair.yml | 1 - addons/mrp_subproduct/mrp_subproduct.py | 2 +- addons/stock/wizard/stock_return_picking.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/mrp_repair/test/test_mrp_repair.yml b/addons/mrp_repair/test/test_mrp_repair.yml index 3e58a837f38..1cf82635825 100644 --- a/addons/mrp_repair/test/test_mrp_repair.yml +++ b/addons/mrp_repair/test/test_mrp_repair.yml @@ -8,7 +8,6 @@ company_id: base.main_company date: '2010-06-24 20:10:28' date_expected: '2010-06-24 20:10:55' - date: '2010-06-24 20:10:28' location_dest_id: stock.stock_location_stock location_id: stock.stock_location_stock name: '[PC1] Basic PC' diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py index 0478b0d1779..5519bba3a5c 100644 --- a/addons/mrp_subproduct/mrp_subproduct.py +++ b/addons/mrp_subproduct/mrp_subproduct.py @@ -83,7 +83,7 @@ class mrp_production(osv.osv): qty2 *= production.product_uos_qty / (production.bom_id.product_uos_qty or 1.0) data = { 'name': 'PROD:'+production.name, - 'date_planned': production.date_planned, + 'date': production.date_planned, 'product_id': sub_product.product_id.id, 'product_qty': qty1, 'product_uom': sub_product.product_uom.id, diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py index 662772faf96..6cb7c144901 100644 --- a/addons/stock/wizard/stock_return_picking.py +++ b/addons/stock/wizard/stock_return_picking.py @@ -177,7 +177,7 @@ class stock_return_picking(osv.osv_memory): new_qty, move.product_uos.id), 'picking_id':new_picking, 'state':'draft', 'location_id':new_location, 'location_dest_id':move.location_id.id, - 'date':date_cur, 'date':date_cur,}) + 'date':date_cur,}) move_obj.write(cr, uid, [move.id], {'move_history_ids2':[(4,new_move)]}) if set_invoice_state_to_none: