Merge remote-tracking branch 'odoo/7.0' into 7.0 7.0_community
authorOCA git bot <OCA-git-bot@therp.nl>
Tue, 25 Nov 2014 22:42:43 +0000 (23:42 +0100)
committerOCA git bot <OCA-git-bot@therp.nl>
Tue, 25 Nov 2014 22:42:43 +0000 (23:42 +0100)
commit87c5703842ff7718634c22064344c1a5185cfd81
treeb1e1faf6136d4fc0a2cd974f1b80fa86925fd383
parentd128b409761835dd40ea5c0b0dbc51adeae3b097
parent4ca389a1a60e7f3266c9e8aedb4961bb6d875bae
Merge remote-tracking branch 'odoo/7.0' into 7.0
addons/account/account_invoice.py
addons/project_timesheet/project_timesheet.py