[MERGE] small fixes
bzr revid: qdp-launchpad@openerp.com-20140507082354-v6til9vb0vwwzrh2
This commit is contained in:
commit
683c0f1866
|
@ -61,6 +61,7 @@ access_stock_location_path_sale_manager,stock.location.path partner salemanager,
|
|||
access_stock_location_path_stock_user,stock.location.path stock user,model_stock_location_path,stock.group_stock_user,1,1,1,1
|
||||
access_stock_location_path,stock.location.path,model_stock_location_path,base.group_sale_salesman,1,0,0,0
|
||||
access_stock_location_route,stock.location.route,model_stock_location_route,stock.group_stock_manager,1,1,1,1
|
||||
access_stock_location_route,stock.location.route,model_stock_location_route,base.group_user,1,0,0,0
|
||||
access_procurement_rule,procurement.rule.flow,model_procurement_rule,base.group_sale_salesman,1,0,0,0
|
||||
access_procurement_rule_internal,procurement.rule.flow internal,model_procurement_rule,base.group_user,1,0,0,0
|
||||
access_stock_pack_operation_manager,stock.pack.operation manager,model_stock_pack_operation,stock.group_stock_manager,1,1,1,1
|
||||
|
@ -73,4 +74,4 @@ access_stock_move_operation_link_manager,stock.move.operation.link manager,model
|
|||
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_product_price_history_stock_user,prices.history stock user,product.model_product_price_history,stock.group_stock_user,1,0,1,0
|
||||
access_product_price_history_stock_manager,prices.history stock manager,product.model_product_price_history,stock.group_stock_manager,1,1,1,1
|
||||
access_product_price_history_stock_manager,prices.history stock manager,product.model_product_price_history,stock.group_stock_manager,1,1,1,1
|
||||
|
|
|
|
@ -627,7 +627,7 @@ function openerp_picking_widgets(instance){
|
|||
// if we have a specified picking id, we load that one, and we load the picking of the same type as the active list
|
||||
if( picking_id ){
|
||||
var loaded_picking = new instance.web.Model('stock.picking')
|
||||
.call('read',[[picking_id], [], new instance.web.CompoundContext()])
|
||||
.call('read',[[parseInt(picking_id)], [], new instance.web.CompoundContext()])
|
||||
.then(function(picking){
|
||||
self.picking = picking[0];
|
||||
|
||||
|
|
Loading…
Reference in New Issue