From 6f1b820d33c2cb588294ddd069bf4396bf09f083 Mon Sep 17 00:00:00 2001
From: Richard Mathot <rim@openerp.com>
Date: Fri, 18 Jul 2014 14:58:30 +0200
Subject: [PATCH] [REF] OpenERP --> Odoo in various UI texts (2)

Some things missed by commit 8b67a7202d9dd3492001cade3d361b8a5424ec3f
---
 .../plugin/openerp_report_designer/bin/script/Change.py   | 2 +-
 addons/google_calendar/static/description/index.html      | 2 +-
 addons/hr_holidays/report/hr_custom_rml.xsl               | 2 +-
 addons/mrp/report/custom_default.xsl                      | 2 +-
 addons/mrp/report/custom_rml.xsl                          | 2 +-
 addons/note/note_demo.xml                                 | 8 ++++----
 addons/point_of_sale/report/user_label.xsl                | 2 +-
 addons/product/report/product_label.xsl                   | 2 +-
 addons/web/static/src/xml/base.xml                        | 2 +-
 addons/website_blog/tests/test_website_blog.yml           | 4 ++--
 addons/website_partner/data/demo.xml                      | 6 +++---
 addons/website_quote/data/website_quotation_demo.xml      | 2 +-
 openerp/addons/base/report/corporate_defaults.xsl         | 2 +-
 openerp/addons/base/report/custom_rml_printscreen.xsl     | 2 +-
 14 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
index e0b66780e8b..4e41e41ae8e 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
@@ -63,7 +63,7 @@ class Change( unohelper.Base, XJobExecutor ):
                     break
         else:
             protocol='XML-RPC'
-        self.win=DBModalDialog(60, 50, 120, 90, "Connect to Open ERP Server")
+        self.win=DBModalDialog(60, 50, 120, 90, "Connect to Odoo Server")
 
         self.win.addFixedText("lblVariable", 38, 12, 25, 15, "Server  ")
         self.win.addEdit("txtHost",-2,9,60,15, host or 'localhost')
diff --git a/addons/google_calendar/static/description/index.html b/addons/google_calendar/static/description/index.html
index 24c5e8f4da2..b74831077c3 100644
--- a/addons/google_calendar/static/description/index.html
+++ b/addons/google_calendar/static/description/index.html
@@ -93,7 +93,7 @@
         </div>
         <div class="oe_span6">
             <p class='oe_mt32'>
-				You can ask to have a alarm of type 'notification' in your Open ERP.<br/>
+				You can ask to have a alarm of type 'notification' in your Odoo.<br/>
 				You will have a notification in you Odoo which ever the page you are.
 			</p>			
         </div>
diff --git a/addons/hr_holidays/report/hr_custom_rml.xsl b/addons/hr_holidays/report/hr_custom_rml.xsl
index 64a4894613a..f57c04aa097 100644
--- a/addons/hr_holidays/report/hr_custom_rml.xsl
+++ b/addons/hr_holidays/report/hr_custom_rml.xsl
@@ -7,7 +7,7 @@
 
 	<xsl:template name="rml">
 		<document filename="example.pdf">
-			<template pageSize="29.7cm,21cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Timesheets" author="Generated by Open ERP, Fabien Pinckaers" allowSplitting="20">
+			<template pageSize="29.7cm,21cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Timesheets" author="Generated by Odoo, Fabien Pinckaers" allowSplitting="20">
 				<pageTemplate id="first_page">
 					<pageGraphics>
 						<xsl:call-template name="first_page_graphics_corporation"/>
diff --git a/addons/mrp/report/custom_default.xsl b/addons/mrp/report/custom_default.xsl
index e5503500a86..6982a95ecea 100644
--- a/addons/mrp/report/custom_default.xsl
+++ b/addons/mrp/report/custom_default.xsl
@@ -2,7 +2,7 @@
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
 	<xsl:variable name="signature" select="//corporate-header/user/signature"/>
-	<xsl:variable name="title">Open ERP Report</xsl:variable>
+	<xsl:variable name="title">Odoo Report</xsl:variable>
 	<xsl:variable name="leftMargin">1cm</xsl:variable>
 	<xsl:variable name="rightMargin">1cm</xsl:variable>
 	<xsl:variable name="topMargin">1cm</xsl:variable>
diff --git a/addons/mrp/report/custom_rml.xsl b/addons/mrp/report/custom_rml.xsl
index e76ec2e947c..6b648bc13e3 100644
--- a/addons/mrp/report/custom_rml.xsl
+++ b/addons/mrp/report/custom_rml.xsl
@@ -7,7 +7,7 @@
 
 	<xsl:template name="rml">
 		<document>
