[MERGE] Sync with trunk
authorOlivier Dony <odo@openerp.com>
Wed, 24 Oct 2012 09:06:15 +0000 (11:06 +0200)
committerOlivier Dony <odo@openerp.com>
Wed, 24 Oct 2012 09:06:15 +0000 (11:06 +0200)
commit88dcca513f005fd5d3366e2895d75a48b8058aaf
tree82cca038768c580752ffa2653b17ba3a09f76727
parent6fadb453259697c10cf2aed0be33c41760dc246b
parentb2d31c0e914ca21c8aad348c4f320daa4162bf32
[MERGE] Sync with trunk

bzr revid: odo@openerp.com-20121024090615-zuh7aub6fhcwhy82
addons/account/account_invoice.py
addons/sale/sale.py