diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 79a1e76c7e7..e5433321f45 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -68,6 +68,7 @@ + diff --git a/addons/mrp/procurement.py b/addons/mrp/procurement.py index 8162c3178dc..128cb62111a 100644 --- a/addons/mrp/procurement.py +++ b/addons/mrp/procurement.py @@ -34,6 +34,11 @@ class procurement_order(osv.osv): 'production_id': fields.many2one('mrp.production', 'Manufacturing Order'), } + def _prepare_order_line_procurement(self, cr, uid, order, line, move_id, date_planned, context=None): + result = super(procurement_order, self)._prepare_order_line_procurement(cr, uid, order, line, move_id, date_planned, context) + result['property_ids'] = [(6, 0, [x.id for x in line.property_ids])] + return result + def check_produce_product(self, cr, uid, procurement, context=None): ''' Depict the capacity of the procurement workflow to produce products (not services)''' return True diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index 747111416c4..a51d21d2735 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -18,6 +18,7 @@ + diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml index c30c91fe6c0..17e059c8de7 100644 --- a/addons/project/report/project_cumulative.xml +++ b/addons/project/report/project_cumulative.xml @@ -6,7 +6,7 @@ project.task.history.cumulative.tree project.task.history.cumulative - + diff --git a/addons/sale_stock/test/cancel_order_sale_stock.yml b/addons/sale_stock/test/cancel_order_sale_stock.yml index 6805a90ca80..a739376b6ad 100644 --- a/addons/sale_stock/test/cancel_order_sale_stock.yml +++ b/addons/sale_stock/test/cancel_order_sale_stock.yml @@ -8,7 +8,7 @@ - !python {model: stock.picking}: | delivery_orders = self.search(cr, uid, [('sale_id','=',ref("sale.sale_order_8"))]) - first_picking = self.browse(cr, uid, delivery_orders[0], context=context) + first_picking = self.browse(cr, uid, delivery_orders[-1], context=context) if first_picking.force_assign(cr, uid, first_picking): first_move = first_picking.move_lines[0] values = {'move%s'%(first_move.id): {'product_qty': 2, 'product_uom':ref('product.product_uom_unit')}} @@ -19,7 +19,7 @@ !python {model: stock.picking}: | import netsvc delivery_orders = self.search(cr, uid, [('sale_id','=',ref("sale.sale_order_8"))]) - last_delivery_order_id = delivery_orders[0] + last_delivery_order_id = delivery_orders[-1] wf_service = netsvc.LocalService("workflow") wf_service.trg_validate(uid, 'stock.picking', last_delivery_order_id, 'button_cancel', cr) -