From d53344651fdf9a4e3ab08b8bbcd8674a3e986711 Mon Sep 17 00:00:00 2001 From: "Pinakin Nayi (OpenERP)" Date: Fri, 25 Jan 2013 11:36:24 +0530 Subject: [PATCH 1/5] [FIX]procurement: in procurement exceptions group by reason it gives error bzr revid: pna@tinyerp.com-20130125060624-s80gwrd5b15w12v5 --- addons/procurement/procurement_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index a59838a3a01..7e9c471ba09 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -18,6 +18,7 @@ + From 0118a9640e0463ec6fcf95684eb12a8e8ea45631 Mon Sep 17 00:00:00 2001 From: "Somesh Khare (OpenERP)" Date: Wed, 13 Feb 2013 11:45:37 +0530 Subject: [PATCH 2/5] [FIX] project: Cumulative flow report shows create button on the tree view which is of no use on analysis report(Case; ref 586007) bzr revid: skh@tinyerp.com-20130213061537-eygstzahil29uf3a --- addons/project/report/project_cumulative.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 - + From dc2f67510c59553b76e66e3780e3d3021978fe09 Mon Sep 17 00:00:00 2001 From: "Somesh Khare (OpenERP)" Date: Wed, 13 Feb 2013 18:27:19 +0530 Subject: [PATCH 3/5] [FIX] account: Grouping on field 'template_id' is not possible because that field does not appear in the list view (Case; ref 586077) bzr revid: skh@tinyerp.com-20130213125719-o5virat3zowaio3p --- addons/account/project/project_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 8590ee286d4..5daae9c28e1 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -67,6 +67,7 @@ + From 28a4b350f49de3dbba6355179203a8c832f4b63f Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 28 May 2013 14:48:49 +0200 Subject: [PATCH 4/5] [FIX] sale_stock: property_ids is in mrp bzr revid: mat@openerp.com-20130528124849-u1uren6fjfe1pcxz --- addons/mrp/procurement.py | 5 +++++ addons/sale_stock/sale_stock.py | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) 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/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py index 8cffa0f7775..d7208b63859 100644 --- a/addons/sale_stock/sale_stock.py +++ b/addons/sale_stock/sale_stock.py @@ -306,7 +306,6 @@ class sale_order(osv.osv): 'move_id': move_id, 'company_id': order.company_id.id, 'note': line.name, - 'property_ids': [(6, 0, [x.id for x in line.property_ids])], } def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, context=None): From 2229e4d1d032ec78412d9d770e87213abc34eba9 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 28 May 2013 15:05:21 +0200 Subject: [PATCH 5/5] [FIX] correct test to match new ordering bzr revid: mat@openerp.com-20130528130521-m09g4mhv3iyuefa2 --- addons/sale_stock/test/cancel_order_sale_stock.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale_stock/test/cancel_order_sale_stock.yml b/addons/sale_stock/test/cancel_order_sale_stock.yml index 6805a90ca80..b8ae5a1de1e 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')}}