-			<template author="Generated by Open ERP, Fabien Pinckaers">
+			<template author="Generated by Odoo, Fabien Pinckaers">
 				<xsl:attribute name="pageSize">
 					<xsl:value-of select="$pageSize"/>
 				</xsl:attribute>
diff --git a/addons/note/note_demo.xml b/addons/note/note_demo.xml
index 2b94f6c0afc..f594d312abe 100644
--- a/addons/note/note_demo.xml
+++ b/addons/note/note_demo.xml
@@ -98,8 +98,8 @@
 
     <record id="note_9" model="note.note">
       <field name="memo"><![CDATA[<b>Read those books</b>
-      <br/><br/>* Open ERP: a modern approach to integrated business management
-      <br/>* Open ERP for Retail and Industrial Management
+      <br/><br/>* Odoo: a modern approach to integrated business management
+      <br/>* Odoo for Retail and Industrial Management
       ]]>
       </field>
       <field name="stage_id" ref="demo_note_stage_02"/>
@@ -107,8 +107,8 @@
 
     <record id="note_12" model="note.note">
       <field name="memo"><![CDATA[<b>Read some documentation about Odoo before diving into the code</b>
-      <br/><br/>* Open ERP: a modern approach to integrated business management
-      <br/>* Open ERP for Retail and Industrial Management
+      <br/><br/>* Odoo: a modern approach to integrated business management
+      <br/>* Odoo for Retail and Industrial Management
       ]]>
       </field>
       <field name="message_follower_ids" eval="[(4, ref('base.group_user'))]"/>
diff --git a/addons/point_of_sale/report/user_label.xsl b/addons/point_of_sale/report/user_label.xsl
index 321cd830a7a..c08a5c3b938 100644
--- a/addons/point_of_sale/report/user_label.xsl
+++ b/addons/point_of_sale/report/user_label.xsl
@@ -18,7 +18,7 @@
 
     <xsl:template match="lots">
         <document>
-            <template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Address list" author="Generated by Open ERP">
+            <template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Address list" author="Generated by Odoo">
                 <pageTemplate id="all">
                     <pageGraphics/>
                     <xsl:apply-templates select="lot-line" mode="frames"/>
diff --git a/addons/product/report/product_label.xsl b/addons/product/report/product_label.xsl
index 30fe282b0c9..2e062222bbd 100644
--- a/addons/product/report/product_label.xsl
+++ b/addons/product/report/product_label.xsl
@@ -15,7 +15,7 @@
 
 	<xsl:template match="lots">
 		<document>
-			<template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Address list" author="Generated by Open ERP">
+			<template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Address list" author="Generated by Odoo">
 				<pageTemplate id="all">
 					<pageGraphics/>
 					<xsl:apply-templates select="lot-line" mode="frames"/>
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 1b04e554431..d77b8d3df46 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -371,7 +371,7 @@
       <h3>Version <t t-esc="version_info.server_version"/></h3>
 
       <div class="oe_bottom">
-        <p>Copyright © 2004-TODAY Odoo SA. All Rights Reserved.<br />
+        <p>Copyright © 2004-TODAY OpenERP SA. All Rights Reserved.<br />
             Odoo is a trademark of the <a target="_blank" href="https://www.odoo.com" style="text-decoration: underline;">OpenERP SA Company</a>.</p>
         <p>Licenced under the terms of <a target="_blank" href="http://www.gnu.org/licenses/agpl.html" style="text-decoration: underline;">GNU Affero General Public License</a></p>
         <p>For more information visit <a target="_blank" href="https://www.odoo.com" style="text-decoration: underline;">Odoo.com</a></p>
diff --git a/addons/website_blog/tests/test_website_blog.yml b/addons/website_blog/tests/test_website_blog.yml
index db70b286bc8..826d8491df5 100644
--- a/addons/website_blog/tests/test_website_blog.yml
+++ b/addons/website_blog/tests/test_website_blog.yml
@@ -6,7 +6,7 @@
       blog_id: blog_blog_1
       content: 'Test content
 
-      The Open ERP wiki allows you to manage your enterprise contents using wiki
+      The Odoo wiki allows you to manage your enterprise contents using wiki
 
       restructured texts. This module provides a collaborative way to manage internal
 
@@ -16,7 +16,7 @@
     !record {model: blog.post, id: test_page0}:
       content: 'Test updated content
 
