projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 50dce74 50f0e7b)
[MERGE]: Merge with lp:openobject-addons
authorrpa (Open ERP) <rpa@tinyerp.com>
Tue, 18 Jan 2011 13:14:59 +0000 (18:44 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Tue, 18 Jan 2011 13:14:59 +0000 (18:44 +0530)
bzr revid: rpa@tinyerp.com-20110118131459-ylpxjil10otxacet

1  2 
addons/purchase/purchase.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/purchase/purchase.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.