diff --git a/.tx/config b/.tx/config index cbe4f0c22..5f3504359 100644 --- a/.tx/config +++ b/.tx/config @@ -47,6 +47,11 @@ file_filter = locale//LC_MESSAGES/services.po source_file = locale/sources/services.pot source_lang = en +[odoo-14-doc.theme] +file_filter = locale//LC_MESSAGES/sphinx.po +source_file = locale/sources/sphinx.pot +source_lang = en + [odoo-14-doc.user_settings] file_filter = locale//LC_MESSAGES/settings.po source_file = locale/sources/settings.pot @@ -55,4 +60,4 @@ source_lang = en [odoo-14-doc.websites] file_filter = locale//LC_MESSAGES/websites.po source_file = locale/sources/websites.pot -source_lang = en +source_lang = en \ No newline at end of file diff --git a/conf.py b/conf.py index 9ede10159..eb06fe110 100644 --- a/conf.py +++ b/conf.py @@ -130,6 +130,7 @@ github_user = 'odoo' github_project = 'documentation' locale_dirs = ['../locale/'] +templates_path = ['../extensions'] # custom docname_to_domain to divide the translations of applications in subdirectories sphinx.transforms.i18n.docname_to_domain = ( diff --git a/content/administration/odoo_sh/getting_started/create.rst b/content/administration/odoo_sh/getting_started/create.rst index 583a45364..e91d74f4d 100644 --- a/content/administration/odoo_sh/getting_started/create.rst +++ b/content/administration/odoo_sh/getting_started/create.rst @@ -78,7 +78,8 @@ You can start using Odoo.sh. Your first build is about to be created. You will s Import your database ==================== -You can import your database in your Odoo.sh project as long as this is an Odoo 10.0, 11.0 or above database. +You can import your database in your Odoo.sh project as long as it is in a :doc:`supported version +` of Odoo. Push your modules in production ------------------------------- diff --git a/content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst b/content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst index 9dd822443..fa638442f 100644 --- a/content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst +++ b/content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst @@ -471,12 +471,12 @@ credit and debit notes, they are set automatically by Odoo: Invoice PDF Report ~~~~~~~~~~~~~~~~~~ -After the invoice is Accepted and valdiated by the SII and the PDF is printed it includes the -fiscal elements that indicates out document is fiscally valid: +Once the invoice is accepted and validated by the SII and the PDF is printed, it includes the +fiscal elements that indicate that the document is fiscally valid: .. image:: media/Chile22.png :align: center - :alt: Barcode and fiscal elements in the invice report. + :alt: Barcode and fiscal elements in the invoice report. Commercial Validation diff --git a/content/applications/finance/accounting/fiscal_localizations/localizations/colombia.rst b/content/applications/finance/accounting/fiscal_localizations/localizations/colombia.rst index e304be8f6..62e87be1f 100644 --- a/content/applications/finance/accounting/fiscal_localizations/localizations/colombia.rst +++ b/content/applications/finance/accounting/fiscal_localizations/localizations/colombia.rst @@ -36,8 +36,8 @@ Configuration Install the Colombian localization modules ------------------------------------------ -For this, go in Apps and search for Colombia. Then click Install for -the first two modules. +To :ref:`install ` the modules, go to :menuselection:`Apps`, remove the *Apps* +filter and search for "Colombia". Then click on *Install* for the first two modules. .. image:: media/colombia02.png :align: center diff --git a/content/applications/finance/accounting/fiscal_localizations/localizations/france.rst b/content/applications/finance/accounting/fiscal_localizations/localizations/france.rst index 18ee3e29b..e9da7e929 100644 --- a/content/applications/finance/accounting/fiscal_localizations/localizations/france.rst +++ b/content/applications/finance/accounting/fiscal_localizations/localizations/france.rst @@ -59,9 +59,9 @@ In case of non-conformity, your company risks a fine of €7,500. To get the certification just follow the following steps: -* If you use **Odoo Point of Sale**, install the **France - VAT Anti-Fraud Certification for Point - of Sale (CGI 286 I-3 bis)** module by going to :menuselection:`Apps`, removing the *Apps* filter, - then searching for *l10n_fr_pos_cert*, and installing the module. +* If you use **Odoo Point of Sale**, :ref:`install ` the **France - VAT Anti-Fraud + Certification for Point of Sale (CGI 286 I-3 bis)** module by going to :menuselection:`Apps`, + removing the *Apps* filter, then searching for *l10n_fr_pos_cert*, and installing the module. * Make sure a country is set on your company, otherwise your entries won’t be encrypted for the inalterability check. To edit your company’s data, diff --git a/content/applications/finance/accounting/fiscal_localizations/localizations/germany.rst b/content/applications/finance/accounting/fiscal_localizations/localizations/germany.rst index 008bc5791..422234c6c 100644 --- a/content/applications/finance/accounting/fiscal_localizations/localizations/germany.rst +++ b/content/applications/finance/accounting/fiscal_localizations/localizations/germany.rst @@ -31,7 +31,135 @@ Export from Odoo to Datev It is possible to export your accounting entries from Odoo to Datev. To be able to use this feature, the german accounting localization needs to be installed on your Odoo Enterprise database. Then you can go in :menuselection:`Accounting --> Reporting --> General Ledger` then click on the -**Export Datev (csv)** button. +**Export Datev (csv)** button. + +.. _germany/pos: + +Point of Sale in Germany: Technical Security System +=================================================== + +The **Kassensicherungsverordnung** (The Act on Protection against Manipulation of Digital Records) +requires that electronic record-keeping systems - including the :doc:`point of sale +<../../../../sales/point_of_sale>` systems - must be equipped with a **Technical Security System** +(also called **TSS** or **TSE**). + +Odoo offers a service that is compliant with the help of `fiskaly `_, a +*cloud-based solution*. + +.. important:: + Since this solution is cloud-based, a working internet connection is required. + +.. note:: + The only VAT rates allowed are given by fiskaly. You can check these rates by consulting: + `fiskaly DSFinV-K API: VAT Definition + `_. + +Configuration +------------- + +Modules installation +~~~~~~~~~~~~~~~~~~~~ + +#. If your database was created before June 2021, :ref:`upgrade ` your **Point of + Sale** app (`point_of_sale`) and the **Restaurant** module (`pos_restaurant`). +#. :ref:`Install ` the **Germany - Certification for Point of Sale** + (`l10n_de_pos_cert`) and **Germany - Certification for Point of Sale of type restaurant** + (`l10n_de_pos_res_cert`) modules. + + .. tip:: + If these modules are not listed, :ref:`update the app list `. + +.. image:: germany/pos-upgrade.png + :align: center + :alt: Upgrading Odoo Point of Sale from the Apps dashboard + +Register your company at the financial authority +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +To register your company, go to :menuselection:`Settings --> General Settings --> Companies --> +Update Info` and fill out the following fields: + +- **Company name** +- Valid **address** +- **VAT** number +- **St.-Nr** (Steuernummer): this number is assigned by the tax office to every taxable natural or + legal person. (e.g., `2893081508152`) +- **W-IdNr** (Wirtschafts-Identifikationsnummer): this number is used as a permanent + identification number for economically active persons. + +You can then **register your company through fiskaly** by opening the *fiskaly* tab and clicking on +the *fiskaly Registration* button. + +.. image:: germany/fiskaly-registration.png + :align: center + :alt: Button to register a company through fiskaly in Odoo + +Once the registration has been finalized, new fields appear: + +- **fiskaly organization ID** refers to the ID of your company at the fiskaly side. +- **fiskaly API key** and **secret** are the credentials the system uses to access the services + offered by fiskaly. + +.. image:: germany/fiskaly-keys.png + :align: center + :alt: fiskaly keys as displayed on Odoo + +.. note:: + It is possible to request new credentials if there is any issue with the current ones. + +Create and link a Technical Security System to your PoS +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +.. image:: germany/create-tss.png + :align: right + :alt: Create TSS option from a point of sale + +To use your point of sale in Germany, you first have to create a :abbr:`TSS (Technical Security +System)` for it. + +To do so, go to :menuselection:`Point of Sale --> Configuration --> Point of Sale`, open the point +of sale you want to edit, then check the box next to **Create TSS** and *Save*. + +.. image:: germany/tss-ids.png + :align: right + :alt: Example of TSS ID and Client ID from fiskaly in Odoo Point of Sale + +Once the creation of the TSS is successful, you can find your **TSS ID** and **Client ID** under the +*fiskaly API* section. + +- **TSS ID** refers to the ID of your TSS at fiskaly's side. +- **Client ID** refers to your PoS but at fiskaly's side. + +DSFinV-K +-------- + +.. image:: germany/dsfinv-k-export.png + :align: right + :alt: Menu to export DSFinV-K + +Whenever you close a PoS session, the orders' details are sent to the :abbr:`DSFinV-K (Digitale +Schnittstelle der Finanzverwaltung für Kassensysteme)` service of fiskaly. + +In case of an audit, you can export the data sent to DSFinV-K by going to :menuselection:`Point of +Sale --> Orders --> DSFinV-k exports`. + +These fields are mandatory: + +- **Name** +- **Start Datetime** (export data with dates larger than or equal to the given start date) +- **End Datetime** (export data with dates smaller than or equal to the given end date) + +Leave the **Point of Sale** field blank if you want to export the data of all your points of sale. +Specify a Point of Sale if you want to export this specific PoS' data only. + +The creation of a DSFinV-K export triggers on export at fiskaly's side. + +.. image:: germany/dsfinv-k-export-fields.png + :align: center + :alt: Pending DSFinV-K export on Odoo + +As you can see, the **State** is *Pending*. This means that the export has been successfully +triggered and is being processed. You have to click on *Refresh State* to check if it is ready. .. _germany/gobd: diff --git a/content/applications/finance/accounting/fiscal_localizations/localizations/germany/create-tss.png b/content/applications/finance/accounting/fiscal_localizations/localizations/germany/create-tss.png new file mode 100644 index 000000000..d40858917 Binary files /dev/null and b/content/applications/finance/accounting/fiscal_localizations/localizations/germany/create-tss.png differ diff --git a/content/applications/finance/accounting/fiscal_localizations/localizations/germany/dsfinv-k-export-fields.png b/content/applications/finance/accounting/fiscal_localizations/localizations/germany/dsfinv-k-export-fields.png new file mode 100644 index 000000000..46a51e4cb Binary files /dev/null and b/content/applications/finance/accounting/fiscal_localizations/localizations/germany/dsfinv-k-export-fields.png differ diff --git a/content/applications/finance/accounting/fiscal_localizations/localizations/germany/dsfinv-k-export.png b/content/applications/finance/accounting/fiscal_localizations/localizations/germany/dsfinv-k-export.png new file mode 100644 index 000000000..9236847eb Binary files /dev/null and b/content/applications/finance/accounting/fiscal_localizations/localizations/germany/dsfinv-k-export.png differ diff --git a/content/applications/finance/accounting/fiscal_localizations/localizations/germany/fiskaly-keys.png b/content/applications/finance/accounting/fiscal_localizations/localizations/germany/fiskaly-keys.png new file mode 100644 index 000000000..18f4408a0 Binary files /dev/null and b/content/applications/finance/accounting/fiscal_localizations/localizations/germany/fiskaly-keys.png differ diff --git a/content/applications/finance/accounting/fiscal_localizations/localizations/germany/fiskaly-registration.png b/content/applications/finance/accounting/fiscal_localizations/localizations/germany/fiskaly-registration.png new file mode 100644 index 000000000..670cdc115 Binary files /dev/null and b/content/applications/finance/accounting/fiscal_localizations/localizations/germany/fiskaly-registration.png differ diff --git a/content/applications/finance/accounting/fiscal_localizations/localizations/germany/pos-upgrade.png b/content/applications/finance/accounting/fiscal_localizations/localizations/germany/pos-upgrade.png new file mode 100644 index 000000000..69d10853e Binary files /dev/null and b/content/applications/finance/accounting/fiscal_localizations/localizations/germany/pos-upgrade.png differ diff --git a/content/applications/finance/accounting/fiscal_localizations/localizations/germany/tss-ids.png b/content/applications/finance/accounting/fiscal_localizations/localizations/germany/tss-ids.png new file mode 100644 index 000000000..8ab98f281 Binary files /dev/null and b/content/applications/finance/accounting/fiscal_localizations/localizations/germany/tss-ids.png differ diff --git a/content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst b/content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst index f221bb94b..c19909008 100644 --- a/content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst +++ b/content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst @@ -118,6 +118,12 @@ click on *Update information* under your company name. In the resulting form, put your full address (including zip code), RFC (VAT number), and the rest of the data. +.. important:: + From a legal point of view, a Mexican company must use the local currency (MXN). Therefore, Odoo + does not provide features to manage an alternative configuration. If you want to manage another + currency, let MXN be the default currency and use a :doc:`pricelist + ` instead. + .. warning:: Make sure that in the address, for the Country field, "Mexico" is chosen from the list of countries that Odoo shows, because if it is entered manually there is a risk of creating a "new diff --git a/content/applications/general.rst b/content/applications/general.rst index 6497db0ef..0aac3875f 100644 --- a/content/applications/general.rst +++ b/content/applications/general.rst @@ -16,130 +16,107 @@ General general/in_app_purchase general/unsplash -.. _general/users-features: +**Odoo** is a suite of open source business apps that cover all your company needs: :doc:`CRM +`, :doc:`eCommerce `, :doc:`accounting `, +:doc:`inventory `, :doc:`point of sale `, +:doc:`project management `, etc. Its unique value proposition is to be at the same +time *very easy* to use and *fully integrated*. -Users and Features -================== +This section of the documentation covers all functional aspects that aren't app-specific. You can +find, for example, information about: -As the administrator of your database, you are responsible for its usage. -This includes the Apps you install as well as the number of users currently -in use. +- :doc:`general/users` and :doc:`general/users/access_rights`, to configure each user correctly. +- :doc:`general/export_import_data`, to transfer data from and to other environments than Odoo or + update data. +- :doc:`general/payment_acquirers`, to allow your customers to pay with their favorite payment + method. +- :doc:`general/auth/google`, as an authentication method. -Odoo is many things (ERP, CMS, CRM application, e-Commerce backend, etc.) -but it is *not* a smartphone. You should apply caution when adding/removing -features (especially Apps) on your database since this may impact your -subscription amount significantly (or switch you from a free account -to a paying one on our online platform). +.. important:: + - | **Installing or uninstalling apps, managing users, etc., is up to you.** + | As the administrator of your database, you are responsible for its usage, as you know best + how your organization works. This includes the installation or uninstallation of :ref:`apps + ` as well as the number of :doc:`users ` currently in + use. + - | **Odoo apps have dependencies.** + | Installing some apps and features with dependencies may also install additional apps and + modules that are technically required, even if you won't actively use them. + - | **Always test app installation/removal on a duplicate of your database.** + | This way, you can know what app dependencies may be required or what data may be erased. -This section contains some information as to how you can manage your Odoo -instances. Before carrying any of these procedures, we **strongly** advise -to test them on a duplicate of your database first. That way, if something goes -wrong, your day-to-day business is not impacted. +.. seealso:: + - :ref:`Online Database management: Duplicate a database ` + - :ref:`On-premises Database management: Duplicate a database ` + - `Submit a Support Ticket `_ -.. note:: You can find guides on how to duplicate your databases both for - :ref:`online ` and :ref:`on premise ` - installations. +.. _general/apps-modules: -.. note:: If you have questions about the content of this section or if you - encounter an issue while carrying out these procedures, please contact - us through our `support form `__. +Apps and modules +================ +You can :ref:`install `, :ref:`upgrade ` and :ref:`uninstall +` all apps and modules from the :menuselection:`Apps` dashboard. -Deactivating Users ------------------- +By default, an *Apps* filter is applied. If you want to search for modules (including :doc:`Fiscal +Localization Packages +`), click on +*Filters* and select *Extra*. -.. note:: Make sure you have sufficient **administrative rights** if - you want to change the status of any of your users. +.. image:: general/apps-search-filter.png + :align: center + :alt: Add "Extra" filter in Odoo Apps -In your Odoo instance, click on **Settings**. You will have a section -showing you the active users on your database. Click on **Manage Users.** +.. warning:: + Odoo is *not a smartphone*, and its apps shouldn't be installed or uninstalled carelessly. Apply + caution when adding or removing apps and modules on your database since this may impact your + subscription costs. -+----------------+----------------+ -| |settings| | |browse_users| | -+----------------+----------------+ +.. _general/install: -You'll then see the list of your users. +Install apps and modules +------------------------ -.. image:: general/list_users.png - :align: center +Go to :menuselection:`Apps`, and click on the *Install* button of the app you want to install. -.. note:: The pre-selected filter *Internal Users* shows your paying - users (different from the *Portal Users* which are free). If you - remove this filter, you'll get all your users (the ones you pay for - and the portal ones) +.. note:: + If the module you are looking for is not listed, you can **update the app list**. -In your list of users, click on the user you want to deactivate. As soon -as you are on the userform, click on the Action drop down menu, and -then click on Archive. + To do so, activate the :ref:`developer mode `, then go to :menuselection:`Apps + --> Update Apps List` and click on *Update*. -.. image:: general/deactivate_user.png - :align: center +.. _general/upgrade: +Upgrade apps and modules +------------------------ -The user is now deactivated. +On some occasions, new improvements or app features are added to :doc:`supported versions of Odoo +`. To be able to use them, you must **upgrade** your app. -.. danger:: **Never** deactivate the main user (*admin*) +Go to :menuselection:`Apps`, click on the *dropdown menu* of the app you want to upgrade, then on +*Upgrade*. -Uninstalling Apps ------------------ +.. _general/uninstall: -.. warning:: Make sure you first test what you are about to do on a - :ref:`duplicate ` of your database before making any - changes (*especially* installing/uninstalling apps). +Uninstall apps and modules +-------------------------- -In your Odoo instance click on **Settings**; in this app, you will be -able to see how many applications you have installed. Click on **Browse -Apps** to access the list of your installed applications. - -+----------------+----------------+ -| |settings| | |browse_apps| | -+----------------+----------------+ - -In your applications' dashboard, you will see all the icons of your -applications. Click on the application you want to uninstall. Then, on -the form of the application, click on **Uninstall**. +Go to :menuselection:`Apps`, click on the *dropdown menu* of the app you want to uninstall, then on +*Uninstall*. .. image:: general/uninstall.png - :align: center + :align: center -.. danger:: Some applications have dependencies, like Invoicing, eCommerce, - etc. Therefore, the system will give you a warning message to advise - you of what is about to be removed. If you uninstall your application, - all its dependencies will be uninstalled as well (and the data in them - will permanently disappear). If you are sure you still want to uninstall - it, then click **Confirm**. - -Last, after having checked the warning message (if any), click **Confirm**. +Some apps have dependencies, meaning that one app requires another. Therefore, uninstalling one app +may uninstall multiple apps and modules. Odoo warns you which dependant apps and modules are +affected by it. .. image:: general/uninstall_deps.png - :align: center + :align: center -You have finished uninstalling your application. +To complete the uninstallation, click on *Confirm*. -Good to know ------------- - -* **Uninstalling apps, managing users, etc. is up to you**: no one else can - know if your business flow is broken better than you. If we were to uninstall - applications for you, we would never be able to tell if relevant data had - been removed or if one of your business flow was broken because we *do not - know how you work* and therefore cannot validate these kinds of operations. - -* **Odoo Apps have dependencies**: this means that you may need to install - modules that you do not actively use to access some features of Odoo - you might need. For example, the Website Builder app is needed to be - able to show your customer their Quotes in a web page. Even though you - might not need or use the Website itself, it is needed for the Online - Quotes feature to work properly. - -* **Always test app installation/removal on a duplicate** (or on a - free trial database): that way you can know what other apps may - be required, etc. This will avoid surprises when uninstalling - or when receiving your invoices. - -.. |settings| image:: general/settings_app.png -.. |browse_apps| image:: general/browse_apps.png -.. |browse_users| image:: general/browse_users.png +.. danger:: + Uninstalling an app also uninstalls all its dependencies and permanently erases their data. .. _developer-mode: @@ -148,8 +125,8 @@ Activate the developer mode (debug mode) The developer mode (or debug mode) gives you access to extra and advanced tools. -Through the Settings application --------------------------------- +Through the Settings +-------------------- Go to :menuselection:`Settings --> Activate the developer mode`. diff --git a/content/applications/general/apps-search-filter.png b/content/applications/general/apps-search-filter.png new file mode 100644 index 000000000..5116a1a69 Binary files /dev/null and b/content/applications/general/apps-search-filter.png differ diff --git a/content/applications/general/auth/google.rst b/content/applications/general/auth/google.rst index 3e7eaeba6..2bbfdf9e7 100644 --- a/content/applications/general/auth/google.rst +++ b/content/applications/general/auth/google.rst @@ -1,49 +1,136 @@ -======================================================= -How to allow users to sign in with their Google account -======================================================= +============================= +Google Sign-In Authentication +============================= -- Connect to your Google account and go to the `Google API Dashboard - `_. +The **Google Sign-In Authentication** is a useful function that allows your users to sign in to Odoo +with their Google account. -- Click on **Create Project** and enter the project name and other details. +This is particularly helpful if your organization uses Google Workforce and you want the employees +within your organization to connect to Odoo with their Google Accounts. -.. image:: media/google01.png - :align: center +.. _google-sign-in/configuration: -.. image:: media/google02.png - :align: center +Configuration +============= -- Click on **Use Google APIs** +The integration of the Google sign-in function requires configuration both on Google and on Odoo. -.. image:: media/google03.png - :align: center +.. _google-sign-in/api: -- On the left side menu, select the sub menu **Credentials** (from **API Manager**) then select **OAuth consent screen**. +Google API Dashboard +-------------------- -.. image:: media/google04.png - :align: center +#. Go to the `Google API Dashboard `_. +#. Make sure the right project is opened. If you don't have a project yet, click on *Create + Project*, fill out the project name and other details of your company, and click on *Create*. -- Fill in your address, email and the product name (for example odoo) and then save. + .. image:: google/new-project-details.png + :align: center + :alt: Filling out the details of a new project -.. image:: media/google05.png - :align: center + .. tip:: + Choose the name of your own company from the drop-down menu. -- Then click on **Add Credentials** and select the second option (OAuth 2.0 Client ID). +.. _google-sign-in/oauth: -.. image:: media/google06.png - :align: center +OAuth consent screen +~~~~~~~~~~~~~~~~~~~~ -.. image:: media/google07.png - :align: center +#. On the left side menu, click on :menuselection:`OAuth consent screen`. -- Check that the application type is set on **Web Application**. Now configure the allowed pages on which you will be redirected. + .. image:: google/consent-selection.png + :align: center + :alt: Google oauth consent selection menu -- To achieve this, complete the field **Authorized redirect URIs**. Copy paste the following link in the box: http://mydomain.odoo.com/auth_oauth/signin. Then click on **Create** +#. Choose one of the options **(Internal / External)** as instructed, and click on *Create*. -.. image:: media/google08.png - :align: center + .. image:: google/consent.png + :align: center + :alt: Choice of a user type in oauth consent -.. image:: media/google09.png - :align: center +#. Fill out your details and domain info, then click on *Save and Continue*. +#. On the **Scopes** page, leave all fields as is, and click on *Save and Continue*. -- Once done, you receive two information (your Client ID and Client Secret). You have to insert your Client ID in the **General Settings**. +.. _google-sign-in/credentials: + +Credentials +~~~~~~~~~~~ + +#. On the left side menu, click on :menuselection:`Credentials`. + + .. image:: google/credentials-button.png + :align: center + :alt: Credentials button menu + +#. Click on *Create Credentials* and select **OAuth client ID**. + + .. image:: google/client-id.png + :align: center + :alt: Oauth client id selection + +#. Select **Web Application** as the Application type. Now configure the allowed pages on which you + will be redirected. + + In order to achieve this, in the **Authorized redirect URIs** field, enter your database's domain + immediately followed by ``/auth_oauth/signin``. For example: + ``https://mydomain.odoo.com/auth_oauth/signin``, then click on *Create*. + + .. image:: google/create-client-id.png + :align: center + :alt: Creating oauth client id + +.. _google-sign-in/auth-odoo: + +Google Authentication on Odoo +----------------------------- + +.. _google-sign-in/client-id: + +Retrieve the Client ID +~~~~~~~~~~~~~~~~~~~~~~ + +Once you have done the previous steps, two keys are generated on the Google API Dashboard: *Client +ID* and *Client Secret*. Copy the *Client ID*. + +.. image:: google/secret-ids.png + :align: center + :alt: Google OAuth Client ID generated + +.. _google-sign-in/odoo-activation: + +Odoo activation +~~~~~~~~~~~~~~~ + +#. Go to :menuselection:`Odoo General Settings --> Integrations` and activate **OAuth + Authentication**. + + .. note:: + You may have to log in again after this step. + +#. Go back to :menuselection:`General Settings --> Integrations`, activate **Google + Authentication**, then fill out the *Client ID* with the key from the Google API Dashboard, and + *Save*. + + .. image:: google/odoo-client-id.png + :align: center + :alt: Filling out the client id in Odoo settings + +.. _google-sign-in/log-in: + +Log in to Odoo with Google +========================== + +To link your Google account to your Odoo profile, click on *Log in with Google* when you are asked +to choose a new password. + + .. image:: google/first-login.png + :align: center + :alt: Reset password screen with "Log in with Google" button + +Existing users must :ref:`reset their password ` to access the *reset +password* page, while new users can directly click on *Log in with Google* instead of choosing a new +password. + +.. seealso:: + - `Google Cloud Platform Console Help - Setting up OAuth 2.0 + `_ diff --git a/content/applications/general/auth/google/client-id.png b/content/applications/general/auth/google/client-id.png new file mode 100644 index 000000000..6934ddabe Binary files /dev/null and b/content/applications/general/auth/google/client-id.png differ diff --git a/content/applications/general/auth/google/consent-selection.png b/content/applications/general/auth/google/consent-selection.png new file mode 100644 index 000000000..a92553c42 Binary files /dev/null and b/content/applications/general/auth/google/consent-selection.png differ diff --git a/content/applications/general/auth/google/consent.png b/content/applications/general/auth/google/consent.png new file mode 100644 index 000000000..07b16f3bd Binary files /dev/null and b/content/applications/general/auth/google/consent.png differ diff --git a/content/applications/general/auth/google/create-client-id.png b/content/applications/general/auth/google/create-client-id.png new file mode 100644 index 000000000..b247d2731 Binary files /dev/null and b/content/applications/general/auth/google/create-client-id.png differ diff --git a/content/applications/general/auth/google/credentials-button.png b/content/applications/general/auth/google/credentials-button.png new file mode 100644 index 000000000..1ca2328e7 Binary files /dev/null and b/content/applications/general/auth/google/credentials-button.png differ diff --git a/content/applications/general/auth/google/first-login.png b/content/applications/general/auth/google/first-login.png new file mode 100644 index 000000000..148ed1e5b Binary files /dev/null and b/content/applications/general/auth/google/first-login.png differ diff --git a/content/applications/general/auth/google/new-project-details.png b/content/applications/general/auth/google/new-project-details.png new file mode 100644 index 000000000..d0d911e7e Binary files /dev/null and b/content/applications/general/auth/google/new-project-details.png differ diff --git a/content/applications/general/auth/google/odoo-client-id.png b/content/applications/general/auth/google/odoo-client-id.png new file mode 100644 index 000000000..6282e4a23 Binary files /dev/null and b/content/applications/general/auth/google/odoo-client-id.png differ diff --git a/content/applications/general/auth/google/secret-ids.png b/content/applications/general/auth/google/secret-ids.png new file mode 100644 index 000000000..d0f275cd6 Binary files /dev/null and b/content/applications/general/auth/google/secret-ids.png differ diff --git a/content/applications/general/auth/media/google01.png b/content/applications/general/auth/media/google01.png deleted file mode 100644 index e566bd57e..000000000 Binary files a/content/applications/general/auth/media/google01.png and /dev/null differ diff --git a/content/applications/general/auth/media/google02.png b/content/applications/general/auth/media/google02.png deleted file mode 100644 index d8efa8a90..000000000 Binary files a/content/applications/general/auth/media/google02.png and /dev/null differ diff --git a/content/applications/general/auth/media/google03.png b/content/applications/general/auth/media/google03.png deleted file mode 100644 index e22da632c..000000000 Binary files a/content/applications/general/auth/media/google03.png and /dev/null differ diff --git a/content/applications/general/auth/media/google04.png b/content/applications/general/auth/media/google04.png deleted file mode 100644 index 9b53656af..000000000 Binary files a/content/applications/general/auth/media/google04.png and /dev/null differ diff --git a/content/applications/general/auth/media/google05.png b/content/applications/general/auth/media/google05.png deleted file mode 100644 index 86010d2c1..000000000 Binary files a/content/applications/general/auth/media/google05.png and /dev/null differ diff --git a/content/applications/general/auth/media/google06.png b/content/applications/general/auth/media/google06.png deleted file mode 100644 index bf9aecb5a..000000000 Binary files a/content/applications/general/auth/media/google06.png and /dev/null differ diff --git a/content/applications/general/auth/media/google07.png b/content/applications/general/auth/media/google07.png deleted file mode 100644 index 064b81a97..000000000 Binary files a/content/applications/general/auth/media/google07.png and /dev/null differ diff --git a/content/applications/general/auth/media/google08.png b/content/applications/general/auth/media/google08.png deleted file mode 100644 index b1ec01739..000000000 Binary files a/content/applications/general/auth/media/google08.png and /dev/null differ diff --git a/content/applications/general/auth/media/google09.png b/content/applications/general/auth/media/google09.png deleted file mode 100644 index 72053a474..000000000 Binary files a/content/applications/general/auth/media/google09.png and /dev/null differ diff --git a/content/applications/general/browse_apps.png b/content/applications/general/browse_apps.png deleted file mode 100644 index de6793e9e..000000000 Binary files a/content/applications/general/browse_apps.png and /dev/null differ diff --git a/content/applications/general/browse_users.png b/content/applications/general/browse_users.png deleted file mode 100644 index fdca2ebe9..000000000 Binary files a/content/applications/general/browse_users.png and /dev/null differ diff --git a/content/applications/general/deactivate_user.png b/content/applications/general/deactivate_user.png deleted file mode 100644 index b76719483..000000000 Binary files a/content/applications/general/deactivate_user.png and /dev/null differ diff --git a/content/applications/general/list_users.png b/content/applications/general/list_users.png deleted file mode 100644 index cbba51b64..000000000 Binary files a/content/applications/general/list_users.png and /dev/null differ diff --git a/content/applications/general/settings_app.png b/content/applications/general/settings_app.png deleted file mode 100644 index f7c7dd121..000000000 Binary files a/content/applications/general/settings_app.png and /dev/null differ diff --git a/content/applications/general/uninstall.png b/content/applications/general/uninstall.png index a686d24cc..f9fd54db4 100644 Binary files a/content/applications/general/uninstall.png and b/content/applications/general/uninstall.png differ diff --git a/content/applications/general/uninstall_deps.png b/content/applications/general/uninstall_deps.png index be5c72013..2d84fe469 100644 Binary files a/content/applications/general/uninstall_deps.png and b/content/applications/general/uninstall_deps.png differ diff --git a/content/applications/general/users.rst b/content/applications/general/users.rst index 877fae188..253d7c846 100644 --- a/content/applications/general/users.rst +++ b/content/applications/general/users.rst @@ -62,6 +62,17 @@ The *Portal* and *Public* options do not allow you to choose access rights. Memb ones (such as record rules and restricted menus) and usually do not belong to the usual Odoo groups. +.. _users/deactivate: + +Deactivate Users +================ + +Go to :menuselection:`Settings --> Users & Companies --> Users`, open the user you want to +deactivate, click on *Action*, and then on *Archive*. + +.. danger:: + **Never** deactivate the main user (*admin*). + .. _users/passwords-management: Passwords management diff --git a/content/applications/inventory_and_mrp/inventory/management/lots_serial_numbers/expiration_dates.rst b/content/applications/inventory_and_mrp/inventory/management/lots_serial_numbers/expiration_dates.rst index f2c5374f3..ba872bcea 100644 --- a/content/applications/inventory_and_mrp/inventory/management/lots_serial_numbers/expiration_dates.rst +++ b/content/applications/inventory_and_mrp/inventory/management/lots_serial_numbers/expiration_dates.rst @@ -1,66 +1,65 @@ -======================= -Manage expiration dates -======================= +================ +Expiration Dates +================ -In many companies, products have expiration dates and they should be -tracked based on those dates. In the food industry, for example, -tracking stocks based on expiration dates is mandatory to avoid selling -expired products to customers. +In many companies, products have expiration dates and they should be managed based on those dates. +In the food industry, for example, tracking and managing product stock based on expiration dates is +mandatory to avoid selling expired products to customers. -With Odoo, you can track your products based on their expiration dates, -even if they are already tracked by lots or serial numbers. +With Odoo, you can track and manage your products based on their expiration dates, even if they are +already tracked by lots or serial numbers. -Configurations -============== +Configuration +============= Application configuration ------------------------- -To use expiration dates tracking, open the *Inventory* application and -go to :menuselection:`Configuration --> Settings` and activate the *Lots & Serial -Numbers* and *Expiration Dates* features. +To use expiration date tracking, open the *Inventory* application and go to +:menuselection:`Configuration --> Settings` and activate the *Lots & Serial Numbers* and *Expiration +Dates* features. .. image:: media/expiration_dates_01.png - :align: center + :align: center Product configuration --------------------- -Now, you have the possibility to define different dates in the -*inventory tab* of the product form: +Now, you can define different dates in the *inventory tab* of the product form: -- Product Use Time: it’s the number of days before the goods start deteriorating, without being dangerous yet. It will be computed using the lot/serial number; - -- Product Life Time: refers to the number of days before the goods may become dangerous and must not be consumed. It will be computed on the lot/serial number; - -- Product Removal Time: shows the number of days before the goods should be removed from the stock. It will be computed on the lot/serial number; - -- Product Alert Time: refers to the number of days before an alert should be raised on the lot/serial number. +- Product Use Time: the number of days before the goods start deteriorating, without being + dangerous. This is used to calculate the Best before date on each lot/serial number received. +- Product Life Time: the number of days before the goods may become dangerous and must not be + consumed. This is used to calculate the Expiration date on each lot/serial number received. +- Product Removal Time: shows the number of days before the goods should be removed from the stock. + This is used to calculate the Removal date on each lot/serial number received. +- Product Alert Time: refers to the number of days before an alert should be raised on the + lot/serial number. This is used to calculate the Alert date on each lot/serial number received. + Once the Alert date is reached, an Activity is assigned on the relevant lot/serial number to the + Responsible user defined on the Product. .. image:: media/expiration_dates_02.png - :align: center + :align: center Expiration Date on Lots/Serial Numbers ====================================== -When receiving a product in stock, the dates will automatically be -updated on the corresponding lot/serial number. This update will be -based on the reception date of the product and the times set on the -product form. +When receiving a product into inventory, the dates will automatically be updated on the +corresponding lot/serial number. These updates will be based on the receipt date of the product and +the days set on the product form. .. image:: media/expiration_dates_03.png - :align: center + :align: center .. image:: media/expiration_dates_04.png - :align: center + :align: center Expiration Alerts ================= -You can access all your expiration alerts from the *inventory* app. To -do so, go to :menuselection:`Master Data --> Lots/Serial Numbers`. There, you can use -the pre-existing filter that shows all the lots/serial numbers that -exceeded their alert date. +You can access expiration alerts from the *inventory* app. To do so, go to :menuselection:`Master +Data --> Lots/Serial Numbers`. There, you can use the pre-existing filter to show all the +lots/serial numbers that have exceeded their respective alert dates. .. image:: media/expiration_dates_05.png - :align: center \ No newline at end of file + :align: center diff --git a/content/applications/sales.rst b/content/applications/sales.rst index 378c25da1..09e413a30 100644 --- a/content/applications/sales.rst +++ b/content/applications/sales.rst @@ -11,3 +11,4 @@ Sales sales/sales sales/point_of_sale sales/subscriptions + sales/rental diff --git a/content/applications/sales/rental.rst b/content/applications/sales/rental.rst new file mode 100644 index 000000000..21706b173 --- /dev/null +++ b/content/applications/sales/rental.rst @@ -0,0 +1,103 @@ +====== +Rental +====== + +**Odoo Rental** is a comprehensive solution to manage your rentals. + +From a single view, you can send out quotations, confirm orders, schedule rentals, register when +products are picked up and returned, and invoice your customers. + +.. seealso:: + - `Odoo Rental: product page `_ + - `Odoo Tutorials: Rental `_ + +.. _rental/pricing: + +Rental Pricing +============== + +Configuration +------------- + +Go to :menuselection:`Rental --> Products`, select or create a product, and click on the product's +*Rental* tab. Under *Rental Pricing*, click on *Add a price*. Then choose a *Unit* of time (hours, +days, weeks, or months), a *Duration*, and a *Price*. You can add as many price lines as necessary, +usually to give out discounts for longer rental durations. + +.. image:: rental/rental-pricing-example.png + :align: center + :alt: Example of rental pricing configuration in Odoo Rental + +.. tip:: + Under *Reservations*, you can add fines for any *Extra Hour* or *Extra Day*. You can also set a + *Security Time*, expressed in hours, to make the product temporarily unavailable between two + rental orders. + +.. note:: + If you want to rent a product created outside of the Rental app, do not forget to tick *Can be + Rented* under the product's name. By default, this option is ticked when you create a product + directly from the Rental app. + +Computing +--------- + +Odoo always uses two rules to compute the price of a product when you create a rental order: + +#. Only one price line is used. +#. The cheapest line is selected. + +.. exercise:: + Consider the following rental pricing configuration for a product: + + - 1 day: $100 + - 3 days: $250 + - 1 week: $500 + + A customer wants to rent this product for eight days. What price will they pay? + + After an order is created, Odoo selects the second line as this is the cheapest option. The + customer has to pay three times '3 days' to cover the rental's eight days, for a total of $750. + +.. _rental/customer-signature: + +Customer signature +================== + +You can ask your customers to sign a rental agreement outlining the arrangement between you and your +customers before they pick up products to make sure your products are returned on time and in their +original condition. To do so, go to :menuselection:`Rental --> Configuration --> Settings`, activate +*Digital Documents*, and *Save*. + +.. image:: rental/digital-documents-settings.png + :align: center + :alt: Digital Documents settings in Odoo Rental + +.. note:: + This feature requires the :doc:`Sign <../finance/sign>` app. If necessary, Odoo installs it after + activating *Digital Documents*. + +Once the app settings are saved, you have the option to change the default *Rental Agreement* from +the dropdown menu. You can pick any document already uploaded to the *Sign* app, or upload a new one +to the *Sign* app by clicking on *Upload Template*. + +To request a customer signature, select a confirmed rental order, click on *Sign Documents*, choose +the document template and click on *Sign Documents* again. On the next window, select your customer +and click on *Sign Now* to start the signing process with your customer. Once the document is +completed, click on *Validate & Send Completed Document*. + +.. seealso:: + - `Odoo Tutorials: Sign `_ + +.. _rental/pickup-return: + +Pickup and Return receipt +========================= + +You can print and give your customers receipts when they pick up and/or return products. To do so, +open any rental order, click on *Print* and select *Pickup and Return Receipt*. Odoo then generates +a PDF detailing all information about the current status of the rented items: which were picked up, +when they are expected to be returned, which were returned, and potential rental delay costs. + +.. image:: rental/print-receipt.png + :align: center + :alt: Printing a Pickup and Return receipt in Odoo Rental \ No newline at end of file diff --git a/content/applications/sales/rental/digital-documents-settings.png b/content/applications/sales/rental/digital-documents-settings.png new file mode 100644 index 000000000..258c27476 Binary files /dev/null and b/content/applications/sales/rental/digital-documents-settings.png differ diff --git a/content/applications/sales/rental/print-receipt.png b/content/applications/sales/rental/print-receipt.png new file mode 100644 index 000000000..8880859b5 Binary files /dev/null and b/content/applications/sales/rental/print-receipt.png differ diff --git a/content/applications/sales/rental/rental-pricing-example.png b/content/applications/sales/rental/rental-pricing-example.png new file mode 100644 index 000000000..78159e681 Binary files /dev/null and b/content/applications/sales/rental/rental-pricing-example.png differ diff --git a/content/applications/websites/ecommerce/managing_products/media/variant_active.png b/content/applications/websites/ecommerce/managing_products/media/variant_active.png deleted file mode 100644 index 06e8ca813..000000000 Binary files a/content/applications/websites/ecommerce/managing_products/media/variant_active.png and /dev/null differ diff --git a/content/applications/websites/ecommerce/managing_products/media/variant_archive.png b/content/applications/websites/ecommerce/managing_products/media/variant_archive.png deleted file mode 100644 index 4c5caf75f..000000000 Binary files a/content/applications/websites/ecommerce/managing_products/media/variant_archive.png and /dev/null differ diff --git a/content/applications/websites/ecommerce/managing_products/media/variant_prices.png b/content/applications/websites/ecommerce/managing_products/media/variant_prices.png deleted file mode 100644 index 4cdde3b64..000000000 Binary files a/content/applications/websites/ecommerce/managing_products/media/variant_prices.png and /dev/null differ diff --git a/content/applications/websites/ecommerce/managing_products/media/variant_prices_button.png b/content/applications/websites/ecommerce/managing_products/media/variant_prices_button.png deleted file mode 100644 index 3c38b47f4..000000000 Binary files a/content/applications/websites/ecommerce/managing_products/media/variant_prices_button.png and /dev/null differ diff --git a/content/applications/websites/ecommerce/managing_products/media/variant_prices_web.png b/content/applications/websites/ecommerce/managing_products/media/variant_prices_web.png deleted file mode 100644 index d49a778b8..000000000 Binary files a/content/applications/websites/ecommerce/managing_products/media/variant_prices_web.png and /dev/null differ diff --git a/content/applications/websites/ecommerce/managing_products/media/variants.png b/content/applications/websites/ecommerce/managing_products/media/variants.png deleted file mode 100644 index 2b01e0f7e..000000000 Binary files a/content/applications/websites/ecommerce/managing_products/media/variants.png and /dev/null differ diff --git a/content/applications/websites/ecommerce/managing_products/media/variants_button.png b/content/applications/websites/ecommerce/managing_products/media/variants_button.png deleted file mode 100644 index a4ccdab1f..000000000 Binary files a/content/applications/websites/ecommerce/managing_products/media/variants_button.png and /dev/null differ diff --git a/content/applications/websites/ecommerce/managing_products/media/variants_setup.png b/content/applications/websites/ecommerce/managing_products/media/variants_setup.png deleted file mode 100644 index 5e1c8ec42..000000000 Binary files a/content/applications/websites/ecommerce/managing_products/media/variants_setup.png and /dev/null differ diff --git a/content/applications/websites/ecommerce/managing_products/variants.rst b/content/applications/websites/ecommerce/managing_products/variants.rst index a464e6cd0..672c61466 100644 --- a/content/applications/websites/ecommerce/managing_products/variants.rst +++ b/content/applications/websites/ecommerce/managing_products/variants.rst @@ -1,92 +1,110 @@ -============================== -How to manage product variants -============================== +======================= +Manage product variants +======================= -Product variants are used to offer variations of the same product to your -customers on the products page. For example, the customer chooses a T-shirt -and then selects its size and color. In the example below, the customer -chooses a phone, and then selects the memory; color and Wi-Fi band from the -available options. +Product variants are used to offer variations of the same product to your customers on the product's +page. -.. image:: ./media/variants.png +Let's say one of your customers selects a T-shirt from your product catalog. + +Then, they choose the size and color they want. The various size and color combinations are known as +product variants. + +Create attributes & variants +============================ + +In order to create various attributes and variants for your products, you first need to turn on +*Variants* in :menuselection:`Sales --> Configuration --> Settings`. + +Then, select a product from the Products list (:menuselection:`Sales / Website --> Products --> +Products`). When the product detail form opens, click on *Edit*, and go to the *Variants* tab. + +Here, you can add as many different attributes as you'd like by clicking on *Add a line*. + +These attributes appear as three different types: + +- Radio buttons +- Color buttons +- Drop-down menu + +Several variants appear as soon as there are two values for one attribute. + +Don't forget to hit *Save* once all variants have been entered. + +.. image:: variants/values.png :align: center + :alt: ecommerce product variants values -How to create attributes & variants -=================================== +Edit variants +============= -* Turn on *Products can have several attributes, defining variants (Example: - size, color,...)* in :menuselection:`Sales --> Settings`. +After you hit *Save*, you are able to see all the variants from the product template detail form via +the *Variants* smart button. -* Select a product from the Products list, go to the *Variants* tab. - -* Add as many attributes as you need from 3 different types: radio buttons, - drop-down menu or color buttons. You get several variants as soon as there are - 2 values for 1 attribute. - -.. image:: ./media/variants_setup.png +.. image:: variants/smart-button.png :align: center + :alt: ecommerce product variants smart button -How to edit variants -==================== +Clicking the *Variants* smart button takes you to the Product Variants page, where you can edit the +following data for each specific variant: -See all the variants from the product template detail form. - -.. image:: ./media/variants_button.png - :align: center - :scale: 50 - :width: 50 - :height: 50 - -You can edit following data: - -* Picture (will update in real time on the website), -* Barcode, -* Internal Reference (SKU #), -* Volume, -* Weight, -* Active (available in quotes & website). +- Picture(s) +- Internal Reference (SKU #) +- Barcode +- Volume +- Weight +- Cost .. note:: - Both the Barcode and the Internal Reference are variant-specific. - You need to populate them once the variants generated. + Both the Barcode and the Internal Reference are variant-specific. You need to populate them once + the variants are generated. -.. tip:: - See and edit all the variants from :menuselection:`Sales --> Sales --> Product Variants` - as well. This might be quicker if you manage lots of variants. - -How to set specific prices per variant -====================================== - -You can also set a specific public price per variant by clicking *Variant Prices* -in the product detail form (action in top-left corner). - -.. image:: ./media/variant_prices_button.png - :align: center - -The Price Extra is added to the product price whenever the corresponding attribute -value is selected. - -.. image:: ./media/variant_prices.png - :align: center - -.. image:: ./media/variant_prices_web.png - :align: center - -.. tip:: - Pricelist formulas let you set advanced price computation methods for product variants. - See :doc:`../maximizing_revenue/pricing`. - -How to disable/archive variants +Set specific prices per variant =============================== -You can disable/archive specific variants so that they are no longer available in quotes & -website (not existing in your stock, deprecated, etc.). Simply uncheck *Active* in their detail form. +You can set a specific public price per variant by clicking on *Configure Variants* in the product +detail form (top-left corner). That takes you to the *Product Variant Values* page for that product. -.. image:: ./media/variant_active.png +.. image:: variants/configure-variants.png :align: center + :alt: ecommerce product variants configure variants -To retrieve such archived items, hit *Archived* on searching the variants list. You can -reactivate them the same way. +To set a specific public price for a particular variant, simply click on the variant you want to +modify, then click on *Edit*. -.. image:: ./media/variant_archive.png +The *Value Price Extra* field represents the monetary value that is added to the original product +price whenever the corresponding attribute value is selected. + +.. image:: variants/value-price-extra.png :align: center + :alt: ecommerce value price extra + +This is how the *Value Price Extra* looks on your website: + +.. image:: variants/value-price-extra-frontend.png + :align: center + :alt: ecommerce value price extra on the frontend + +.. note:: + Pricelist formulas let you set advanced price computation methods for product variants. See + :doc:`../maximizing_revenue/pricing`. + +Disable/archive variants +======================== + +You can disable/archive specific variants so they are no longer available in quotes or on your +website (not existing in your stock, deprecated, etc.). Simply select *Archive* in their detail +form. You can reactivate them the same way. + +.. image:: variants/archive.png + :align: center + :alt: ecommerce product variants archive + +To retrieve such items, hit *Archived* in the *Filters* category while searching the variants list. + +.. image:: variants/archive-search.png + :align: center + :alt: ecommerce product variants archive search + +.. seealso:: + - :doc:`../../../sales/sales/products_prices/products/variants` diff --git a/content/applications/websites/ecommerce/managing_products/variants/archive-search.png b/content/applications/websites/ecommerce/managing_products/variants/archive-search.png new file mode 100644 index 000000000..2781ea090 Binary files /dev/null and b/content/applications/websites/ecommerce/managing_products/variants/archive-search.png differ diff --git a/content/applications/websites/ecommerce/managing_products/variants/archive.png b/content/applications/websites/ecommerce/managing_products/variants/archive.png new file mode 100644 index 000000000..6601899af Binary files /dev/null and b/content/applications/websites/ecommerce/managing_products/variants/archive.png differ diff --git a/content/applications/websites/ecommerce/managing_products/variants/configure-variants.png b/content/applications/websites/ecommerce/managing_products/variants/configure-variants.png new file mode 100644 index 000000000..43d6c5cee Binary files /dev/null and b/content/applications/websites/ecommerce/managing_products/variants/configure-variants.png differ diff --git a/content/applications/websites/ecommerce/managing_products/variants/smart-button.png b/content/applications/websites/ecommerce/managing_products/variants/smart-button.png new file mode 100644 index 000000000..bbb071cc1 Binary files /dev/null and b/content/applications/websites/ecommerce/managing_products/variants/smart-button.png differ diff --git a/content/applications/websites/ecommerce/managing_products/variants/value-price-extra-frontend.png b/content/applications/websites/ecommerce/managing_products/variants/value-price-extra-frontend.png new file mode 100644 index 000000000..71333d204 Binary files /dev/null and b/content/applications/websites/ecommerce/managing_products/variants/value-price-extra-frontend.png differ diff --git a/content/applications/websites/ecommerce/managing_products/variants/value-price-extra.png b/content/applications/websites/ecommerce/managing_products/variants/value-price-extra.png new file mode 100644 index 000000000..33e0453a6 Binary files /dev/null and b/content/applications/websites/ecommerce/managing_products/variants/value-price-extra.png differ diff --git a/content/applications/websites/ecommerce/managing_products/variants/values.png b/content/applications/websites/ecommerce/managing_products/variants/values.png new file mode 100644 index 000000000..8b6b5f478 Binary files /dev/null and b/content/applications/websites/ecommerce/managing_products/variants/values.png differ diff --git a/content/contributing/documentation/rst_cheat_sheet.rst b/content/contributing/documentation/rst_cheat_sheet.rst index 8349a600c..7b78c24b0 100644 --- a/content/contributing/documentation/rst_cheat_sheet.rst +++ b/content/contributing/documentation/rst_cheat_sheet.rst @@ -518,7 +518,7 @@ Document metadata | `code-column` | | Show a dynamic side column that can be used to display interactive | | | tutorials or code excerpts. | | | | For example, see :doc:`/developer/webservices/upgrade` or | -| | :doc:`/applications/finance/accounting/overview/main_concepts/memento`. | +| | :doc:`/applications/finance/accounting/getting_started/memento`. | +-----------------+--------------------------------------------------------------------------------+ | `hide-page-toc` | Hide the "On this page" sidebar and use full page width for the content. | +-----------------+--------------------------------------------------------------------------------+ diff --git a/content/developer/howtos/rdtraining/03_newapp.rst b/content/developer/howtos/rdtraining/03_newapp.rst index bda76da0e..7cb1338a1 100644 --- a/content/developer/howtos/rdtraining/03_newapp.rst +++ b/content/developer/howtos/rdtraining/03_newapp.rst @@ -82,7 +82,7 @@ be uninstalled**. Think about your favorite Linux distribution package manager - ``/home/$USER/src/custom/estate/__manifest__.py`` The ``__manifest__.py`` file should only define the name and the dependencies of our modules. - Two framework modules are necessary: ``base`` and ``web``. + The only necessary framework module for now is ``base``. Restart the Odoo server and add the ``custom`` folder to the ``addons-path``: diff --git a/content/legal.rst b/content/legal.rst index fb87d7b87..f70be5c8c 100644 --- a/content/legal.rst +++ b/content/legal.rst @@ -10,9 +10,9 @@ Legal .. toctree:: :hidden: + legal/cla legal/licenses legal/terms - legal/others Licenses ======== diff --git a/content/legal/others/cla.rst b/content/legal/cla.rst similarity index 100% rename from content/legal/others/cla.rst rename to content/legal/cla.rst diff --git a/content/legal/licenses.rst b/content/legal/licenses.rst index a20fb8801..02dc81496 100644 --- a/content/legal/licenses.rst +++ b/content/legal/licenses.rst @@ -1,8 +1,105 @@ -:nosearch: + +.. _licenses: ======== Licenses ======== -.. toctree:: - licenses/licenses \ No newline at end of file +.. _odoo_community_license: + +Odoo 14 Community Edition +========================= + +Odoo 14 Community Edition is licensed under +`LGPL version 3 `_ (also known as LGPLv3). +See also the `GPL FAQ `_ and the +`compatibility matrix `_. + + +.. _odoo_enterprise_license: + +Odoo 14 Enterprise Edition +========================== + +Odoo 14 Enterprise Edition is licensed under the Odoo Enterprise Edition License v1.0, +defined as follows: + +.. use to avoid default 
 styling
