git.inspyration.org Git - odoo/odoo.git/commit - addons/sale_stock/sale

author	Josse Colpaert <jco@openerp.com>
	Wed, 26 Mar 2014 15:50:41 +0000 (16:50 +0100)
committer	Josse Colpaert <jco@openerp.com>
	Wed, 26 Mar 2014 15:50:41 +0000 (16:50 +0100)
commit	56af6792b54b16510ad0115604d1369f3bc244d0
tree	0d45f64335ac54cf318fc6532f36dedf12bd77c2	tree \| snapshot
parent	78457a17ea7175c02baf823c296b5cefe1a52a03	commit \| diff
parent	801d6201b25212283ac9a53d1349381f9af1ed51	commit \| diff

[MERGE] Merge from trunk-wms-loconopreport-jco

bzr revid: jco@openerp.com-20140326155041-rryzcotazkzjcq8j

Unnamed repository; edit this file 'description' to name the repository.

addons/product/product.py	diff1 \|	diff2 \|	blob \| history
addons/sale_stock/sale_stock.py	diff1 \|	diff2 \|	blob \| history
addons/stock/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/stock/stock.py	diff1 \|	diff2 \|	blob \| history
addons/stock/stock_report.xml	diff1 \|	diff2 \|	blob \| history
addons/stock/views.moved/report_package_barcode.xml	\|	\|	blob
addons/stock_account/wizard/stock_valuation_history.py	diff1 \|	diff2 \|	blob \| history