-      The Open ERP wiki allows you to manage your enterprise contents using wiki
+      The Odoo wiki allows you to manage your enterprise contents using wiki
 
       restructured texts. This module provides a collaborative way to manage internal
 
diff --git a/addons/website_partner/data/demo.xml b/addons/website_partner/data/demo.xml
index 9fa1ba68ca1..eab70d2568c 100644
--- a/addons/website_partner/data/demo.xml
+++ b/addons/website_partner/data/demo.xml
@@ -110,9 +110,9 @@ e. Human resources: recruitment, payroll management.]]></field>
     </record>
 
     <record id="base.res_partner_13" model="res.partner">
-        <field name="website_short_description">Axelor is a service company specializing in the integration of Open Source ERP. She is co-editor including the web version of Open ERP and concentrates all its activities to Odoo  integration and implementation of supply...</field>
-        <field name="website_description"><![CDATA[Axelor is a service company specializing in the integration of Open Source ERP. She is co-editor including the web version of Open ERP and concentrates all its activities to Open ERP integration and implementation of supply Saas (ASP) based on Open ERP projects. Axelor can now claim many references to Open ERP implementations in various industries.<br/> <br/>
-The company has its own R & D performing many innovations to the continuous improvement of Open ERP, such as the new web version, the plug-in MS Office and connectors to other applications. Its main advantages are its integration methodology and rigor to the management of major projects for the audit and design phase up to production and customer support.]]></field>
+        <field name="website_short_description">Axelor is a service company specializing in the integration of Open Source ERP. She is co-editor including the web version of Odoo and concentrates all its activities to Odoo integration and implementation of supply...</field>
+        <field name="website_description"><![CDATA[Axelor is a service company specializing in the integration of Open Source ERP. She is co-editor including the web version of Odoo and concentrates all its activities to Odoo integration and implementation of supply Saas (ASP) based on Odoo. Axelor can now claim many references to Odoo implementations in various industries.<br/> <br/>
+The company has its own R&D performing many innovations to the continuous improvement of Odoo, such as the new web version, the plug-in MS Office and connectors to other applications. Its main advantages are its integration methodology and rigor to the management of major projects for the audit and design phase up to production and customer support.]]></field>
     </record>
 
     <record id="base.res_partner_12" model="res.partner">
diff --git a/addons/website_quote/data/website_quotation_demo.xml b/addons/website_quote/data/website_quotation_demo.xml
index 61a8bbd90c8..cdc0e589fa9 100644
--- a/addons/website_quote/data/website_quotation_demo.xml
+++ b/addons/website_quote/data/website_quotation_demo.xml
@@ -410,7 +410,7 @@
                                     <li>Participants preferably have a functional knowledge of our software (see Functional Training).</li>
                                 </ul><p></p>
 
-                                <p>To get more information, visit the <a href="http://openerp.com/">Odoo Official Website</a>.</p>
+                                <p>To get more information, visit the <a href="https://www.odoo.com/">Odoo Official Website</a>.</p>
                             </div>
                         </div>
                     </div>
diff --git a/openerp/addons/base/report/corporate_defaults.xsl b/openerp/addons/base/report/corporate_defaults.xsl
index 9e976381e48..7f7a1e8182a 100644
--- a/openerp/addons/base/report/corporate_defaults.xsl
+++ b/openerp/addons/base/report/corporate_defaults.xsl
@@ -2,7 +2,7 @@
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
 	<xsl:variable name="signature" select="//corporate-header/user/signature"/>
-	<xsl:variable name="title">Open ERP Report</xsl:variable>
+	<xsl:variable name="title">Odoo Report</xsl:variable>
 	<xsl:variable name="leftMargin">1cm</xsl:variable>
 	<xsl:variable name="rightMargin">1cm</xsl:variable>
 	<xsl:variable name="topMargin">1cm</xsl:variable>
diff --git a/openerp/addons/base/report/custom_rml_printscreen.xsl b/openerp/addons/base/report/custom_rml_printscreen.xsl
index 43e3fbecefe..52cba543d86 100644
--- a/openerp/addons/base/report/custom_rml_printscreen.xsl
+++ b/openerp/addons/base/report/custom_rml_printscreen.xsl
@@ -6,7 +6,7 @@
 
 	<xsl:template name="rml">
 		<document filename="example.pdf">
-			<template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Report" author="Generated by Open ERP, Fabien Pinckaers" allowSplitting="20">
+			<template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Report" author="Generated by Odoo, Fabien Pinckaers" allowSplitting="20">
 				<pageTemplate id="first_page">
 					<pageGraphics>
 						<xsl:call-template name="first_page_graphics_corporation"/>