+
+.. raw:: html
+
+    
+
+.. include:: licenses/enterprise_license.txt
+
+.. raw:: html
+
+    
+
+
+.. _odoo_apps_license:
+
+Odoo Apps
+=========
+
+Unless otherwise stated, Odoo Apps by Odoo SA (including the website themes) are published under
+the Odoo Proprietary License v1.0, defined as follows
+
+.. use  to avoid default 
 styling
+
+.. raw:: html
+
+    
+
+Odoo Proprietary License v1.0
+
+This software and associated files (the "Software") may only be used
+(executed, modified, executed after modifications) if you have purchased a
+valid license from the authors, typically via Odoo Apps, or if you have
+received a written agreement from the authors of the Software (see the
+COPYRIGHT file).
+
+You may develop Odoo modules that use the Software as a library (typically
+by depending on it, importing it and using its resources), but without
+copying any source code or material from the Software. You may distribute
+those modules under the license of your choice, provided that this license
+is compatible with the terms of the Odoo Proprietary License (For example:
+LGPL, MIT, or proprietary licenses similar to this one).
+
+It is forbidden to publish, distribute, sublicense, or sell copies of the
+Software or modified copies of the Software.
+
+The above copyright notice and this permission notice must be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+.. raw:: html
+
+    
+
+.. _odoo_9_license:
+
+Odoo 9 - Odoo 13
+================
+
+The licenses for both Community Edition and Enterprise Edition of all
+Odoo versions since Odoo 9 are respectively the same as for
+:ref:`odoo_community_license` and :ref:`odoo_enterprise_license`.
+
+.. _odoo_8_license:
+
+
+Odoo 8
+======
+
+Odoo 8 is licensed under
+`AGPL version 3 `_  (also known as AGPLv3).
+See also the `GPL FAQ `_ and the
+`compatibility matrix `_.
diff --git a/content/legal/licenses/licenses.rst b/content/legal/licenses/licenses.rst
deleted file mode 100644
index 7759b2027..000000000
--- a/content/legal/licenses/licenses.rst
+++ /dev/null
@@ -1,105 +0,0 @@
-
-.. _licenses:
-
-========
-Licenses
-========
-
-.. _odoo_community_license:
-
-Odoo 14 Community Edition
-=========================
-
-Odoo 14 Community Edition is licensed under
-`LGPL version 3 `_  (also known as LGPLv3).
-See also the `GPL FAQ `_ and the
-`compatibility matrix `_.
-
-
-.. _odoo_enterprise_license:
-
-Odoo 14 Enterprise Edition
-==========================
-
-Odoo 14 Enterprise Edition is licensed under the Odoo Enterprise Edition License v1.0,
-defined as follows:
-
-.. use  to avoid default 
 styling
