[MOV] general: single docs content up to their parent pages

This commit is part of a larger work to improve the documentation's
structure. The toctree structure used to add levels to create categories
and make the structure visually more understandable.
With the new version of the documentation, plenty of these categories
are now redundant.

This commit improves the structure of the "general" section:
- it moves the content of the doc "in_app_purchase" to its parent page
  "multi_companies"
- it moves the content of the doc "tags/take_tags" to "odoo_basics/tags"
- it moves the content of the doc "manage_multi_companies" to its parent
  page "multi_companies"

task-2535899

content/applications/general/in_app_purchase.rst

@@ -1,8 +1,71 @@
-===============
-In-App Purchase
-===============
+=====================
+In-App Purchase (IAP)
+=====================
 
-.. toctree::
-   :titlesonly:
+In-App Purchases (IAP) gives access to additional services through Odoo. For instance, it allows you
+to send SMS Text Messages or to send Invoices by post directly from my database.
 
-   in_app_purchase/in_app_purchase
+Buying Credits
+==============
+
+Each IAP Service relies on prepaid credits to work and has its own pricing. To consult my current
+balance or to recharge my account, go to :menuselection:`Settings --> Odoo IAP --> View my
+Services`.
+
+.. image:: in_app_purchase/image1.png
+   :align: center
+
+.. tip::
+   If I am on Odoo Online (SAAS) and have the Enterprise version, I benefit from free credits to
+   test our IAP features.
+
+IAP accounts
+============
+
+Credits to use IAP services are stored on IAP accounts, which are specific to each service and
+database. By default, IAP accounts are common to all companies, but can be restricted to specific
+ones. Activate the :doc:`Developer mode </applications/general/developer_mode>`, then go to
+:menuselection:`Technical Settings --> IAP Account`.
+
+.. image:: in_app_purchase/image2.png
+   :align: center
+   
+IAP Portal
+==========
+
+The IAP Portal is a platform regrouping my IAP Services. It is accessible from
+:menuselection:`Settings app --> Odoo IAP --> View my Services`. From there, I can view my current
+balance, recharge my credits, review my consumption and set a reminder to when credits are low.
+
+.. image:: in_app_purchase/image3.png
+   :align: center
+
+Get notified when credits are low
+=================================
+
+To be notified when it’s time to recharge my credits, I’ll go to my IAP Portal through
+:menuselection:`Settings app --> Odoo IAP --> View my Services`, unfold a service and mark the
+Receive threshold warning option. Then, I’ll provide a minimum amount of credits and email
+addresses. Now, every time that the limit is reached, an automatic reminder will be sent to by
+email!
+
+.. image:: in_app_purchase/image4.png
+   :align: center
+
+IAP services available
+======================
+
+Different services are available depending on the hosting type of your Database:
+
+- *Odoo Online (SAAS)*: only the IAP services provided by Odoo can be used (i.e. the SMS, Snailmail,
+  Reveal and Partner Autocomplete features);
+- *Odoo.sh and Odoo Enterprise (on-premise)*: both the services provided by Odoo and by third-party
+  apps can be used.
+
+Offering my own services 
+========================
+
+I am more than welcome to offer my own IAP services through Odoo Apps! It is the perfect opportunity
+to get recurring revenue for an ongoing service use rather than — and possibly instead of — a sole
+initial purchase. Please, find more information at: :doc:`In-App Purchase
+</developer/webservices/iap>`.

content/applications/general/in_app_purchase/in_app_purchase.rst

