[MERGE] From trunk
authorCecile Tonglet <cto@openerp.com>
Mon, 17 Dec 2012 14:43:06 +0000 (15:43 +0100)
committerCecile Tonglet <cto@openerp.com>
Mon, 17 Dec 2012 14:43:06 +0000 (15:43 +0100)
commit15fe5156011f67b575aa5f819d52735cb999b3c8
tree30f0466d251ecb4669b600445e07778b26a3fa86
parent6072fd11afb076b1781e23096a8c8794df3a00c7
parentd7461fb1c813590d70ddecaeff65c02a1029d61b
[MERGE] From trunk

bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
52 files changed:
addons/account/account.py
addons/account/account_bank_statement.py
addons/account/edi/invoice.py
addons/account_analytic_analysis/cron_account_analytic_account.py
addons/account_analytic_plans/report/crossovered_analytic.py
addons/account_budget/account_budget.py
addons/account_followup/account_followup.py
addons/account_followup/report/account_followup_print.py
addons/analytic/analytic.py
addons/anonymization/anonymization.py
addons/base_calendar/base_calendar.py
addons/base_calendar/crm_meeting.py
addons/base_setup/res_config.py
addons/crm/crm.py
addons/crm/crm_lead.py
addons/document_webdav/webdav.py
addons/email_template/email_template.py
addons/fleet/fleet.py
addons/hr_evaluation/hr_evaluation.py
addons/hr_holidays/report/holidays_summary_report.py
addons/hr_timesheet/hr_timesheet.py
addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
addons/hr_timesheet_invoice/hr_timesheet_invoice.py
addons/hr_timesheet_sheet/hr_timesheet_sheet.py
addons/l10n_be_coda/l10n_be_coda.py
addons/l10n_be_coda/wizard/account_coda_import.py
addons/mail/mail_followers.py
addons/mail/mail_group.py
addons/mail/mail_group_menu.py
addons/mail/mail_mail.py
addons/mail/mail_message.py
addons/mail/mail_thread.py
addons/mail/res_users.py
addons/mail/tests/test_mail_features.py
addons/mail/wizard/invite.py
addons/mail/wizard/mail_compose_message.py
addons/mrp/mrp.py
addons/mrp_byproduct/mrp_byproduct.py
addons/mrp_operations/mrp_operations.py
addons/mrp_repair/mrp_repair.py
addons/mrp_repair/wizard/make_invoice.py
addons/product_margin/wizard/product_margin.py
addons/project/project.py
addons/project_long_term/project_long_term.py
addons/project_timesheet/report/task_report.py
addons/sale/edi/sale_order.py
addons/sale/sale.py
addons/sale_stock/sale_stock.py
addons/share/wizard/share_wizard.py
addons/stock/stock.py
addons/survey/wizard/survey_answer.py
addons/warning/warning.py