-
-.. raw:: html
-
-    
-
-.. include:: enterprise_license.txt
-
-.. raw:: html
-
-    
-
-
-.. _odoo_apps_license:
-
-Odoo Apps
-=========
-
-Unless otherwise stated, Odoo Apps by Odoo SA (including the website themes) are published under
-the Odoo Proprietary License v1.0, defined as follows
-
-.. use  to avoid default 
 styling
-
-.. raw:: html
-
-    
-
-Odoo Proprietary License v1.0
-
-This software and associated files (the "Software") may only be used
-(executed, modified, executed after modifications) if you have purchased a
-valid license from the authors, typically via Odoo Apps, or if you have
-received a written agreement from the authors of the Software (see the
-COPYRIGHT file).
-
-You may develop Odoo modules that use the Software as a library (typically
-by depending on it, importing it and using its resources), but without
-copying any source code or material from the Software. You may distribute
-those modules under the license of your choice, provided that this license
-is compatible with the terms of the Odoo Proprietary License (For example:
-LGPL, MIT, or proprietary licenses similar to this one).
-
-It is forbidden to publish, distribute, sublicense, or sell copies of the
-Software or modified copies of the Software.
-
-The above copyright notice and this permission notice must be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-.. raw:: html
-
-    
-
-.. _odoo_9_license:
-
-Odoo 9 - Odoo 13
-================
-
-The licenses for both Community Edition and Enterprise Edition of all
-Odoo versions since Odoo 9 are respectively the same as for
-:ref:`odoo_community_license` and :ref:`odoo_enterprise_license`.
-
-.. _odoo_8_license:
-
-
-Odoo 8
-======
-
-Odoo 8 is licensed under
-`AGPL version 3 `_  (also known as AGPLv3).
-See also the `GPL FAQ `_ and the
-`compatibility matrix `_.
diff --git a/content/legal/others.rst b/content/legal/others.rst
deleted file mode 100644
index fa5b86ebe..000000000
--- a/content/legal/others.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-:nosearch:
-
-======================
-Other legal references
-======================
-
-.. toctree::
-
-    others/privacy
-    others/cla
diff --git a/content/legal/others/privacy.rst b/content/legal/others/privacy.rst
deleted file mode 100644
index 95dae38d1..000000000
--- a/content/legal/others/privacy.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-.. _privacy_policy:
-
-==============
-Privacy Policy
-==============
-
-Temporary version at ``__ (needs cleanup)
\ No newline at end of file
diff --git a/extensions/odoo_theme/layout_templates/footer.html b/extensions/odoo_theme/layout_templates/footer.html
index 0031dbbda..27de05dc6 100644
--- a/extensions/odoo_theme/layout_templates/footer.html
+++ b/extensions/odoo_theme/layout_templates/footer.html
@@ -1,9 +1,9 @@
 

     

