projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c570078 fc3edda)
[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 3 Oct 2012 04:42:56 +0000 (10:12 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 3 Oct 2012 04:42:56 +0000 (10:12 +0530)
bzr revid: mdi@tinyerp.com-20121003044256-aw7p8dw64gzbjj08

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

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.