projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f693e0 4908975)
[MERGE]: Merge with lp:openobject-trunk-dev-addons2
authoraag (OpenERP) <aag@tinyerp.co.in>
Mon, 13 Dec 2010 05:07:45 +0000 (10:37 +0530)
committeraag (OpenERP) <aag@tinyerp.co.in>
Mon, 13 Dec 2010 05:07:45 +0000 (10:37 +0530)
bzr revid: aag@tinyerp.co.in-20101210053101-unv8h44gej4nvoz6
bzr revid: aag@tinyerp.co.in-20101213050745-lzf3st41udjn66ai

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.