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

author	Bharat R. Devnani (OpenERP) <bde@tinyerp.com>
	Fri, 18 Apr 2014 06:12:56 +0000 (11:42 +0530)
committer	Bharat R. Devnani (OpenERP) <bde@tinyerp.com>
	Fri, 18 Apr 2014 06:12:56 +0000 (11:42 +0530)
commit	b8d4387d33740161ca2efcba9a5450a97477d869
tree	b7f18334fe39ffd4c656a3757c898ae77fa3fdf7	tree \| snapshot
parent	9e102b6b243111847533d920748e301ecb5786a6	commit \| diff
parent	04c809e9f6444ccf6c38befb99c0e5741e629964	commit \| diff

[MERGE] merged with main addons branch

bzr revid: bde@tinyerp.com-20140418061256-n53rymt5j8krzvr5

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

addons/hr_timesheet_sheet/hr_timesheet_sheet.py	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase.py	diff1 \|	diff2 \|	blob \| history
addons/sale_stock/sale_stock.py	diff1 \|	diff2 \|	blob \| history
addons/stock/stock.py	diff1 \|	diff2 \|	blob \| history