Revert "[IMP] website, doc: replace eCommerce by e-Commerce"

This reverts commit b4d7b7e. Odoo always uses term eCommerce
cosmo83 · Sep 6, 2016 · e9426b0 · e9426b0
1 parent 60b11d6
commit e9426b0
Show file tree

Hide file tree

Showing 26 changed files with 47 additions and 47 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ Odoo is a suite of web based open source business apps.
 
 The main Odoo Apps include an <a href="https://www.odoo.com/page/crm">Open Source CRM</a>,
 <a href="https://www.odoo.com/page/website-builder">Website Builder</a>,
-<a href="https://www.odoo.com/page/e-commerce">e-Commerce</a>,
+<a href="https://www.odoo.com/page/e-commerce">eCommerce</a>,
 <a href="https://www.odoo.com/page/warehouse">Warehouse Management</a>,
 <a href="https://www.odoo.com/page/project-management">Project Management</a>,
 <a href="https://www.odoo.com/page/accounting">Billing &amp; Accounting</a>,

diff --git a/addons/payment/data/payment_acquirer_data.xml b/addons/payment/data/payment_acquirer_data.xml
@@ -28,7 +28,7 @@
                 A payment gateway to accept online payments via credit cards.
             </p>
             <ul>
-                <li><i class="fa fa-check"/>e-Commerce</li>
+                <li><i class="fa fa-check"/>eCommerce</li>
             </ul>
         </field>
     </record>
@@ -43,7 +43,7 @@
                 Ingenico Payment Services (formerly Ogone) supports credit cards, debit cards and bank transfers.
             </p>
             <ul class="list-inline">
-                <li><i class="fa fa-check"/>e-Commerce</li>
+                <li><i class="fa fa-check"/>eCommerce</li>
                 <li><i class="fa fa-check"/>Cards storage</li>
                 <li><i class="fa fa-check"/>Pay button in emails</li>
             </ul>
@@ -60,7 +60,7 @@
                 A payment gateway to accept online payments via credit cards, debit cards and bank transfers.
             </p>
             <ul>
-                <li><i class="fa fa-check"/>e-Commerce</li>
+                <li><i class="fa fa-check"/>eCommerce</li>
             </ul>
         </field>
     </record>
@@ -75,7 +75,7 @@
                 A payment gateway to accept online payments via credit cards and e-checks.
             </p>
             <ul class="list-inline">
-                <li><i class="fa fa-check"/>e-Commerce</li>
+                <li><i class="fa fa-check"/>eCommerce</li>
                 <li><i class="fa fa-check"/>Cards storage</li>
                 <li><i class="fa fa-check"/>Authorize &amp; Capture</li>
             </ul>
@@ -93,7 +93,7 @@
                 Provide instructions to customers so that they can pay their orders manually.
             </p>
             <ul>
-                <li><i class="fa fa-check"/>e-Commerce</li>
+                <li><i class="fa fa-check"/>eCommerce</li>
             </ul>
         </field>
     </record>
@@ -108,7 +108,7 @@
                 A payment gateway from Atos Worldline to accept online payments via credit cards.
             </p>
             <ul>
-                <li><i class="fa fa-check"/>e-Commerce</li>
+                <li><i class="fa fa-check"/>eCommerce</li>
             </ul>
         </field>
     </record>
@@ -123,7 +123,7 @@
                 PayPal is the easiest way to accept payments via Paypal or credit cards.
             </p>
             <ul class="list-inline">
-                <li><i class="fa fa-check"/>e-Commerce</li>
+                <li><i class="fa fa-check"/>eCommerce</li>
                 <li><i class="fa fa-check"/>Pay button in emails</li>
             </ul>
         </field>
@@ -139,7 +139,7 @@
                 A payment gateway to accept online payments via credit cards.
             </p>
             <ul>
-                <li><i class="fa fa-check"/>e-Commerce</li>
+                <li><i class="fa fa-check"/>eCommerce</li>
             </ul>
         </field>
 
@@ -156,7 +156,7 @@
                 A generic acquirer payment acquirer.
             </p>
             <ul>
-                <li><i class="fa fa-check"/>e-Commerce</li>
+                <li><i class="fa fa-check"/>eCommerce</li>
             </ul>
         </field>
     </record>
@@ -171,7 +171,7 @@
                 PayU India is an online payments solutions company serving the Indian market.
             </p>
             <ul class="list-inline">
-                <li><i class="fa fa-check"/>e-Commerce</li>
+                <li><i class="fa fa-check"/>eCommerce</li>
                 <li><i class="fa fa-check"/>Subscription</li>
                 <li><i class="fa fa-check"/>Pay button in emails</li>
             </ul>

