diff --git a/addons/board_manufacturing/__terp__.py b/addons/board_manufacturing/__terp__.py index 9c644262969..50afa0d6cbc 100644 --- a/addons/board_manufacturing/__terp__.py +++ b/addons/board_manufacturing/__terp__.py @@ -32,7 +32,7 @@ * List of procurement in exception """, 'author': 'Tiny', - 'depends': ['board', 'mrp', 'stock', 'report_mrp'], + 'depends': ['board', 'mrp', 'stock' ], 'update_xml': ['board_manufacturing_view.xml'], 'demo_xml': ['board_manufacturing_demo.xml'], 'installable': True, diff --git a/addons/board_manufacturing/board_manufacturing_view.xml b/addons/board_manufacturing/board_manufacturing_view.xml index 7e913209c4a..df4a6805afb 100644 --- a/addons/board_manufacturing/board_manufacturing_view.xml +++ b/addons/board_manufacturing/board_manufacturing_view.xml @@ -20,9 +20,9 @@ - + - + diff --git a/addons/mrp/report/mrp_production_order.py b/addons/mrp/report/mrp_production_order.py index ba3e9dd7730..d2299a19731 100644 --- a/addons/mrp/report/mrp_production_order.py +++ b/addons/mrp/report/mrp_production_order.py @@ -32,6 +32,7 @@ class mrp_production_order(osv.osv): ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True), 'reference': fields.char('Reference', size=64, required=True), 'origin': fields.char('Source Document', size=64), + 'nbr': fields.integer('# of Orders', readonly=True), 'product_id': fields.many2one('product.product', 'Product', required=True, domain=[('type','<>','service')]), 'state': fields.selection([('draft','Draft'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'State', readonly=True), 'scheduled_date':fields.date('Scheduled Date'), @@ -50,6 +51,7 @@ class mrp_production_order(osv.osv): to_char(c.create_date, 'MM') as month, c.state, c.product_id, + count(*) as nbr, to_date(to_char(c.date_planned, 'dd-MM-YYYY'),'dd-MM-YYYY') as scheduled_date, c.name as reference, c.origin, diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml index d3ef3ec82b6..841c1b9084e 100644 --- a/addons/mrp/report/mrp_production_order_view.xml +++ b/addons/mrp/report/mrp_production_order_view.xml @@ -17,6 +17,7 @@ + @@ -39,18 +40,17 @@ - - - - - - - - - - - - + + mrp.production.order.graph + mrp.production.order + graph + + + + + + + mrp.production.order.select @@ -89,7 +89,7 @@ Production Order mrp.production.order form - tree + tree,graph @@ -101,12 +101,12 @@ - - - - - - + + + graph + + + diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv index ea845f9db51..9913071038c 100644 --- a/addons/mrp/security/ir.model.access.csv +++ b/addons/mrp/security/ir.model.access.csv @@ -32,4 +32,6 @@ "access_mrp_production_stock_worker","mrp.production stock_worker","model_mrp_production","stock.group_stock_user",1,0,0,0 "access_mrp_installer","mrp.installer","model_mrp_installer","mrp.group_mrp_user",1,0,0,0 "access_mrp_product_produce","mrp.product.produce","model_mrp_product_produce","mrp.group_mrp_user",1,0,0,0 -"access_mrp_production_order","mrp.production.order","model_mrp_production_order","mrp.group_mrp_user",,,, +"access_mrp_production_order","mrp.production.order","model_mrp_production_order","mrp.group_mrp_user",1,0,0,0 +"access_report_workcenter_load","report.workcenter.load","model_report_workcenter_load","mrp.group_mrp_manager",1,0,0,0 +"access_report_mrp_inout","report.mrp.inout","model_report_mrp_inout","mrp.group_mrp_manager",1,0,0,0 diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py index 794793e3baa..e094d9dcb37 100644 --- a/addons/point_of_sale/__terp__.py +++ b/addons/point_of_sale/__terp__.py @@ -36,7 +36,7 @@ Main features : """, 'author': 'Tiny', - 'depends': ['sale', 'delivery','report_mrp'], + 'depends': ['sale', 'delivery'], # 'depends': ['sale', 'purchase', 'account', 'account_tax_include','board','mrp','board_manufacturing','delivery','profile_manufacturing','account','multi_company'], 'init_xml': [ 'security/point_of_sale_security.xml', diff --git a/addons/point_of_sale/statement_data.xml b/addons/point_of_sale/statement_data.xml index 641cb8e52cf..947348a990d 100644 --- a/addons/point_of_sale/statement_data.xml +++ b/addons/point_of_sale/statement_data.xml @@ -33,7 +33,7 @@ - + diff --git a/addons/report_mrp/__terp__.py b/addons/report_mrp/__terp__.py index b58dbd5c601..5f14cc517b8 100644 --- a/addons/report_mrp/__terp__.py +++ b/addons/report_mrp/__terp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -30,7 +30,7 @@ 'website': 'http://www.openerp.com', 'depends': ['mrp'], 'init_xml': [], - 'update_xml': ['security/ir.model.access.csv', 'report_mrp_view.xml'], + 'update_xml': ['security/ir.model.access.csv', ], 'demo_xml': [], 'installable': True, 'certificate': '0071582896029', diff --git a/addons/report_mrp/security/ir.model.access.csv b/addons/report_mrp/security/ir.model.access.csv index 57029b92b13..0343f29f43a 100644 --- a/addons/report_mrp/security/ir.model.access.csv +++ b/addons/report_mrp/security/ir.model.access.csv @@ -1,3 +1 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_report_workcenter_load,report.workcenter.load,model_report_workcenter_load,mrp.group_mrp_manager,1,0,0,0 -access_report_mrp_inout,report.mrp.inout,model_report_mrp_inout,mrp.group_mrp_manager,1,0,0,0 +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"