Syncing from upstream OCA/contract (18.0)

README.md

@@ -22,7 +22,7 @@ Available addons
 addon | version | maintainers | summary
 --- | --- | --- | ---
 [agreement_rebate_partner_company_group](agreement_rebate_partner_company_group/) | 18.0.1.0.0 |  | Rebate agreements applied to all company group members
-[contract](contract/) | 18.0.2.3.0 |  | Recurring - Contracts Management
+[contract](contract/) | 18.0.2.3.1 |  | Recurring - Contracts Management
 [contract_analytic_tag](contract_analytic_tag/) | 18.0.1.0.0 | <a href='https://github.com/victoralmau'><img src='https://github.com/victoralmau.png' width='32' height='32' style='border-radius:50%;' alt='victoralmau'/></a> | Contract Analytic Tag
 [contract_forecast](contract_forecast/) | 18.0.1.0.1 | <a href='https://github.com/sbejaoui'><img src='https://github.com/sbejaoui.png' width='32' height='32' style='border-radius:50%;' alt='sbejaoui'/></a> | Contract Forecast
 [contract_forecast_variable_quantity](contract_forecast_variable_quantity/) | 18.0.1.0.0 |  | Contract Forecast Variable Quantity
@@ -36,7 +36,7 @@ addon | version | maintainers | summary
 [contract_queue_job](contract_queue_job/) | 18.0.1.0.0 | <a href='https://github.com/sbejaoui'><img src='https://github.com/sbejaoui.png' width='32' height='32' style='border-radius:50%;' alt='sbejaoui'/></a> <a href='https://github.com/BurkhalterY'><img src='https://github.com/BurkhalterY.png' width='32' height='32' style='border-radius:50%;' alt='BurkhalterY'/></a> | This addon make contract invoicing cron plan each contract in a job instead of creating all invoices in one transaction
 [contract_refund_on_stop](contract_refund_on_stop/) | 18.0.1.0.0 | <a href='https://github.com/sbejaoui'><img src='https://github.com/sbejaoui.png' width='32' height='32' style='border-radius:50%;' alt='sbejaoui'/></a> | Contract Refund On Stop
 [contract_sale](contract_sale/) | 18.0.1.0.0 |  | Contract from Sale
-[contract_sale_generation](contract_sale_generation/) | 18.0.1.0.1 |  | Contracts Management - Recurring Sales
+[contract_sale_generation](contract_sale_generation/) | 18.0.1.0.2 |  | Contracts Management - Recurring Sales
 [contract_sale_invoicing](contract_sale_invoicing/) | 18.0.1.1.0 |  | Include sales to invoice in contract invoice creation
 [contract_sale_mandate](contract_sale_mandate/) | 18.0.1.0.0 |  | This module manages the banking mandate from the sale order to the contract.
 [contract_sale_payment_mode](contract_sale_payment_mode/) | 18.0.1.0.0 |  | This addon manages payment mode from sale order to contract.

contract/README.rst

@@ -11,7 +11,7 @@ Recurring - Contracts Management
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:8a16ef8382d1bd1ced048cac2e0263c3a20cbf804ea5260828c2402a4b9b8993
+   !! source digest: sha256:14d080c2118f57c5187d6640b9ef0a0dd6b38f26fe538452a8d81f6d4696d3f4
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png

contract/__manifest__.py