diff --git a/addons/website/README.md b/addons/website/README.md
@@ -36,7 +36,7 @@ Enterprise-Ready, out-of-the-box
 Activate ready-to-use enterprise features in just a click; e-commerce,
 call-to-actions, jobs announces, events, customer references, blogs, etc.
 
-Traditional e-Commerce and CMS have poorly designed backends as it's not their
+Traditional eCommerce and CMS have poorly designed backends as it's not their
 core focus. With the Odoo integration, you benefit from the best management
 software to follow-up on your orders, your jobs applicants, your leads, etc.
 

diff --git a/addons/website/static/description/index.html b/addons/website/static/description/index.html
@@ -121,7 +121,7 @@ <h2 class="oe_slogan" style="color:#A24689;">Extend your website with hundreds o
         <div class="oe_span4">
           <h4><b>Sell Online</b></h4>
           <ul class="list-unstyled">
-            <li>- e-Commerce</li>
+            <li>- eCommerce</li>
             <li>- Event Tickets</li>
           </ul>
           <h4 class="oe_mt32"><b>Full Marketing Stack</b></h4>

diff --git a/addons/website_crm/static/description/index.html b/addons/website_crm/static/description/index.html
@@ -47,7 +47,7 @@ <h2 class="oe_slogan">Fully Integrated With Others Apps</h2>
         <h3 class="oe_slogan">Get hundreds of open source apps for free</h3>
         <div class="oe_span4">
             <a href="/apps/website_sale">
-                <h3>e-Commerce</h3>
+                <h3>eCommerce</h3>
                 <div class="oe_row_img oe_centered">
                     <img class="oe_picture oe_screenshot" src="website_sale.png">
                 </div>

diff --git a/addons/website_event/README.md b/addons/website_event/README.md
@@ -100,7 +100,7 @@ Fully Integrated With Others Apps
 ### Get hundreds of open source apps for free
 
 
-### e-Commerce
+### eCommerce
 
 Promote products, sell online, optimize visitors' shopping experiences.
 

diff --git a/addons/website_event/static/description/index.html b/addons/website_event/static/description/index.html
@@ -71,7 +71,7 @@ <h3 class="oe_slogan" style="text-align: left; margin-bottom: 60px;">Organize tr
             <h2 class="oe_slogan oe_mt32" style="text-align: left; color:#A24689;">Get sponsors to come to you</h2>
             <h3 class="oe_slogan" style="text-align: left;">Sell sponsorship, promote your sponsors</h3>
             <p class="oe_mt32 text-justify">
-            Easily manage existing and new sponsors with Odoo Events. Add sponsors to your events and publish sponsors per level (e.g., gold) on the bottom of every page of the event. Sell sponsorship packages online through Odoo e-Commerce.</p>
+            Easily manage existing and new sponsors with Odoo Events. Add sponsors to your events and publish sponsors per level (e.g., gold) on the bottom of every page of the event. Sell sponsorship packages online through Odoo eCommerce.</p>
         </div>
         <div class="oe_span6">
             <img class="oe_picture oe_screenshot" src="website_seo.png" style="margin-left: -1px;">

diff --git a/addons/website_event_track/README.md b/addons/website_event_track/README.md
@@ -28,7 +28,7 @@ Manage Sponsors
 
 Add sponsors to your events and publish sponsors per level (e.g. bronze, silver, gold) on the bottom of every page of the event.
 
-Sell sponsorship packages online through the Odoo e-Commerce for a full sales cycle integration.
+Sell sponsorship packages online through the Odoo eCommerce for a full sales cycle integration.
 
 Communicate Efficiently
 -----------------------

diff --git a/addons/website_event_track/data/website_event_track_demo.xml b/addons/website_event_track/data/website_event_track_demo.xml
@@ -82,7 +82,7 @@
         <field name="state">announced</field>
     </record>
     <record id="event_track7" model="event.track">
-        <field name="name">A technical explanation of Odoo as a CMS and a e-Commerce platform for version 8.</field>
+        <field name="name">A technical explanation of Odoo as a CMS and a eCommerce platform for version 8.</field>
         <field name="website_published" eval="True"/>
         <field name="event_id" ref="event.event_0"/>
         <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 8:30:00')"></field>

diff --git a/addons/website_event_track/static/description/index.html b/addons/website_event_track/static/description/index.html
@@ -68,7 +68,7 @@ <h3 class="oe_slogan">Sell sponsorship, promote your sponsors</h3>
             Add sponsors to your events and publish sponsors per level (e.g.
             bronze, silver, gold) on the bottom of every page of the event.
           </p><p>
-            Sell sponsorship packages online through the Odoo e-Commerce for
+            Sell sponsorship packages online through the Odoo eCommerce for
             a full sales cycle integration.
           </p>
         </div>

