diff --git a/addons/account_analytic_analysis/account_analytic_analysis_cron.xml b/addons/account_analytic_analysis/account_analytic_analysis_cron.xml index 3264facdf89..311d8708872 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_cron.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_cron.xml @@ -30,7 +30,7 @@ Hello ${object.name}, ${account.date_start} to ${account.date and account.date or '???'} % if account.quantity_max != 0.0: - ${account.quantity}/${account.quantity_max} hours + ${account.remaining_hours}/${account.quantity_max} units % endif ${account.partner_id.phone or ''}, ${account.partner_id.email or ''} diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml index dfbded83baa..50cdaff44d1 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml @@ -161,6 +161,7 @@ + @@ -201,6 +202,7 @@ + diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index af5fc2f3890..85e21d5fbc5 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -258,6 +258,9 @@ class account_analytic_account(osv.osv): (check_recursion, 'Error! You cannot create recursive analytic accounts.', ['parent_id']), ] + def name_create(self, cr, uid, name, context=None): + raise osv.except_osv(_('Warning'), _("Quick account creation disallowed.")) + def copy(self, cr, uid, id, default=None, context=None): if not default: default = {}