From 5843a12f264eb7dcbecf5144cdee79e2e3968154 Mon Sep 17 00:00:00 2001 From: Erwin van der Ploeg Date: Fri, 12 Dec 2014 22:29:04 +0100 Subject: [PATCH] [Fix] Some missed frontend openerp to odoo changes --- addons/base_setup/res_config.py | 2 +- addons/fleet/__openerp__.py | 2 +- addons/hw_posbox_homepage/controllers/main.py | 4 ++-- addons/hw_proxy/controllers/main.py | 2 +- addons/product_email_template/data/product_demo.xml | 2 +- addons/share/wizard/share_wizard.py | 4 ++-- openerp/addons/base/base_data.xml | 4 ++-- .../addons/base/module/wizard/base_export_language_view.xml | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py index 546513344bb..dafd3e23369 100644 --- a/addons/base_setup/res_config.py +++ b/addons/base_setup/res_config.py @@ -32,7 +32,7 @@ class base_config_settings(osv.osv_memory): help='Work in multi-company environments, with appropriate security access between companies.\n' '-This installs the module multi_company.'), 'module_share': fields.boolean('Allow documents sharing', - help="""Share or embbed any screen of openerp."""), + help="""Share or embbed any screen of Odoo."""), 'module_portal': fields.boolean('Activate the customer portal', help="""Give your customers access to their documents."""), 'module_auth_oauth': fields.boolean('Use external authentication providers, sign in with google, facebook, ...'), diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py index 9350a7e884b..dbe93618ee1 100644 --- a/addons/fleet/__openerp__.py +++ b/addons/fleet/__openerp__.py @@ -29,7 +29,7 @@ 'description' : """ Vehicle, leasing, insurances, cost ================================== -With this module, OpenERP helps you managing all your vehicles, the +With this module, Odoo helps you managing all your vehicles, the contracts associated to those vehicle as well as services, fuel log entries, costs and many other features necessary to the management of your fleet of vehicle(s) diff --git a/addons/hw_posbox_homepage/controllers/main.py b/addons/hw_posbox_homepage/controllers/main.py index 6cf639348bf..25e33c409fa 100644 --- a/addons/hw_posbox_homepage/controllers/main.py +++ b/addons/hw_posbox_homepage/controllers/main.py @@ -31,8 +31,8 @@ index_template = """

The PosBox is an hardware adapter that allows you to use receipt printers and barcode scanners with Odoo's Point of - Sale, version 8.0 or later. You can start an online free trial, - or download and install it yourself. + Sale, version 8.0 or later. You can start an online free trial, + or download and install it yourself.

For more information on how to setup the Point of Sale with diff --git a/addons/hw_proxy/controllers/main.py b/addons/hw_proxy/controllers/main.py index d3dde7b1b0f..88a569d366c 100644 --- a/addons/hw_proxy/controllers/main.py +++ b/addons/hw_proxy/controllers/main.py @@ -98,7 +98,7 @@ class Proxy(http.Controller):

Copy and paste your printer's device description in the form below. You can find your printer's description in the device list above. If you find that your printer works - well, please send your printer's description to + well, please send your printer's description to support@openerp.com so that we can add it to the default list of supported devices.

diff --git a/addons/product_email_template/data/product_demo.xml b/addons/product_email_template/data/product_demo.xml index d9ac11c917d..d7c24dc97fe 100644 --- a/addons/product_email_template/data/product_demo.xml +++ b/addons/product_email_template/data/product_demo.xml @@ -620,7 +620,7 @@ - It would be very difficult to cover all of the possibilities of OpenERP and I believe the major aspects were covered very well + It would be very difficult to cover all of the possibilities of Odoo and I believe the major aspects were covered very well The trainer has a very good knowledge of the subject, he understands the issues of the trainees very fast and provided answers with the right level of illustration. diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py index 6d3ba0ec31f..b0ff0cfca00 100644 --- a/addons/share/wizard/share_wizard.py +++ b/addons/share/wizard/share_wizard.py @@ -832,7 +832,7 @@ class share_wizard(osv.TransientModel): body += '%s\n\n' % ((user.signature or '')) body += "--\n" body += _("Odoo is a powerful and user-friendly suite of Business Applications (CRM, Sales, HR, etc.)\n" - "It is open source and can be found on http://www.openerp.com.") + "It is open source and can be found on https://www.odoo.com.") msg_id = message_obj.schedule_with_attach(cr, uid, user.email, [email_to], subject, body, model='', context=context) notification_obj.create(cr, uid, {'user_id': result_line.user_id.id, 'message_id': msg_id}, context=context) @@ -866,7 +866,7 @@ class share_wizard(osv.TransientModel): body += "\n\n%s\n\n" % ( (user.signature or '') ) body += "--\n" body += _("Odoo is a powerful and user-friendly suite of Business Applications (CRM, Sales, HR, etc.)\n" - "It is open source and can be found on http://www.openerp.com.") + "It is open source and can be found on https://www.odoo.com.") mail_ids.append(mail_mail.create(cr, uid, { 'email_from': user.email, 'email_to': email_to, diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml index 5518b5c7621..89f22401338 100644 --- a/openerp/addons/base/base_data.xml +++ b/openerp/addons/base/base_data.xml @@ -88,7 +88,7 @@ Administrator]]> Portal Portal members have specific access rights (such as record rules and restricted menus). - They usually do not belong to the usual OpenERP groups. + They usually do not belong to the usual Odoo groups. diff --git a/openerp/addons/base/module/wizard/base_export_language_view.xml b/openerp/addons/base/module/wizard/base_export_language_view.xml index 882eb6a68bc..6de413e01e0 100644 --- a/openerp/addons/base/module/wizard/base_export_language_view.xml +++ b/openerp/addons/base/module/wizard/base_export_language_view.xml @@ -25,11 +25,11 @@
  • PO(T) format: you should edit it with a PO editor such as POEdit, or your preferred text editor
  • TGZ format: this is a compressed archive containing a PO file, directly suitable - for uploading to OpenERP's translation platform, + for uploading to Odoo's translation platform, Launchpad
  • -

    For more details about translating OpenERP in your language, please refer to the +

    For more details about translating Odoo in your language, please refer to the documentation.