[MERGE] forward port of branch 7.0 up to 9cc54dc
authorDenis Ledoux <dle@odoo.com>
Wed, 1 Oct 2014 10:41:42 +0000 (12:41 +0200)
committerDenis Ledoux <dle@odoo.com>
Wed, 1 Oct 2014 10:41:42 +0000 (12:41 +0200)
commit3d4b82cd5625956b6a723c19ee0cff41b30629e4
tree50905e2232c99f52a6aae57e084f1d52d694413f
parentb235c9d1fb75e0945c399b0f82e22569bbc679ed
parent9cc54dcd2c09610e95cd379d4b7e216630a72b51
[MERGE] forward port of branch 7.0 up to 9cc54dc
addons/hr_expense/hr_expense.py
addons/hr_payroll_account/hr_payroll_account.py
addons/product/product.py
addons/purchase/purchase.py