projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f9e1616 43ed050)
[MERGE] Merge with lp:openobject-addons
authorSbh (Openerp) <sbh@tinyerp.com>
Mon, 14 May 2012 12:45:55 +0000 (18:15 +0530)
committerSbh (Openerp) <sbh@tinyerp.com>
Mon, 14 May 2012 12:45:55 +0000 (18:15 +0530)
bzr revid: sbh@tinyerp.com-20120514124555-xw7sxqnk7w72m8q5

1  2 
addons/mrp/mrp_view.xml patch | diff1 | diff2 | blob | history
addons/procurement/procurement.py patch | diff1 | diff2 | blob | history
addons/procurement/procurement_view.xml patch | diff1 | diff2 | blob | history
addons/product/product_view.xml patch | diff1 | diff2 | blob | history

diff --cc addons/mrp/mrp_view.xml
Simple merge
diff --cc addons/procurement/procurement.py
Simple merge
diff --cc addons/product/product_view.xml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.