diff --git a/content/applications/finance/accounting/customer_invoices.rst b/content/applications/finance/accounting/customer_invoices.rst index 4dfd41901..29cac5962 100644 --- a/content/applications/finance/accounting/customer_invoices.rst +++ b/content/applications/finance/accounting/customer_invoices.rst @@ -229,6 +229,7 @@ the material has been shipped to the customer. customer_invoices/overview customer_invoices/payment_terms + customer_invoices/terms_conditions customer_invoices/cash_discounts customer_invoices/credit_notes customer_invoices/cash_rounding diff --git a/content/applications/finance/accounting/customer_invoices/terms_conditions.rst b/content/applications/finance/accounting/customer_invoices/terms_conditions.rst new file mode 100644 index 000000000..60f7ff0c5 --- /dev/null +++ b/content/applications/finance/accounting/customer_invoices/terms_conditions.rst @@ -0,0 +1,40 @@ +================================== +Default terms and conditions (T&C) +================================== + +Specifying terms and conditions is essential to establish important contractual points, such as +return and refunds, warranty, and after-sale services. + +You can add default terms and conditions at the bottom of all customer invoices, sales orders, and +quotations, either as text or a link to a web page. + +.. seealso:: + `Odoo Tutorial: Terms & Conditions + `_ + +Configuration +============= + +Go to :menuselection:`Accounting --> Configuration --> Settings`. Under the :guilabel:`Customer +Invoices`, enable :guilabel:`Default Terms & Conditions`. By default, the :guilabel:`Add a Note` +option is selected, and the terms and conditions are displayed at the bottom of the document. Enter +the terms and conditions in the text box below. + +.. image:: terms_conditions/terms-note.png + :alt: Example of terms and conditions as a note + +.. tip:: + You can also add a PDF version of your terms and conditions as an attachment when sending the + document via email. Edit the email templates if you want to include them by default. + +Alternatively, to display the terms and conditions on a web page, select the :guilabel:`Add a link +to a Web Page` option and click :guilabel:`Save`. Click :guilabel:`Update Terms`, edit the +content, and click :guilabel:`Save`. The link to that page is then added as a note in your document. + +.. note:: + You can edit the layout and content of the page using the :doc:`Website + ` app. If the Website app is activated, the :guilabel:`Edit in + Website Builder` option then replaces :guilabel:`Update Terms`. + +.. image:: terms_conditions/terms-webpage.png + :alt: Example of terms and conditions as a web page diff --git a/content/applications/finance/accounting/customer_invoices/terms_conditions/terms-note.png b/content/applications/finance/accounting/customer_invoices/terms_conditions/terms-note.png new file mode 100644 index 000000000..061aa8648 Binary files /dev/null and b/content/applications/finance/accounting/customer_invoices/terms_conditions/terms-note.png differ diff --git a/content/applications/finance/accounting/customer_invoices/terms_conditions/terms-webpage.png b/content/applications/finance/accounting/customer_invoices/terms_conditions/terms-webpage.png new file mode 100644 index 000000000..8ee82a3d7 Binary files /dev/null and b/content/applications/finance/accounting/customer_invoices/terms_conditions/terms-webpage.png differ diff --git a/content/applications/sales/sales/send_quotations.rst b/content/applications/sales/sales/send_quotations.rst index 5dc617841..74a680326 100644 --- a/content/applications/sales/sales/send_quotations.rst +++ b/content/applications/sales/sales/send_quotations.rst @@ -13,5 +13,4 @@ Send Quotations send_quotations/get_paid_to_validate send_quotations/deadline send_quotations/different_addresses - send_quotations/terms_and_conditions send_quotations/orders_and_variants diff --git a/content/applications/sales/sales/send_quotations/quote_template.rst b/content/applications/sales/sales/send_quotations/quote_template.rst index ee1caf15c..4acbf8663 100644 --- a/content/applications/sales/sales/send_quotations/quote_template.rst +++ b/content/applications/sales/sales/send_quotations/quote_template.rst @@ -1,93 +1,70 @@ -======================= -Use quotation templates -======================= +=================== +Quotation templates +=================== -By creating custom quotation templates, you will save a lot of time. Indeed, with the use of -templates, you will be able to send complete quotations at a fast pace. +Using quotation templates speeds up the creation of sales orders by filling in most quotation fields +automatically. Configuration ============= -To enable this feature, go to :menuselection:`Sales --> Configuration --> Settings` and activate -**Quotation Templates**. +Go to :menuselection:`Sales --> Configuration --> Settings` and enable :guilabel:`Quotation +Templates`. -.. image:: quote_template/quotations_templates_1.png - :align: center - :class: img-thumbnail - :alt: How to enable quotation templates on Odoo Sales? +Create a template +================= -For even more convenience, it is also recommended to add the **Quotation Builder** feature which -will help you design your quotation templates very easily. This option will automatically install -the Odoo Website App. - -.. image:: quote_template/quotations_templates_2.png - :align: center - :class: img-thumbnail - :alt: How to enable quotation builder on Odoo Sales? - -Create your first template -========================== - -Quotation templates are under :menuselection:`Sales --> Configuration`. - -You can create a new template or edit an existing one. Once named, you will be able to select -products and quantities as well as the expiration time of the quotation. - -.. image:: quote_template/quotations_templates_3.png - :align: center - :class: img-thumbnail - :alt: Create a new quotation template on Odoo Sales - -Design your template -==================== - -You will have the possibility to design your template and edit the customer interface in order -to manage what clients will see before accepting and paying the quotation. For example, you will -be able to describe your company, your services and your products. To do so, you can click on -**Edit** and you will be brought to the quotation builder. - -.. image:: quote_template/quotations_templates_4.png - :align: center - :class: img-thumbnail - :alt: Design your quotation template on Odoo Sales - -You can easily edit the content of your template by dragging & dropping different building blocks -to organize your quotation. For example, you can add a content block to describe your products. - -.. image:: quote_template/quotations_templates_5.png - :align: center - :class: img-thumbnail - :alt: Drag & drop building blocks to create your quotation template on Odoo Sales - -Use a quotation template -======================== - -When creating a quotation, you can choose a specific template. - -.. image:: quote_template/quotations_templates_6.png - :align: center - :class: img-thumbnail - :alt: Select a specific template on Odoo Sales - -.. tip:: - You can select any template of your choice and suggest it as the default template in - the **Sales** settings. - -Confirm the quotation -===================== - -Templates facilitate the confirmation process by allowing customers to sign electronically or to -pay online. You can activate these two options directly in the quotation template itself. - -.. image:: quote_template/quotations_templates_7.png - :align: center - :class: img-thumbnail - :alt: Allow your customers to sign electronically or to pay online on Odoo Sales +Go to :menuselection:`Sales --> Configuration --> Quotations Templates` and click :guilabel:`New`. .. note:: - Every quotation will now have this setting. Of course you can always change it and make it - specific for each quotation. + Apart from the name, all template fields are optional. -.. seealso:: - - :doc:`get_signature_to_validate` - - :doc:`get_paid_to_validate` +After having named the template, choose default values for the following fields: + +- :guilabel:`Quotation expires after`: choose the number of days for which the quotation is valid. +- :guilabel:`Online confirmation`: after sending the quotation by email, it is possible to ask the + customer to confirm it online on their customer portal: + + - by providing a :guilabel:`Signature`, + - by making a :guilabel:`Payment`, + - or both. + +- :guilabel:`Confirmation Mail`: select an email template to automatically send an email to the + customer upon confirming the quotation. + +On the :guilabel:`Lines` tab, add the default products and their quantity. Add :doc:`optional +products ` in the :guilabel:`Optional Products` tab. + +Finally, add any specific sales terms and conditions on the :guilabel:`Terms & Conditions` tab. + +.. tip:: + If the terms and conditions are standard across all quotations, :doc:`set them globally in the + Accounting/Invoicing settings + ` instead. + +Design a template +================= + +Customize the appearance of quotations on the customer portal by going to :menuselection:`Sales --> +Configuration --> Settings` and enabling the :guilabel:`Quotation Builder` feature. + +.. note:: + If necessary, Odoo automatically activates the :doc:`Website ` + app when enabling this feature. + +Select a template by going to :menuselection:`Sales --> Configuration --> Quotations Templates` and +clicking on a template. Then click the :guilabel:`Design Template` button. On the website builder, +click :guilabel:`Edit`. Drag and drop the building blocks, edit the content, and :guilabel:`Save`. + +.. image:: quote_template/quotation-builder.png + :alt: Using the quotation builder + +Use a template +============== + +When creating a quotation, choose a template under the :guilabel:`Quotation Template` field. All the +fields are then filled accordingly. Manually edit any pre-filled field if needed. + +.. tip:: + Go to :menuselection:`Sales --> Configuration --> Settings` to select a :guilabel:`Default + Template`. diff --git a/content/applications/sales/sales/send_quotations/quote_template/quotation-builder.png b/content/applications/sales/sales/send_quotations/quote_template/quotation-builder.png new file mode 100644 index 000000000..633684fbb Binary files /dev/null and b/content/applications/sales/sales/send_quotations/quote_template/quotation-builder.png differ diff --git a/content/applications/sales/sales/send_quotations/quote_template/quotations_templates_1.png b/content/applications/sales/sales/send_quotations/quote_template/quotations_templates_1.png deleted file mode 100644 index cb3bb5090..000000000 Binary files a/content/applications/sales/sales/send_quotations/quote_template/quotations_templates_1.png and /dev/null differ diff --git a/content/applications/sales/sales/send_quotations/quote_template/quotations_templates_2.png b/content/applications/sales/sales/send_quotations/quote_template/quotations_templates_2.png deleted file mode 100644 index 8fdfd5de9..000000000 Binary files a/content/applications/sales/sales/send_quotations/quote_template/quotations_templates_2.png and /dev/null differ diff --git a/content/applications/sales/sales/send_quotations/quote_template/quotations_templates_3.png b/content/applications/sales/sales/send_quotations/quote_template/quotations_templates_3.png deleted file mode 100644 index 5f3a19a7c..000000000 Binary files a/content/applications/sales/sales/send_quotations/quote_template/quotations_templates_3.png and /dev/null differ diff --git a/content/applications/sales/sales/send_quotations/quote_template/quotations_templates_4.png b/content/applications/sales/sales/send_quotations/quote_template/quotations_templates_4.png deleted file mode 100644 index bcf3c4fc1..000000000 Binary files a/content/applications/sales/sales/send_quotations/quote_template/quotations_templates_4.png and /dev/null differ diff --git a/content/applications/sales/sales/send_quotations/quote_template/quotations_templates_5.png b/content/applications/sales/sales/send_quotations/quote_template/quotations_templates_5.png deleted file mode 100644 index 36faf4ad3..000000000 Binary files a/content/applications/sales/sales/send_quotations/quote_template/quotations_templates_5.png and /dev/null differ diff --git a/content/applications/sales/sales/send_quotations/quote_template/quotations_templates_6.png b/content/applications/sales/sales/send_quotations/quote_template/quotations_templates_6.png deleted file mode 100644 index eb7339f57..000000000 Binary files a/content/applications/sales/sales/send_quotations/quote_template/quotations_templates_6.png and /dev/null differ diff --git a/content/applications/sales/sales/send_quotations/quote_template/quotations_templates_7.png b/content/applications/sales/sales/send_quotations/quote_template/quotations_templates_7.png deleted file mode 100644 index 1d0a3f87c..000000000 Binary files a/content/applications/sales/sales/send_quotations/quote_template/quotations_templates_7.png and /dev/null differ diff --git a/content/applications/sales/sales/send_quotations/terms_and_conditions.rst b/content/applications/sales/sales/send_quotations/terms_and_conditions.rst deleted file mode 100644 index 9cb44753f..000000000 --- a/content/applications/sales/sales/send_quotations/terms_and_conditions.rst +++ /dev/null @@ -1,117 +0,0 @@ -====================== -Add terms & conditions -====================== - -Specifying terms and conditions is essential to set out important contractual points such as payment -terms, limitation of liability and delivery terms between customers and sellers. Every seller must -declare all formal information concerning products and company policy. On the other hand, each -customer must take note of all these conditions before committing to anything. With Odoo Sales, it -is very easy to include your default terms and conditions on every quotation, sales order, and -invoice that you manage. - -Default Terms & Conditions -========================== - -Configuration -------------- - -Go to :menuselection:`Accounting --> Configuration --> Settings` and activate -*Default Terms & Conditions*. - -.. image:: terms_and_conditions/terms_conditions_1.png - :align: center - :class: img-thumbnail - :alt: How to enable Default Terms & Conditions on Odoo Sales? - -.. note:: - Please note that this feature is activated via the settings of the **Invoicing App** and **not** - via the settings of the **Sales App**. Moreover, you don't need to install the invoicing - application since it is done automatically with the installation of the sales application. - -DT&C on your quotations, sales orders, and invoices ---------------------------------------------------- - -In the settings of the **Invoicing App**, you have the possibility to insert your default terms -and conditions. - -.. image:: terms_and_conditions/terms_conditions_2.png - :align: center - :class: img-thumbnail - :alt: Default Terms & Conditions on quotation on Odoo Sales - -They appear subsequently on every quotation, sales order, and invoice. - -DT&C on your quotation templates --------------------------------- - -According to your business needs, you can specify your terms and conditions on your quotation -templates. This is interesting if you have different terms and conditions within your company. - -.. image:: terms_and_conditions/terms_conditions_3.png - :align: center - :class: img-thumbnail - :alt: Add Default Terms & Conditions to your quotation templates on Odoo Sales - -.. important:: - Be sure to check out our documentation about quotation templates: :doc:`quote_template`, - to master each step of this amazing feature. - -General Terms & Conditions -========================== - -GT&C on your website --------------------- - -Use the **Website App** and create your own general terms and conditions page. For example, here is -the Odoo terms and conditions page: - -.. image:: terms_and_conditions/terms_conditions_4.png - :align: center - :class: img-thumbnail - :alt: General Terms & Conditions on your website - -You can refer to this page in the footer of all your documents. The layout is available in the -**General Settings** under the **Business Documents** category. For example, this footer appears -in every document from Odoo. - -.. image:: terms_and_conditions/terms_conditions_7.png - :align: center - :class: img-thumbnail - :alt: General Terms & Conditions in your business documents - -GT&C as attachment in your emails ---------------------------------- - -Attach an external document with your general terms and conditions when you are about to send your -quotation by email to your customers. - -.. image:: terms_and_conditions/terms_conditions_5.png - :align: center - :class: img-thumbnail - :alt: General Terms & conditions as attachment in your email - -GT&C as attachment in your quotation templates ----------------------------------------------- - -Create and edit email templates to set a default attachment for all quotation emails that you -will send in the future. To do so, you have to go to :menuselection:`Sales --> Configuration ---> Quotation templates` and create a new quotation template or modify an existing one. Under -the confirmation tab, you are now able to activate online signatures, online payments and to set -a confirmation mail in which you have the possibility to configure the default attachment. -There, you can put your general terms & conditions. - -.. image:: terms_and_conditions/terms_conditions_6.png - :align: center - :class: img-thumbnail - :alt: General Terms & conditions as attachment in your quotation templates - -.. tip:: - To customize your email templates, activate the **developer mode** and - go to :menuselection:`Settings --> Technical --> Email --> Templates`. - -With Odoo Sales it is now very simple to deal with terms & conditions. - -.. seealso:: - - :doc:`quote_template` - - :doc:`get_signature_to_validate` - - :doc:`get_paid_to_validate` diff --git a/content/applications/sales/sales/send_quotations/terms_and_conditions/terms_conditions_1.png b/content/applications/sales/sales/send_quotations/terms_and_conditions/terms_conditions_1.png deleted file mode 100644 index c85f68c44..000000000 Binary files a/content/applications/sales/sales/send_quotations/terms_and_conditions/terms_conditions_1.png and /dev/null differ diff --git a/content/applications/sales/sales/send_quotations/terms_and_conditions/terms_conditions_2.png b/content/applications/sales/sales/send_quotations/terms_and_conditions/terms_conditions_2.png deleted file mode 100644 index 7c1e0b465..000000000 Binary files a/content/applications/sales/sales/send_quotations/terms_and_conditions/terms_conditions_2.png and /dev/null differ diff --git a/content/applications/sales/sales/send_quotations/terms_and_conditions/terms_conditions_3.png b/content/applications/sales/sales/send_quotations/terms_and_conditions/terms_conditions_3.png deleted file mode 100644 index 0bf769276..000000000 Binary files a/content/applications/sales/sales/send_quotations/terms_and_conditions/terms_conditions_3.png and /dev/null differ diff --git a/content/applications/sales/sales/send_quotations/terms_and_conditions/terms_conditions_4.png b/content/applications/sales/sales/send_quotations/terms_and_conditions/terms_conditions_4.png deleted file mode 100644 index 3a31cb215..000000000 Binary files a/content/applications/sales/sales/send_quotations/terms_and_conditions/terms_conditions_4.png and /dev/null differ diff --git a/content/applications/sales/sales/send_quotations/terms_and_conditions/terms_conditions_5.png b/content/applications/sales/sales/send_quotations/terms_and_conditions/terms_conditions_5.png deleted file mode 100644 index 919e854dd..000000000 Binary files a/content/applications/sales/sales/send_quotations/terms_and_conditions/terms_conditions_5.png and /dev/null differ diff --git a/content/applications/sales/sales/send_quotations/terms_and_conditions/terms_conditions_6.png b/content/applications/sales/sales/send_quotations/terms_and_conditions/terms_conditions_6.png deleted file mode 100644 index 540fac1aa..000000000 Binary files a/content/applications/sales/sales/send_quotations/terms_and_conditions/terms_conditions_6.png and /dev/null differ diff --git a/content/applications/sales/sales/send_quotations/terms_and_conditions/terms_conditions_7.png b/content/applications/sales/sales/send_quotations/terms_and_conditions/terms_conditions_7.png deleted file mode 100644 index fe46463e9..000000000 Binary files a/content/applications/sales/sales/send_quotations/terms_and_conditions/terms_conditions_7.png and /dev/null differ diff --git a/content/applications/sales/subscriptions/plans.rst b/content/applications/sales/subscriptions/plans.rst index 6614a3483..cfb884bda 100644 --- a/content/applications/sales/subscriptions/plans.rst +++ b/content/applications/sales/subscriptions/plans.rst @@ -75,9 +75,9 @@ In the :guilabel:`Optional Products` tab, enter any optional products that the c their quotation before confirming the order. If the subscription plan has unique :doc:`terms and conditions -`, add them in the :guilabel:`Terms -& Conditions` tab. If terms conditions are specified on a plan, these will be used instead of the -default terms and conditions set up in the *Sales* app settings. +`, add them in the +:guilabel:`Terms & Conditions` tab. If terms conditions are specified on a plan, these will be used +instead of the default terms and conditions set up in the *Sales* app settings. .. image:: plans/subplan-terms-conditions.png :align: center diff --git a/redirects/16.0.txt b/redirects/16.0.txt index 80b87074d..f473732ef 100644 --- a/redirects/16.0.txt +++ b/redirects/16.0.txt @@ -26,6 +26,7 @@ applications/finance/payment_acquirers/wire_transfer.rst applications/finance/pa applications/sales/point_of_sale/payment/stripe.rst applications/sales/point_of_sale/payment_methods/terminals/stripe.rst # /payment/* -> /payment_methods/terminals/* applications/sales/sales/invoicing/subscriptions.rst applications/sales/subscriptions.rst # sales/sales/invoicing/subscriptions --> /sales/subscriptions +applications/sales/sales/send_quotations/terms_and_conditions.rst applications/finance/accounting/customer_invoices/terms_conditions.rst # from sales to accounting applications/sales/subscriptions/configuration/subscription_products.rst applications/sales/subscriptions/products.rst # configuration/subscription_products --> products applications/sales/subscriptions/configuration/subscription_templates.rst applications/sales/subscriptions/plans.rst # configuration/subscription_templates --> plans applications/sales/subscriptions/follow_up/automatic_alerts.rst applications/sales/subscriptions/automatic_alerts.rst # follow_up/* --> *