@@ -1,71 +0,0 @@
-==================================================
-General guide about In-App Purchase (IAP) Services
-==================================================
-
-In-App Purchases (IAP) gives access to additional services through Odoo. For instance, it allows me
-to send SMS Text Messages or to send Invoices by post directly from my database.
-
-Buying Credits
-==============
-
-Each IAP Service relies on prepaid credits to work and has its own pricing. To consult my current
-balance or to recharge my account, go to :menuselection:`Settings --> Odoo IAP -->
-View my Services`.
-
-.. image:: media/image1.png
-   :align: center
-
-.. tip::
-   If I am on Odoo Online (SAAS) and have the Enterprise version, I benefit from free credits to
-   test our IAP features.
-
-IAP accounts
-============
-
-Credits to use IAP services are stored on IAP accounts, which are specific to each service and
-database. By default, IAP accounts are common to all companies, but can be restricted to specific
-ones. Activate the :doc:`Developer mode </applications/general/developer_mode>`, then go to
-:menuselection:`Technical Settings --> IAP Account`.
-
-.. image:: media/image2.png
-   :align: center
-   
-IAP Portal
-==========
-
-The IAP Portal is a platform regrouping my IAP Services. It is accessible from
-:menuselection:`Settings app --> Odoo IAP --> View my Services`. From there, I can view my current
-balance, recharge my credits, review my consumption and set a reminder to when credits are low.
-
-.. image:: media/image3.png
-   :align: center
-
-Get notified when credits are low
-=================================
-
-To be notified when it’s time to recharge my credits, I’ll go to my IAP Portal through
-:menuselection:`Settings app --> Odoo IAP --> View my Services`, unfold a service and mark the
-Receive threshold warning option. Then, I’ll provide a minimum amount of credits and email
-addresses. Now, every time that the limit is reached, an automatic reminder will be sent to by
-email!
-
-.. image:: media/image4.png
-   :align: center
-
-IAP services available
-======================
-
-Different services are available depending on the hosting type of your Database:
-
-- *Odoo Online (SAAS)*: only the IAP services provided by Odoo can be used (i.e. the SMS, Snailmail,
-  Reveal and Partner Autocomplete features);
-- *Odoo.sh and Odoo Enterprise (on-premise)*: both the services provided by Odoo and by third-party
-  apps can be used.
-
-Offering my own services 
-========================
-
-I am more than welcome to offer my own IAP services through Odoo Apps! It is the perfect opportunity
-to get recurring revenue for an ongoing service use rather than — and possibly instead of — a sole
-initial purchase. Please, find more information at: :doc:`In-App Purchase
-</developer/webservices/iap>`.

content/applications/general/multi_companies.rst

@@ -2,7 +2,134 @@
 Multi Companies
 ===============
 
-.. toctree::
-   :titlesonly:
+A centralized management environment allows you to select multiple companies simultaneously and set
+their specific warehouses, customers, equipment, and contacts. It provides you the ability to
+generate reports of aggregated figures without switching interfaces, which facilitates daily tasks
+and the overall management process.
 
