Merge PR #3418 into 17.0

Signed-off-by pedrobaeza

sale_order_general_discount/README.rst

@@ -28,12 +28,14 @@ Sale Order General Discount
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
 
-This module allows to set a general discount in a sales order. This general
-discount is set to each line order in the standard `discount` field.
+This module allows to set a general discount in a sales order. This
+general discount is set to each line order in the standard discount
+field.
 
 You can configure:
- * a default general discount on customers
- * On each product define if general discount is applied
+
+- a default general discount on customers
+- On each product define if general discount is applied
 
 **Table of contents**
 
@@ -43,19 +45,19 @@ You can configure:
 Installation
 ============
 
-You need to install sale_management module for accessing the needed menus.
+You need to install sale_management module for accessing the needed
+menus.
 
 Usage
 =====
 
 To use this module, you need to:
 
-#. Create a sale order and set a discount,
-   this discount will be set in all lines.
-#. You can set a discount in a partner.
-#. On product you can define if you
-   apply general discount on sale order line
-   linked to that product
+1. Create a sale order and set a discount, this discount will be set in
+   all lines.
+2. You can set a discount in a partner.
+3. On product you can define if you apply general discount on sale order
+   line linked to that product
 
 Bug Tracker
 ===========
@@ -71,23 +73,23 @@ Credits
 =======
 
 Authors
-~~~~~~~
+-------
 
 * Tecnativa
 
 Contributors
-~~~~~~~~~~~~
+------------
 
-* `Tecnativa <https://www.tecnativa.com>`_:
+- `Tecnativa <https://www.tecnativa.com>`__:
 
-  * Sergio Teruel <[email protected]>
-  * Stefan Ungureanu <[email protected]>
+  - Sergio Teruel <[email protected]>
+  - Stefan Ungureanu <[email protected]>
 
-* Raf Ven <[email protected]>
-* Sudhir Arya <[email protected]>
+- Raf Ven <[email protected]>
+- Sudhir Arya <[email protected]>
 
 Maintainers
-~~~~~~~~~~~
+-----------
 
 This module is maintained by the OCA.
 

sale_order_general_discount/readme/CONTRIBUTORS.md

