diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml index 20a99f0ab6a..04e4b592aef 100644 --- a/addons/stock/board_warehouse_view.xml +++ b/addons/stock/board_warehouse_view.xml @@ -40,9 +40,7 @@ - - + diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml index 12a43a5abbe..df91f1f7737 100644 --- a/addons/stock/report/report_stock_move_view.xml +++ b/addons/stock/report/report_stock_move_view.xml @@ -45,7 +45,7 @@ - + diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv index 285eebccde5..e879a03e9e1 100644 --- a/addons/stock/security/ir.model.access.csv +++ b/addons/stock/security/ir.model.access.csv @@ -32,8 +32,6 @@ "access_stock_lines_date_manager","report.stock.lines.date manager","model_report_stock_lines_date","stock.group_stock_manager",1,1,1,1 "access_stock_lines_date_system","report.stock.lines.date system","model_report_stock_lines_date","base.group_system",1,0,0,0 "access_stock_report_tracklots","stock.report.tracklots","model_stock_report_tracklots","stock.group_stock_user",1,1,1,1 -"access_report_products_to_received_planned","report.products.to.received.planned","model_report_products_to_received_planned","stock.group_stock_user",1,1,1,1 -"access_report_delivery_products_planned","report.delivery.products.planned","model_report_delivery_products_planned","stock.group_stock_user",1,1,1,1 "access_report_stock_move_user","report.stock.move user","model_report_stock_move","stock.group_stock_user",1,0,0,0 "access_report_stock_move_system","report.stock.move system","model_report_stock_move","base.group_system",1,0,0,0 "access_report_stock_move_manager","report.stock.move manager","model_report_stock_move","stock.group_stock_manager",1,1,1,1 diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 3a70b387d49..bdad93d7e5e 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -2561,73 +2561,5 @@ class stock_picking_move_wizard(osv.osv_memory): stock_picking_move_wizard() -class report_products_to_received_planned(osv.osv): - _name = "report.products.to.received.planned" - _description = "Received Products vs Planned" - _auto = False - _columns = { - 'date':fields.date('Date'), - 'qty': fields.float('Actual Qty', digits_compute=dp.get_precision('Product UoM')), - 'planned_qty': fields.float('Planned Qty', digits_compute=dp.get_precision('Product UoM')), - - } - def init(self, cr): - 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.create_date as 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' - where stock.create_date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7) - group by stock.create_date - - union - - select stock.date as date , 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' - where stock.date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7) - group by stock.date - ) - """) - -report_products_to_received_planned() - -class report_delivery_products_planned(osv.osv): - _name = "report.delivery.products.planned" - _description = "Delivered products vs Planned" - _auto = False - _columns = { - 'date':fields.date('Date'), - 'qty': fields.float('Actual Qty', digits_compute=dp.get_precision('Product UoM')), - 'planned_qty': fields.float('Planned Qty', digits_compute=dp.get_precision('Product UoM')), - - } - - def init(self, cr): - tools.drop_view_if_exists(cr, 'report_delivery_products_planned') - cr.execute(""" - create or replace view report_delivery_products_planned as ( - select stock.create_date as 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' - where stock.create_date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7) - group by stock.create_date - - union - - select stock.date as date, min(stock.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 = 'out' - where stock.date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7) - group by stock.date - ) - """) - -report_delivery_products_planned() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index cd2c6439326..1a8a13c0f7b 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1953,78 +1953,6 @@ - - - - Products To Received - report.products.to.received.planned - tree - - - - - - - - - - - Products To Received - report.products.to.received.planned - graph - - - - - - - - - - - Number of Products to receive Vs planned - report.products.to.received.planned - ir.actions.act_window - form - graph,tree - - - - - - Delivery Products - report.delivery.products.planned - tree - - - - - - - - - - - Delivery Products - report.delivery.products.planned - graph - - - - - - - - - - - Delivery Products Vs Planned - report.delivery.products.planned - ir.actions.act_window - form - graph,tree - - Customers Packings