git.inspyration.org Git - odoo/odoo.git/commit

[MERGE]: Merge with lp:openobject-trunk-dev-addons2

bzr revid: ksa@tinyerp.co.in-20101020045725-3ozsb1aw379acz63

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

addons/account/account_view.xml	diff1 \|	diff2 \|	blob \| history
addons/mrp/mrp.py	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase.py	diff1 \|	diff2 \|	blob \| history
addons/sale_crm/wizard/crm_make_sale.py	diff1 \|	diff2 \|	blob \| history
addons/stock/stock.py	diff1 \|	diff2 \|	blob \| history
addons/stock/stock_view.xml	diff1 \|	diff2 \|	blob \| history