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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b14d68e 8ce1789)

author	Quentin De Paoli <qdp@cyan>
	Thu, 3 Jun 2010 12:46:08 +0000 (14:46 +0200)
committer	Quentin De Paoli <qdp@cyan>
	Thu, 3 Jun 2010 12:46:08 +0000 (14:46 +0200)
commit	5eab03db0d0f282e3efe89826c6338f1a42a1313
tree	85100f0094c846b246334392cb2a95e625159593	tree \| snapshot
parent	b14d68ebc4850f80bf5476b372ac5595cb1165e0	commit \| diff
parent	8ce1789a575992f1cc7eab99ee1f1d6a9839d4c3	commit \| diff

[MERGE]

bzr revid: qdp@cyan-20100603124608-0eygwi4rlt9nbteq

14 files changed:

addons/mrp/mrp_view.xml	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/pos_view.xml	diff1 \|	diff2 \|	blob \| history
addons/procurement/procurement.py	diff1 \|	\|	blob \| history
addons/procurement/procurement_view.xml	diff1 \|	\|	blob \| history
addons/product/product.py	diff1 \|	diff2 \|	blob \| history
addons/product/product_data.xml	diff1 \|	diff2 \|	blob \| history
addons/product/product_view.xml	diff1 \|	diff2 \|	blob \| history
addons/project_mrp/mrp.py	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase.py	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase_view.xml	diff1 \|	diff2 \|	blob \| history
addons/sale/report/sale_report.py	diff1 \|	diff2 \|	blob \| history
addons/sale/sale.py	diff1 \|	diff2 \|	blob \| history
addons/stock/stock.py	diff1 \|	diff2 \|	blob \| history
addons/stock/stock_view.xml	diff1 \|	diff2 \|	blob \| history

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