[MERGE] merged csn branch with fixes of access rights on prices.history table

bzr revid: qdp-launchpad@openerp.com-20140120150334-8h6jg5wkwklc2c42

diff --cc addons/stock/security/ir.model.access.csv
index c8c56c3,b64f4a9..f8bc664
--- 1/addons/stock/security/ir.model.access.csv
--- 2/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@@ -70,3 -70,5 +70,5 @@@ access_stock_removal_all,product.remova
  access_stock_move_operation_link_manager,stock.move.operation.link manager,model_stock_move_operation_link,stock.group_stock_manager,1,1,1,1
  access_stock_move_operation_link_user,stock.move.operation.link user,model_stock_move_operation_link,stock.group_stock_user,1,1,1,1
  access_stock_move_operation_link_all,stock.move.operation.link all users,model_stock_move_operation_link,base.group_user,1,0,0,0
 -access_prices_history_stock_user,prices.history stock user,product.model_prices_history,stock.group_stock_user,1,1,0,0
 -access_prices_history_stock_manager,prices.history stock manager,product.model_prices_history,stock.group_stock_manager,1,1,1,1
++access_prices_history_stock_user,prices.history stock user,product.model_prices_history,stock.group_stock_user,1,0,1,0
++access_prices_history_stock_manager,prices.history stock manager,product.model_prices_history,stock.group_stock_manager,1,1,1,1