diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index fb452f2960d..9bbb6a97cee 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -111,12 +111,10 @@ + parent="menu_mrp_property"/> + id="menu_mrp_property_group_action"/> - + parent="base.menu_mrp_root" sequence="2" + groups="base.group_extended"/> + diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv index 95004f69c2a..95f433247c5 100644 --- a/addons/purchase/security/ir.model.access.csv +++ b/addons/purchase/security/ir.model.access.csv @@ -7,8 +7,8 @@ "access_stock_warehouse_purchase_user","stock.warehouse","stock.model_stock_warehouse","group_purchase_user",1,0,0,0 "access_stock_picking_purchase_user","stock.picking","stock.model_stock_picking","group_purchase_user",1,1,1,1 "access_stock_move_purchase_user","stock.move","stock.model_stock_move","group_purchase_user",1,1,1,1 -"access_purchase_order_stock_worker","purchase.order","model_purchase_order","stock.group_stock_user",1,1,1,0 -"access_purchase_order_line_stock_worker","purchase.order.line","model_purchase_order_line","stock.group_stock_user",1,0,1,0 +"access_purchase_order_stock_worker","purchase.order","model_purchase_order","stock.group_stock_user",1,0,0,0 +"access_purchase_order_line_stock_worker","purchase.order.line","model_purchase_order_line","stock.group_stock_user",1,0,0,0 "access_account_tax_purchase_user","account.tax","account.model_account_tax","group_purchase_user",1,0,0,0 "access_report_purchase_order","purchase.report","model_purchase_report","group_purchase_manager",1,0,0,0 "access_report_purchase_order_user","purchase.report user","model_purchase_report","group_purchase_user",1,0,0,0 @@ -36,14 +36,14 @@ "access_account_journal_manager","account.journal","account.model_account_journal","group_purchase_manager",1,0,0,0 "access_account_period","account.period","account.model_account_period","group_purchase_user",1,0,0,0 "access_account_fiscalyear","account.fiscalyear","account.model_account_fiscalyear","group_purchase_user",1,0,0,0 -"access_account_move","account.move","account.model_account_move","group_purchase_user",1,1,1,1 +"access_account_move","account.move","account.model_account_move","group_purchase_user",1,0,0,0 "access_account_move_line","account.move.line","account.model_account_move_line","group_purchase_user",1,0,0,0 "access_account_analytic_line","account.analytic.line","account.model_account_analytic_line","group_purchase_user",1,0,0,0 "access_account_move_reconcile","account.move.reconcile","account.model_account_move_reconcile","group_purchase_user",1,0,0,0 "access_report_stock_move","report.stock.move.manager","stock.model_report_stock_move","group_purchase_manager",1,0,0,0 "access_report_stock_move_user","report.stock.move.user","stock.model_report_stock_move","group_purchase_user",1,0,0,0 -"access_stock_production_lot_user","stock.production.lot user","stock.model_stock_production_lot","group_purchase_user",1,0,1,0 -"access_stock_production_lot_revision","stock.production.lot.revision","stock.model_stock_production_lot_revision","group_purchase_user",1,0,1,0 +"access_stock_production_lot_user","stock.production.lot user","stock.model_stock_production_lot","group_purchase_user",1,1,1,0 +"access_stock_production_lot_revision","stock.production.lot.revision","stock.model_stock_production_lot_revision","group_purchase_user",1,1,1,0 "access_res_partner_purchase_manager","res.partner.purchase.manager","base.model_res_partner","group_purchase_manager",1,1,1,1 "access_product_uom_categ_purchase_manager","product.uom.categ purchase_manager","product.model_product_uom_categ","purchase.group_purchase_manager",1,1,1,1 "access_product_uom_purchase_manager","product.uom purchase_manager","product.model_product_uom","purchase.group_purchase_manager",1,1,1,1 diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml index e4a8a880e9c..4e89de5cc5e 100644 --- a/addons/sale/security/sale_security.xml +++ b/addons/sale/security/sale_security.xml @@ -8,6 +8,9 @@ Sales / User + + Sales / User - See All Leads + @@ -17,34 +20,20 @@ + + Sale Order multi-company ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] - Sale Order Line multi-company ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] - - - Personal Orders - - ['|',('user_id','=',user.id),('user_id','=',False)] - - - - - Personal Order Lines - - ['|',('order_id.user_id','=',user.id),('order_id.user_id','=',False)] - - - Sale Shop multi-company @@ -52,5 +41,34 @@ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + + + Personal Orders + + ['|',('user_id','=',user.id),('user_id','=',False)] + + + + All Orders + + [(1,'=',1)] + + + + + + Personal Order Lines + + ['|',('order_id.user_id','=',user.id),('order_id.user_id','=',False)] + + + + All Orders Lines + + [(1,'=',1)] + + + diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 8d726d2c4e0..8c08041678c 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -11,7 +11,7 @@ - + @@ -389,7 +389,7 @@ {'full':'1',"search_default_available":1} This is the list of all the production lots (serial numbers) you recorded. When you select a lot, you can get the upstream or downstream traceability of the products contained in lot. - + # # Lot composition (history) @@ -529,7 +529,7 @@ {'full':1, 'search_default_in_location':1} Define your locations to reflect your warehouse structure and organization. OpenERP is able to manage physical locations (warehouses, shelves, bin, etc), partner locations (customers, suppliers) and virtual locations which are the counterpart of the stock operations like the manufacturing orders consumptions, inventories, etc. Every stock operation in OpenERP moves the products from one location to another one. For instance, if you receive products from a supplier, OpenERP will move products from the Supplier location to the Stock location. Each report can be performed on physical, partner or virtual locations. - + stock.location.tree @@ -594,7 +594,7 @@ Create and manage your warehouses and assign them a location from here - + stock.picking.calendar @@ -1901,7 +1901,7 @@