From 2b109a2814ac8bf4ac0482cae26f9d62d6ea79c6 Mon Sep 17 00:00:00 2001 From: Olivier Laurent Date: Mon, 27 Oct 2008 13:25:14 +0100 Subject: [PATCH 1/3] French translation: wrong translation for lowest, highest, ... bzr revid: olt@tinyerp.com-20081027122514-b341e5ycyaz5m0j3 --- addons/crm/i18n/fr_FR.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/crm/i18n/fr_FR.po b/addons/crm/i18n/fr_FR.po index efb9ced9d26..566c2c474d1 100644 --- a/addons/crm/i18n/fr_FR.po +++ b/addons/crm/i18n/fr_FR.po @@ -127,7 +127,7 @@ msgstr "Cas" #: selection:crm.case.rule,trg_priority_from:0 #: selection:crm.case.rule,trg_priority_to:0 msgid "Highest" -msgstr "Haute" +msgstr "La Plus Haute" #. module: crm #: model:ir.actions.act_window,name:crm.act_crm_case_categ_crm_case_opened @@ -406,7 +406,7 @@ msgstr "Calculer la segmentation" #: selection:crm.case.rule,trg_priority_from:0 #: selection:crm.case.rule,trg_priority_to:0 msgid "Lowest" -msgstr "Très basse" +msgstr "La Plus Basse" #. module: crm #: view:crm.segmentation:0 @@ -693,7 +693,7 @@ msgstr "Vue calendrier" #: selection:crm.case.rule,trg_priority_from:0 #: selection:crm.case.rule,trg_priority_to:0 msgid "Low" -msgstr "Bas" +msgstr "Basse" #. module: crm #: field:crm.case,date_closed:0 @@ -1250,7 +1250,7 @@ msgstr "Rappeler le partenaire" #: selection:crm.case.rule,trg_priority_from:0 #: selection:crm.case.rule,trg_priority_to:0 msgid "High" -msgstr "Haut" +msgstr "Haute" #. module: crm #: field:crm.segmentation.line,expr_name:0 From 6f6337da69396c561019b65af8114c526f108b32 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Mon, 27 Oct 2008 18:22:13 +0530 Subject: [PATCH 2/3] Small changes in : account/wizard/wizard_account_balance_report.py account/wizard/wizard_general_ledger_report.py bzr revid: patelamit2003@gmail.com-20081027125213-3x8g8m2hu9n3souy --- addons/account/wizard/wizard_account_balance_report.py | 2 +- addons/account/wizard/wizard_general_ledger_report.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/wizard/wizard_account_balance_report.py b/addons/account/wizard/wizard_account_balance_report.py index 6cbcb02702e..dce3dfa35be 100644 --- a/addons/account/wizard/wizard_account_balance_report.py +++ b/addons/account/wizard/wizard_account_balance_report.py @@ -134,7 +134,7 @@ class wizard_report(wizard.interface): }, 'account_selection': { 'actions': [], - 'result': {'type':'form', 'arch':account_form,'fields':account_fields, 'state':[('end','Cancel','gtk-cancel'),('checktype','Print','gtk-print')]} + 'result': {'type':'form', 'arch':account_form,'fields':account_fields, 'state':[('end','Cancel','gtk-cancel'),('checktype','Next','gtk-go-forward')]} }, 'checktype': { 'actions': [_get_defaults], diff --git a/addons/account/wizard/wizard_general_ledger_report.py b/addons/account/wizard/wizard_general_ledger_report.py index 6bb5d6f84b5..1b22e75d424 100644 --- a/addons/account/wizard/wizard_general_ledger_report.py +++ b/addons/account/wizard/wizard_general_ledger_report.py @@ -182,7 +182,7 @@ class wizard_report(wizard.interface): }, 'account_selection': { 'actions': [], - 'result': {'type':'form', 'arch':account_form,'fields':account_fields, 'state':[('end','Cancel','gtk-cancel'),('checktype','Print','gtk-print')]} + 'result': {'type':'form', 'arch':account_form,'fields':account_fields, 'state':[('end','Cancel','gtk-cancel'),('checktype','Next','gtk-go-forward')]} }, 'checktype': { 'actions': [_get_defaults], From 62d4166cd884673f27f202df7ac3f4442e04529e Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Mon, 27 Oct 2008 14:05:17 +0100 Subject: [PATCH 3/3] bugfix bzr revid: chs@tinyerp.com-20081027130517-gjnozg23wennmire --- addons/crm/crm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 3cd86c36d25..0dc516b38a9 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -493,7 +493,7 @@ class crm_case(osv.osv): 'case_subject': case.name, 'case_date': case.date, - 'case_user': case.user_id.name or '/', + 'case_user': (case.user_id and case.user_id.name) or '/', 'case_user_email': (case.user_id and case.user_id.address_id and case.user_id.address_id.email) or '/', 'case_user_phone': (case.user_id and case.user_id.address_id and case.user_id.address_id.phone) or '/',