diff --git a/addons/website_forum/data/forum_demo.xml b/addons/website_forum/data/forum_demo.xml
@@ -34,12 +34,12 @@
             <field name="tag_ids" eval="[(4,ref('website_forum.tags_0')), (4,ref('website_forum.tags_1'))]"/>
         </record>
         <record id="question_1" model="forum.post">
-            <field name="name">CMS replacement for ERP and e-Commerce</field>
+            <field name="name">CMS replacement for ERP and eCommerce</field>
             <field name="views">8</field>
             <field name="forum_id" ref="website_forum.forum_help"/>
-            <field name="content"><![CDATA[<p>I use Wordpress as a CMS and e-Commerce platform. The developing in Wordpress is quite easy and solid but it missing ERP feature (there is single plugin to integrate with Frontaccounting) so I wonder:
+            <field name="content"><![CDATA[<p>I use Wordpress as a CMS and eCommerce platform. The developing in Wordpress is quite easy and solid but it missing ERP feature (there is single plugin to integrate with Frontaccounting) so I wonder:
 
-Can I use Odoo as a replacement CMS of Wordpress + e-Commerce plugin?
+Can I use Odoo as a replacement CMS of Wordpress + eCommerce plugin?
 
 In simple words does Odoo became CMS+ERP platform?</p>]]></field>
             <field name="post_type">question</field>

diff --git a/addons/website_forum_doc/data/doc_demo.xml b/addons/website_forum_doc/data/doc_demo.xml
@@ -64,7 +64,7 @@
             <field name="forum_id" ref="website_forum.forum_help"/>
         </record>
         <record id="toc_cms_ecommerce" model="forum.documentation.toc">
-            <field name="name">CMS &amp; e-Commerce</field>
+            <field name="name">CMS &amp; eCommerce</field>
             <field name="parent_id" ref="toc_website"/>
             <field name="forum_id" ref="website_forum.forum_help"/>
         </record>

diff --git a/addons/website_mail/data/mail_channel_data.xml b/addons/website_mail/data/mail_channel_data.xml
@@ -44,7 +44,7 @@
                             <ul style="margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;">
                                 <li dir="ltr">
                                     <p dir="ltr" style="margin-top:0pt;margin-bottom:0pt;">
-                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, e-Commerce, jobs, ...)</span>
+                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)</span>
                                     </p>
                                 </li>
                                 <li dir="ltr">

diff --git a/addons/website_sale/README.md b/addons/website_sale/README.md
@@ -3,7 +3,7 @@ Odoo e-Commerce
 
 ### Optimize sales with an awesome online store.
 
-Odoo is an <a href="https://www.odoo.com/page/e-commerce">Open Source e-Commerce</a>
+Odoo is an <a href="https://www.odoo.com/page/e-commerce">Open Source eCommerce</a>
 unlike anything you have ever seen before. Get an awesome catalog of products
 and great product description pages.
 

