Merge remote-tracking branch 'odoo/7.0' into 7.0
authorOCA git bot <OCA-git-bot@therp.nl>
Wed, 17 Sep 2014 21:42:42 +0000 (23:42 +0200)
committerOCA git bot <OCA-git-bot@therp.nl>
Wed, 17 Sep 2014 21:42:42 +0000 (23:42 +0200)
commitf5e93654c4088bf067f27e5eadb6f6dc05569cb0
tree20bd5bb1b30251bc0f8531ba589174733a74a776
parent2f2f3869a822c267bb74fde26747273f8b3b5d2d
parent16a969214fd1c468b5a2df6ac4624e588c3e5b35
Merge remote-tracking branch 'odoo/7.0' into 7.0
addons/hr_timesheet_sheet/hr_timesheet_sheet.py
addons/purchase/purchase.py
openerp/modules/loading.py
openerp/osv/orm.py