projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c979339 3571ad2)
[MERGE] Sync with trunk
authorOlivier Dony <odo@openerp.com>
Thu, 15 Nov 2012 13:51:41 +0000 (14:51 +0100)
committerOlivier Dony <odo@openerp.com>
Thu, 15 Nov 2012 13:51:41 +0000 (14:51 +0100)
bzr revid: odo@openerp.com-20121114172252-q1xj3hdugqhky532
bzr revid: odo@openerp.com-20121115135141-ia8uf5649rapj0v7

1  2 
addons/account/account_invoice.py patch | diff1 | diff2 | blob | history
addons/email_template/wizard/mail_compose_message.py patch | diff1 | diff2 | blob | history
addons/portal_sale/security/portal_security.xml patch | diff1 | diff2 | blob | history
addons/sale/sale_view.xml patch | diff1 | diff2 | blob | history

diff --cc addons/account/account_invoice.py
Simple merge
diff --cc addons/sale/sale_view.xml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.