From b4d7b7e6dc91d92e9f57479ddf5f691d1fc04ba8 Mon Sep 17 00:00:00 2001 From: "Denis Vermylen (dve)" Date: Fri, 2 Sep 2016 13:20:42 +0200 Subject: [PATCH] [IMP] website, doc: replace eCommerce by e-Commerce --- README.md | 2 +- addons/payment/data/payment_acquirer_data.xml | 20 +++++++++---------- addons/website/README.md | 2 +- addons/website/static/description/index.html | 2 +- .../website_crm/static/description/index.html | 2 +- addons/website_event/README.md | 2 +- .../static/description/index.html | 2 +- addons/website_event_track/README.md | 2 +- .../data/website_event_track_demo.xml | 2 +- .../static/description/index.html | 2 +- addons/website_forum/data/forum_demo.xml | 6 +++--- addons/website_forum_doc/data/doc_demo.xml | 2 +- .../website_mail/data/mail_channel_data.xml | 2 +- addons/website_sale/README.md | 2 +- addons/website_sale/__openerp__.py | 2 +- addons/website_sale/data/web_planner_data.xml | 2 +- addons/website_sale/security/website_sale.xml | 2 +- addons/website_sale/views/backend.xml | 8 ++++---- addons/website_sale/views/res_config_view.xml | 2 +- addons/website_sale/views/templates.xml | 4 ++-- addons/website_sale_delivery/__openerp__.py | 2 +- .../views/website_sale_delivery_views.xml | 2 +- addons/website_sale_options/__openerp__.py | 2 +- .../data/website_slides_demo.xml | 10 +++++----- doc/_extensions/odoo/layout.html | 4 ++-- doc/howtos/themes.rst | 4 ++-- 26 files changed, 47 insertions(+), 47 deletions(-) diff --git a/README.md b/README.md index 90c3c86deeb..d221cc9b221 100644 --- 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 Open Source CRM, Website Builder, -eCommerce, +e-Commerce, Warehouse Management, Project Management, Billing & Accounting, diff --git a/addons/payment/data/payment_acquirer_data.xml b/addons/payment/data/payment_acquirer_data.xml index 1a46fe631b0..84a40489b30 100644 --- 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.

@@ -43,7 +43,7 @@ Ingenico Payment Services (formerly Ogone) supports credit cards, debit cards and bank transfers.

    -
  • eCommerce
    • +
  • e-Commerce
  • Cards storage
  • Pay button in emails
@@ -60,7 +60,7 @@ A payment gateway to accept online payments via credit cards, debit cards and bank transfers.

    -
  • eCommerce
    • +
  • e-Commerce
@@ -75,7 +75,7 @@ A payment gateway to accept online payments via credit cards and e-checks.

    -
  • eCommerce
    • +
  • e-Commerce
  • Cards storage
  • Authorize & Capture
@@ -93,7 +93,7 @@ Provide instructions to customers so that they can pay their orders manually.

    -
  • eCommerce
    • +
  • e-Commerce
@@ -108,7 +108,7 @@ A payment gateway from Atos Worldline to accept online payments via credit cards.

    -
  • eCommerce
    • +
  • e-Commerce
@@ -123,7 +123,7 @@ PayPal is the easiest way to accept payments via Paypal or credit cards.

    -
  • eCommerce
    • +
  • e-Commerce
  • Pay button in emails
@@ -139,7 +139,7 @@ A payment gateway to accept online payments via credit cards.

    -
  • eCommerce
    • +
  • e-Commerce
@@ -156,7 +156,7 @@ A generic acquirer payment acquirer.

    -
  • eCommerce
    • +
  • e-Commerce
@@ -171,7 +171,7 @@ PayU India is an online payments solutions company serving the Indian market.

    -
  • eCommerce
    • +
  • e-Commerce
  • Subscription
  • Pay button in emails
diff --git a/addons/website/README.md b/addons/website/README.md index 2f31310c837..8b00e6d4b08 100644 --- 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 eCommerce and CMS have poorly designed backends as it's not their +Traditional e-Commerce 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 index 658c0e95215..413e4ec6bb8 100644 --- a/addons/website/static/description/index.html +++ b/addons/website/static/description/index.html @@ -121,7 +121,7 @@

Sell Online

    -
  • - eCommerce
    • +
  • - e-Commerce
  • - Event Tickets

Full Marketing Stack

