projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 714596c 01d9ea6)
[MERGE] Sync with trunk
authorRichard Mathot (OpenERP) <rim@openerp.com>
Mon, 14 Apr 2014 09:03:36 +0000 (11:03 +0200)
committerRichard Mathot (OpenERP) <rim@openerp.com>
Mon, 14 Apr 2014 09:03:36 +0000 (11:03 +0200)
bzr revid: rim@openerp.com-20140414090336-vc5283odv5f612es

1  2 
addons/account/account_invoice.py patch | diff1 | diff2 | blob | history
addons/sale/sale.py patch | diff1 | diff2 | blob | history

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