From f9a5008bea270a39d863b04f6a023cb05f764962 Mon Sep 17 00:00:00 2001 From: "nel@tinyerp.com" <> Date: Wed, 31 Mar 2010 16:58:35 +0200 Subject: [PATCH] [FIX] Change names of wizards fix m2m pblems bzr revid: nel@tinyerp.com-20100331145835-hdbmoi82996fvy6w --- addons/board_account/__terp__.py | 3 --- addons/stock/stock.py | 8 ++++---- addons/stock/wizard/__init__.py | 4 ++-- addons/stock/wizard/stock_picking_make.py | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/addons/board_account/__terp__.py b/addons/board_account/__terp__.py index b22221ae1e3..58de913f2ea 100644 --- a/addons/board_account/__terp__.py +++ b/addons/board_account/__terp__.py @@ -38,9 +38,6 @@ 'account', 'hr_timesheet_invoice', 'board', -# 'report_account', -# 'report_analytic', -# 'report_analytic_line', 'account_report' ], 'update_xml': ['board_account_view.xml'], diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 22c9c5d362f..b28895024f3 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -2122,7 +2122,7 @@ class report_products_to_received_planned(osv.osv): tools.drop_view_if_exists(cr, 'report_products_to_received_planned') cr.execute(""" create or replace view report_products_to_received_planned as ( - select stock.date, min(stock.id), sum(stock.product_qty) as qty, 0 as planned_qty + select stock.date, min(stock.id) as id, sum(stock.product_qty) as qty, 0 as planned_qty from stock_picking picking inner join stock_move stock on picking.id = stock.picking_id and picking.type = 'in' @@ -2131,7 +2131,7 @@ class report_products_to_received_planned(osv.osv): union - select stock.date_planned, min(stock.id), 0 as actual_qty, sum(stock.product_qty) as planned_qty + select stock.date_planned, min(stock.id) as id, 0 as actual_qty, sum(stock.product_qty) as planned_qty from stock_picking picking inner join stock_move stock on picking.id = stock.picking_id and picking.type = 'in' @@ -2156,7 +2156,7 @@ class report_delivery_products_planned(osv.osv): tools.drop_view_if_exists(cr, 'report_delivery_products_planned') cr.execute(""" create or replace view report_delivery_products_planned as ( - select stock.date, min(stock.id), sum(stock.product_qty) as qty, 0 as planned_qty + select stock.date, min(stock.id) as id, sum(stock.product_qty) as qty, 0 as planned_qty from stock_picking picking inner join stock_move stock on picking.id = stock.picking_id and picking.type = 'out' @@ -2176,4 +2176,4 @@ class report_delivery_products_planned(osv.osv): ) """) report_delivery_products_planned() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py index 6f5a83a07b3..d8702212646 100644 --- a/addons/stock/wizard/__init__.py +++ b/addons/stock/wizard/__init__.py @@ -23,12 +23,12 @@ import stock_traceability import stock_move import stock_partial_picking import stock_partial_move -import wizard_picking_make +import stock_picking_make import wizard_replacement import wizard_return import wizard_split_lot_line import wizard_ups -import inventory_merge +import stock_inventory_merge import stock_inventory_set_stock_zero import stock_fill_inventory import stock_inventory_line_split diff --git a/addons/stock/wizard/stock_picking_make.py b/addons/stock/wizard/stock_picking_make.py index 6ac54ee3bc1..c03b478a3a9 100644 --- a/addons/stock/wizard/stock_picking_make.py +++ b/addons/stock/wizard/stock_picking_make.py @@ -32,7 +32,7 @@ class stock_picking_make(osv.osv_memory): _name = "stock.picking.make" _description = "Make picking" _columns = { - 'pickings': fields.many2many('stock.picking', 'Picking', required=True), + 'pickings': fields.many2many('stock.picking','picking_rel', 'stock_id', 'pick_id', 'Picking', required=True), } ARCH = '''