@@ -0,0 +1,5 @@
+- [Tecnativa](https://www.tecnativa.com):
+  - Sergio Teruel \<<[email protected]>\>
+  - Stefan Ungureanu \<<[email protected]>\>
+- Raf Ven \<<[email protected]>\>
+- Sudhir Arya \<<[email protected]>\>

sale_order_general_discount/readme/DESCRIPTION.md

@@ -0,0 +1,7 @@
+This module allows to set a general discount in a sales order. This
+general discount is set to each line order in the standard discount
+field.
+
+You can configure:  
+- a default general discount on customers
+- On each product define if general discount is applied

sale_order_general_discount/readme/INSTALL.rst → sale_order_general_discount/readme/INSTALL.md

@@ -1 +1,2 @@
-You need to install sale_management module for accessing the needed menus.
+You need to install sale_management module for accessing the needed
+menus.

sale_order_general_discount/readme/USAGE.md

@@ -0,0 +1,7 @@
+To use this module, you need to:
+
+1.  Create a sale order and set a discount, this discount will be set in
+    all lines.
+2.  You can set a discount in a partner.
+3.  On product you can define if you apply general discount on sale
+    order line linked to that product

sale_order_general_discount/static/description/index.html

@@ -370,16 +370,14 @@ <h1 class="title">Sale Order General Discount</h1>
 !! source digest: sha256:a4eeadfa3e2fc4ad9f54244dc002a32d12938c91207c4f729001730ca727a156
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/sale-workflow/tree/17.0/sale_order_general_discount"><img alt="OCA/sale-workflow" src="https://img.shields.io/badge/github-OCA%2Fsale--workflow-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/sale-workflow-17-0/sale-workflow-17-0-sale_order_general_discount"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/sale-workflow&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
-<p>This module allows to set a general discount in a sales order. This general
-discount is set to each line order in the standard <cite>discount</cite> field.</p>
-<dl class="docutils">
-<dt>You can configure:</dt>
-<dd><ul class="first last simple">
+<p>This module allows to set a general discount in a sales order. This
+general discount is set to each line order in the standard discount
+field.</p>
+<p>You can configure:</p>
+<ul class="simple">
 <li>a default general discount on customers</li>
 <li>On each product define if general discount is applied</li>
 </ul>
-</dd>
-</dl>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
@@ -396,18 +394,18 @@ <h1 class="title">Sale Order General Discount</h1>
 </div>
 <div class="section" id="installation">
 <h1><a class="toc-backref" href="#toc-entry-1">Installation</a></h1>
-<p>You need to install sale_management module for accessing the needed menus.</p>
+<p>You need to install sale_management module for accessing the needed
+menus.</p>
 </div>
 <div class="section" id="usage">
 <h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
 <p>To use this module, you need to:</p>
 <ol class="arabic simple">
-<li>Create a sale order and set a discount,
-this discount will be set in all lines.</li>
+<li>Create a sale order and set a discount, this discount will be set in
+all lines.</li>
 <li>You can set a discount in a partner.</li>
-<li>On product you can define if you
-apply general discount on sale order line
-linked to that product</li>
+<li>On product you can define if you apply general discount on sale order
+line linked to that product</li>
 </ol>
 </div>
 <div class="section" id="bug-tracker">

sale_substate/README.rst

@@ -0,0 +1,93 @@
+==============
+Sale Sub State
+==============
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:30c35ddeeceae6b4a279d86652752cc3fbf10f0a9e73f8054ab7effd2ace4e99
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsale--workflow-lightgray.png?logo=github
+    :target: https://github.com/OCA/sale-workflow/tree/17.0/sale_substate
+    :alt: OCA/sale-workflow
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/sale-workflow-17-0/sale-workflow-17-0-sale_substate
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/sale-workflow&target_branch=17.0
+    :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
+This module allows to add a substate to sale order. For each sale order
+state you can define a substate. With this module substates can be
+defined allowing to extend the sales workflow. For example, you can add
+substate "waiting for legal documents" if the order cannot be validated
+without this document (sell a car for example).
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Usage
+=====
+
+1. | Go to \*\* Settings > Technical > Sub State Configuration \*\* and
+     Add "Base Substate".
+   | If necessary you can add "Target State values" (ex define a
+     substate for "cancel" state). Substate sequence is very important.
+
+2. Create a sale order and check if the substate are displayed on the
+   header of form view. Check if you can't set substate defined for sale
+   if sate is a quotation.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/sale-workflow/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/sale-workflow/issues/new?body=module:%20sale_substate%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+-------
+
+* Akretion
+
+Contributors
+------------
+
+- Mourad EL HADJ MIMOUNE <[email protected]>
+- Alexei Rivera <[email protected]> (migration to 15.0)
+
+Maintainers
+-----------
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+This module is part of the `OCA/sale-workflow <https://github.com/OCA/sale-workflow/tree/17.0/sale_substate>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

sale_substate/__init__.py

@@ -0,0 +1 @@
+from . import models

sale_substate/__manifest__.py

@@ -0,0 +1,21 @@
+# Copyright 2019 Akretion (<http://www.akretion.com>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Sale Sub State",
+    "version": "17.0.1.0.0",
+    "category": "Tools",
+    "author": "Akretion, " "Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/sale-workflow",
+    "license": "AGPL-3",
+    "depends": ["base_substate", "sale_management"],
+    "data": [
+        "views/sale_views.xml",
+        "data/sale_substate_mail_template_data.xml",
+        "data/sale_substate_data.xml",
+    ],
+    "demo": [
+        "data/sale_substate_demo.xml",
+    ],
+    "installable": True,
+}

sale_substate/data/sale_substate_data.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="base_substate_type_sale" model="base.substate.type">
+        <field name="name">Sale order Substate</field>
+        <field name="model">sale.order</field>
+        <field name="target_state_field">state</field>
+    </record>
+    <!-- Sale related substate to Sale state (draft, sale) -->
+    <record id="target_state_value_draft" model="target.state.value">
+        <field name="name">Quotation</field>
+        <field name="base_substate_type_id" ref="base_substate_type_sale" />
+        <field name="target_state_value">draft</field>
+        </record>
+    <record id="target_state_value_sale" model="target.state.value">
+        <field name="name">Sale</field>
+        <field name="base_substate_type_id" ref="base_substate_type_sale" />
+        <field name="target_state_value">sale</field>
+    </record>
+ </odoo>

sale_substate/data/sale_substate_demo.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo noupdate="1">
+
+<!--Sale Substate -->
+<record id="base_substate_under_nego" model="base.substate">
+    <field name="name">In negotiation</field>
+    <field name="sequence">1</field>
+    <field name="target_state_value_id" ref="target_state_value_draft" />
+</record>
+<record id="base_substate_won" model="base.substate">
+    <field name="name">Won</field>
+    <field name="sequence">2</field>
+    <field name="target_state_value_id" ref="target_state_value_draft" />
+</record>
+ <record id="base_substate_lost" model="base.substate">
+    <field name="name">Lost</field>
+    <field name="sequence">3</field>
+    <field name="target_state_value_id" ref="target_state_value_draft" />
+</record>
+<record id="base_substate_wait_docs" model="base.substate">
+    <field name="name">Waiting for legal documents</field>
+    <field name="sequence">4</field>
+    <field name="target_state_value_id" ref="target_state_value_draft" />
+    <field
+            name="mail_template_id"
+            ref="sale_substate.mail_template_data_sale_substate_wait_docs"
+        />
+</record>
+ <record id="base_substate_valid_docs" model="base.substate">
+     <field name="name">To validate legal documents</field>
+    <field name="sequence">5</field>
+    <field name="target_state_value_id" ref="target_state_value_sale" />
+</record>
+<record id="base_substate_in_delivery" model="base.substate">
+    <field name="name">In delivering</field>
+    <field name="sequence">6</field>
+    <field name="target_state_value_id" ref="target_state_value_sale" />
+    <field
+            name="mail_template_id"
+            ref="sale_substate.mail_template_data_sale_substate_delivery"
+        />
+</record>
+ <record id="base_substate_delivered" model="base.substate">
+     <field name="name">Delivered</field>
+    <field name="sequence">7</field>
+    <field name="target_state_value_id" ref="target_state_value_sale" />
+</record>
+</odoo>