-   multi_companies/manage_multi_companies
+Manage companies and records
+============================
+
+Go to :menuselection:`Settings --> Manage Companies` and fill in the form with your company’s
+information. If a *Parent Company* is selected, records are shared between the two companies (as
+long as both environments are active).
+
+.. image:: multi_companies/create_js_store_us.png
+   :align: center
+   :alt: Overview of a new company's form in Odoo
+
+.. tip::
+   Activate the :doc:`Developer mode <developer_mode/activate>` to choose a *Favicon*
+   for each of your companies, and easily identify them by the browser tabs. Set your
+   favicons’ files size to 16x16 or 32x32 pixels. JPG, PNG, GIF, and ICO are extensions accepted.
+
+   .. image:: multi_companies/favicon.png
+      :align: center
+      :height: 200
+      :alt: View of a web browser and the favicon for a specific company chosen in Odoo
+
+Switch between or select multiple companies by enabling their selection boxes to activate them. The
+grayed company is the one which environment is in use. To switch environments, click on the
+company’s name. In the example below, the user has access to three companies, two are activated, and
+the environment in use is of *JS Store US*.
+
+.. image:: multi_companies/multi_companies_menu_dashboard.png
+   :align: center
+   :alt: View of the companies menu through the main dashboard in Odoo
+
+Data such as Products, Contacts, and Equipment can be shared or set to be shown for a specific
+company only. To do so, on their forms, choose between:
+
+- *A blank field*: the record is shared within all companies.
+- *Adding a company*: the record is visible to users logged in to that specific company.
+
+.. image:: multi_companies/product_form_company.png
+   :align: center
+   :alt: View of a product's form emphasizing the company field in Odoo Sales
+
+Employees' access
+=================
+
+Once companies are created, manage your employees' :doc:`Access Rights <odoo_basics/users>`
+for *Multi Companies*.
+
+.. image:: multi_companies/access_rights_multi_companies.png
+   :align: center
+   :alt: View of an user form emphasizing the multi companies field under the access rights tabs
+         in Odoo
+
+| If a user has multiple companies *activated* on his database, and he is **editing** a record,
+  the editing happens on the record's related company.
+| Example: if editing a sale order issued under JS Store US while working on the JS Store Belgium
+  environment, the changes are applied under JS Store US (the company from which the sale order
+  was issued).
+| When **creating** a record, the company taken into account is:
+
+- The current company (the one active) or,
+- No company is set (on products and contacts’ forms for example) or,
+- The company set is the one linked to the document (the same as if a record is being edited).
+
+Documents’ format
+=================
+
+To set documents' formats according to each company, *activate* and *select* the respective one and,
+under *Settings*, click on *Configure Document Layout*.
+
+.. image:: multi_companies/document_layout.png
+   :align: center
+   :alt: View of the settings page emphasizing the document layout field in Odoo
+
+Inter-Company Transactions
+==========================
+
+First, make sure each one of your companies is properly set in relation to:
+
+- :doc:`Chart of Accounts
+  <../finance/accounting/getting_started/initial_configuration/chart_of_accounts>`
+- :doc:`Taxes <../finance/accounting/taxation/taxes/default_taxes>`
+- :doc:`Fiscal Positions <../finance/accounting/taxation/taxes/fiscal_positions>`
+- :doc:`Journals <../finance/accounting/bank/setup/bank_accounts>`
+- :doc:`Fiscal Localizations
+  <../finance/accounting/fiscal_localizations/overview/fiscal_localization_packages>`
+- :doc:`Pricelists <../sales/sales/products_prices/prices/pricing>`
+- :doc:`Warehouses <../inventory_and_mrp/inventory/management/warehouses/warehouse_creation>`
+
+Now, activate the *Inter-Company Transactions* option under *Settings*. With the respective company
+*activated* and *selected*, choose if you would like operations between companies to be synchronized
+at an invoice/bills level or at a sales/purchase orders level.
+
+.. image:: multi_companies/inter_company_transactions.png
+   :align: center
+   :alt: View of the settings page emphasizing the inter company transaction field in Odoo
+
+- **Synchronize invoice/bills**: generates a bill/invoice when a company confirms a bill/invoice for
+  the selected company.
+
+  *Example:* an invoice posted on JS Store Belgium, for JS Store US, automatically creates a vendor
+  bill on the JS Store US, from the JS Store Belgium.
+
+.. image:: multi_companies/invoice_inter_company.png
+   :align: center
+   :alt: View of an invoice for JS Store US created on JS Store Belgium in Odoo
+
+- **Synchronize sales/purchase order**: generates a drafted purchase/sales order using the selected
+  company warehouse when a sales/purchase order is confirmed for the selected company. If instead of
+  a drafted purchase/sales order you rather have it validated, enable *Automatic Validation*.
+
+  *Example:* when a sale order for JS Store US is confirmed on JS Store Belgium, a purchase order
+  on JS Store Belgium is automatically created (and confirmed if the *Automatic Validation* feature
+  was enabled).
+
+.. image:: multi_companies/purchase_order_inter_company.png
+   :align: center
+   :alt: View of the purchase created on JS Store US from JS Store Belgium in Odoo
+
+.. note::
+   Products have to be configured as *Can be sold* and must be shared between the companies.
+
+.. tip::
+   Remember to test all workflows as an user other than the administrator.
+
+.. seealso::
+   - :doc:`Multi-company Guidelines </developer/howtos/company>`
+   - :doc:`../finance/accounting/others/multicurrencies/how_it_works`

content/applications/general/multi_companies/manage_multi_companies.rst

