merge sale stock loc
authorjke-openerp <jke@openerp.com>
Tue, 8 Oct 2013 14:32:31 +0000 (16:32 +0200)
committerjke-openerp <jke@openerp.com>
Tue, 8 Oct 2013 14:32:31 +0000 (16:32 +0200)
commitd86e8623a3131b32329f2b08377db250421d7824
tree3209211bbf3bbca567a6c623615a9bae9551f124
parent0ad5ed7c8a948dd3ed7388051cdc9e94a5d852ef
merge sale stock loc

bzr revid: jke@openerp.com-20131008143231-6l30g8z2bju8z4cu
13 files changed:
addons/sale_stock/res_config.py
addons/sale_stock/res_config_view.xml
addons/sale_stock/sale_stock.py
addons/sale_stock/sale_stock_view.xml
addons/sale_stock/security/sale_stock_security.xml
addons/sale_stock/stock_view.xml
addons/sale_stock_location/__init__.py [deleted file]
addons/sale_stock_location/__openerp__.py [deleted file]
addons/sale_stock_location/res_config.py [deleted file]
addons/sale_stock_location/res_config_view.xml [deleted file]
addons/sale_stock_location/sale_stock_location.py [deleted file]
addons/sale_stock_location/sale_stock_location_view.xml [deleted file]
addons/sale_stock_location/security/sale_stock_location_security.xml [deleted file]