[MERGE] forward port of branch 7.0 up to 5f696ba
authorDenis Ledoux <dle@odoo.com>
Fri, 8 Aug 2014 14:18:35 +0000 (16:18 +0200)
committerDenis Ledoux <dle@odoo.com>
Fri, 8 Aug 2014 14:18:35 +0000 (16:18 +0200)
commit81a902a07daacfcb22224627df3d51b719ba5643
tree07c11226fc5fa2c9cb7e6447789e6ef50ce8b977
parent02bf0fd9c862e84ad728125fe8bf53ef866fb8b6
parent5f696ba86c5acdde11199ff4e7a41b9d7ace815f
[MERGE] forward port of branch 7.0 up to 5f696ba
addons/account_analytic_plans/account_analytic_plans.py
addons/account_anglo_saxon/invoice.py
addons/point_of_sale/static/src/xml/pos.xml
addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
openerp/tools/yaml_import.py