@@ -11,7 +11,7 @@
 
 {
     "name": "Recurring - Contracts Management",
-    "version": "18.0.2.3.0",
+    "version": "18.0.2.3.1",
     "category": "Contract Management",
     "license": "AGPL-3",
     "author": "Tecnativa, ACSONE SA/NV, Odoo Community Association (OCA)",

contract/static/description/index.html

@@ -372,7 +372,7 @@ <h1>Recurring - Contracts Management</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:8a16ef8382d1bd1ced048cac2e0263c3a20cbf804ea5260828c2402a4b9b8993
+!! source digest: sha256:14d080c2118f57c5187d6640b9ef0a0dd6b38f26fe538452a8d81f6d4696d3f4
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/contract/tree/18.0/contract"><img alt="OCA/contract" src="https://img.shields.io/badge/github-OCA%2Fcontract-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/contract-18-0/contract-18-0-contract"><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/contract&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module enables contracts management with recurring invoicing

contract/views/contract.xml

@@ -16,7 +16,7 @@
                     <button
                         name="recurring_create_invoice"
                         type="object"
-                        invisible="not create_invoice_visibility and generation_type != 'invoice'"
+                        invisible="not create_invoice_visibility or generation_type != 'invoice'"
                         string="Create invoices"
                         groups="base.group_no_one"
                     />
@@ -304,11 +304,7 @@
                                     <field name="payment_term_id" />
                                 </group>
                             </group>
-                            <group
-                                col="4"
-                                name="recurring_type"
-                                string="Recurring Type"
-                            >
+                            <group name="recurring_type" string="Recurring Type">
                                 <field name="generation_type" />
                             </group>
                         </page>

contract_sale_generation/README.rst

@@ -11,7 +11,7 @@ Contracts Management - Recurring Sales
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:808234541f0cfcabaf228dd995245e29f57c47b4f7733033d3ca4a6539f8efa1
+   !! source digest: sha256:08c06a6a2e464732ca0a450dcce59ee7eae01546079439a29f0b05bf001f8fcf
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

contract_sale_generation/__manifest__.py

@@ -5,7 +5,7 @@
 
 {
     "name": "Contracts Management - Recurring Sales",
-    "version": "18.0.1.0.1",
+    "version": "18.0.1.0.2",
     "category": "Contract Management",
     "license": "AGPL-3",
     "author": "ACSONE SA/NV, PESOL, Odoo Community Association (OCA)",

contract_sale_generation/i18n/ca.po

@@ -19,23 +19,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.3.2\n"
 
-#. module: contract_sale_generation
-#: model:ir.model,name:contract_sale_generation.model_contract_abstract_contract
-msgid "Abstract Recurring Contract"
-msgstr "Contracte recurrent abstracte"
-
-#. module: contract_sale_generation
-#: model_terms:ir.ui.view,arch_db:contract_sale_generation.contract_contract_form_view_recurring_sale_form
-msgid "CREATE SALES"
-msgstr "CREAR VENDES"
-
-#. module: contract_sale_generation
-#: model:ir.model.fields,help:contract_sale_generation.field_contract_abstract_contract__generation_type
-#: model:ir.model.fields,help:contract_sale_generation.field_contract_contract__generation_type
-#: model:ir.model.fields,help:contract_sale_generation.field_contract_template__generation_type
-msgid "Choose the document that will be automatically generated by cron."
-msgstr ""
-
 #. module: contract_sale_generation
 #: model:ir.model,name:contract_sale_generation.model_contract_contract
 msgid "Contract"
@@ -52,37 +35,48 @@ msgstr ""
 msgid "Contract Line"
 msgstr "Línia de contracte"
 
+#. module: contract_sale_generation
+#: model:ir.model,name:contract_sale_generation.model_contract_template
+msgid "Contract Template"
+msgstr ""
+
 #. module: contract_sale_generation
 #. odoo-python
 #: code:addons/contract_sale_generation/models/contract.py:0
-#, python-format
 msgid ""
 "Contract manually sale order: <a href=\"#\" data-oe-model=\"%(model)s\" data-"
 "oe-id=\"%(id)s\">Sale Order</a>"
 msgstr ""
 
+#. module: contract_sale_generation
+#: model_terms:ir.ui.view,arch_db:contract_sale_generation.contract_contract_form_view_recurring_sale_form
+msgid "Create Sales"
+msgstr ""
+
+#. module: contract_sale_generation
+#: model:ir.model.fields,help:contract_sale_generation.field_contract_contract__generation_type
+#: model:ir.model.fields,help:contract_sale_generation.field_contract_template__generation_type
+msgid "Defines what document is automatically generated by the cron."
+msgstr ""
+
 #. module: contract_sale_generation
 #: model:ir.actions.server,name:contract_sale_generation.contract_cron_for_sale_ir_actions_server
-#: model:ir.cron,cron_name:contract_sale_generation.contract_cron_for_sale
 msgid "Generate Recurring sales from Contracts"
 msgstr "Generar vendes recurrents a partir de contractes"
 
 #. module: contract_sale_generation
-#: model:ir.model.fields,field_description:contract_sale_generation.field_contract_abstract_contract__generation_type
 #: model:ir.model.fields,field_description:contract_sale_generation.field_contract_contract__generation_type
 #: model:ir.model.fields,field_description:contract_sale_generation.field_contract_template__generation_type
 msgid "Generation Type"
 msgstr ""
 
 #. module: contract_sale_generation
-#: model:ir.model.fields.selection,name:contract_sale_generation.selection__contract_abstract_contract__generation_type__sale
 #: model:ir.model.fields.selection,name:contract_sale_generation.selection__contract_contract__generation_type__sale
 #: model:ir.model.fields.selection,name:contract_sale_generation.selection__contract_template__generation_type__sale
 msgid "Sale"
 msgstr "Venda"
 
 #. module: contract_sale_generation
-#: model:ir.model.fields,field_description:contract_sale_generation.field_contract_abstract_contract__sale_autoconfirm
 #: model:ir.model.fields,field_description:contract_sale_generation.field_contract_contract__sale_autoconfirm
 #: model:ir.model.fields,field_description:contract_sale_generation.field_contract_template__sale_autoconfirm
 msgid "Sale Autoconfirm"
@@ -111,6 +105,12 @@ msgid ""
 "automatically confirmed if generated by contract."
 msgstr ""
 
+#~ msgid "Abstract Recurring Contract"
+#~ msgstr "Contracte recurrent abstracte"
+
+#~ msgid "CREATE SALES"
+#~ msgstr "CREAR VENDES"
+
 #~ msgid "Contract Line to replace"
 #~ msgstr "Línia de contracte a substituir"
 
@@ -119,8 +119,8 @@ msgstr ""
 #~ "Contract manually sale order: <a href=\"#\" data-oe-model=\"%s\" data-oe-"
 #~ "id=\"%s\">Sale Order</a>"
 #~ msgstr ""
-#~ "Contracte manualment la comanda de venda: <a href=\"#\" data-oe-model=\"%s"
-#~ "\" data-oe-id=\"%s\">Comanda de venda</a>"
+#~ "Contracte manualment la comanda de venda: <a href=\"#\" data-oe-"
+#~ "model=\"%s\" data-oe-id=\"%s\">Comanda de venda</a>"
 
 #~ msgid "Invoice"
 #~ msgstr "Factura"

contract_sale_generation/i18n/contract_sale_generation.pot

@@ -13,11 +13,6 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: contract_sale_generation
-#: model_terms:ir.ui.view,arch_db:contract_sale_generation.contract_contract_form_view_recurring_sale_form
-msgid "CREATE SALES"
-msgstr ""
-
 #. module: contract_sale_generation
 #: model:ir.model,name:contract_sale_generation.model_contract_contract
 msgid "Contract"
@@ -47,6 +42,11 @@ msgid ""
 "data-oe-id=\"%(id)s\">Sale Order</a>"
 msgstr ""
 
+#. module: contract_sale_generation
+#: model_terms:ir.ui.view,arch_db:contract_sale_generation.contract_contract_form_view_recurring_sale_form
+msgid "Create Sales"
+msgstr ""
+
 #. module: contract_sale_generation
 #: model:ir.model.fields,help:contract_sale_generation.field_contract_contract__generation_type
 #: model:ir.model.fields,help:contract_sale_generation.field_contract_template__generation_type

contract_sale_generation/i18n/de.po

@@ -19,23 +19,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.4\n"
 
-#. module: contract_sale_generation
-#: model:ir.model,name:contract_sale_generation.model_contract_abstract_contract
-msgid "Abstract Recurring Contract"
-msgstr ""
-
-#. module: contract_sale_generation
-#: model_terms:ir.ui.view,arch_db:contract_sale_generation.contract_contract_form_view_recurring_sale_form
-msgid "CREATE SALES"
-msgstr ""
-
-#. module: contract_sale_generation
-#: model:ir.model.fields,help:contract_sale_generation.field_contract_abstract_contract__generation_type
-#: model:ir.model.fields,help:contract_sale_generation.field_contract_contract__generation_type
-#: model:ir.model.fields,help:contract_sale_generation.field_contract_template__generation_type
-msgid "Choose the document that will be automatically generated by cron."
-msgstr ""
-
 #. module: contract_sale_generation
 #: model:ir.model,name:contract_sale_generation.model_contract_contract
 msgid "Contract"
@@ -52,37 +35,48 @@ msgstr ""
 msgid "Contract Line"
 msgstr ""
 
+#. module: contract_sale_generation
+#: model:ir.model,name:contract_sale_generation.model_contract_template
+msgid "Contract Template"
+msgstr ""
+
 #. module: contract_sale_generation
 #. odoo-python
 #: code:addons/contract_sale_generation/models/contract.py:0
-#, python-format
 msgid ""
 "Contract manually sale order: <a href=\"#\" data-oe-model=\"%(model)s\" data-"
 "oe-id=\"%(id)s\">Sale Order</a>"
 msgstr ""
 
+#. module: contract_sale_generation
+#: model_terms:ir.ui.view,arch_db:contract_sale_generation.contract_contract_form_view_recurring_sale_form
+msgid "Create Sales"
+msgstr ""
+
+#. module: contract_sale_generation
+#: model:ir.model.fields,help:contract_sale_generation.field_contract_contract__generation_type
+#: model:ir.model.fields,help:contract_sale_generation.field_contract_template__generation_type
+msgid "Defines what document is automatically generated by the cron."
+msgstr ""
+
 #. module: contract_sale_generation
 #: model:ir.actions.server,name:contract_sale_generation.contract_cron_for_sale_ir_actions_server
-#: model:ir.cron,cron_name:contract_sale_generation.contract_cron_for_sale
 msgid "Generate Recurring sales from Contracts"
 msgstr ""
 
 #. module: contract_sale_generation
-#: model:ir.model.fields,field_description:contract_sale_generation.field_contract_abstract_contract__generation_type
 #: model:ir.model.fields,field_description:contract_sale_generation.field_contract_contract__generation_type
 #: model:ir.model.fields,field_description:contract_sale_generation.field_contract_template__generation_type
 msgid "Generation Type"
 msgstr ""
 
 #. module: contract_sale_generation
-#: model:ir.model.fields.selection,name:contract_sale_generation.selection__contract_abstract_contract__generation_type__sale
 #: model:ir.model.fields.selection,name:contract_sale_generation.selection__contract_contract__generation_type__sale
 #: model:ir.model.fields.selection,name:contract_sale_generation.selection__contract_template__generation_type__sale
 msgid "Sale"
 msgstr "Verkaufsaufträge"
 
 #. module: contract_sale_generation
-#: model:ir.model.fields,field_description:contract_sale_generation.field_contract_abstract_contract__sale_autoconfirm
 #: model:ir.model.fields,field_description:contract_sale_generation.field_contract_contract__sale_autoconfirm
 #: model:ir.model.fields,field_description:contract_sale_generation.field_contract_template__sale_autoconfirm
 #, fuzzy

contract_sale_generation/i18n/el_GR.po

@@ -19,23 +19,6 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: contract_sale_generation
-#: model:ir.model,name:contract_sale_generation.model_contract_abstract_contract
-msgid "Abstract Recurring Contract"
-msgstr ""
-
-#. module: contract_sale_generation
-#: model_terms:ir.ui.view,arch_db:contract_sale_generation.contract_contract_form_view_recurring_sale_form
-msgid "CREATE SALES"
-msgstr ""
-
-#. module: contract_sale_generation
-#: model:ir.model.fields,help:contract_sale_generation.field_contract_abstract_contract__generation_type
-#: model:ir.model.fields,help:contract_sale_generation.field_contract_contract__generation_type
-#: model:ir.model.fields,help:contract_sale_generation.field_contract_template__generation_type
-msgid "Choose the document that will be automatically generated by cron."
-msgstr ""
-
 #. module: contract_sale_generation
 #: model:ir.model,name:contract_sale_generation.model_contract_contract
 msgid "Contract"
@@ -52,37 +35,48 @@ msgstr ""
 msgid "Contract Line"
 msgstr ""
 
+#. module: contract_sale_generation
+#: model:ir.model,name:contract_sale_generation.model_contract_template
+msgid "Contract Template"
+msgstr ""
+
 #. module: contract_sale_generation
 #. odoo-python
 #: code:addons/contract_sale_generation/models/contract.py:0
-#, python-format
 msgid ""
 "Contract manually sale order: <a href=\"#\" data-oe-model=\"%(model)s\" data-"
 "oe-id=\"%(id)s\">Sale Order</a>"
 msgstr ""
 
+#. module: contract_sale_generation
+#: model_terms:ir.ui.view,arch_db:contract_sale_generation.contract_contract_form_view_recurring_sale_form
+msgid "Create Sales"
+msgstr ""
+
+#. module: contract_sale_generation
+#: model:ir.model.fields,help:contract_sale_generation.field_contract_contract__generation_type
+#: model:ir.model.fields,help:contract_sale_generation.field_contract_template__generation_type
+msgid "Defines what document is automatically generated by the cron."
+msgstr ""
+
 #. module: contract_sale_generation
 #: model:ir.actions.server,name:contract_sale_generation.contract_cron_for_sale_ir_actions_server
-#: model:ir.cron,cron_name:contract_sale_generation.contract_cron_for_sale
 msgid "Generate Recurring sales from Contracts"
 msgstr ""
 
 #. module: contract_sale_generation
-#: model:ir.model.fields,field_description:contract_sale_generation.field_contract_abstract_contract__generation_type
 #: model:ir.model.fields,field_description:contract_sale_generation.field_contract_contract__generation_type
 #: model:ir.model.fields,field_description:contract_sale_generation.field_contract_template__generation_type
 msgid "Generation Type"
 msgstr ""
 
 #. module: contract_sale_generation
-#: model:ir.model.fields.selection,name:contract_sale_generation.selection__contract_abstract_contract__generation_type__sale
 #: model:ir.model.fields.selection,name:contract_sale_generation.selection__contract_contract__generation_type__sale
 #: model:ir.model.fields.selection,name:contract_sale_generation.selection__contract_template__generation_type__sale
 msgid "Sale"
 msgstr ""
 
 #. module: contract_sale_generation
-#: model:ir.model.fields,field_description:contract_sale_generation.field_contract_abstract_contract__sale_autoconfirm
 #: model:ir.model.fields,field_description:contract_sale_generation.field_contract_contract__sale_autoconfirm
 #: model:ir.model.fields,field_description:contract_sale_generation.field_contract_template__sale_autoconfirm
 msgid "Sale Autoconfirm"