projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e347011 de07c64)
[MERGE] forward port of branch 7.0 up to de07c64
authorChristophe Simonis <chs@odoo.com>
Fri, 28 Nov 2014 14:16:38 +0000 (15:16 +0100)
committerChristophe Simonis <chs@odoo.com>
Fri, 28 Nov 2014 14:16:38 +0000 (15:16 +0100)
1  2 
addons/product/product.py patch | diff1 | diff2 | blob | history
addons/product/product_data.xml patch | diff1 | diff2 | blob | history
openerp/addons/base/res/res_partner.py patch | diff1 | diff2 | blob | history

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