@@ -1,132 +0,0 @@
-Multi Companies
-===============
-
-A centralized management environment allows you to select multiple companies simultaneously and set
-their specific warehouses, customers, equipment, and contacts. It provides you the ability to
-generate reports of aggregated figures without switching interfaces, which facilitates daily tasks
-and the overall management process.
-
-Manage companies and records
-----------------------------
-
-Go to :menuselection:`Settings --> Manage Companies` and fill in the form with your company’s
-information. If a *Parent Company* is selected, records are shared between the two companies (as
-long as both environments are active).
-
-.. image:: media/create_js_store_us.png
-   :align: center
-   :alt: Overview of a new company's form in Odoo
-
-.. tip::
-   Activate the :doc:`Developer mode <../developer_mode/activate>` to choose a *Favicon*
-   for each of your companies, and easily identify them by the browser tabs. Set your
-   favicons’ files size to 16x16 or 32x32 pixels. JPG, PNG, GIF, and ICO are extensions accepted.
-
-   .. image:: media/favicon.png
-      :align: center
-      :height: 200
-      :alt: View of a web browser and the favicon for a specific company chosen in Odoo
-
-Switch between or select multiple companies by enabling their selection boxes to activate them. The
-grayed company is the one which environment is in use. To switch environments, click on the
-company’s name. In the example below, the user has access to three companies, two are activated, and
-the environment in use is of *JS Store US*.
-
-.. image:: media/multi_companies_menu_dashboard.png
-   :align: center
-   :alt: View of the companies menu through the main dashboard in Odoo
-
-Data such as Products, Contacts, and Equipment can be shared or set to be shown for a specific
-company only. To do so, on their forms, choose between:
-
-- *A blank field*: the record is shared within all companies.
-- *Adding a company*: the record is visible to users logged in to that specific company.
-
-.. image:: media/product_form_company.png
-   :align: center
-   :alt: View of a product's form emphasizing the company field in Odoo Sales
-
-Employees' access
------------------
-
-Once companies are created, manage your employees' :doc:`Access Rights <../odoo_basics/users>`
-for *Multi Companies*.
-
-.. image:: media/access_rights_multi_companies.png
-   :align: center
-   :alt: View of an user form emphasizing the multi companies field under the access rights tabs
-         in Odoo
-
-| If a user has multiple companies *activated* on his database, and he is **editing** a record,
-  the editing happens on the record's related company.
-| Example: if editing a sale order issued under JS Store US while working on the JS Store Belgium
-  environment, the changes are applied under JS Store US (the company from which the sale order
-  was issued).
-| When **creating** a record, the company taken into account is:
-
-- The current company (the one active) or,
-- No company is set (on products and contacts’ forms for example) or,
-- The company set is the one linked to the document (the same as if a record is being edited).
-
-Documents’ format
------------------
-
-To set documents' formats according to each company, *activate* and *select* the respective one and,
-under *Settings*, click on *Configure Document Layout*.
-
-.. image:: media/document_layout.png
-   :align: center
-   :alt: View of the settings page emphasizing the document layout field in Odoo
-
-Inter-Company Transactions
---------------------------
-
-First, make sure each one of your companies is properly set in relation to:
-
-- :doc:`Chart of Accounts <../../finance/accounting/getting_started/initial_configuration/chart_of_accounts>`
-- :doc:`Taxes <../../finance/accounting/taxation/taxes/default_taxes>`
-- :doc:`Fiscal Positions <../../finance/accounting/taxation/taxes/fiscal_positions>`
-- :doc:`Journals <../../finance/accounting/bank/setup/bank_accounts>`
-- :doc:`Fiscal Localizations <../../finance/accounting/fiscal_localizations/overview/fiscal_localization_packages>`
-- :doc:`Pricelists <../../sales/sales/products_prices/prices/pricing>`
-- :doc:`Warehouses <../../inventory_and_mrp/inventory/management/warehouses/warehouse_creation>`
-
-Now, activate the *Inter-Company Transactions* option under *Settings*. With the respective company
-*activated* and *selected*, choose if you would like operations between companies to be synchronized
-at an invoice/bills level or at a sales/purchase orders level.
-
-.. image:: media/inter_company_transactions.png
-   :align: center
-   :alt: View of the settings page emphasizing the inter company transaction field in Odoo
-
-- **Synchronize invoice/bills**: generates a bill/invoice when a company confirms a bill/invoice for
-  the selected company.
-
-  *Example:* an invoice posted on JS Store Belgium, for JS Store US, automatically creates a vendor
-  bill on the JS Store US, from the JS Store Belgium.
-
-.. image:: media/invoice_inter_company.png
-   :align: center
-   :alt: View of an invoice for JS Store US created on JS Store Belgium in Odoo
-
-- **Synchronize sales/purchase order**: generates a drafted purchase/sales order using the selected
-  company warehouse when a sales/purchase order is confirmed for the selected company. If instead of
-  a drafted purchase/sales order you rather have it validated, enable *Automatic Validation*.
-
-  *Example:* when a sale order for JS Store US is confirmed on JS Store Belgium, a purchase order
-  on JS Store Belgium is automatically created (and confirmed if the *Automatic Validation* feature
-  was enabled).
-
-.. image:: media/purchase_order_inter_company.png
-   :align: center
-   :alt: View of the purchase created on JS Store US from JS Store Belgium in Odoo
-
-.. note::
-   Products have to be configured as *Can be sold* and must be shared between the companies.
-
-.. tip::
-   Remember to test all workflows as an user other than the administrator.
-
-.. seealso::
-   - :doc:`Multi-company Guidelines </developer/howtos/company>`
-   - :doc:`../../finance/accounting/others/multicurrencies/how_it_works`

