projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a09a74 df64948)
[MERGE]: Merge with lp:openobject-trunk-dev-addons2
authorksa (Open ERP) <ksa@tinyerp.co.in>
Mon, 15 Nov 2010 04:55:10 +0000 (10:25 +0530)
committerksa (Open ERP) <ksa@tinyerp.co.in>
Mon, 15 Nov 2010 04:55:10 +0000 (10:25 +0530)
bzr revid: ksa@tinyerp.co.in-20101115045510-0qmgqiz8n20fmtnm

1  2 
addons/product/product.py patch | diff1 | diff2 | blob | history
addons/stock/stock.py patch | diff1 | diff2 | blob | history
addons/stock/stock_view.xml patch | diff1 | diff2 | blob | history

diff --cc addons/product/product.py
Simple merge
diff --cc addons/stock/stock.py
Simple merge
diff --cc addons/stock/stock_view.xml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.