diff --git a/addons/website_sale/__manifest__.py b/addons/website_sale/__manifest__.py
@@ -1,5 +1,5 @@
 {
-    'name': 'e-Commerce',
+    'name': 'eCommerce',
     'category': 'Website',
     'sequence': 55,
     'summary': 'Sell Your Products Online',

diff --git a/addons/website_sale/data/web_planner_data.xml b/addons/website_sale/data/web_planner_data.xml
@@ -281,7 +281,7 @@
             <t t-call="web_planner.page">
                 <t t-set="page_title">Sell More</t>
                 <p class="text-muted">
-                    If you have an e-Commerce, one of your objectives is of course to grow your revenues by
+                    If you have an eCommerce, one of your objectives is of course to grow your revenues by
                     selling more and pricier products. Luckily for you, Odoo integrates three powerful
                     customizations for that.
                 </p>

diff --git a/addons/website_sale/security/website_sale.xml b/addons/website_sale/security/website_sale.xml
@@ -37,7 +37,7 @@
     </record>
 
     <record id="website_sale.group_website_multi_image" model="res.groups">
-        <field name="name">Show multi image on e-Commerce</field>
+        <field name="name">Show multi image on eCommerce</field>
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 

diff --git a/addons/website_sale/views/backend.xml b/addons/website_sale/views/backend.xml
@@ -33,7 +33,7 @@
     </record>
 
     <record id="action_orders_ecommerce" model="ir.actions.act_window">
-        <field name="name">e-Commerce Orders</field>
+        <field name="name">eCommerce Orders</field>
         <field name="res_model">sale.order</field>
         <field name="view_mode">tree,form</field>
         <field name="domain">[('state', 'in', ('sale', 'done'))]</field>
@@ -43,7 +43,7 @@
     </record>
 
     <record id="action_unpaid_orders_ecommerce" model="ir.actions.act_window">
-        <field name="name">Unpaid e-Commerce Orders</field>
+        <field name="name">Unpaid eCommerce Orders</field>
         <field name="res_model">sale.order</field>
         <field name="view_mode">tree,form</field>
         <field name="domain">[('state', '=', 'sent')]</field>
@@ -53,7 +53,7 @@
     </record>
 
     <record id="action_abandonned_orders_ecommerce" model="ir.actions.act_window">
-        <field name="name">Abandonned e-Commerce Orders</field>
+        <field name="name">Abandonned eCommerce Orders</field>
         <field name="res_model">sale.order</field>
         <field name="view_mode">tree,form</field>
         <field name="domain">[('state', '=', 'cancel')]</field>
@@ -87,7 +87,7 @@
     <menuitem id="menu_catalog_categories" parent="menu_catalog" action="product_public_category_action" sequence="2"/>
 
     <!-- Configuration sub-menus -->
-    <menuitem id="menu_ecommerce_settings" parent="website.menu_website_global_configuration" name="e-Commerce"/>
+    <menuitem id="menu_ecommerce_settings" parent="website.menu_website_global_configuration" name="eCommerce"/>
     <menuitem id="menu_ecommerce_payment_acquirers" parent="menu_ecommerce_settings" name="Payment Acquirers" action="payment.action_payment_acquirer"/>
     <menuitem id="menu_catalog_pricelists" name="Pricelists" parent="menu_ecommerce_settings" action="product.product_pricelist_action2" groups="product.group_pricelist_item" sequence="3"/>
 

diff --git a/addons/website_sale/views/res_config_view.xml b/addons/website_sale/views/res_config_view.xml
@@ -6,7 +6,7 @@
         <field name="inherit_id" ref="website.view_website_config_settings"/>
         <field name="arch" type="xml">
             <group name="social" position="before">
-                <group name="delivery" string="e-Commerce">
+                <group name="delivery" string="eCommerce">
                     <field name="group_website_multiimage" widget="radio"/>
                     <field name="module_website_sale_options" widget="radio"/>
                     <field name="group_sale_pricelist" class="oe_inline" invisible="1"/>

diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
@@ -1326,7 +1326,7 @@
                                   <li>
                                     <label t-if="acquirer.button">
                                         <input t-att-value="acquirer.id" type="radio" name="acquirer" t-att-checked="acquirers[0] == acquirer" />
-                                        <span t-field="acquirer.image_small" t-options='{"widget": "image", "alt-field": "name", "style":"display: inline-block;"}'/>
+                                        <span t-field="acquirer.image_small" t-att-title="acquirer.name" t-field-options='{"widget": "image", "style":"max-width: 60px; display: inline-block"}'/>
                                         <span t-field="acquirer.name" />
                                         <span t-if="acquirer.fees_active">(processing fees apply)</span>
                                     </label>
@@ -1701,7 +1701,7 @@
             <div class="container mt16 mb8">
                 <div class="pull-right" t-ignore="true" t-if="not editable">
                                                       Powered by <a class="label label-danger" href="http://www.odoo.com/page/website-builder">Odoo</a>,
-                                                      the #1 <a href="http://www.odoo.com/page/e-commerce">Open Source e-Commerce</a>.
+                                                      the #1 <a href="http://www.odoo.com/page/e-commerce">Open Source eCommerce</a>.
                                                     </div>
                 <div class="pull-left text-muted">
                                                       Copyright &amp;copy; <span t-field="res_company.name">Company name</span></div>

diff --git a/addons/website_sale_delivery/__manifest__.py b/addons/website_sale_delivery/__manifest__.py
@@ -1,5 +1,5 @@
 {
-    'name': 'e-Commerce Delivery',
+    'name': 'eCommerce Delivery',
     'category': 'Website',
     'summary': 'Add Delivery Costs to Online Sales',
     'website': 'https://www.odoo.com/page/e-commerce',

diff --git a/addons/website_sale_delivery/views/website_sale_delivery_views.xml b/addons/website_sale_delivery/views/website_sale_delivery_views.xml
@@ -13,7 +13,7 @@
             </div>
             <div name="title" position="after">
                 <group name="website">
-                    <field name="website_description" string="Description" placeholder="Description displayed on the e-Commerce and on online quotations."/>
+                    <field name="website_description" string="Description" placeholder="Description displayed on the eCommerce and on online quotations."/>
                 </group>
             </div>
         </field>

diff --git a/addons/website_sale_options/__manifest__.py b/addons/website_sale_options/__manifest__.py
@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
-    'name': 'e-Commerce Optional Products',
+    'name': 'eCommerce Optional Products',
     'category': 'Website',
     'version': '1.0',
     'website': 'https://www.odoo.com/page/e-commerce',