projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 55ddb36 086b844)
[MERGE] Merge from trunk
authorJosse Colpaert <jco@openerp.com>
Mon, 8 Apr 2013 15:17:51 +0000 (17:17 +0200)
committerJosse Colpaert <jco@openerp.com>
Mon, 8 Apr 2013 15:17:51 +0000 (17:17 +0200)
bzr revid: jco@openerp.com-20130408151751-kta4x8swa6wcmsnl

1  2 
addons/account/account_invoice_view.xml patch | diff1 | diff2 | blob | history
addons/account/account_view.xml patch | diff1 | diff2 | blob | history
addons/account/partner_view.xml patch | diff1 | diff2 | blob | history

diff --cc addons/account/account_view.xml
Simple merge
diff --cc addons/account/partner_view.xml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.