[MERGE] Forward-port 7.0 up to 9411a2da
authorOlivier Dony <odo@openerp.com>
Fri, 1 Aug 2014 21:01:57 +0000 (23:01 +0200)
committerOlivier Dony <odo@openerp.com>
Fri, 1 Aug 2014 21:01:57 +0000 (23:01 +0200)
commit5a0a5009944c157f354e1504ec10d2a148232f2b
tree833d3f06b0d52d5dc6c8b682072fccade9a14c1e
parentb20636e0b2fa8590c9b80862249b98689cbcf285
parent9411a2da03ebfe9d1aeacc43c8bd789a64f647e9
[MERGE] Forward-port 7.0 up to 9411a2da
addons/product_visible_discount/product_visible_discount.py
openerp/addons/base/res/res_partner_view.xml
openerp/osv/orm.py