diff --git a/addons/website_crm/static/description/index.html b/addons/website_crm/static/description/index.html index d580e4c9cde..d5d915bdb4e 100644 --- a/addons/website_crm/static/description/index.html +++ b/addons/website_crm/static/description/index.html @@ -47,7 +47,7 @@

Get hundreds of open source apps for free

-

eCommerce

+

e-Commerce

diff --git a/addons/website_event/README.md b/addons/website_event/README.md index 862c44a685c..6c2275c9651 100644 --- 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 -### eCommerce +### e-Commerce 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 index 6b3085d49e2..58be24a0ced 100644 --- a/addons/website_event/static/description/index.html +++ b/addons/website_event/static/description/index.html @@ -71,7 +71,7 @@

Get sponsors to come to you

Sell sponsorship, promote your sponsors

- 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.

+ 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.

diff --git a/addons/website_event_track/README.md b/addons/website_event_track/README.md index c78babcb64c..9f6f5948d5b 100644 --- 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 eCommerce for a full sales cycle integration. +Sell sponsorship packages online through the Odoo e-Commerce 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 index 992bf209f25..7cb043049d3 100644 --- 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 @@ announced - A technical explanation of Odoo as a CMS and a eCommerce platform for version 8. + A technical explanation of Odoo as a CMS and a e-Commerce platform for version 8. diff --git a/addons/website_event_track/static/description/index.html b/addons/website_event_track/static/description/index.html index 52dde14fc6d..d2d5c4c0306 100644 --- a/addons/website_event_track/static/description/index.html +++ b/addons/website_event_track/static/description/index.html @@ -68,7 +68,7 @@ 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 eCommerce for + Sell sponsorship packages online through the Odoo e-Commerce for a full sales cycle integration.

