diff --git a/_extensions/odoo/layout.html b/_extensions/odoo/layout.html index 50dba6224..abcdd2d16 100644 --- a/_extensions/odoo/layout.html +++ b/_extensions/odoo/layout.html @@ -39,6 +39,7 @@ })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); ga('create', '{{ google_analytics_key }}', 'auto'); + ga('set', 'anonymizeIp', true); ga('send','pageview'); {%- endif -%} diff --git a/_extensions/odoo/translator.py b/_extensions/odoo/translator.py index bc78ae418..34eb03d07 100644 --- a/_extensions/odoo/translator.py +++ b/_extensions/odoo/translator.py @@ -109,7 +109,7 @@ class BootstrapTranslator(nodes.NodeVisitor, object): return u''.join(self.body) def unknown_visit(self, node): - print "unknown node", node.__class__.__name__ + print("unknown node", node.__class__.__name__) self.body.append(u'[UNKNOWN NODE {}]'.format(node.__class__.__name__)) raise nodes.SkipNode diff --git a/db_management/db_online.rst b/db_management/db_online.rst index 6ace71f87..939be63df 100644 --- a/db_management/db_online.rst +++ b/db_management/db_online.rst @@ -50,13 +50,19 @@ Several actions are available: Upgrade ======= -Make sure to be connected to the database you want to upgrade and access to the +Make sure to be connected to the database you want to upgrade and access the database management page. On the line of the database you want to upgrade, click on the "Upgrade" button. .. image:: media/upgrade1.png :align: center +You have the possibility to choose the target version of the upgrade. By default, +we select the highest available version available for your database; if you were +already in the process of testing a migration, we will automatically select the +version you were already testing (even if we released a more recent version during +your tests). + By clicking on the "Test upgrade" button an upgrade request will be generated. If our automated system does not encounter any problem, you will receive a "Test" version of your upgraded database. @@ -68,14 +74,22 @@ If our automated system does not encounter any problem, you will receive a test database, our dedicated team will have to work on it. You will be notified by email and the process will take up to 4 weeks. -You will have the possibility to test it for 1 month. When you will be ready, -and be sure that there are no problem compared to your actual version, you can -click again on the Upgrade button, and confirm by clicking on Upgrade (the button -with the little rocket!) to definitely switch to the upgraded version of Odoo. +You will have the possibility to test it for 1 month. Inspect your data (e.g. +accounting reports, stock valuation, etc.), check that all your usual flows +work correctly (CRM flow, Sales flow, etc.). + +Once you are ready and that everything is correct in your test migration, you +can click again on the Upgrade button, and confirm by clicking on Upgrade +(the button with the little rocket!) to switch your production database to +the new version. .. image:: media/upgrade.png :align: center +.. warning :: Your database will be taken offline during the upgrade + (usually between 30min up to several hours for big databases), + so make sure to plan your migration during non-business hours. + .. _duplicate_online: Duplicating a database diff --git a/db_management/media/test_upgrade.png b/db_management/media/test_upgrade.png index 00a533fef..66474aa60 100644 Binary files a/db_management/media/test_upgrade.png and b/db_management/media/test_upgrade.png differ diff --git a/legal.rst b/legal.rst index 51c2b1b8f..01257f062 100644 --- a/legal.rst +++ b/legal.rst @@ -46,10 +46,6 @@ Terms and Conditions :alt: View Terms of Sale :target: legal/terms/terms_of_sale.html -.. |view_terms_odoosh| image:: _static/banners/txt.svg - :alt: View Odoo.sh Terms - :target: legal/terms/odoo_sh_terms.html - .. |download_terms_of_sale_en| image:: _static/banners/pdf.svg :alt: Download Odoo Terms of Sale :target: terms_of_sale.pdf @@ -119,24 +115,22 @@ Terms and Conditions :target: legal/terms/i18n/partnership_es.html -+-----------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+ -| | **English** | Français | Nederlands | Deutsch | Español | -+=============================+=======================================================================+========================================================================+=======================================================================+=======================================================================+=======================================================================+ -| Odoo Enterprise Agreement | |view_enterprise_en| |download_enterprise_en| | |view_enterprise_fr| |download_enterprise_fr| | (Coming soon) | |view_enterprise_de| |download_enterprise_de| | (Coming soon) | -+-----------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+ -| Odoo Partnership Agreement | |view_partnership_en| |download_partnership_en| | |view_partnership_fr| |download_partnership_fr| | (Coming soon) | (Coming soon) | |view_partnership_es| |download_partnership_es| | -+-----------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+ -| Odoo.sh Terms of Use | |view_terms_odoosh| | | | | | -+-----------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+ -| Terms of Sale | |view_terms_of_sale_en| |download_terms_of_sale_en| | |view_terms_of_sale_fr| |download_terms_of_sale_fr| | | | | -+-----------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+ ++--------------------------------------------------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+ +| | **English** | Français | Nederlands | Deutsch | Español | ++====================================================================+=======================================================================+========================================================================+=======================================================================+=======================================================================+=======================================================================+ +| Odoo Enterprise Agreement (Also applies to Odoo Cloud and Odoo.sh) | |view_enterprise_en| |download_enterprise_en| | |view_enterprise_fr| |download_enterprise_fr| | (Coming soon) | |view_enterprise_de| |download_enterprise_de| | (Coming soon) | ++--------------------------------------------------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+ +| Odoo Partnership Agreement | |view_partnership_en| |download_partnership_en| | |view_partnership_fr| |download_partnership_fr| | (Coming soon) | (Coming soon) | |view_partnership_es| |download_partnership_es| | ++--------------------------------------------------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+ +| Terms of Sale | |view_terms_of_sale_en| |download_terms_of_sale_en| | |view_terms_of_sale_fr| |download_terms_of_sale_fr| | | | | ++--------------------------------------------------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+ Other legal references ====================== -- `Odoo Online Service Level Agreement `_ -- `Odoo Online Acceptable Use Policy `_ +- `Odoo Cloud Service Level Agreement (SLA) `_ +- `Odoo Cloud Acceptable Use Policy `_ +- `Odoo SA's Privacy Policy `_ +- `Odoo SA's GDPR Compliance Guide `_ - :ref:`cla` - -.. - :ref:`privacy_policy` TODO! diff --git a/legal/terms.rst b/legal/terms.rst index 115ead952..9555d6b57 100644 --- a/legal/terms.rst +++ b/legal/terms.rst @@ -7,7 +7,6 @@ Terms and Conditions .. toctree:: :titlesonly: - terms/online terms/odoo_sh_terms terms/enterprise terms/partnership diff --git a/legal/terms/enterprise.rst b/legal/terms/enterprise.rst index f101f9c42..c142d5f36 100644 --- a/legal/terms/enterprise.rst +++ b/legal/terms/enterprise.rst @@ -5,15 +5,17 @@ Odoo Enterprise Subscription Agreement ====================================== -.. note:: Version 7.1 - 2018-03-16 +.. note:: Version 8.0 - 2018-05-22 .. v6: add "App" definition + update pricing per-App .. v7: remove possibility of price change at renewal after prior notice .. 7.1: specify that 7% renewal increase applies to all charges, not just per-User. +.. v8.0: adapt for "Self-Hosting" + "Data Protection" for GDPR By subscribing to the Odoo Enterprise services (the "Services") provided by Odoo SA and its -affiliates (collectively, "Odoo SA") in relation with Odoo Enterprise Edition or -Odoo Community Edition (the "Software"), you (the "Customer") are agreeing to be bound by the +affiliates (collectively, "Odoo SA") in relation with Odoo Enterprise Edition or Odoo Community +Edition (the "Software"), hosted on Odoo SA's Cloud platforms (the "Cloud Platform") or +on-premises ("Self-Hosting"), you (the "Customer") are agreeing to be bound by the following terms and conditions (the "Agreement"). .. _term: @@ -21,10 +23,10 @@ following terms and conditions (the "Agreement"). 1 Term of the Agreement ======================= -The duration of this Agreement (the “Term”) shall be minimally one year and as specified in writing -at the signature of this Agreement, beginning on the date of the signature. +The duration of this Agreement (the “Term”) shall be specified in writing on conclusion of this +Agreement, beginning on the date of conclusion. It is automatically renewed for an equal Term, unless either party provides a written notice of -termination minimum 30 days before the end of the Term by registered mail to the other party. +termination minimum 30 days before the end of the Term to the other party. .. _definitions: @@ -39,8 +41,7 @@ User App An "App" is a specialized group of features available for installation in the Software, - and listed in the public Pricing section of `Odoo SA's website `_ at the - signature of this Agreement. + and listed in the public Pricing section of `Odoo SA's website `_. Bug Is considered a Bug any failure of the Software that results in a complete stop, error @@ -51,18 +52,24 @@ Bug accounting requirements anymore). Covered Versions - All Services provided under this Agreement are applicable only to the Covered Versions of + Unless specified otherwise, the Services provided under this Agreement are applicable only + to the Covered Versions of the Software, which include the 3 (three) most recently released major versions. - To be covered by the current Agreement, Customer’s installations have to run the most recent - Covered Version at the time of this Agreement’s signature. When this is not the case, + To be covered by the current Agreement, the Customer has to run the most recent + Covered Version at the time of conclusion of this Agreement. When this is not the case, additional costs are applicable, as described in :ref:`charges`. .. _enterprise_access: -3 Access to Odoo Enterprise Edition -=================================== +3 Access to the Software +======================== + +The Customer can use the Software hosted on the Cloud Platform, or choose the Self-Hosting option. +The Cloud Platform is hosted and fully managed by Odoo SA, and accessed remotely by the Customer. +With the Self-Hosting option, the Customer instead hosts the Software on computer systems of their +choice, that are not under the control of Odoo SA. For the duration of this Agreement, Odoo SA gives the Customer a non-exclusive, non-transferable license to use (execute, modify, execute after modification) the Odoo Enterprise Edition software, @@ -78,7 +85,7 @@ of the Customer, and to deal with all collected data in compliance with its offi Policy, published at https://www.odoo.com/privacy. Upon expiration or termination of this Agreement, this license is revoked immediately and the -Customer agrees to stop using the Odoo Enterprise Edition software. +Customer agrees to stop using the Odoo Enterprise Edition software and the Cloud Platform. Should the Customer breach the terms of this section, the Customer agrees to pay Odoo SA an extra fee equal to 300% of the applicable list price for the actual number of Users and installed Apps. @@ -86,8 +93,8 @@ fee equal to 300% of the applicable list price for the actual number of Users an .. _services: -4 Included Services -=================== +4 Services +========== 4.1 Bug Fixing Service ---------------------- @@ -101,7 +108,8 @@ The Customer understands that Bugs caused by a modification or extension that is official Software will not be covered by this service. As soon as the Bug is fixed an appropriate remedy will be communicated to the Customer. -If the bug has been addressed in a more recent revision of the Covered Version of the + +For Self-Hosting, if the bug has been addressed in a more recent revision of the Covered Version of the Software used by the Customer, the Customer agrees to update its systems to that revision in order to obtain the correction. The Customer will not be asked to upgrade to a more recent Covered Version of the Software as a remedy to a Bug. @@ -113,11 +121,16 @@ Both parties acknowledge that as specified in the license of the Software and in section of this Agreement, Odoo SA cannot be held liable for Bugs in the Software. -4.2 Security Advisories Service -------------------------------- +4.2 Security Updates Service +---------------------------- + +.. _secu_self_hosting: + +Self-Hosting +++++++++++++ For the duration of this Agreement, Odoo SA commits to sending a "Security Advisory" to the Customer -for any security Bug that are discovered in the Covered Versions of the Software, at least 2 weeks +for any security Bug that is discovered in the Covered Versions of the Software, at least 2 weeks before making the Security Advisory public, unless the Bug has already been disclosed publicly by a third party. Security Advisories include a complete description of the Bug, its cause, its possible impacts @@ -127,6 +140,16 @@ The Customer understands that the Bug and the information in the Security Adviso as Confidential Information as described in :ref:`confidentiality` during the embargo period prior to the public disclosure. +.. _secu_cloud_platform: + +Cloud Platform +++++++++++++++ + +Odoo SA commits to apply the security remedies for any security Bug discovered in a version of +the Software hosted on the Cloud Platform, on all systems under its control, as soon as +the remedy is available, without requiring any manual action of the Customer. + + .. _upgrade: 4.3 Upgrade Services @@ -141,7 +164,9 @@ For the duration of this Agreement, the Customer can submit upgrade requests thr channel (typically Odoo SA's upgrade service website), in order to convert a database of the Software from one Covered Version of the Software to a more recent Covered Version (the "Target Version"). -Upgrade requests must include a complete backup copy of the Customer's database and the +For the Cloud Platform, upgrade requests are submitted directly from the control panel of the +Cloud Platform, and do not require any data upload. For Self-Hosting, +upgrade requests must include a complete backup copy of the Customer's database and the associated data (typically obtained from the Backup menu of the Software). Where necessary for data security or regulation reasons, the Upgrade Service includes an optional tool to anonymize identifiable data inside a database before submitting the upgrade request, and a tool to restore @@ -177,6 +202,52 @@ technical adaptation of third-party modules installed in the Customer's database corresponding data in order to be compatible with the Target Version. The Customer will receive an upgraded version of all installed third-party modules along with the upgraded database. + +.. _cloud_hosting: + +4.4 Cloud Hosting Services +-------------------------- + +For the duration of this Agreement, when the Customer chooses to use the Cloud Platform, +Odoo SA commits to providing at least the following services: + +- Choice of multiple hosting regions (minimum 3: Europe, America, Asia/Pacific) +- Hosting in Tier-III data centers or equivalent, with 99.9% network uptime +- Grade A SSL (HTTPS) Encryption of communication +- Fully automated, verified backups, replicated in multiple regions +- Disaster Recovery Plan, tested regularly + +The details of the Cloud Hosting Services are described on the Service Level Agreement page at +https://www.odoo.com/cloud-sla. + + +.. _support_service: + +4.4 Support Services +-------------------- + +Scope ++++++ + +For the duration of this Agreement, the Customer may open an unlimited number of support tickets +free of charge, exclusively for questions regarding Bugs (see 4.1 Bug Fixing Service) or guidance +with respect to the use of the standard features of the Software and Services +(functionalities, intended use, configuration, troubleshooting). + +Other assistance requests, such as questions related to development, customizations, +installation for Self-Hosting, or services requiring to access the Customer's database, +may be covered through the purchase of a separate Service Pack. +In case it’s not clear if a request is covered by this Agreement or a Service Pack, +the decision is at the discretion of Odoo SA. + +Availability +++++++++++++ + +Tickets can be submitted online at https://www.odoo.com/help, or by phone directly to the +various Odoo SA offices, subject to local opening hours. + + + .. _charges: 5 Charges and Fees @@ -187,15 +258,15 @@ upgraded version of all installed third-party modules along with the upgraded da 5.1 Standard charges -------------------- -The standard charges for the Odoo Enterprise subscription, the Bug Fixing Service, Security Advisories -Service and the Upgrade Service are based on the number of Users, the installed -Apps, the Software version used by the Customer, and specified in writing at the signature of the Agreement. +The standard charges for the Odoo Enterprise subscription and the Services are based on the number +of Users, the installed Apps, the Software version used by the Customer, and specified in writing +at the conclusion of the Agreement. When during the Term, the Customer has more Users or more installed Apps than specified at the time -of signature of this Agreement, the Customer agrees to pay an extra fee equivalent to the applicable +of conclusion of this Agreement, the Customer agrees to pay an extra fee equivalent to the applicable list price (at the beginning of the Term) for the additional Users or Apps, for the remainder of the Term. -If at the time of the signature of this Agreement, the Customer uses a Covered Version +If at the time of the conclusion of this Agreement, the Customer uses a Covered Version that is not the most recent one, the standard charges may be increased by 50% for the duration of the first Term, at the sole discretion of Odoo SA, to cover the extra maintenance costs. @@ -247,23 +318,32 @@ is legally obliged to pay or collect Taxes for which the Customer is responsible 6.1 Customer Obligations ------------------------ -.. FIXME: removed the clause about - The Customer agrees to: - pay Odoo SA any applicable charges for the Services of the present Agreement, in accordance with the payment conditions specified in the corresponding invoice ; - immediately notify Odoo SA when their actual number of Users or their installed Apps exceed the - numbers specified at the signature of the Agreement, and in this event, pay the applicable + numbers specified at the conclusion of the Agreement, and in this event, pay the applicable additional fee as described in section :ref:`charges_standard`; - take all measures necessary to guarantee the unmodified execution of the part of the Software that verifies the validity of the Odoo Enterprise Edition usage, as described in :ref:`enterprise_access` ; -- grant Odoo SA the necessary access to verify the validity of the Odoo Enterprise Edition usage - upon request (e.g. if the automatic validation is found to be inoperant for the Customer); - appoint 1 dedicated Customer contact person for the entire duration of the Agreement; + +When the Customer chooses to use the Cloud Platform, the Customer further agrees to: + +- take all reasonable measures to keep their user accounts secure, including by choosing + a strong password and not sharing it with anyone else; +- make a reasonable use of the Hosting Services, to the exclusion of any illegal or abusive + activities, and strictly observe the rules outlined in the Acceptable Use Policy + published at https://www.odoo.com/acceptable-use. + +When the Customer chooses the Self-Hosting option, the Customer further agrees to: + - take all reasonable measures to protect Customer’s files and databases and to ensure Customer’s data is safe and secure, acknowledging that Odoo SA cannot be held liable for any data loss; +- grant Odoo SA the necessary access to verify the validity of the Odoo Enterprise Edition usage + upon request (e.g. if the automatic validation is found to be inoperant for the Customer); .. _no_soliciting: @@ -312,9 +392,71 @@ The Receiving Party may disclose Confidential Information of the Disclosing Part compelled by law to do so, provided the Receiving Party gives the Disclosing Party prior notice of the compelled disclosure, to the extent permitted by law. + +.. _data_protection: + +6.5 Data Protection +------------------- + +Definitions + "Personal Data", "Controller", "Processing" take the same meanings as in the + Regulation (EU) 2016/679 and the Directive 2002/58/EC, + and any regulation or legislation that amends or replaces them + (hereafter referred to as “Data Protection Legislation”) + +Processing of Personal Data ++++++++++++++++++++++++++++ + +The parties acknowledge that the Customer's database may contain Personal Data, for which the +Customer is the Controller. This data will be processed by Odoo SA when the Customer instructs so, +by using any of the Services that require a database (e.g. the Cloud Hosting Services or +the Database Upgrade Service), or if the Customer transfers their database or a part of +their database to Odoo SA for any reason pertaining to this Agreement. + +This processing will be performed in conformance with Data Protection Legislation. +In particular, Odoo SA commits to: + +- (a) only process the Personal Data when and as instructed by the Customer, and for the purpose of + performing one of the Services under this Agreement, unless required by law to do so, + in which case Odoo SA will provide prior notice to the Customer, unless the law + forbids it ; +- (b) ensure that all persons within Odoo SA authorised to process the Personal Data have committed + themselves to confidentiality ; +- (c) implement and maintain appropriate technical and organizational measures to protect + the Personal Data against unauthorized or unlawful processing and against accidental loss, + destruction, damage, theft, alteration or disclosure ; +- (d) forward promptly to the Customer any Data Protection request that was submitted + to Odoo SA with regard to the Customer's database ; +- (e) notify the Customer promptly upon becoming aware of and confirming any accidental, + unauthorized, or unlawful processing of, disclosure of, or access to the Personal Data ; +- (f) notify the Customer if the processing instructions infringe applicable Data Protection + Legislation, in the opinion of Odoo SA; +- (g) make available to the Customer all information necessary to demonstrate compliance with the + Data Protection Legislation, allow for and contribute reasonably to audits, including + inspections, conducted or mandated by the Customer; +- (h) permanently delete all copies of the Customer's database in possession of Odoo SA, + or return such data, at the Customer’s choice, upon termination of this Agreement, + subject to the delays specified in Odoo SA's + `Privacy Policy `_ ; + +With regard to points (d) to (f), the Customer agrees to provide Odoo SA with accurate contact +information at all times, as necessary to notify the Customer's Data Protection responsible. + +Subprocessors ++++++++++++++ + +The Customer acknowledges and agrees that in order to provide the Services, Odoo SA may use +third-party service providers (Subprocessors) to process Personal Data. Odoo SA commits to only +use Subprocessors in compliance with Data Protection Legislation. This use will be covered by a +contract between Odoo SA and the Subprocessor that provides guarantees to that effect. +Odoo SA's Privacy Policy, published at https://www.odoo.com/privacy provides up-to-date information +regarding the names and purposes of Subprocessors currently in use by Odoo SA for the +execution of the Services. + + .. _termination: -6.5 Termination +6.6 Termination --------------- In the event that either Party fails to fulfill any of its obligations arising herein, and if such @@ -345,10 +487,10 @@ Surviving Provisions: For the duration of this Agreement, Odoo SA commits to using commercially reasonable efforts to execute the Services in accordance with the generally accepted industry standards provided that: -- the Customer’s computing systems are in good operational order and the Software is installed in a - suitable operating environment; -- the Customer provides adequate troubleshooting information and access so that Odoo SA can - identify, reproduce and address problems; +- the Customer’s computing systems are in good operational order and, for Self-Hosting, that + the Software is installed in a suitable operating environment; +- the Customer provides adequate troubleshooting information and, for Self-Hosting, any access + that Odoo SA may need to identify, reproduce and address problems; - all amounts due to Odoo SA have been paid. The Customer's sole and exclusive remedy and Odoo SA's only obligation for any breach of this warranty diff --git a/legal/terms/online.rst b/legal/terms/online.rst deleted file mode 100644 index b92fd3746..000000000 --- a/legal/terms/online.rst +++ /dev/null @@ -1,614 +0,0 @@ -.. _online_terms_of_sale: - -============================== -Odoo Online Terms & Conditions -============================== - -.. note:: Version 1 - Last revision: July 12, 2017. - -By subscribing to the Odoo Online services (the "Services") provided by Odoo SA and its -affiliates (collectively, "Odoo SA") in relation with Odoo Enterprise Edition or -Odoo Community Edition (the "Software"), you (the "Customer") are agreeing to be bound by the -following terms and conditions (the "Agreement"). - -.. _term_online: - -1 Term of the Agreement -======================= - -The duration of this Agreement (the “Term”) shall be minimally one month and as -specified in writing at the signature of this Agreement, beginning on the date -of the signature. It is automatically renewed for an equal Term, unless either -party provides a written notice of termination minimum 30 days before the end -of the Term by registered mail to the other party. - - -.. _definitions_online: - -2 Definitions -============= - -User - Any active user account with access to the Software in creation and/or edition mode. - Deactivated user accounts and accounts used by external people (or systems) who only have - limited access to the Software through the portal facilities (known as "portal Users") are not - counted as Users. - -Bug - Is considered a Bug any failure of the Software that results in a complete stop, error - traceback or security breach, and is not directly caused by a defective installation or - configuration. Non-compliance with specifications or requirements will be considered as Bugs at - the discretion of Odoo SA (typically, when the Software does not produce the results or - performance it was designed to produce, or when a country-specific feature does not meet legal - accounting requirements anymore). - -.. _enterprise_access_online: - -3 Access to source code -======================= - -For the duration of this Agreement, Odoo SA gives the Customer a non-exclusive, -non-transferable license to use (execute, modify, execute after modification) -the Odoo software, under the terms set forth in :ref:`appendix_a_online`. - -The Customer agrees to take all necessary measures to guarantee the unmodified -execution of the part of the Software that verifies the validity of the usage -and collects statistics for that purpose, including but not limited to the -running of an instance, the applications installed and the number of Users. - -Odoo SA commits not to disclose individual or named figures to third parties without the consent -of the Customer, and to deal with all collected data in compliance with its official Privacy -Policy, as published on `Odoo SA's website `_. - -Upon expiration or termination of this Agreement, this license is revoked immediately and the -Customer agrees to stop using the software. - -Should the Customer breach the terms of this section, the Customer agrees to -pay Odoo SA an extra fee equal to 300% of the applicable list price for the -actual number of Users for one year. - - -.. _services_online: - -4 Service Level -=============== - -4.1 Bug Fixing Service ----------------------- - -For the duration of this Agreement, Odoo SA commits to making all reasonable efforts to remedy any -Bug of the Software submitted by the Customer through the appropriate channel (typically, Odoo SA's -service desk email address or website form), and to start handling such Customer submissions -within 2 business days. - -The Customer understands that Bugs caused by a modification or extension that is not part of the -official Software will not be covered by this service. - -Both parties acknowledge that as specified in the license of the Software and in the :ref:`liability_online` -section of this Agreement, Odoo SA cannot be held liable for Bugs in the Software. - -4.2 Support Service -------------------- - -Support Scope -+++++++++++++ - -For the duration of this Agreement, Odoo SA offer a support service, with an -unlimited number of tickets for bugs and functional questions: how to use and -configure Odoo for your specific needs. - -This support service does not include support to customize Odoo, develop new -modules, or perform specific actions on your database on your behalf. (e.g. -recording data, or configuring the system for you) Those services can be -offered in extra through our Success Pack service offer. - -Support Service -+++++++++++++++ - -Support issues should be submited online on https://odoo.com/help In case of -emergency, you can call our support teams directly for a real time answer. - -Our support teams are split across 3 continents in India (Ahmedabad), Belgium -(Brussels) and United States (San Francisco) in order to cover 20 hours per -open day. (monday to friday, excluding legal holidays in the respective -countries) - -No guarantees are provided on the time to qualify or close a support ticket, -it's based on our best efforts. But 95% of the tickets are qualified within 2 -open days, and 90% of the critical bugs (when a user can not work on the system -anymore) are processed within 2 hours. - -The Odoo portal allows you to track you support tickets. - - -4.3 Service Availability ------------------------- - -Customer databases are hosted in the closest Odoo data center (EMEA: France, -Americas: Canada, APAC: Hong Kong or Taiwan). Each customer instance is replicated -in real-time on a hot-standby system located in the same data center. - -We work with different hosting providers worldwide (and we can switch at anytime), -but they always deliver at least 99.9% uptime guarantee. These metrics refer to -the availability of the platform itself for all customers. Individual databases -may be temporarily unavailable for specific reasons, typically related to the -customer's actions, customizations or upgrades. - -Our data centers are Tier-III certified or equivalent, with N+1 redundancy for -power, network and cooling. - -4.4 Backups & Recovery ----------------------- - -Every database has 14 full snapshot backups for up to 3 months: 1/day for 7 -days, 1/week for 4 weeks, 1/month for 3 months. Every backup is replicated on -at least 3 different machines in different data centers. - -Users can download manual backups of their live data at any time. - -For a permanent disaster impacting one server only, our Disaster Recovery Plan -has the following metrics: -- RPO (Recovery Point Objective) = 5 minutes, i.e. can lose maximum 5 minutes of work -- RTO (Recovery Time Objective) = 30 minutes, i.e the service will be back online after maximum 30 minutes (Standby promotion time + DNS propagation time included) - -For data center disasters (one entire data center is completely and permanently -down), Disaster Recovery Plan has these metrics: -- RPO (Recovery Point Objective) = 24h, i.e. you can lose maximum 24h of work if the data cannot be recovered and we need to restore the last daily backup -- RTO (Recovery Time Objective) = 24h, i.e. the service will be restored from the backup within 24 hours in a different data center - -4.5 Security ------------- - -Database Security -+++++++++++++++++ - -Customer data is stored in a dedicated database - no sharing of data between -clients. Data access control rules implement complete isolation between customer -databases running on the same cluster, no access is possible from one database -to another. - -Password Security -+++++++++++++++++ - -Customer passwords are protected with industry-standard PBKDF2+SHA512 -encryption (salted + stretched for thousands of rounds). - -Odoo staff does not have access to your password, and cannot retrieve it for -you, the only option if you lose it is to reset it Login credentials are always -transmitted securely over HTTPS. - -System Security -+++++++++++++++ - -All web connections to client instances are protected with state-of-the-art -256-bit SSL encryption. All our SSL certificates use robust 2048-bit modulus -with full SHA-2 certificates chains. Our servers are kept under a strict -security watch, and always patched against the latest SSL vulnerabilities, -enjoying Grade A SSL ratings at all times. - -All Odoo online servers are running hardened Linux distributions with -up-to-date security patches. Installations are ad-hoc and minimal to limit the -number of services that could contain vulnerabilities (no PHP/MySQL stack for -example) - -Only a few trusted Odoo engineers have clearance to remotely manage the servers -- and access is only possible using SSH key pairs (password authentication -disallowed) - -Firewalls and intrusion counter-measures help prevent unauthorized access. -Automatic Distributed Denial of Service (DDoS) mitigation is implemented in EU -and US data centers, and coming soon in Asia. - -Staff Access -++++++++++++ - -Odoo helpdesk staff may sign into your account to access settings related to -your support issue. For this they use their own special staff credentials, not -your password (which they have no way to know). - -This special staff access improves efficiency and security: they can -immediately reproduce the problem you are seeing, you never need to share your -password, and we can audit and control staff actions separately! - -Our Helpdesk staff strives to respect your privacy as much as possible, and -only access files and settings needed to diagnose and resolve your issue - -Physical Security -+++++++++++++++++ - -The Odoo Online servers are hosted in several data centers worldwide, that must -all satisfy with our minimum physical security criterions: -- Physical access to the data center area where Odoo servers are located is restricted to data center technicians only -- Security cameras are monitoring the data center locations - -Credit Cards Safety -+++++++++++++++++++ - -When you sign up for a paid Odoo Online subscription, we do not store your -credit card information. Your credit card information is only transmitted -securely between you and our PCI-Compliant payment acquirers: Ingenico and -Paypal (even for recurring subscriptions) - -Software Security -+++++++++++++++++ - -The codebase of Odoo is laregely distributed and, thus, is continuously under -examination by Odoo users and contributors worldwide. Community bug reports are -therefore one important source of feedback regarding security. We encourage -developers to audit the code and report security issues. - -Odoo SA commits to sending a "Security Advisory" to the Customer for any -security Bug that are discovered in the Software, at least 2 weeks before -making the Security Advisory public, unless the Bug has already been disclosed -publicly by a third party. - -Security Advisories include a complete description of the Bug, its cause, its -possible impacts on the Customer's systems, and the corresponding remedy for -each Covered Version. - -The Customer understands that the Bug and the information in the Security -Advisory must be treated are Confidential Information as described in -:ref:`confidentiality_online` during the embargo period prior to the public -disclosure. - -The Odoo R&D processes have code review steps that include security aspects, -for new and contributed pieces of code. Odoo is designed in a way that prevents -introducing most common security vulnerabilities: - -- SQL injections are prevented by the use of a higher-level API that does not require manual SQL queries -- XSS attacks are prevented by the use of a high-level templating system that automatically escapes injected data -- The framework prevents RPC access to private methods, making it harder to introduce exploitable vulnerabilities -- See also the OWASP Top Vulnerabilities section to see how Odoo is designed from the ground up to prevent such vulnerabilities from appearing. - -Odoo is regularly audited by independent companies that are hired by our -customers and prospects to perform audits and penetration tests. The Odoo -Security Team receives the results and takes appropriate corrective measures -whenever it is necessary. We can't however disclose any of those results, -because they are confidential and belong to the commissioners. - -Odoo also has a very active community of independent security researchers, who -continuously monitor the source code and work with us to improve and harden the -security of Odoo. Our Security Program is described on our Responsible -Disclosure page: https://www.odoo.com/page/responsible-disclosure. - -.. _upgrade_online: - -4.6 Upgrade Services --------------------- - -.. _upgrade_odoo_online: - -Upgrade Service for the Software -++++++++++++++++++++++++++++++++ - -For the duration of this Agreement, the Customer can submit upgrade requests, -in order to convert a database of the Software from one Covered Version of the -Software to a more recent Covered Version (the "Target Version"). - -This service provided through an automated platform in order to allow the Customer to perform -unattended upgrades once a previous version of the Customer's database has been successfully -upgraded for a Covered Version. -The Customer may submit successive upgrade requests for a database, and agrees to submit at least -1 upgrade request for testing purposes before submitting the final upgrade request. - -It is the sole responsibility of the Customer to verify and validate the upgraded database in order -to detect Bugs, to analyze the impact of changes and new features implemented in the Target Version, -and to convert and adapt for the Target Version any third-party extensions of the Software that -were installed in the database before the upgrade (except where applicable as foreseen in section -:ref:`upgrade_extra_online`). - -The Customer may submit multiple upgrade requests for a database, until an -acceptable result is achieved. - -.. _upgrade_extra_online: - -Upgrade Service for customizations -++++++++++++++++++++++++++++++++++ - -For the duration of this Agreement, the Customer may request optional upgrade -services for third-party extension modules of the Software, in addition to the -regular Upgrade Services. - -This optional service is subject to additional fees -(as described in charges_online_) and includes the technical adaptation of third-party -modules installed in the Customer's database and their corresponding data in -order to be compatible with the Target Version. The Customer will receive an -upgraded version of all installed third-party modules along with the upgraded -database. - -.. _charges_online: - -5 Charges and Fees -================== - -.. _charges_standard_online: - -5.1 Standard charges --------------------- - -The standard charges for the Odoo Online subscription, the Bug Fixing Service, Security Advisories -Service and the Upgrade Service are based on the number of Users and applications used by -the Customer, and specified in writing at the signature of the Agreement. - -When during the Term, the Customer has more Users or applications than -specified at the time of signature of this Agreement, the Customer agrees to -pay an extra fee equivalent to the applicable list price (at the beginning of -the Term) for the additional Users and applications, for the remainder of the -Term. - -.. _charges_renewal_online: - -5.2 Renewal charges -------------------- - -Upon renewal as covered in section :ref:`term_online`, if the per-User charges applied -during the previous Term are lower than the most current applicable per-User -list price, the per-User charges will increase by up to 7% per year. - - -.. _charges_thirdparty_online: - -5.3 Charges for custom features or third-party modules ------------------------------------------------------- - -.. FIXME: should we really fix the price in the contract? - -The additional charge for the Upgrade, Support and Bugfix Service for custom -modules developed by Odoo SA is a recurring price depending on the number of -hours done to develop these custom features: -- 4 EUR / month per hour of development in European contries -- 5 USD / month per hour of development in other countries - -In case the modules are not developed by Odoo SA, Odoo SA reserves the right to -reject an upgrade request for third-party modules under the above conditions if -the quality of the source code of those modules is too low, or if these modules -constitute an interface with third-party software or systems. The upgrade of -such modules will subject to a separate offer, outside of this Agreement. - -.. _taxes_online: - -5.4 Taxes ---------- - -.. FIXME : extra section, not sure we need it? - -All fees and charges are exclusive of all applicable federal, provincial, state, local or other -governmental taxes, fees or charges (collectively, "Taxes"). The Customer is responsible for paying -all Taxes associated with purchases made by the Customer under this Agreement, except when Odoo SA -is legally obliged to pay or collect Taxes for which the Customer is responsible. - - -.. _conditions_online: - -6 Conditions of Services -======================== - -6.1 Customer Obligations ------------------------- - -.. FIXME: removed the clause about - -The Customer agrees to: - -- pay Odoo SA any applicable charges for the Services of the present Agreement, in accordance with - the payment conditions specified in the corresponding invoice ; -- appoint 1 dedicated Customer contact person for the entire duration of the Agreement; - - -.. _no_soliciting_online: - -6.2 No Soliciting or Hiring ---------------------------- - -Except where the other party gives its consent in writing, each party, its affiliates and -representatives agree not to solicit or offer employment to any employee of the other party who is -involved in performing or using the Services under this Agreement, for the duration of the Agreement -and for a period of 12 months from the date of termination or expiration of this Agreement. -In case of any breach of the conditions of this section that leads to the termination of said -employee toward that end, the breaching party agrees to pay to the other party an amount of -EUR (€) 30 000.00 (thirty thousand euros). - - -.. _publicity_online: - -6.3 Publicity -------------- - -Except where notified otherwise in writing, each party grants the other a non-transferable, -non-exclusive, royalty free, worldwide license to reproduce and display the other party’s name, -logos and trademarks, solely for the purpose of referring to the other party as a customer or -supplier, on websites, press releases and other marketing materials. - - -.. _confidentiality_online: - -6.4 Confidentiality -------------------- - -Definition of "Confidential Information": - All information disclosed by a party (the "Disclosing Party") to the other party - (the "Receiving Party"), whether orally or in writing, that is designated as confidential or - that reasonably should be understood to be confidential given the nature of the information and - the circumstances of disclosure. In particular any information related to the business, - affairs, products, developments, trade secrets, know-how, personnel, customers and suppliers of - either party should be regarded as confidential. - -For all Confidential Information received during the Term of this Agreement, the Receiving Party -will use the same degree of care that it uses to protect the confidentiality of its own similar -Confidential Information, but not less than reasonable care. - -The Receiving Party may disclose Confidential Information of the Disclosing Party to the extent -compelled by law to do so, provided the Receiving Party gives the Disclosing Party prior notice of -the compelled disclosure, to the extent permitted by law. - -.. _termination_online: - -6.5 Termination ---------------- - -In the event that either Party fails to fulfill any of its obligations arising herein, and if such -breach has not been remedied within 30 calendar days from the written notice of such -breach, this Agreement may be terminated immediately by the non-breaching Party. - -Further, Odoo SA may terminate the Agreement immediately in the event the Customer fails to pay -the applicable fees for the Services within the due date specified on the corresponding invoice. - -Surviving Provisions: - The sections ":ref:`confidentiality_online`”, “:ref:`disclaimers_online`”, - “:ref:`liability_online`”, and “:ref:`general_provisions_online`” will survive any termination or expiration of - this Agreement. - - -.. _warranties_disclaimers_online: - -7 Warranties, Disclaimers, Liability -==================================== - -.. _warranties_online: - -7.1 Warranties --------------- - -.. industry-standard warranties regarding our Services while Agreement in effect - -For the duration of this Agreement, Odoo SA commits to using commercially reasonable efforts to -execute the Services in accordance with the generally accepted industry standards provided that: - -- the Customer’s computing systems are in good operational order and the Software is installed in a - suitable operating environment; -- the Customer provides adequate troubleshooting information and access so that Odoo SA can - identify, reproduce and address problems; -- all amounts due to Odoo SA have been paid. - -The Customer's sole and exclusive remedy and Odoo SA's only obligation for any breach of this warranty -is for Odoo SA to resume the execution of the Services at no additional charge. - -.. _disclaimers_online: - -7.2 Disclaimers ---------------- - -.. no other warranties than explicitly provided - -Except as expressly provided herein, neither party makes any warranty of any kind, whether express, -implied, statutory or otherwise, and each party specifically disclaims all implied warranties, -including any implied warranty of merchantability, fitness for a particular purpose or -non-infringement, to the maximum extent permitted by applicable law. - -Odoo SA does not warrant that the Software complies with any local or international law or regulations. - -.. _liability_online: - -7.3 Limitation of Liability ---------------------------- - -To the maximum extent permitted by law, the aggregate liability of each party together with its -affiliates arising out of or related to this Agreement will not exceed 50% of the total amount -paid by the Customer under this Agreement during the 12 months immediately preceding the date of the event -giving rise to such claim. Multiple claims shall not enlarge this limitation. - -In no event will either party or its affiliates be liable for any indirect, special, exemplary, -incidental or consequential damages of any kind, including but not limited to loss of revenue, -profits, savings, loss of business or other financial loss, costs of standstill or delay, lost or -corrupted data, arising out of or in connection with this Agreement regardless of the form of -action, whether in contract, tort (including strict negligence) or any other legal or equitable -theory, even if a party or its affiliates have been advised of the possibility of such damages, -or if a party or its affiliates' remedy otherwise fails of its essential purpose. - -.. _force_majeure_online: - -7.4 Force Majeure ------------------ - -Neither party shall be liable to the other party for the delay in any performance or failure to -render any performance under this Agreement when such failure or delay is caused by governmental -regulations, fire, strike, war, flood, accident, epidemic, embargo, appropriation of plant or -product in whole or in part by any government or public authority, or any other cause or causes, -whether of like or different nature, beyond the reasonable control of such party as long as such -cause or causes exist. - - -.. _general_provisions_online: - -8 General Provisions -==================== - -.. _governing_law_online: - -8.1 Governing Law ------------------ - -Both parties agree that the laws of Belgium will apply, should any dispute arise out of or -in connection with this Agreement, without regard to choice or conflict of law principles. -To the extent that any lawsuit or court proceeding is permitted hereinabove, both -parties agree to submit to the sole jurisdiction of the Nivelles (Belgium) court for the purpose of -litigating all disputes. - -.. _severability_online: - -8.2 Severability ----------------- - -In case any one or more of the provisions of this Agreement or any application thereof shall be -invalid, illegal or unenforceable in any respect, the validity, legality and enforceability of the -remaining provisions of this Agreement and any application thereof shall be in no way thereby -affected or impaired. Both parties undertake to replace any invalid, illegal or -unenforceable provision of this Agreement by a valid provision having the same effects and -objectives. - - -.. _appendix_a_online: - -9 Appendix A: Odoo Enterprise Edition License -============================================= - -.. only:: latex - - Odoo Enterprise Edition is licensed under the Odoo Enterprise Edition License v1.0, - defined as follows: - - .. include:: ../licenses/enterprise_license.txt - :literal: - -.. only:: html - - See :ref:`odoo_enterprise_license`. - - - - - -.. FIXME: move this is to appendix or somewhere else? - -.. only:: disabled - - Agreement Registration - ====================== - - Customer contact information - ---------------------------- - - Company name: - Company address: - VAT number (if applicable): - Contact name: - Email: - Phone: - - Technical contact information (can be an Odoo partner): - ------------------------------------------------------- - Company name: - Contact name: - Email: - Phone: - - - By signing this Agreement I confirm I am a legal representative of Customer as stated in the - resent section and approve all provisions and conditions of the present Agreement: - - For and on behalf of (company name): - Last name, first name: - Title: - Date: - - Signature: diff --git a/legal/terms/partnership.rst b/legal/terms/partnership.rst index 7ed3c9e5b..73f1bd895 100644 --- a/legal/terms/partnership.rst +++ b/legal/terms/partnership.rst @@ -5,9 +5,10 @@ Odoo Partnership Agreement ========================== -.. note:: Version 6a - 2017-12-11 +.. note:: Version 7 - 2018-05-24 .. v6a: typo in section 4.4 +.. v7: introduce "Learning Partners" and a few related changes BETWEEN: @@ -76,32 +77,37 @@ Edition and to collect statistics that are needed for that purpose. 4.1 Partnership levels ---------------------- -The Odoo partner program consists of three partnership levels; Ready, Silver and Gold with specific -requirements and benefits for each level. +The Odoo partner program consists of two types of partnerships and four levels; +“Learning Partners” is for companies who want everything necessary to start implementing Odoo, +without visibility as an official partner until they get the required experience; +“Official Partners” is for companies who want the visibility as Ready, Silver and Gold, +according to their experience with Odoo. Partnership level granted to PARTNER depends on the annual new Odoo Enterprise revenue generated -for ODOO. Renewals of existing contracts do not account for the partnership level, but PARTNER +for ODOO, the number of certified resources and the customer retention rate. +Renewals of existing contracts do not account for the partnership level, but PARTNER still gets a commission on these contracts as stated in section :ref:`benefits`. The table below summarizes the requirements for each partnership level. -+--------------------------------------------+----------+----------+----------+ -| | Ready | Silver | Gold | -+============================================+==========+==========+==========+ -| Annual New Net Odoo Enterprise Users Sold | 0 | 50 | 100 | -+--------------------------------------------+----------+----------+----------+ -| Certified Active Internal Resources | 1 | 2 | 4 | -+--------------------------------------------+----------+----------+----------+ -| Minimum retention rate | n/a | 85% | 85% | -+--------------------------------------------+----------+----------+----------+ ++--------------------------------------------+------------------+--------------------+--------------------+--------------------+ +| | Learning Partner | Official: Ready | Official: Silver | Official: Gold | ++============================================+==================+====================+====================+====================+ +| Annual New Net Odoo Enterprise Users Sold | 0 | 10 | 50 | 150 | ++--------------------------------------------+------------------+--------------------+--------------------+--------------------+ +| Certified Active Internal Resources | 0 | 1 | 2 | 3 | ++--------------------------------------------+------------------+--------------------+--------------------+--------------------+ +| Minimum retention rate | n/a | n/a | 70% | 80% | ++--------------------------------------------+------------------+--------------------+--------------------+--------------------+ Certifications are personal, so when a certified staff member leaves the company, PARTNER must notify ODOO in order to update the number of certified resources active for the partnership contract. The level of partnerships will be reviewed quarterly by ODOO based on new Odoo Enterprise contracts -sold by PARTNER over the previous 12 months. +sold by PARTNER over the previous 12 months, official certifications granted to employees of the partner, +and customer retention rate. -Partners may be upgraded automatically to a higher level once they reach the requirements for that +"Official Partners" may be upgraded automatically to a higher level once they reach the requirements for that higher partnership level. Silver and Gold partners that are not meeting their partnerships requirements at the end of annual period may be assigned to a lower partnership level. @@ -112,54 +118,58 @@ requirements at the end of annual period may be assigned to a lower partnership The details of the benefits for each level of partnership are described in the table below: -+---------------------------------------+-----------------+------------------+----------------+ -| | Ready | Silver | Gold | -+=======================================+=================+==================+================+ -| **Recognition** | | | | -+---------------------------------------+-----------------+------------------+----------------+ -| Visibility on odoo.com | "Ready Partner" | "Silver Partner" | "Gold Partner" | -+---------------------------------------+-----------------+------------------+----------------+ -| Rights to use "Odoo" trademark | Ready logo | Silver logo | Gold Logo | -+---------------------------------------+-----------------+------------------+----------------+ -| **Training benefits** | | | | -+---------------------------------------+-----------------+------------------+----------------+ -| Yearly upgrade seminars | Yes | Yes | Yes | -+---------------------------------------+-----------------+------------------+----------------+ -| Sales Coaching | Yes | Yes | Yes | -+---------------------------------------+-----------------+------------------+----------------+ -| Access to E-Learning Platform and | Yes | Yes | Yes | -| | | | | -| Odoo Knowledge Base | | | | -+---------------------------------------+-----------------+------------------+----------------+ -| **Software benefits** | | | | -+---------------------------------------+-----------------+------------------+----------------+ -| Access to Odoo Enterprise source code | Yes | Yes | Yes | -+---------------------------------------+-----------------+------------------+----------------+ -| **Sales benefits** | | | | -+---------------------------------------+-----------------+------------------+----------------+ -| Commission on Odoo SH platform [#f1]_ | 100% | 100% | 100% | -+---------------------------------------+-----------------+------------------+----------------+ -| Commission on Odoo Enterprise | 10% | 15% | 20% | -+---------------------------------------+-----------------+------------------+----------------+ -| Access to dedicated Account Manager | Yes | Yes | Yes | -+---------------------------------------+-----------------+------------------+----------------+ -| **Marketing benefits** | | | | -+---------------------------------------+-----------------+------------------+----------------+ -| Access to marketing material | Yes | Yes | Yes | -+---------------------------------------+-----------------+------------------+----------------+ -| PARTNER Event - ODOO support & | Yes | Yes | Yes | -| Promotion | | | | -+---------------------------------------+-----------------+------------------+----------------+ +.. only:: latex -.. [#f1] The 100% commission rate on Odoo SH Platform is granted for all Odoo Enterprise - subscriptions signed during the first year of partnership, as long as those subscription - are renewed. After the first year, PARTNER gets the normal Odoo Enterprise commission, - according to the partnership level. + .. tabularcolumns:: |L|p{1.5cm}|p{1.5cm}|p{1.5cm}|p{1.5cm}| + ++---------------------------------------+------------------+--------------------+--------------------+--------------------+ +| | Learning Partner | Official: Ready | Official: Silver | Official: Gold | ++=======================================+==================+====================+====================+====================+ +| **Recognition** | | | | | ++---------------------------------------+------------------+--------------------+--------------------+--------------------+ +| Visibility on odoo.com | No | "Ready Partner" | "Silver Partner" | "Gold Partner" | ++---------------------------------------+------------------+--------------------+--------------------+--------------------+ +| Rights to use "Odoo" trademark | Learning Logo | Ready logo | Silver logo | Gold Logo | ++---------------------------------------+------------------+--------------------+--------------------+--------------------+ +| **Training benefits** | | | | | ++---------------------------------------+------------------+--------------------+--------------------+--------------------+ +| Yearly upgrade seminars | Yes | Yes | Yes | Yes | ++---------------------------------------+------------------+--------------------+--------------------+--------------------+ +| Sales Coaching | Yes | Yes | Yes | Yes | ++---------------------------------------+------------------+--------------------+--------------------+--------------------+ +| Access to E-Learning Platform and | Yes | Yes | Yes | Yes | +| | | | | | +| Odoo Knowledge Base | Yes | Yes | Yes | Yes | ++---------------------------------------+------------------+--------------------+--------------------+--------------------+ +| **Software benefits** | | | | | ++---------------------------------------+------------------+--------------------+--------------------+--------------------+ +| Access to Odoo Enterprise source code | Yes | Yes | Yes | Yes | ++---------------------------------------+------------------+--------------------+--------------------+--------------------+ +| Odoo Enterprise trial extension codee | Yes | Yes | Yes | Yes | ++---------------------------------------+------------------+--------------------+--------------------+--------------------+ +| **Sales benefits** | | | | | ++---------------------------------------+------------------+--------------------+--------------------+--------------------+ +| Commission on Odoo SH platform [#f1]_ | 10% | 100% | 100% | 100% | ++---------------------------------------+------------------+--------------------+--------------------+--------------------+ +| Commission on Odoo Enterprise | 10% | 10% | 15% | 20% | ++---------------------------------------+------------------+--------------------+--------------------+--------------------+ +| Access to dedicated Account Manager | No | Yes | Yes | Yes | ++---------------------------------------+------------------+--------------------+--------------------+--------------------+ +| **Marketing benefits** | | | | | ++---------------------------------------+------------------+--------------------+--------------------+--------------------+ +| Access to marketing material | Yes | Yes | Yes | Yes | ++---------------------------------------+------------------+--------------------+--------------------+--------------------+ +| PARTNER Event - ODOO support & | No | Yes | Yes | Yes | +| Promotion | | | | | ++---------------------------------------+------------------+--------------------+--------------------+--------------------+ + +.. [#f1] In case the 100% commission rate for Odoo SH is modified upon renewal by a future version + of this Agreement, the previous rate will continue to apply for existing subscriptions. 4.3 Partner Recognition ----------------------- -ODOO will promote PARTNER as an official partner on the official website (odoo.com). +ODOO will promote "Official Partners" on the list of Odoo Partners on the official website (odoo.com). ODOO grants PARTNER, on a non-exclusive basis, the right to use and reproduce the ODOO Partner logo of the corresponding partnership level, and the "Odoo" name in relation with this partnership @@ -194,7 +204,7 @@ retribution as follows: - For “Odoo Enterprise” and "Odoo SH" subscriptions sold via PARTNER; ODOO will invoice directly the customer based on final pricing agreed between ODOO, PARTNER, and the customer. Then, PARTNER - will invoice his commission to ODOO based on the Odoo Enteprise Edition price, net of possible + will invoice his commission to ODOO based on the Odoo Enterprise Edition price, net of possible rebates, and based on PARTNER's current partnership level at the time of signature of the sale. - For “Odoo Enterprise” subscription renewals; PARTNER receives a commission for each renewal of a subscription sold via PARTNER, as long as PARTNER maintains a contractual relationship with the @@ -209,7 +219,7 @@ PARTNER agrees to pay either the Partnership Entry fee or the Partnership Annual immediately upon receipt of the annual invoice sent by ODOO. The fees will be specified in writing at the time of signature of this agreement. -PARTNER acknowledges that the abovementioned partnership fees are not refundable. +PARTNER acknowledges that the above-mentioned partnership fees are not refundable. The "Partnership Entry" fee shall be paid before the activation of this Agreement, and applies for new partners only. diff --git a/locale/fr/LC_MESSAGES/discuss.po b/locale/fr/LC_MESSAGES/discuss.po index 0335c970a..dc12bf22b 100644 --- a/locale/fr/LC_MESSAGES/discuss.po +++ b/locale/fr/LC_MESSAGES/discuss.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-03-08 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Olivier Lenoir , 2018\n" +"Last-Translator: kaj nithi , 2018\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -71,7 +71,7 @@ msgstr "" #: ../../discuss/email_servers.rst:34 msgid "Can I use an Office 365 server" -msgstr "" +msgstr "Puis-je utiliser un serveur Office 365?" #: ../../discuss/email_servers.rst:35 msgid "" diff --git a/sales.rst b/sales.rst index d5f42db15..649276b62 100644 --- a/sales.rst +++ b/sales.rst @@ -7,8 +7,7 @@ Sales .. toctree:: :titlesonly: - sales/overview - sales/quotation + sales/send_quotations sales/invoicing sales/products_prices sales/sale_ebay diff --git a/sales/overview.rst b/sales/overview.rst deleted file mode 100644 index d789f007a..000000000 --- a/sales/overview.rst +++ /dev/null @@ -1,8 +0,0 @@ -======== -Overview -======== - -.. toctree:: - :titlesonly: - - overview/main_concepts diff --git a/sales/overview/main_concepts.rst b/sales/overview/main_concepts.rst deleted file mode 100644 index 25876313e..000000000 --- a/sales/overview/main_concepts.rst +++ /dev/null @@ -1,9 +0,0 @@ -============= -Main Concepts -============= - -.. toctree:: - :titlesonly: - - main_concepts/introduction - main_concepts/invoicing \ No newline at end of file diff --git a/sales/overview/main_concepts/introduction.rst b/sales/overview/main_concepts/introduction.rst deleted file mode 100644 index dc6cc4a24..000000000 --- a/sales/overview/main_concepts/introduction.rst +++ /dev/null @@ -1,63 +0,0 @@ -========================== -Introduction to Odoo Sales -========================== - -.. youtube:: VMuCr5_arsY - :align: right - :width: 700 - :height: 394 - -Transcript -========== - -As a sales manager, closing opportunities with Odoo Sales is -really simple. - -I selected a predefined quotation for a new product line offer. -The products, the service details are already in the quotation. -Of course, I can adapt the offer to fit my clients needs. - -The interface is really smooth. I can add references, some -catchy phrases such as closing triggers (*here, you save $500 -if you sign the quote within 15 days*). I have a beautiful and -modern design. This will help me close my opportunities more -easily. - -Plus, reviewing the offer from a mobile phone is easy. -Really easy. The customer got a clear quotation with a -table of content. We can communicate easily. I identified an -upselling opportunity. So, I adapt the offer by adding more -products. When the offer is ready, the customer just needs to sign -it online in just a few clicks. -Odoo Sales is integrated with major shipping services: UPS, Fedex, -USPS and more. The signed offer creates a delivery order automatically. - -That's it, I successfully sold my products in just a few clicks. - -Oh, I also have the transaction and communication history -at my fingertips. It's easy for every stakeholder to know -clearly the past interaction. And any information related -to the transaction. - -- If you want to show information, I would do it from a customer - form, something like: - - - Kanban of customers, click on one customer - - - Click on opportunities, click on quotation - - - Come back to customers (breadcrum) - - - Click on customer statement letter - -Anytime, I can get an in-depth report of my sales activity. -Revenue by salespeople or department. Revenue by category of -product, drill-down to specific products, by quarter or month,... -I like this report: I can add it to my dashboard in just a click. - -Odoo Sales is a powerful, yet easy-to-use app. At first, I used -the sales planner. Thanks to it, I got tips and tricks to boost -my sales performance. - -Try Odoo Sales now and get beautiful quotations, amazing dashboards -and increase your success rate. diff --git a/sales/overview/main_concepts/invoicing.rst b/sales/overview/main_concepts/invoicing.rst deleted file mode 100644 index a4f569c0a..000000000 --- a/sales/overview/main_concepts/invoicing.rst +++ /dev/null @@ -1,100 +0,0 @@ -================================= -Overview of the invoicing process -================================= - -Depending on your business and the application you use, there are -different ways to automate the customer invoice creation in Odoo. -Usually, draft invoices are created by the system (with information -coming from other documents like sales order or contracts) and -accountant just have to validate draft invoices and send the invoices in -batch (by regular mail or email). - -Depending on your business, you may opt for one of the following way to -create draft invoices: - -:menuselection:`Sales Order --> Invoice` ----------------------------------------- - -In most companies, salespeople create quotations that become sales order -once they are validated. Then, draft invoices are created based on the -sales order. You have different options like: - -- Invoice on ordered quantity: invoice the full order before - triggering the delivery order - -- Invoice based on delivered quantity: see next section - -Invoice before delivery is usually used by the eCommerce application -when the customer pays at the order and we deliver afterwards. -(pre-paid) - -For most other use cases, it's recommended to invoice manually. It -allows the salesperson to trigger the invoice on demand with options: -invoice ready to invoice line, invoice a percentage (advance), invoice a -fixed advance. - -This process is good for both services and physical products. - -.. todo:: Read more: *Invoice based on sales orders.* - -:menuselection:`Sales Order --> Delivery --> Invoice` ------------------------------------------------------ - -Retailers and eCommerce usually invoice based on delivered quantity , -instead of sales order. This approach is suitable for businesses where -the quantities you deliver may differs from the ordered quantities: -foods (invoice based on actual Kg). - -This way, if you deliver a partial order, you only invoice for what you -really delivered. If you do back orders (deliver partially and the rest -later), the customer will receive two invoices, one for each delivery -order. - -.. todo:: - Read more: *Invoice based on delivery orders.* - -:menuselection:`Recurring Contracts (subscriptions) --> Invoices` ------------------------------------------------------------------ - -For subscriptions, an invoice is triggered periodically, automatically. -The frequency of the invoicing and the services/products invoiced are -defined on the contract. - -.. todo:: - Read more: *Subscription based invoicing.* - -:menuselection:`eCommerce Order --> Invoice` --------------------------------------------- - -An eCommerce order will also trigger the creation of the invoice when it -is fully paid. If you allow paying orders by check or wire transfer, -Odoo only creates an order and the invoice will be triggered once the -payment is received. - -Creating an invoice manually ----------------------------- - -Users can also create invoices manually without using contracts or a -sales order. It's a recommended approach if you do not need to manage -the sales process (quotations), or the delivery of the products or -services. - -Even if you generate the invoice from a sales order, you may need to -create invoices manually in exceptional use cases: - -- if you need to create a refund - -- If you need to give a discount - -- if you need to change an invoice created from a sales order - -- if you need to invoice something not related to your core business - -Others ------- - -Some specific modules are also able to generate draft invoices: - -- membership: invoice your members every year - -- repairs: invoice your after-sale services diff --git a/sales/quotation.rst b/sales/quotation.rst deleted file mode 100644 index 35a71bf95..000000000 --- a/sales/quotation.rst +++ /dev/null @@ -1,9 +0,0 @@ -========= -Quotation -========= - -.. toctree:: - :titlesonly: - - quotation/setup - quotation/online diff --git a/sales/quotation/online.rst b/sales/quotation/online.rst deleted file mode 100644 index d3753af41..000000000 --- a/sales/quotation/online.rst +++ /dev/null @@ -1,9 +0,0 @@ -================ -Online Quotation -================ - -.. toctree:: - :titlesonly: - - online/creation - diff --git a/sales/quotation/online/creation.rst b/sales/quotation/online/creation.rst deleted file mode 100644 index ebfa9a0cc..000000000 --- a/sales/quotation/online/creation.rst +++ /dev/null @@ -1,63 +0,0 @@ -=========================================== -How to create and edit an online quotation? -=========================================== - -Configuration -============= - -Enable Online Quotations ------------------------- - -To send online quotations, you must first enable online quotations in the Sales app -from :menuselection:`Configuration --> Settings`. Doing so will prompt you to install -the Website app if you haven't already. - -.. image:: media/creation01.png - :align: center - -You can view the online version of each quotation you create after enabling this setting -by selecting **Preview** from the top of the quotation. - -.. image:: media/creation02.png - :align: center - -Edit Your Online Quotations ---------------------------- - -The online quotation page can be edited for each quotation template in the Sales app -via :menuselection:`Configuration --> Quotation Templates`. From within any quotation -template, select **Edit Template** to be taken to the corresponding page of your website. - -.. image:: media/creation03.png - :align: center - -You can add text, images, and structural elements to the quotation page by dragging -and dropping blocks from the pallet on the left sidebar menu. A table of contents -will be automatically generated based on the content you add. - -Advanced descriptions for each product on a quotation are displayed on the online quotation -page. These descriptions are inherited from the product page in your eCommerce Shop, and -can be edited directly on the page through the inline text editor. - -.. image:: media/creation04.png - :align: center - -You can choose to allow payment immediately after the customer validates the quote by selecting -a payment option on the quotation template. - -You can edit the webpage of an individual quotation as you would for any web page by clicking -the **Edit** button. Changes made in this way will only affect the individual quotation. - -Using Online Quotations -======================= - -To share an online quotation with your customer, copy the URL of the online quotation, -then share it with customer. - -.. image:: media/creation05.png - :align: center - -Alternatively, your customer can access their online quotations by logging into your -website through the customer portal. Your customer can accept or reject the quotation, -print it, or negotiate the terms in the chat box. You will also receive a notification -in the chatter within Odoo whenever the customer views the quotation. diff --git a/sales/quotation/online/media/creation01.png b/sales/quotation/online/media/creation01.png deleted file mode 100644 index 8e82b1e24..000000000 Binary files a/sales/quotation/online/media/creation01.png and /dev/null differ diff --git a/sales/quotation/online/media/creation02.png b/sales/quotation/online/media/creation02.png deleted file mode 100644 index f79743bf2..000000000 Binary files a/sales/quotation/online/media/creation02.png and /dev/null differ diff --git a/sales/quotation/online/media/creation03.png b/sales/quotation/online/media/creation03.png deleted file mode 100644 index cab59f6d7..000000000 Binary files a/sales/quotation/online/media/creation03.png and /dev/null differ diff --git a/sales/quotation/online/media/creation04.png b/sales/quotation/online/media/creation04.png deleted file mode 100644 index f2cedc837..000000000 Binary files a/sales/quotation/online/media/creation04.png and /dev/null differ diff --git a/sales/quotation/online/media/creation05.png b/sales/quotation/online/media/creation05.png deleted file mode 100644 index d8cb3e038..000000000 Binary files a/sales/quotation/online/media/creation05.png and /dev/null differ diff --git a/sales/quotation/setup.rst b/sales/quotation/setup.rst deleted file mode 100644 index 600c24914..000000000 --- a/sales/quotation/setup.rst +++ /dev/null @@ -1,11 +0,0 @@ -===== -Setup -===== - -.. toctree:: - :titlesonly: - - setup/first_quote - setup/different_addresses - setup/optional - setup/terms_conditions \ No newline at end of file diff --git a/sales/quotation/setup/different_addresses.rst b/sales/quotation/setup/different_addresses.rst deleted file mode 100644 index b7fc71462..000000000 --- a/sales/quotation/setup/different_addresses.rst +++ /dev/null @@ -1,62 +0,0 @@ -==================================================== -How to use different invoice and delivery addresses? -==================================================== - -Overview -======== - -It is possible to configure different addresses for delivery and -invoicing. This is very useful, because it could happen that your clients -have multiple locations and that the invoice address differs from the -delivery location. - -Configuration -============= - -First, go to the Sales application, then click on -:menuselection:`Configuration --> Settings` and activate the option -**Enable the multiple address configuration from menu**. - -.. image:: media/different_addresses01.png - :align: center - -Set the addresses on the contact form -===================================== - -Invoice and/or shipping addresses and even other addresses are added on -the contact form. To do so, go to the contact application, select the -customer and in the **Contacts & Addresses** tab click on **Create** - -.. image:: media/different_addresses02.png - :align: center - -A new window will open where you can specify the delivery or the invoice -address. - -.. image:: media/different_addresses03.png - :align: center - -Once you validated your addresses, it will appear in the **Contacts & -addresses** tab with distinctive logos. - -.. image:: media/different_addresses04.png - :align: center - -On the quotations and sales orders -================================== - -When you create a new quotation, the option to select an invoice address -and a delivery address is now available. Both addresses will -automatically be filled in when selecting the customer. - -.. image:: media/different_addresses05.png - :align: center - -.. tip:: - Note that you can also create invoice and delivery addresses on - the fly by selecting **Create and edit** in the dropdown menu. - -When printing your sales orders, you'll notice the two addresses. - -.. image:: media/different_addresses06.png - :align: center \ No newline at end of file diff --git a/sales/quotation/setup/first_quote.rst b/sales/quotation/setup/first_quote.rst deleted file mode 100644 index d3af04774..000000000 --- a/sales/quotation/setup/first_quote.rst +++ /dev/null @@ -1,129 +0,0 @@ -================================= -How to create my first quotation? -================================= - -Overview -======== - -Quotations are documents sent to customers to offer an estimated cost -for a particular set of goods or services. The customer can accept the -quotation, in which case the seller will have to issue a sales order, or -refuse it. - -For example, my company sells electronic products and my client -Agrolait showed interest in buying ``3 iPads`` to facilitate their -operations. I would like to send them a quotation for those iPads with -a sales price of ``320 USD`` by iPad with a ``5%`` discount. - -This section will show you how to proceed. - -Configuration -============= - -Install the Sales Management module ------------------------------------ - -In order to be able to issue your first quotation, you'll need to -install the **Sales Management** module from the app module in the Odoo -backend. - -.. image:: media/first_quote01.png - :align: center - -Allow discounts on sales order line ------------------------------------ - -Allowing discounts on quotations is a common sales practice to improve -the chances to convert the prospect into a client. - -In our example, we wanted to grant ``Agrolait`` with a ``5%`` discount on the -sale price. To enable the feature, go into the **Sales** application, select -:menuselection:`Configuration --> Settings` and, under **Quotations and Sales**, tick -**Allow discounts on sales order line** (see picture below) and apply your -changes. - -.. image:: media/first_quote02.png - :align: center - -Create your quotation -===================== - -To create your first quotation, click on :menuselection:`Sales --> Quotations` and -click on **Create**. Then, complete your quotation as follows: - -Customer and Products ---------------------- - -The basic elements to add to any quotation are the customer (the person -you will send your quotation to) and the products you want to sell. From -the quotation view, choose the prospect from the **Customer** drop-down list -and under **Order Lines**, click on **Add an item** and select your product. -Do not forget to manually add the number of items under **Ordered -Quantity** and the discount if applicable. - -.. image:: media/first_quote03.png - :align: center - -If you don't have any customer or product recorded on your Odoo -environment yet, you can create them on the fly directly from your -quotations : - -- To add a new customer, click on the **Customer** drop-down menu and click - on **Create and edit**. In this new window, you will be able to - record all the customer details, such as the address, website, - phone number and person of contact. - -- To add a new product, under **Order line**, click on add an item and on - **Create and Edit** from the drop-down list. You will be able to - record your product information (product type, cost, sale price, - invoicing policy, etc.) along with a picture. - -Taxes ------ - -To parameter taxes, simply go on the taxes section of the product line -and click on **Create and Edit**. Fill in the details (for example if you -are subject to a ``21%`` taxe on your sales, simply fill in the right amount -in percentage) and save. - -.. image:: media/first_quote04.png - :align: center - -Terms and conditions --------------------- - -You can select the expiration date of your quotation and add your -company's terms and conditions directly in your quotation (see picture -below). - -.. image:: media/first_quote05.png - :align: center - -Preview and send quotation -========================== - -If you want to see what your quotation looks like before sending it, -click on the **Print** button (upper left corner). It will give you a -printable PDF version with all your quotation details. - -.. image:: media/first_quote06.png - :align: center - -.. tip:: - Update your company's details (address, website, logo, etc) appearing - on your quotation from the the **Settings** menu on the app switcher, and - on click on the link - :menuselection:`Settings --> General settings --> Configure company data`. - -Click on **Send by email** to automatically send an email to your customer -with the quotation as an attachment. You can adjust the email body -before sending it and even save it as a template if you wish to reuse -it. - -.. image:: media/first_quote07.png - :align: center - -.. seealso:: - * :doc:`../online/creation` - * :doc:`optional` - * :doc:`terms_conditions` \ No newline at end of file diff --git a/sales/quotation/setup/media/different_addresses01.png b/sales/quotation/setup/media/different_addresses01.png deleted file mode 100644 index 409dc65dc..000000000 Binary files a/sales/quotation/setup/media/different_addresses01.png and /dev/null differ diff --git a/sales/quotation/setup/media/different_addresses02.png b/sales/quotation/setup/media/different_addresses02.png deleted file mode 100644 index 61333f8ef..000000000 Binary files a/sales/quotation/setup/media/different_addresses02.png and /dev/null differ diff --git a/sales/quotation/setup/media/different_addresses03.png b/sales/quotation/setup/media/different_addresses03.png deleted file mode 100644 index b21b9a01b..000000000 Binary files a/sales/quotation/setup/media/different_addresses03.png and /dev/null differ diff --git a/sales/quotation/setup/media/different_addresses04.png b/sales/quotation/setup/media/different_addresses04.png deleted file mode 100644 index 2ab0c595a..000000000 Binary files a/sales/quotation/setup/media/different_addresses04.png and /dev/null differ diff --git a/sales/quotation/setup/media/different_addresses05.png b/sales/quotation/setup/media/different_addresses05.png deleted file mode 100644 index 430d64545..000000000 Binary files a/sales/quotation/setup/media/different_addresses05.png and /dev/null differ diff --git a/sales/quotation/setup/media/different_addresses06.png b/sales/quotation/setup/media/different_addresses06.png deleted file mode 100644 index 84f3635cb..000000000 Binary files a/sales/quotation/setup/media/different_addresses06.png and /dev/null differ diff --git a/sales/quotation/setup/media/first_quote01.png b/sales/quotation/setup/media/first_quote01.png deleted file mode 100644 index 87b182228..000000000 Binary files a/sales/quotation/setup/media/first_quote01.png and /dev/null differ diff --git a/sales/quotation/setup/media/first_quote02.png b/sales/quotation/setup/media/first_quote02.png deleted file mode 100644 index 3221e1510..000000000 Binary files a/sales/quotation/setup/media/first_quote02.png and /dev/null differ diff --git a/sales/quotation/setup/media/first_quote03.png b/sales/quotation/setup/media/first_quote03.png deleted file mode 100644 index f0202b730..000000000 Binary files a/sales/quotation/setup/media/first_quote03.png and /dev/null differ diff --git a/sales/quotation/setup/media/first_quote04.png b/sales/quotation/setup/media/first_quote04.png deleted file mode 100644 index 972f39516..000000000 Binary files a/sales/quotation/setup/media/first_quote04.png and /dev/null differ diff --git a/sales/quotation/setup/media/first_quote05.png b/sales/quotation/setup/media/first_quote05.png deleted file mode 100644 index 14489e914..000000000 Binary files a/sales/quotation/setup/media/first_quote05.png and /dev/null differ diff --git a/sales/quotation/setup/media/first_quote06.png b/sales/quotation/setup/media/first_quote06.png deleted file mode 100644 index 815e868b1..000000000 Binary files a/sales/quotation/setup/media/first_quote06.png and /dev/null differ diff --git a/sales/quotation/setup/media/first_quote07.png b/sales/quotation/setup/media/first_quote07.png deleted file mode 100644 index 0bce8c392..000000000 Binary files a/sales/quotation/setup/media/first_quote07.png and /dev/null differ diff --git a/sales/quotation/setup/media/optional01.png b/sales/quotation/setup/media/optional01.png deleted file mode 100644 index 8e82b1e24..000000000 Binary files a/sales/quotation/setup/media/optional01.png and /dev/null differ diff --git a/sales/quotation/setup/media/optional02.png b/sales/quotation/setup/media/optional02.png deleted file mode 100644 index 5ec6af228..000000000 Binary files a/sales/quotation/setup/media/optional02.png and /dev/null differ diff --git a/sales/quotation/setup/media/optional06.png b/sales/quotation/setup/media/optional06.png deleted file mode 100644 index 7fb2fbe36..000000000 Binary files a/sales/quotation/setup/media/optional06.png and /dev/null differ diff --git a/sales/quotation/setup/media/terms_conditions01.png b/sales/quotation/setup/media/terms_conditions01.png deleted file mode 100644 index 5f1006e63..000000000 Binary files a/sales/quotation/setup/media/terms_conditions01.png and /dev/null differ diff --git a/sales/quotation/setup/media/terms_conditions02.png b/sales/quotation/setup/media/terms_conditions02.png deleted file mode 100644 index d20c6877b..000000000 Binary files a/sales/quotation/setup/media/terms_conditions02.png and /dev/null differ diff --git a/sales/quotation/setup/optional.rst b/sales/quotation/setup/optional.rst deleted file mode 100644 index 4717e6b54..000000000 --- a/sales/quotation/setup/optional.rst +++ /dev/null @@ -1,46 +0,0 @@ -================================================ -How to display optional products on a quotation? -================================================ - -Overview -======== - -The use of suggested products is a marketing strategy that attempts -to increase the amount a customer spends once they begin the buying -process. For instance, a customer purchasing a cell phone could be -shown accessories like a protective case, a screen cover, and headset. -In Odoo, a customer can be presented with additional products that are -relevant to their chosen purchase in one of several locations. - -Configuration -============= - -Suggested products can be added to quotations directly, or to the ecommerce -platform via each product form. In order to use suggested products, you will -need to have the **Ecommerce** app installed: - -Quotations ----------- - -To add suggested products to quotations, you must first enable online quotations -in the Sales app from :menuselection:`Configuration --> Settings`. Doing so will -prompt you to install the Website app if you haven't already. - -.. image:: media/optional01.png - :align: center - -You will then be able to add suggested products to your individual quotations and -quotation templates under the **Suggested Products** tab of a quotation. - -.. image:: media/optional02.png - :align: center - -Website Sales -------------- - -You can add suggested products to a product on its product form, under the Website -heading in the **Sales** tab. **Suggested products** will appear on the *product* -page, and **Accessory Products** will appear on the *cart* page prior to checkout. - -.. image:: media/optional06.png - :align: center diff --git a/sales/quotation/setup/terms_conditions.rst b/sales/quotation/setup/terms_conditions.rst deleted file mode 100644 index a6c3463b8..000000000 --- a/sales/quotation/setup/terms_conditions.rst +++ /dev/null @@ -1,42 +0,0 @@ -================================================ -How to link terms and conditions to a quotation? -================================================ - -Overview --------- - -Specifying Terms and Conditions is essential to ensure a good -relationship between customers and sellers. Every seller has to declare -all the formal information which include products and company policy so -customer can read all those terms before committing to anything. - -Thanks to Odoo you can easily include your default terms and conditions -on every quotation, sales order and invoice. - -Let's take the following example: Your company sells water bottles to -restaurants and you would like to add the following standard terms and -conditions on all your quotations: - -*Safe storage of the products of MyCompany is necessary in order to -ensure their quality, MyCompany will not be held accountable in case of -unsafe storage of the products.* - -General terms and conditions ----------------------------- - -General terms and conditions can be specified in the Sales settings. -They will then automatically appear on every sales document from the -quotation to the invoice. - -To specify your Terms and Conditions go into : :menuselection:`Sales --> Configuration --> Settings --> Default Terms and Conditions`. - -.. image:: media/terms_conditions01.png - :align: center - -After saving, your terms and conditions will appear on your new -quotations, sales orders and invoices (in the system but also on your -printed documents). - -.. image:: media/terms_conditions02.png - :align: center - diff --git a/sales/send_quotations.rst b/sales/send_quotations.rst new file mode 100644 index 000000000..2c5ffaa7e --- /dev/null +++ b/sales/send_quotations.rst @@ -0,0 +1,9 @@ +=============== +Send Quotations +=============== + +.. toctree:: + :titlesonly: + + send_quotations/quote_template + send_quotations/optional_items diff --git a/sales/send_quotations/media/optional_items01.png b/sales/send_quotations/media/optional_items01.png new file mode 100644 index 000000000..d0ee5ee06 Binary files /dev/null and b/sales/send_quotations/media/optional_items01.png differ diff --git a/sales/send_quotations/media/optional_items02.png b/sales/send_quotations/media/optional_items02.png new file mode 100644 index 000000000..9b40ff9ca Binary files /dev/null and b/sales/send_quotations/media/optional_items02.png differ diff --git a/sales/send_quotations/media/optional_items03.png b/sales/send_quotations/media/optional_items03.png new file mode 100644 index 000000000..690b100e4 Binary files /dev/null and b/sales/send_quotations/media/optional_items03.png differ diff --git a/sales/send_quotations/media/optional_items04.png b/sales/send_quotations/media/optional_items04.png new file mode 100644 index 000000000..b812d1764 Binary files /dev/null and b/sales/send_quotations/media/optional_items04.png differ diff --git a/sales/send_quotations/media/optional_items05.png b/sales/send_quotations/media/optional_items05.png new file mode 100644 index 000000000..d31a9ec7c Binary files /dev/null and b/sales/send_quotations/media/optional_items05.png differ diff --git a/sales/send_quotations/media/quote_template01.png b/sales/send_quotations/media/quote_template01.png new file mode 100644 index 000000000..957ae1dae Binary files /dev/null and b/sales/send_quotations/media/quote_template01.png differ diff --git a/sales/send_quotations/media/quote_template02.png b/sales/send_quotations/media/quote_template02.png new file mode 100644 index 000000000..5d6677d0d Binary files /dev/null and b/sales/send_quotations/media/quote_template02.png differ diff --git a/sales/send_quotations/media/quote_template03.png b/sales/send_quotations/media/quote_template03.png new file mode 100644 index 000000000..eae671692 Binary files /dev/null and b/sales/send_quotations/media/quote_template03.png differ diff --git a/sales/send_quotations/media/quote_template04.png b/sales/send_quotations/media/quote_template04.png new file mode 100644 index 000000000..664b6a5ee Binary files /dev/null and b/sales/send_quotations/media/quote_template04.png differ diff --git a/sales/send_quotations/media/quote_template05.png b/sales/send_quotations/media/quote_template05.png new file mode 100644 index 000000000..2b9a5eceb Binary files /dev/null and b/sales/send_quotations/media/quote_template05.png differ diff --git a/sales/send_quotations/media/quote_template06.png b/sales/send_quotations/media/quote_template06.png new file mode 100644 index 000000000..49c1c2b9f Binary files /dev/null and b/sales/send_quotations/media/quote_template06.png differ diff --git a/sales/send_quotations/media/quote_template07.png b/sales/send_quotations/media/quote_template07.png new file mode 100644 index 000000000..871b25de7 Binary files /dev/null and b/sales/send_quotations/media/quote_template07.png differ diff --git a/sales/send_quotations/optional_items.rst b/sales/send_quotations/optional_items.rst new file mode 100644 index 000000000..f9167de32 --- /dev/null +++ b/sales/send_quotations/optional_items.rst @@ -0,0 +1,50 @@ +=========================================== +Increase your sales with suggested products +=========================================== + +The use of suggested products is an attempt to offer related and useful +products to your client. For instance, a client purchasing a cellphone +could be shown accessories like a protective case, a screen cover, and +headset. + +Add suggested products to your quotation templates +================================================== + +Suggested products can be set on *Quotation Templates*. + +.. TODO You can find documentation about it here https://docs.google.com/document/u/1/d/11UaYJ0k67dA2p-ExPAYqZkBNaRcpnItCyIdO6udgyOY/edit?usp=drive_web&ouid=104638657716670524342 + +Once on a template, you can see a *Suggested Products* tab where you +can add related products or services. + +.. image:: media/optional_items01.png + :align: center + +You can also add or modify suggested products on the quotation. + +Add suggested products to the quotation +======================================= + +When opening the quotation from the received email, the customer can add +the suggested products to the order. + +.. image:: media/optional_items02.png + :align: center + +.. image:: media/optional_items03.png + :align: center + +The product(s) will be instantly added to their quotation when clicking +on any of the little carts. + +.. image:: media/optional_items04.png + :align: center + +Depending on your confirmation process, they can either digitally sign +or pay to confirm the quotation. + +Each move done by the customer to the quotation will be tracked in the +sales order, letting the salesperson see it. + +.. image:: media/optional_items05.png + :align: center diff --git a/sales/send_quotations/quote_template.rst b/sales/send_quotations/quote_template.rst new file mode 100644 index 000000000..f043808ff --- /dev/null +++ b/sales/send_quotations/quote_template.rst @@ -0,0 +1,93 @@ +======================= +Use quotation templates +======================= + +If you often sell the same products or services, you can save a lot of +time by creating custom quotation templates. By using a template you can +send a complete quotation in no time. + +Configuration +============= + +For this feature to work, go to :menuselection:`Sales --> Configuration +--> Settings` and activate *Quotations Templates*. + +.. image:: media/quote_template01.png + :align: center + +Create your first template +========================== + +You will find the templates menu under :menuselection:`Sales --> +Configuration`. + +You can then create or edit an existing one. Once named, you will be +able to select the product(s) and their quantity as well as the +expiration time for the quotation. + +.. image:: media/quote_template02.png + :align: center + +On each template, you can also specify discounts if the option is +activated in the *Sales* settings. The base price is set in the +product configuration and can be alterated by customer pricelists. + +.. TODO (TO LINK DOC LATER WHEN DONE based on this https://www.odoo.com/documentation/user/11.0/sales/products_prices/prices/pricing.html + +Edit your template +================== + +You can edit the customer interface of the template that they see to +accept or pay the quotation. This lets you describe your company, +services and products. When you click on *Edit Template* you will be +brought to the quotation editor. + +.. image:: media/quote_template03.png + :align: center + +.. image:: media/quote_template04.png + :align: center + +This lets you edit the description content thanks to drag & drop of +building blocks. To describe your products add a content block in the +zone dedicated to each product. + +.. image:: media/quote_template05.png + :align: center + +.. note:: + The description set for the products will be used in all + quotations templates containing those products. + +Use a quotation template +======================== + +When creating a quotation, you can select a template. + +.. image:: media/quote_template06.png + :align: center + +Each product in that template will be added to your quotation. + +.. tip:: + You can select a template to be suggested by default in the + *Sales* settings. + +Confirm the quotation +===================== + +Templates also ease the confirmation process for customers with a +digital signature or online payment. You can select that in the template +itself. + +.. image:: media/quote_template07.png + :align: center + +Every quotation will now have this setting added to it. + +Of course you can still change it and make it specific for each +quotation. + +.. todo seealso +.. `*https://docs.google.com/document/d/1OkC9MVvuDvzz2b9gZjfzMPzep7qdbOyZZxE0ZZj2K7E/edit* `__.. +.. `*https://docs.google.com/document/d/1LZC5C8dZY2gvP6QHx2w5BlakIxgcHIP6GeEuBBfsRNc/edit* `__