content/applications/general/odoo_basics/users.rst

@@ -202,5 +202,5 @@ the user can have access.
    :alt: View of a user’s form emphasizing the multi companies field in Odoo
 
 .. seealso::
-   - :doc:`../multi_companies/manage_multi_companies`
+   - :doc:`../multi_companies`
    - :doc:`../../settings/users_and_features`

content/applications/general/tags.rst

@@ -2,7 +2,65 @@
 Tags
 ====
 
-.. toctree::
-   :titlesonly:
+Tags work like keywords or labels that will help you to categorize your work, as well as make
+objectives and goals clearer and available for everyone instantly. They are also a useful source of
+filtering, helping you boost productivity.
 
-   tags/take_tags
+
+Where can I use and how do I create tags?
+=========================================
+
+| Tags can be used in numerous applications going from *CRM*, *Project*, *Contacts*, *Marketing
+  Automation*, etc.
+| On *CRM* for instance, under :menuselection:`CRM --> Configuration --> Tags` you can create new or
+  edit existing ones.
+
+.. image:: tags/create_tags.png
+   :align: center
+   :height: 300
+   :alt: Click on Create to create Tags in Odoo
+
+You can also create them on the fly.
+
+.. image:: tags/create_tags_fly.png
+   :align: center
+   :alt: Type the name of the tag on the field and create and edit a tag in Odoo
+
+Choose specific colors for each tag to help identify them, or *Hide in Kanban*, simply by
+clicking on the tag once it is created.
+
+.. image:: tags/tags_colors.png
+   :align: center
+   :height: 260
+   :alt: Click on the tag and choose a color in Odoo
+
+Remove tags from a task or from the database
+============================================
+
+Click on the *x* to delete a tag from a specific task or contact. To delete it from your
+database, go to :menuselection:`CRM --> Configuration --> Tags --> Action --> Delete`.
+
+.. image:: tags/delete.png
+   :align: center
+   :alt: Select a tag and click on action then delete to delete it from the database in Odoo
+
+Use tags as a parameter
+=======================
+
+On the *Marketing Automation* application, for example, you can re-use tags as a parameter to
+specify a niche of records for your campaign.
+
+.. image:: tags/mkt_automation.png
+   :align: center
+   :height: 430
+   :alt: Apply tags as filters in Odoo Marketing Automation application
+
+Use tags for reporting
+======================
+
+To get the information you need in an organized format and for a specific purpose, you can also
+add tags.
+
+.. image:: tags/reporting.png
+   :align: center
+   :alt: Apply tags to create reports in Odoo

content/applications/general/tags/take_tags.rst

