xrg has proposed merging lp:~xrg/openobject-client/client_maint_sep into
lp:openobject-client.
Requested reviews:
OpenERP sa GTK client R&D (openerp-dev-gtk)
--
https://code.launchpad.net/~xrg/openobject-client/client_maint_sep/+merge/39071
Your team OpenERP sa GTK client R&D is requested to review the proposed merge
of lp:~xrg/openobject-client/client_maint_sep into lp:openobject-client.
=== modified file 'bin/common/common.py'
--- bin/common/common.py 2010-10-21 05:30:09 +0000
+++ bin/common/common.py 2010-10-21 17:34:44 +0000
@@ -26,6 +26,8 @@
import tools
import gettext
+from maint_messages import message_no_contract, message_partial_contract
+
import os
import sys
import platform
@@ -381,71 +383,13 @@
maintenance = rpc.session.rpc_exec_auth_try('/object', 'execute', 'maintenance.contract', 'status')
if maintenance['status'] == 'none':
- maintenance_contract_message=_("""
-<b>An unknown error has been reported.</b>
-
-<b>You do not have a valid OpenERP maintenance contract !</b>
-If you are using OpenERP in production, it is highly suggested to subscribe
-a maintenance program.
-
-The OpenERP maintenance contract provides you a bugfix guarantee and an
-automatic migration system so that we can fix your problems within a few
-hours. If you had a maintenance contract, this error would have been sent
-to the quality team of the OpenERP editor.
-
-The maintenance program offers you:
-* Automatic migrations on new versions,
-* A bugfix guarantee,
-* Monthly announces of potential bugs and their fixes,
-* Security alerts by email and automatic migration,
-* Access to the customer portal.
-
-You can use the link bellow for more information. The detail of the error
-is displayed on the second tab.
-""")
+ maintenance_contract_message = message_no_contract
elif maintenance['status'] == 'partial':
- maintenance_contract_message=_("""
-<b>An unknown error has been reported.</b>
-
-Your maintenance contract does not cover all modules installed in your system !
-If you are using OpenERP in production, it is highly suggested to upgrade your
-contract.
-
-If you have developed your own modules or installed third party module, we
-can provide you an additional maintenance contract for these modules. After
-having reviewed your modules, our quality team will ensure they will migrate
-automatically for all future stable versions of OpenERP at no extra cost.
-
-Here is the list of modules not covered by your maintenance contract:
-%s
-
-You can use the link bellow for more information. The detail of the error
-is displayed on the second tab.""") % (", ".join(maintenance['uncovered_modules']), )
+ maintenance_contract_message= message_partial_contract % (", ".join(maintenance['uncovered_modules']), )
else:
show_message = False
else:
- maintenance_contract_message=_("""
-<b>An unknown error has been reported.</b>
-
-<b>You do not have a valid OpenERP maintenance contract !</b>
-If you are using OpenERP in production, it is highly suggested to subscribe
-a maintenance program.
-
-The OpenERP maintenance contract provides you a bugfix guarantee and an
-automatic migration system so that we can fix your problems within a few
-hours. If you had a maintenance contract, this error would have been sent
-to the quality team of the OpenERP editor.
-
-The maintenance program offers you:
-* Automatic migrations on new versions,
-* A bugfix guarantee,
-* Monthly announces of potential bugs and their fixes,
-* Security alerts by email and automatic migration,
-* Access to the customer portal.
-
-You can use the link bellow for more information. The detail of the error
-is displayed on the second tab.
-""")
+ maintenance_contract_message = message_no_contract
xmlGlade = glade.XML(terp_path('win_error.glade'), 'dialog_error', gettext.textdomain())
win = xmlGlade.get_widget('dialog_error')
=== added file 'bin/common/maint_messages.py'
--- bin/common/maint_messages.py 1970-01-01 00:00:00 +0000
+++ bin/common/maint_messages.py 2010-10-21 17:34:44 +0000
@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2010 OpenERP SA. (<http://www.openerp.com>).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import gettext
+
+message_no_contract = _("""
+<b>An unknown error has been reported.</b>
+
+<b>You do not have a valid OpenERP maintenance contract !</b>
+If you are using OpenERP in production, it is highly suggested to subscribe
+a maintenance program.
+
+The OpenERP maintenance contract provides you a bugfix guarantee and an
+automatic migration system so that we can fix your problems within a few
+hours. If you had a maintenance contract, this error would have been sent
+to the quality team of the OpenERP editor.
+
+The maintenance program offers you:
+* Automatic migrations on new versions,
+* A bugfix guarantee,
+* Monthly announces of potential bugs and their fixes,
+* Security alerts by email and automatic migration,
+* Access to the customer portal.
+
+You can use the link bellow for more information. The detail of the error
+is displayed on the second tab.
+""")
+
+message_partial_contract = _("""
+<b>An unknown error has been reported.</b>
+
+Your maintenance contract does not cover all modules installed in your system !
+If you are using OpenERP in production, it is highly suggested to upgrade your
+contract.
+
+If you have developed your own modules or installed third party module, we
+can provide you an additional maintenance contract for these modules. After
+having reviewed your modules, our quality team will ensure they will migrate
+automatically for all future stable versions of OpenERP at no extra cost.
+
+Here is the list of modules not covered by your maintenance contract:
+%s
+
+You can use the link bellow for more information. The detail of the error
+is displayed on the second tab.""")
+
+#eof
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