diff --git a/addons/website_forum/data/forum_demo.xml b/addons/website_forum/data/forum_demo.xml index 4ec354c5766..de0aba2b445 100644 --- a/addons/website_forum/data/forum_demo.xml +++ b/addons/website_forum/data/forum_demo.xml @@ -34,12 +34,12 @@ - CMS replacement for ERP and eCommerce + CMS replacement for ERP and e-Commerce 8 - 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: + 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: -Can I use Odoo as a replacement CMS of Wordpress + eCommerce plugin? +Can I use Odoo as a replacement CMS of Wordpress + e-Commerce plugin? In simple words does Odoo became CMS+ERP platform?

]]> question diff --git a/addons/website_forum_doc/data/doc_demo.xml b/addons/website_forum_doc/data/doc_demo.xml index a1a21191274..e83426b0c12 100644 --- a/addons/website_forum_doc/data/doc_demo.xml +++ b/addons/website_forum_doc/data/doc_demo.xml @@ -64,7 +64,7 @@ - CMS & eCommerce + CMS & e-Commerce diff --git a/addons/website_mail/data/mail_channel_data.xml b/addons/website_mail/data/mail_channel_data.xml index f73182a2830..c1d4f83830f 100644 --- a/addons/website_mail/data/mail_channel_data.xml +++ b/addons/website_mail/data/mail_channel_data.xml @@ -44,7 +44,7 @@

  • - From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...) + From the Customize / Install Apps menu, you can install new features (forum, blog, e-Commerce, jobs, ...)

  • diff --git a/addons/website_sale/README.md b/addons/website_sale/README.md index 5ce2d491fea..69d34099913 100644 --- 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 Open Source eCommerce +Odoo is an Open Source e-Commerce unlike anything you have ever seen before. Get an awesome catalog of products and great product description pages. diff --git a/addons/website_sale/__openerp__.py b/addons/website_sale/__openerp__.py index 367d64ec1d4..2b1899085d0 100644 --- a/addons/website_sale/__openerp__.py +++ b/addons/website_sale/__openerp__.py @@ -1,5 +1,5 @@ { - 'name': 'eCommerce', + 'name': 'e-Commerce', '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 index ebe643d95d5..e7b00f95eb3 100644 --- a/addons/website_sale/data/web_planner_data.xml +++ b/addons/website_sale/data/web_planner_data.xml @@ -281,7 +281,7 @@ Sell More

    - If you have an eCommerce, one of your objectives is of course to grow your revenues by + If you have an e-Commerce, 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.

    diff --git a/addons/website_sale/security/website_sale.xml b/addons/website_sale/security/website_sale.xml index 4a129d60ece..353d6029647 100644 --- a/addons/website_sale/security/website_sale.xml +++ b/addons/website_sale/security/website_sale.xml @@ -37,7 +37,7 @@ - Show multi image on eCommerce + Show multi image on e-Commerce diff --git a/addons/website_sale/views/backend.xml b/addons/website_sale/views/backend.xml index afa8fef59c1..3c112f338a4 100644 --- a/addons/website_sale/views/backend.xml +++ b/addons/website_sale/views/backend.xml @@ -33,7 +33,7 @@ - eCommerce Orders + e-Commerce Orders sale.order tree,form [('state', 'in', ('sale', 'done'))] @@ -43,7 +43,7 @@ - Unpaid eCommerce Orders + Unpaid e-Commerce Orders sale.order tree,form [('state', '=', 'sent')] @@ -53,7 +53,7 @@ - Abandonned eCommerce Orders + Abandonned e-Commerce Orders sale.order tree,form [('state', '=', 'cancel')] @@ -87,7 +87,7 @@ - + diff --git a/addons/website_sale/views/res_config_view.xml b/addons/website_sale/views/res_config_view.xml index e4891b6d60d..261fb899663 100644 --- a/addons/website_sale/views/res_config_view.xml +++ b/addons/website_sale/views/res_config_view.xml @@ -6,7 +6,7 @@ - + diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml index 19deb3f20e1..50b3ba2a328 100644 --- a/addons/website_sale/views/templates.xml +++ b/addons/website_sale/views/templates.xml @@ -1326,7 +1326,7 @@
  • @@ -1701,7 +1701,7 @@
    Powered by Odoo, - the #1 Open Source eCommerce. + the #1 Open Source e-Commerce.
    Copyright © Company name
    diff --git a/addons/website_sale_delivery/__openerp__.py b/addons/website_sale_delivery/__openerp__.py index 6b54c891f3c..29b4cc2853b 100644 --- a/addons/website_sale_delivery/__openerp__.py +++ b/addons/website_sale_delivery/__openerp__.py @@ -1,5 +1,5 @@ { - 'name': 'eCommerce Delivery', + 'name': 'e-Commerce 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 index 73ec58e7a81..271fbf39eee 100644 --- 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 @@
    - +
    diff --git a/addons/website_sale_options/__openerp__.py b/addons/website_sale_options/__openerp__.py index 323cd78860f..1f737a96909 100644 --- a/addons/website_sale_options/__openerp__.py +++ b/addons/website_sale_options/__openerp__.py @@ -2,7 +2,7 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. { - 'name': 'eCommerce Optional Products', + 'name': 'e-Commerce Optional Products', 'category': 'Website', 'version': '1.0', 'website': 'https://www.odoo.com/page/e-commerce', diff --git a/addons/website_slides/data/website_slides_demo.xml b/addons/website_slides/data/website_slides_demo.xml index 7bea15166eb..b106c2dc161 100644 --- a/addons/website_slides/data/website_slides_demo.xml +++ b/addons/website_slides/data/website_slides_demo.xml @@ -117,14 +117,14 @@ 3. from $2M to $10M Investment Areas To Turn Odoo Mainstream 5 or how to spend $10M as fast as possible and burn a lot of energy... 4. Release A Product That Deprecates Every Competitor 1 This is something we excel at... 5. A product growth no one can follow -6. Version 9: roadmap o 40% Usability: – Improving all existing apps, the right feature at the right place – User onboarding, ease of use o 20% Accounting: – 8 countries in the core o 20% CMS / eCommerce o 10% New design: – Merge front/backend, mobile, modern design o 10% Framework: o New API +6. Version 9: roadmap o 40% Usability: – Improving all existing apps, the right feature at the right place – User onboarding, ease of use o 20% Accounting: – 8 countries in the core o 20% CMS / e-Commerce o 10% New design: – Merge front/backend, mobile, modern design o 10% Framework: o New API 7. 1 Release cycle February 2012: v6.1 (13 months) 2 January 2013: v7 (11 months) 3 June 2014: v8 (18 months) 4 June 2015: v9 (12 months) 5 Every new version is a revolution. Version 9 will be even more impressive! January 2011: v6.0 8. Attract The Mass Of Users 2 It's all about getting users, a lot of users. Not only customers. -9. An attractive pricing... o The cloud, free for 2 users: – Why the cloud? Smooth user experience. High satisfaction rates as everything works out-of-the-box – Unlimited applications: CRM, CMS, eCommerce, Accounting, etc. o Millions of CMS/eCommerce for free: – Already 50k pages on CMS/eCommerce websites built with Odoo CMS Beta – You can do a lot with 2 users: we don't need to get revenues from CMS/eCommerce-only instances as we have so many applications to upsell +9. An attractive pricing... o The cloud, free for 2 users: – Why the cloud? Smooth user experience. High satisfaction rates as everything works out-of-the-box – Unlimited applications: CRM, CMS, e-Commerce, Accounting, etc. o Millions of CMS/e-Commerce for free: – Already 50k pages on CMS/e-Commerce websites built with Odoo CMS Beta – You can do a lot with 2 users: we don't need to get revenues from CMS/e-Commerce-only instances as we have so many applications to upsell 10. Affordable implementations o Lower entry barrier - no huge starting costs for SMEs: – No complex implementation projects – A fixed-price packaged offer o New service offer, 100€ / month per application for: – Implementation assistance and configuration – Unlimited customization of screens, reports, workflows – Monthly upgrades – Training material – Unlimited support tickets, 24/24 response time! -11. Disrupt A Market Having A Huge Traction 3 Creating the frontend of all apps will not only increase the quality of all apps but also disrupt the CMS/eCommerce market. -12. " " The CMS/eCommerce market looks like the ERP market 6 years ago, before Odoo entered into it. Full of complex products that did not evolve over the past 3 years. -13. Traditional ERPs o The monetization (and main focus) remains on business apps: – Accounting – Warehouse Management – Project Management – Point of sale – Marketing – HR, ... o But CMS/eCommerce will bring a huge volume of prospects to our other business apps +11. Disrupt A Market Having A Huge Traction 3 Creating the frontend of all apps will not only increase the quality of all apps but also disrupt the CMS/e-Commerce market. +12. " " The CMS/e-Commerce market looks like the ERP market 6 years ago, before Odoo entered into it. Full of complex products that did not evolve over the past 3 years. +13. Traditional ERPs o The monetization (and main focus) remains on business apps: – Accounting – Warehouse Management – Project Management – Point of sale – Marketing – HR, ... o But CMS/e-Commerce will bring a huge volume of prospects to our other business apps 14. Make Partners Rich By Making Customers Super-Happy 4 You will like our product and services so much that you will always want to purchase more. 15. Traditional ERPs o Buy an ERP – Invest on 7 years o Maintain as long as you can – Implementations are so painful that you have no other choice – Upgrades are too expensive o After 7 years : it breaks – You change the product and call other vendors 16. Traditional ERPs o Modern companies deserve to: – Evolve continuously – Benefit from top features every year – Be free of any legacy constraints – Have the flexibility to customize easily o Odoo Enterprise – our main value proposition: – Providing so much value to customers through continuous upgrades that they will want to purchase even more diff --git a/doc/_extensions/odoo/layout.html b/doc/_extensions/odoo/layout.html index 000019b32cf..027b663cb57 100644 --- a/doc/_extensions/odoo/layout.html +++ b/doc/_extensions/odoo/layout.html @@ -68,7 +68,7 @@
  • Website Builder
    • -
  • eCommerce
    • +
  • e-Commerce
  • Blogs
  • Forums
  • Slides
    • @@ -320,7 +320,7 @@

    - Odoo is a suite of open source business apps that cover all your company needs: CRM, eCommerce, accounting, inventory, point of sale, project management, etc. + Odoo is a suite of open source business apps that cover all your company needs: CRM, e-Commerce, accounting, inventory, point of sale, project management, etc.

    Odoo's unique value proposition is to be at the same time very easy to use and fully integrated.     diff --git a/doc/howtos/themes.rst b/doc/howtos/themes.rst index a66068a7b00..cce149a847f 100644 --- a/doc/howtos/themes.rst +++ b/doc/howtos/themes.rst @@ -73,7 +73,7 @@ Odoo default theme structure **Main features:** - * Basic layouts for pages, blog and eCommerce + * Basic layouts for pages, blog and e-Commerce * Website Builder integration * Basic Snippets * Automatic Less/Sass compiling @@ -258,7 +258,7 @@ The ``data`` property will contain the xml files list. Right now it’s empty, b ``category`` defines your module category (always “Theme”) and, after a slash, the subcategory. You can use one subcategory from the Odoo Apps categories list. (https://www.odoo.com/apps/themes) -``depends`` specifies the modules needed by our theme to work properly. For our tutorial theme, we only need website. If you need blogging or eCommerce features as well, you have to add those modules too. +``depends`` specifies the modules needed by our theme to work properly. For our tutorial theme, we only need website. If you need blogging or e-Commerce features as well, you have to add those modules too. .. code-block:: python