@@ -1,66 +0,0 @@
-======================
-Take Advantage of Tags
-======================
-
-Tags work like keywords or labels that will help you to categorize your work, as well as make
-objectives and goals clearer and available for everyone instantly. They are also a useful source of
-filtering, helping you to boost productivity.
-
-
-Where can I use and how do I create tags?
-=========================================
-
-| Tags can be used in numerous applications going from *CRM*, *Project*, *Contacts*, *Marketing
-  Automation*, etc.
-| On *CRM* for instance, under :menuselection:`CRM --> Configuration --> Tags` you can create new or
-  edit existing ones.
-
-.. image:: media/create_tags.png
-   :align: center
-   :height: 300
-   :alt: Click on Create to create Tags in Odoo
-
-You can also create them on the fly.
-
-.. image:: media/create_tags_fly.png
-   :align: center
-   :alt: Type the name of the tag on the field and create and edit a tag in Odoo
-
-Choose specific colors for each tag to help identify them, or *Hide in Kanban*, simply by
-clicking on the tag once it is created.
-
-.. image:: media/tags_colors.png
-   :align: center
-   :height: 260
-   :alt: Click on the tag and choose a color in Odoo
-
-Remove tags from a task or from the database
-============================================
-
-Click on the *x* to delete a tag from a specific task or contact. To delete it from your
-database, go to :menuselection:`CRM --> Configuration --> Tags --> Action --> Delete`.
-
-.. image:: media/delete.png
-   :align: center
-   :alt: Select a tag and click on action then delete to delete it from the database in Odoo
-
-Use tags as a parameter
-=======================
-
-On the *Marketing Automation* application, for example, you can re-use tags as a parameter to
-specify a niche of records for your campaign.
-
-.. image:: media/mkt_automation.png
-   :align: center
-   :height: 430
-   :alt: Apply tags as filters in Odoo Marketing Automation application
-
-Use tags for reporting
-======================
-
-To get the information you need in an organized format and for a specific purpose, you can also
-add tags.
-
-.. image:: media/reporting.png
-   :align: center
-   :alt: Apply tags to create reports in Odoo

content/applications/marketing/events/integrations/integration_sms.rst

@@ -64,7 +64,7 @@ Speakers*.
 .. note::
    Credits are required to be able to send SMSs. For more information about Pricing :doc:`click here
    <../../sms_marketing/pricing/pricing_and_faq>`, and, about IAP Services :doc:`here
-   </applications/general/in_app_purchase/in_app_purchase>`.
+   </applications/general/in_app_purchase>`.
 
 
 

content/applications/marketing/marketing_automation/overview/segment.rst

@@ -64,4 +64,4 @@ Use cases
 
 .. seealso::
    - :doc:`automate_actions`
-   - :doc:`/applications/general/tags/take_tags`
+   - :doc:`/applications/general/tags`

content/applications/sales/crm/acquire_leads/lead_mining.rst

@@ -68,5 +68,5 @@ Credits`; or go to :menuselection:`Settings --> In-App Purchases --> View my Ser
    If you are on Odoo Online (SAAS) and have the Enterprise version, you benefit from free trial credits to test the feature.
 
 .. seealso::
-   * :doc:`In-App Purchases (IAP) </applications/general/in_app_purchase/in_app_purchase>`
+   * :doc:`In-App Purchases (IAP) </applications/general/in_app_purchase>`
  

content/applications/services/project/tasks/get_started.rst

@@ -80,7 +80,7 @@ Drag and drop tasks to change their stage and define colors to help you identify
    :alt: Choose a color to identify your task in Odoo Project
 
 .. seealso::
-   - :doc:`/applications/general/tags/take_tags`
+   - :doc:`/applications/general/tags`
 
 
 

redirects.txt

@@ -195,6 +195,9 @@ discuss/overview.rst applications/productivity/discuss/overview/get_started.rst
 crm/optimize/onsip.rst applications/general/voip/onsip.rst                    # crm/optimize/* --> general/voip/*
 crm/optimize/setup.rst applications/general/voip/asterisk.rst                 # crm/optimize/setup --> general/voip/asterisk
 
-general/odoo_basics/add_user.rst applications/general/odoo_basics/users.rst      # add_user --> users
+general/odoo_basics/add_user.rst applications/general/odoo_basics/users.rst                               # add_user -> users
+applications/general/in_app_purchase/in_app_purchase.rst applications/general/in_app_purchase.rst         # in_app_purchase/in_app_purchase -> in_app_purchase
+applications/general/tags/take_tags.rst applications/general/tags.rst                                     # tags/take_tags -> tags
+applications/general/multi_companies/manage_multi_companies.rst applications/general/multi_companies.rst  # multi_companies/manage_multi_companies -> multi_companies
 
 applications/finance/sign/overview/signature_validity.rst applications/finance/sign.rst        #sign/overview/signature_validity -> sign/*