Skip to content

Syncing from upstream OCA/contract (18.0) #964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bt-admin merged 5 commits into from
May 23, 2026
Merged

Syncing from upstream OCA/contract (18.0) #964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
95f4da7
[IMP] contract: add monthly_recurring field to contracts and lines
cristina-hidalgo-tecnativa May 21, 2026
04011ff
Merge PR #1435 into 18.0
OCA-git-bot May 22, 2026
77c7e6f
[UPD] Update contract.pot
May 22, 2026
444c93b
[BOT] post-merge updates
OCA-git-bot May 22, 2026
793b58e
Update translation files
weblate May 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,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.3 | | Recurring - Contracts Management
[contract](contract/) | 18.0.2.4.0 | | 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
Expand Down
2 changes: 1 addition & 1 deletion contract/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Recurring - Contracts Management
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:e395f519d62bac7a25c01767e5e91f0a646779db0f51ab345c28fd5c5f2efa5c
!! source digest: sha256:68f83bb4e4dde7a54beeac546d364285c4a44d7abab73c256aced1f6ae6e4e72
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

.. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
Expand Down
2 changes: 1 addition & 1 deletion contract/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

{
"name": "Recurring - Contracts Management",
"version": "18.0.2.3.3",
"version": "18.0.2.4.0",
"category": "Contract Management",
"license": "AGPL-3",
"author": "Tecnativa, ACSONE SA/NV, Odoo Community Association (OCA)",
Expand Down
32 changes: 22 additions & 10 deletions contract/i18n/am.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ msgid ""
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;"
"\">\n"
" &amp;nbsp;&amp;nbsp;<strong>REFERENCES</strong><br/>\n"
" &amp;nbsp;&amp;nbsp;Contract: <strong t-out=\"object."
"name\"/><br/>\n"
" &amp;nbsp;&amp;nbsp;Contract: <strong t-"
"out=\"object.name\"/><br/>\n"
" <t t-if=\"object.date_start\">\n"
" &amp;nbsp;&amp;nbsp;Contract Date Start: <t t-"
"out=\"object.date_start or ''\"/><br/>\n"
Expand All @@ -39,8 +39,8 @@ msgid ""
" <t t-if=\"object.user_id\">\n"
" <t t-if=\"object.user_id.email\">\n"
" &amp;nbsp;&amp;nbsp;Your Contact: <a t-att-"
"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object."
"name)\" t-out=\"object.user_id.name\"/>\n"
"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)"
"\" t-out=\"object.user_id.name\"/>\n"
" </t>\n"
" <t t-else=\"\">\n"
" &amp;nbsp;&amp;nbsp;Your Contact: <t t-"
Expand Down Expand Up @@ -69,10 +69,10 @@ msgid ""
"line-height: 16px; background-color: #F2F2F2;\">\n"
" <span style=\"color: #222; margin-bottom: 5px; display: "
"block; \">\n"
" <address t-field=\"object.company_id.sudo()."
"partner_id\" t-options=\"{&quot;widget&quot;: &quot;contact&quot;, &quot;"
"fields&quot;: [&quot;name&quot;, &quot;address&quot;], &quot;"
"no_marker&quot;: True}\"/>\n"
" <address t-"
"field=\"object.company_id.sudo().partner_id\" t-"
"options=\"{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: "
"[&quot;name&quot;, &quot;address&quot;], &quot;no_marker&quot;: True}\"/>\n"
" </span>\n"
" <t t-if=\"object.company_id.phone\">\n"
" <div style=\"margin-top: 0px; margin-right: 0px; "
Expand Down Expand Up @@ -113,8 +113,8 @@ msgid ""
"<span invisible=\"contract_to_invoice_count &gt; 1\">\n"
" contract to invoice\n"
" </span>\n"
" <span invisible=\"contract_to_invoice_count &lt;"
"= 1\">\n"
" <span invisible=\"contract_to_invoice_count "
"&lt;= 1\">\n"
" contracts to invoice\n"
" </span>"
msgstr ""
Expand Down Expand Up @@ -938,6 +938,7 @@ msgstr ""

#. module: contract
#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
#: model_terms:ir.ui.view,arch_db:contract.contract_line_search_view
msgid "In progress"
msgstr ""

Expand Down Expand Up @@ -1156,6 +1157,11 @@ msgstr ""
msgid "Month(s) last day"
msgstr ""

#. module: contract
#: model:ir.model.fields,field_description:contract.field_contract_line__monthly_recurring
msgid "Monthly Recurring"
msgstr ""

#. module: contract
#: model:ir.model.fields,field_description:contract.field_contract_contract__my_activity_date_deadline
msgid "My Activity Deadline"
Expand Down Expand Up @@ -1584,6 +1590,12 @@ msgstr ""
msgid "Technical field for UX purposes."
msgstr ""

#. module: contract
#: model_terms:ir.ui.view,arch_db:contract.contract_line_report_tree_view
#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
msgid "Total Monthly Recurring"
msgstr ""

#. module: contract
#: model:ir.model.fields,help:contract.field_contract_contract__activity_exception_decoration
msgid "Type of the exception activity on record."
Expand Down
32 changes: 22 additions & 10 deletions contract/i18n/ar.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ msgid ""
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;"
"\">\n"
" &amp;nbsp;&amp;nbsp;<strong>REFERENCES</strong><br/>\n"
" &amp;nbsp;&amp;nbsp;Contract: <strong t-out=\"object."
"name\"/><br/>\n"
" &amp;nbsp;&amp;nbsp;Contract: <strong t-"
"out=\"object.name\"/><br/>\n"
" <t t-if=\"object.date_start\">\n"
" &amp;nbsp;&amp;nbsp;Contract Date Start: <t t-"
"out=\"object.date_start or ''\"/><br/>\n"
Expand All @@ -40,8 +40,8 @@ msgid ""
" <t t-if=\"object.user_id\">\n"
" <t t-if=\"object.user_id.email\">\n"
" &amp;nbsp;&amp;nbsp;Your Contact: <a t-att-"
"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object."
"name)\" t-out=\"object.user_id.name\"/>\n"
"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)"
"\" t-out=\"object.user_id.name\"/>\n"
" </t>\n"
" <t t-else=\"\">\n"
" &amp;nbsp;&amp;nbsp;Your Contact: <t t-"
Expand Down Expand Up @@ -70,10 +70,10 @@ msgid ""
"line-height: 16px; background-color: #F2F2F2;\">\n"
" <span style=\"color: #222; margin-bottom: 5px; display: "
"block; \">\n"
" <address t-field=\"object.company_id.sudo()."
"partner_id\" t-options=\"{&quot;widget&quot;: &quot;contact&quot;, &quot;"
"fields&quot;: [&quot;name&quot;, &quot;address&quot;], &quot;"
"no_marker&quot;: True}\"/>\n"
" <address t-"
"field=\"object.company_id.sudo().partner_id\" t-"
"options=\"{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: "
"[&quot;name&quot;, &quot;address&quot;], &quot;no_marker&quot;: True}\"/>\n"
" </span>\n"
" <t t-if=\"object.company_id.phone\">\n"
" <div style=\"margin-top: 0px; margin-right: 0px; "
Expand Down Expand Up @@ -114,8 +114,8 @@ msgid ""
"<span invisible=\"contract_to_invoice_count &gt; 1\">\n"
" contract to invoice\n"
" </span>\n"
" <span invisible=\"contract_to_invoice_count &lt;"
"= 1\">\n"
" <span invisible=\"contract_to_invoice_count "
"&lt;= 1\">\n"
" contracts to invoice\n"
" </span>"
msgstr ""
Expand Down Expand Up @@ -939,6 +939,7 @@ msgstr ""

#. module: contract
#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
#: model_terms:ir.ui.view,arch_db:contract.contract_line_search_view
msgid "In progress"
msgstr ""

Expand Down Expand Up @@ -1157,6 +1158,11 @@ msgstr ""
msgid "Month(s) last day"
msgstr ""

#. module: contract
#: model:ir.model.fields,field_description:contract.field_contract_line__monthly_recurring
msgid "Monthly Recurring"
msgstr ""

#. module: contract
#: model:ir.model.fields,field_description:contract.field_contract_contract__my_activity_date_deadline
msgid "My Activity Deadline"
Expand Down Expand Up @@ -1585,6 +1591,12 @@ msgstr ""
msgid "Technical field for UX purposes."
msgstr ""

#. module: contract
#: model_terms:ir.ui.view,arch_db:contract.contract_line_report_tree_view
#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
msgid "Total Monthly Recurring"
msgstr ""

#. module: contract
#: model:ir.model.fields,help:contract.field_contract_contract__activity_exception_decoration
msgid "Type of the exception activity on record."
Expand Down
32 changes: 22 additions & 10 deletions contract/i18n/bg.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ msgid ""
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;"
"\">\n"
" &amp;nbsp;&amp;nbsp;<strong>REFERENCES</strong><br/>\n"
" &amp;nbsp;&amp;nbsp;Contract: <strong t-out=\"object."
"name\"/><br/>\n"
" &amp;nbsp;&amp;nbsp;Contract: <strong t-"
"out=\"object.name\"/><br/>\n"
" <t t-if=\"object.date_start\">\n"
" &amp;nbsp;&amp;nbsp;Contract Date Start: <t t-"
"out=\"object.date_start or ''\"/><br/>\n"
Expand All @@ -39,8 +39,8 @@ msgid ""
" <t t-if=\"object.user_id\">\n"
" <t t-if=\"object.user_id.email\">\n"
" &amp;nbsp;&amp;nbsp;Your Contact: <a t-att-"
"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object."
"name)\" t-out=\"object.user_id.name\"/>\n"
"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)"
"\" t-out=\"object.user_id.name\"/>\n"
" </t>\n"
" <t t-else=\"\">\n"
" &amp;nbsp;&amp;nbsp;Your Contact: <t t-"
Expand Down Expand Up @@ -69,10 +69,10 @@ msgid ""
"line-height: 16px; background-color: #F2F2F2;\">\n"
" <span style=\"color: #222; margin-bottom: 5px; display: "
"block; \">\n"
" <address t-field=\"object.company_id.sudo()."
"partner_id\" t-options=\"{&quot;widget&quot;: &quot;contact&quot;, &quot;"
"fields&quot;: [&quot;name&quot;, &quot;address&quot;], &quot;"
"no_marker&quot;: True}\"/>\n"
" <address t-"
"field=\"object.company_id.sudo().partner_id\" t-"
"options=\"{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: "
"[&quot;name&quot;, &quot;address&quot;], &quot;no_marker&quot;: True}\"/>\n"
" </span>\n"
" <t t-if=\"object.company_id.phone\">\n"
" <div style=\"margin-top: 0px; margin-right: 0px; "
Expand Down Expand Up @@ -113,8 +113,8 @@ msgid ""
"<span invisible=\"contract_to_invoice_count &gt; 1\">\n"
" contract to invoice\n"
" </span>\n"
" <span invisible=\"contract_to_invoice_count &lt;"
"= 1\">\n"
" <span invisible=\"contract_to_invoice_count "
"&lt;= 1\">\n"
" contracts to invoice\n"
" </span>"
msgstr ""
Expand Down Expand Up @@ -938,6 +938,7 @@ msgstr ""

#. module: contract
#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
#: model_terms:ir.ui.view,arch_db:contract.contract_line_search_view
msgid "In progress"
msgstr ""

Expand Down Expand Up @@ -1156,6 +1157,11 @@ msgstr ""
msgid "Month(s) last day"
msgstr ""

#. module: contract
#: model:ir.model.fields,field_description:contract.field_contract_line__monthly_recurring
msgid "Monthly Recurring"
msgstr ""

#. module: contract
#: model:ir.model.fields,field_description:contract.field_contract_contract__my_activity_date_deadline
msgid "My Activity Deadline"
Expand Down Expand Up @@ -1585,6 +1591,12 @@ msgstr ""
msgid "Technical field for UX purposes."
msgstr ""

#. module: contract
#: model_terms:ir.ui.view,arch_db:contract.contract_line_report_tree_view
#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
msgid "Total Monthly Recurring"
msgstr ""

#. module: contract
#: model:ir.model.fields,help:contract.field_contract_contract__activity_exception_decoration
msgid "Type of the exception activity on record."
Expand Down
32 changes: 22 additions & 10 deletions contract/i18n/bs.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ msgid ""
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;"
"\">\n"
" &amp;nbsp;&amp;nbsp;<strong>REFERENCES</strong><br/>\n"
" &amp;nbsp;&amp;nbsp;Contract: <strong t-out=\"object."
"name\"/><br/>\n"
" &amp;nbsp;&amp;nbsp;Contract: <strong t-"
"out=\"object.name\"/><br/>\n"
" <t t-if=\"object.date_start\">\n"
" &amp;nbsp;&amp;nbsp;Contract Date Start: <t t-"
"out=\"object.date_start or ''\"/><br/>\n"
Expand All @@ -40,8 +40,8 @@ msgid ""
" <t t-if=\"object.user_id\">\n"
" <t t-if=\"object.user_id.email\">\n"
" &amp;nbsp;&amp;nbsp;Your Contact: <a t-att-"
"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object."
"name)\" t-out=\"object.user_id.name\"/>\n"
"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)"
"\" t-out=\"object.user_id.name\"/>\n"
" </t>\n"
" <t t-else=\"\">\n"
" &amp;nbsp;&amp;nbsp;Your Contact: <t t-"
Expand Down Expand Up @@ -70,10 +70,10 @@ msgid ""
"line-height: 16px; background-color: #F2F2F2;\">\n"
" <span style=\"color: #222; margin-bottom: 5px; display: "
"block; \">\n"
" <address t-field=\"object.company_id.sudo()."
"partner_id\" t-options=\"{&quot;widget&quot;: &quot;contact&quot;, &quot;"
"fields&quot;: [&quot;name&quot;, &quot;address&quot;], &quot;"
"no_marker&quot;: True}\"/>\n"
" <address t-"
"field=\"object.company_id.sudo().partner_id\" t-"
"options=\"{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: "
"[&quot;name&quot;, &quot;address&quot;], &quot;no_marker&quot;: True}\"/>\n"
" </span>\n"
" <t t-if=\"object.company_id.phone\">\n"
" <div style=\"margin-top: 0px; margin-right: 0px; "
Expand Down Expand Up @@ -114,8 +114,8 @@ msgid ""
"<span invisible=\"contract_to_invoice_count &gt; 1\">\n"
" contract to invoice\n"
" </span>\n"
" <span invisible=\"contract_to_invoice_count &lt;"
"= 1\">\n"
" <span invisible=\"contract_to_invoice_count "
"&lt;= 1\">\n"
" contracts to invoice\n"
" </span>"
msgstr ""
Expand Down Expand Up @@ -939,6 +939,7 @@ msgstr ""

#. module: contract
#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
#: model_terms:ir.ui.view,arch_db:contract.contract_line_search_view
msgid "In progress"
msgstr ""

Expand Down Expand Up @@ -1156,6 +1157,11 @@ msgstr ""
msgid "Month(s) last day"
msgstr ""

#. module: contract
#: model:ir.model.fields,field_description:contract.field_contract_line__monthly_recurring
msgid "Monthly Recurring"
msgstr ""

#. module: contract
#: model:ir.model.fields,field_description:contract.field_contract_contract__my_activity_date_deadline
msgid "My Activity Deadline"
Expand Down Expand Up @@ -1584,6 +1590,12 @@ msgstr ""
msgid "Technical field for UX purposes."
msgstr ""

#. module: contract
#: model_terms:ir.ui.view,arch_db:contract.contract_line_report_tree_view
#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
msgid "Total Monthly Recurring"
msgstr ""

#. module: contract
#: model:ir.model.fields,help:contract.field_contract_contract__activity_exception_decoration
msgid "Type of the exception activity on record."
Expand Down
Loading
Loading