pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source 
bzr revid: fp@tinyerp.com-20081027131356-k511r2odr94bqmtl
This commit is contained in:
Fabien Pinckaers
2008-10-27 14:13:56 +01:00
parent 05a78565cd 62d4166cd8
commit 1f94689780
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/wizard/wizard_account_balance_report.py
+1 -1
View File
@@ -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],
addons/account/wizard/wizard_general_ledger_report.py
+1 -1
View File
@@ -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],
addons/crm/crm.py
+1 -1
View File
@@ -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 '/',
addons/crm/i18n/fr_FR.po
+4 -4
View File
@@ -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