From 8d26e7858252da7e78becc0ea8ce07e948b403eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 19 Dec 2012 22:23:30 +0100 Subject: [PATCH] [IMP] Addons: removed bold in subtype descriptions. bzr revid: tde@openerp.com-20121219212330-xfx3lykstl1nsa8m --- addons/account/data/account_data.xml | 4 +- addons/crm/crm_lead_data.xml | 37 ++++++++++--------- addons/hr_holidays/hr_holidays_data.xml | 6 +-- addons/hr_recruitment/hr_recruitment_data.xml | 6 +-- addons/mail/mail_thread.py | 10 ++--- addons/project/project_data.xml | 20 +++++----- addons/project_issue/project_issue.py | 3 +- addons/project_issue/project_issue_data.xml | 22 +++++------ addons/sale/sale.py | 2 +- addons/sale/sale_data.xml | 8 ++-- addons/sale_crm/sale_crm_data.xml | 8 ++-- 11 files changed, 64 insertions(+), 62 deletions(-) diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml index eeca792b970..0406efd4526 100644 --- a/addons/account/data/account_data.xml +++ b/addons/account/data/account_data.xml @@ -155,12 +155,12 @@ Validated account.invoice - Invoice <b>validated</b> + Invoice validated Paid account.invoice - Invoice <b>paid</b> + Invoice paid diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml index 96ce219bbb6..da677972b8b 100644 --- a/addons/crm/crm_lead_data.xml +++ b/addons/crm/crm_lead_data.xml @@ -159,63 +159,64 @@ Lead Created crm.lead - Opportunity <b>created</b> + Opportunity created Lead to Opportunity crm.lead + Lead converted into an opportunity Stage Changed crm.lead - Stage <b>changed</b> + Stage changed + + + Opportunity Won + crm.lead + Opportunity won Opportunity Lost crm.lead - Opportunity <b>lost</b> - - - Opportunity Won - crm.lead - Opportunity <b>won</b> + Opportunity lost - ST-Lead Created + Lead Created crm.case.section section_id - ST-Lead to Opportunity + Lead to Opportunity crm.case.section section_id - ST-Stage Changed + Opportunity Stage Changed crm.case.section section_id + + Opportunity Won + crm.case.section + + section_id + - ST-Opportunity Lost + Opportunity Lost crm.case.section section_id - - ST-Opportunity Won - crm.case.section - - section_id - diff --git a/addons/hr_holidays/hr_holidays_data.xml b/addons/hr_holidays/hr_holidays_data.xml index 056000199b8..365423427c5 100644 --- a/addons/hr_holidays/hr_holidays_data.xml +++ b/addons/hr_holidays/hr_holidays_data.xml @@ -49,18 +49,18 @@ To Approve hr.holidays - Request <b>confirmed</b>, waiting confirmation + Request confirmed, waiting confirmation Approved hr.holidays - Request <b>approved</b> + Request approved Refused hr.holidays - Request <b>refused</b> + Request refused diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml index 0d46af13b35..13736d1442a 100644 --- a/addons/hr_recruitment/hr_recruitment_data.xml +++ b/addons/hr_recruitment/hr_recruitment_data.xml @@ -470,18 +470,18 @@ Stage Changed hr.applicant - Stage <b>changed</b> + Stage changed Applicant Hired hr.applicant - Applicant <b>hired</b> + Applicant hired Applicant Refused hr.applicant - Applicant <b>refused</b> + Applicant refused diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 67c1420b5aa..92082d59b5e 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -247,7 +247,7 @@ class mail_thread(osv.AbstractModel): # automatic logging unless asked not to (mainly for various testing purpose) if not context.get('mail_create_nolog'): - self.message_post(cr, uid, thread_id, body='Document created.', context=context) + self.message_post(cr, uid, thread_id, body='Document created', context=context) return thread_id def write(self, cr, uid, ids, values, context=None): @@ -342,12 +342,12 @@ class mail_thread(osv.AbstractModel): for col_name, col_info in tracked_fields.items(): if record[col_name] == initial[col_name] and getattr(self._all_columns[col_name].column, 'track_visibility', 0) == 2: tracked_values[col_name] = dict(col_info=col_info['string'], - new_value=convert_for_display(record[col_name], col_info)) + new_value=convert_for_display(record[col_name], col_info)) elif record[col_name] != initial[col_name]: if getattr(self._all_columns[col_name].column, 'track_visibility', 0) in [1, 2]: tracked_values[col_name] = dict(col_info=col_info['string'], - old_value=convert_for_display(initial[col_name], col_info), - new_value=convert_for_display(record[col_name], col_info)) + old_value=convert_for_display(initial[col_name], col_info), + new_value=convert_for_display(record[col_name], col_info)) if col_name in tracked_fields: changes.append(col_name) if not changes: @@ -369,7 +369,7 @@ class mail_thread(osv.AbstractModel): except ValueError, e: _logger.debug('subtype %s not found, giving error "%s"' % (subtype, e)) continue - message = format_message(subtype_rec.description, tracked_values) + message = format_message(subtype_rec.description if subtype_rec.description else subtype_rec.name, tracked_values) self.message_post(cr, uid, record['id'], body=message, subtype=subtype, context=context) posted = True if not posted: diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml index 58aa11bc398..56a21342d9e 100644 --- a/addons/project/project_data.xml +++ b/addons/project/project_data.xml @@ -83,58 +83,58 @@ Task Created project.task - Task <b>created</b> + Task created Task Started project.task - Task <b>started</b> + Task started Task Blocked project.task - Task <b>blocked</b> + Task blocked Task Done project.task - Task <b>closed</b> + Task closed Stage Changed project.task - Stage <b>changed</b> + Stage changed - PT-Task Created + Task Created project.project project_id - PT-Task Started + Task Started project.project project_id - PT-Task Blocked + Task Blocked project.project project_id - PT-Task Done + Task Done project.project project_id - PT-Stage Changed + Task Stage Changed project.project project_id diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index a7ffc79002d..e65055491a2 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -52,11 +52,12 @@ class project_issue(base_stage, osv.osv): _track = { 'state': { + 'project_issue.mt_issue_new': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'new', 'project_issue.mt_issue_closed': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done', 'project_issue.mt_issue_started': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'open', }, 'stage_id': { - 'project_issue.mt_issue_stage': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['done', 'open'], + 'project_issue.mt_issue_stage': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['new', 'done', 'open'], }, 'kanban_state': { 'project_issue.mt_issue_blocked': lambda self, cr, uid, obj, ctx=None: obj['kanban_state'] == 'blocked', diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml index 5b11d1ca510..55ec90b430d 100644 --- a/addons/project_issue/project_issue_data.xml +++ b/addons/project_issue/project_issue_data.xml @@ -48,60 +48,60 @@ Access all issues from the top Project menu, and access the issues of a specific Issue Created project.issue - Issue <b>created</b> + Issue created Issue Started project.issue - Issue <b>started</b> + Issue started Issue Blocked project.issue - Issue <b>blocked</b> + Issue blocked Issue Closed project.issue - Issue <b>closed</b> + Issue closed Stage Changed project.issue - Stage <b>changed</b> + Stage changed - PJ-Issue Created + Issue Created project.project project_id - PJ-Issue Started + Issue Started project.project project_id - PJ-Issue Blocked + Issue Blocked project.project project_id - PJ-Issue Closed + Issue Closed project.project project_id - PJ-Stage Changed + Issue Stage Changed project.project - Stage <b>changed</b> + Stage changed project_id diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 4bf96924bd2..616e1642bf0 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -52,7 +52,7 @@ class sale_order(osv.osv): _track = { 'state': { 'sale.mt_order_confirmed': lambda self, cr, uid, obj, ctx=None: obj['state'] in ['manual', 'progress'], - 'sale.mt_quotation_sent': lambda self, cr, uid, obj, ctx=None: obj['state'] in ['sent'] + 'sale.mt_order_sent': lambda self, cr, uid, obj, ctx=None: obj['state'] in ['sent'] }, } diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml index 4a08063ea81..3176c1e7212 100644 --- a/addons/sale/sale_data.xml +++ b/addons/sale/sale_data.xml @@ -45,15 +45,15 @@ - - Quotation sent + + Quotation send sale.order - Quotation <b>send</b> + Quotation send Sale Order Confirmed sale.order - Quotation <b>confirmed</b> + Quotation confirmed diff --git a/addons/sale_crm/sale_crm_data.xml b/addons/sale_crm/sale_crm_data.xml index ab52e71a076..7a8f3d9c691 100644 --- a/addons/sale_crm/sale_crm_data.xml +++ b/addons/sale_crm/sale_crm_data.xml @@ -3,13 +3,13 @@ - - Quotation sent + + Quotation Send crm.case.section - + section_id - + Sale Order Confirmed crm.case.section