-        
Get Help

+        
{{ _("Get Help") }}

         
     

     

diff --git a/extensions/odoo_theme/layout_templates/header.html b/extensions/odoo_theme/layout_templates/header.html
index ff2cad8fd..29f4382c6 100644
--- a/extensions/odoo_theme/layout_templates/header.html
+++ b/extensions/odoo_theme/layout_templates/header.html
@@ -8,5 +8,5 @@
 

     {%- include "layout_templates/language_switcher.html" %}
     {%- include "layout_templates/version_switcher.html" %}
-    Try Odoo for FREE
+    {{ _('Try Odoo for FREE') }}
 

diff --git a/extensions/odoo_theme/layout_templates/homepage.html b/extensions/odoo_theme/layout_templates/homepage.html
index 2a2d98bba..6ab00651f 100644
--- a/extensions/odoo_theme/layout_templates/homepage.html
+++ b/extensions/odoo_theme/layout_templates/homepage.html
@@ -1,65 +1,65 @@
 

     

         

-            
Odoo Documentation

-            
The comprehensive guide for Odoo users. Easily find the tutorial and helpful tips that suit your needs.

+            
{{ _("Odoo Documentation") }}

+            
{{ _("The comprehensive guide for Odoo users. Easily find the tutorial and helpful tips that suit your needs.") }}

             

