[MERGE] forward port of branch 7.0 up to revid 9302 chs@openerp.com-20130718111616...
authorChristophe Simonis <chs@openerp.com>
Thu, 18 Jul 2013 11:59:28 +0000 (13:59 +0200)
committerChristophe Simonis <chs@openerp.com>
Thu, 18 Jul 2013 11:59:28 +0000 (13:59 +0200)
commitbf29a2ebc7f493ae8b4ad329f253f460a1cc4b6b
treec4b26cfaf8fdc726568257fb6f14624242072752
parent955eaca4fa72290836b3bf419b82692189f3b40b
parent1e9789baf8cae0c09b3919846071c51b26e769ee
[MERGE] forward port of branch 7.0 up to revid 9302 chs@openerp.com-20130718111616-apacuhc2qhquobtc

bzr revid: dle@openerp.com-20130627104833-b9zgtu8urj43f12b
bzr revid: mat@openerp.com-20130702135856-kmg7d8anw17nkbd8
bzr revid: chs@openerp.com-20130718115928-wpa84dqh8tcq31zt
22 files changed:
addons/account/wizard/account_report_common.py
addons/account_voucher/account_voucher.py
addons/base_calendar/base_calendar.py
addons/base_report_designer/static/base-report-designer-plugin/openerp_report_designer.zip
addons/crm/crm_lead.py
addons/crm/res_partner.py
addons/email_template/wizard/mail_compose_message.py
addons/hr_expense/hr_expense_view.xml
addons/hr_recruitment/hr_recruitment.py
addons/hr_recruitment/hr_recruitment_view.xml
addons/hr_timesheet_invoice/hr_timesheet_invoice.py
addons/l10n_be_coda/wizard/account_coda_import.py
addons/mail/mail_thread.py
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_demo.xml
addons/point_of_sale/wizard/pos_session_opening.py
addons/procurement/schedulers.py
addons/project/project.py
addons/project_issue/project_issue.py
addons/purchase/purchase.py
addons/purchase/wizard/purchase_line_invoice.py
addons/stock/stock_view.xml