-                Try Odoo for FREE
+                {{ _("Try Odoo for FREE") }}
             

         

     

     

         

             

-                
Applications

-                
Master any app thanks to their end-user guides. Our wide array of functional workflows and processes are designed to help you unleash Odoo's potential.

-                
Top Links

+                
{{ _("Applications") }}

+                
{{ _("Master any app thanks to their end-user guides. Our wide array of functional workflows and processes are designed to help you unleash Odoo's potential.") }}

+                
{{ _("Top Links") }}

                 
             

             

-                
Administration

-                
Easily setup your first Odoo installation. From downloads to day-to-day database administration, the dedicated tutorials have got you covered.

-                
Top Links

+                
{{ _("Administration") }}

+                
{{ _("Easily setup your first Odoo installation. From downloads to day-to-day database administration, the dedicated tutorials have got you covered.") }}

+                
{{ _("Top Links") }}

                 
@@ -67,50 +67,50 @@
         

         

             

-                
Developer

-                
Learn to develop in Odoo by reading the framework references and programmer tutorials.

-                
Top Links

+                
{{ _("Developer") }}

+                
{{ _("Learn to develop in Odoo by reading the framework references and programmer tutorials.") }}

+                
{{ _("Top Links") }}

                 
             

             

-                
Services

-                
Find out how to open a support ticket should you need to contact a Customer Service Representative.

-                
Top Links

+                
{{ _("Services") }}

+                
{{ _("Find out how to open a support ticket should you need to contact a Customer Service Representative.") }}

+                
{{ _("Top Links") }}

                 
@@ -118,18 +118,18 @@
         

         

             

-                
Contributing

-                
You want to contribute to Odoo but don't know where to start? The tutorials and guidelines are there to help you make Odoo even better.

-                
Top Links

+                
{{ _("Contributing") }}

+                
{{ _("You want to contribute to Odoo but don't know where to start? The tutorials and guidelines are there to help you make Odoo even better.") }}

+                
{{ _("Top Links") }}

                 
diff --git a/extensions/odoo_theme/layout_templates/page_toc.html b/extensions/odoo_theme/layout_templates/page_toc.html
index e0e603363..c73d9f43e 100644
--- a/extensions/odoo_theme/layout_templates/page_toc.html
+++ b/extensions/odoo_theme/layout_templates/page_toc.html
@@ -1,4 +1,4 @@
 

-    
On this page

+    
{{ _("On this page") }}

     {{ toc }} {# this is the page TOC (or local toc) #}
 

diff --git a/redirects.txt b/redirects.txt
index e4989c103..493374772 100644
--- a/redirects.txt
+++ b/redirects.txt
@@ -218,6 +218,9 @@ applications/finance/sign/overview/signature_validity.rst applications/finance/s
 
 # Redirections introduced in 14.0 :
 
+legal/others/cla.rst legal/cla.rst
+legal/licenses/licenses.rst legal/licenses.rst
+
 crm/optimize/mail_client_extension.rst applications/sales/crm/optimize/outlook_extension.rst  # mail_client_extension -> outlook_extension | mail_client_extension is the first link provided as a tip in Odoo 14 but should be updated and point directly to outlook_extension
 crm/optimize/google_calendar_credentials.rst applications/general/calendars/google/google_calendar_credentials.rst    # (#765)