diff --git a/README.md b/README.md index d3466abbed..0b879da381 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Available addons addon | version | maintainers | summary --- | --- | --- | --- [agreement_rebate_partner_company_group](agreement_rebate_partner_company_group/) | 16.0.1.0.0 | | Rebate agreements applied to all company group members -[contract](contract/) | 16.0.2.14.3 | | Recurring - Contracts Management +[contract](contract/) | 16.0.2.15.0 | | Recurring - Contracts Management [contract_analytic_tag](contract_analytic_tag/) | 16.0.1.0.0 | victoralmau | Contract Analytic Tag [contract_forecast](contract_forecast/) | 16.0.1.0.0 | | Contract forecast [contract_invoice_start_end_dates](contract_invoice_start_end_dates/) | 16.0.1.0.0 | florian-dacosta | Contract Invoice Start End Dates diff --git a/contract/README.rst b/contract/README.rst index 538410ea4d..fd640d7e2f 100644 --- a/contract/README.rst +++ b/contract/README.rst @@ -1,3 +1,7 @@ +.. image:: https://odoo-community.org/readme-banner-image + :target: https://odoo-community.org/get-involved?utm_source=readme + :alt: Odoo Community Association + ================================ Recurring - Contracts Management ================================ @@ -7,13 +11,13 @@ Recurring - Contracts Management !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:fcbf0d9e74385728a9b6214b0550105168ee739aa8bb1dec3d63680a70413c66 + !! source digest: sha256:05975c47ce6d40f4ade5bf08f1c85a0fd1233fcf847d5f80dfac106c4c007a45 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png :target: https://odoo-community.org/page/development-status :alt: Production/Stable -.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png +.. |badge2| image:: https://img.shields.io/badge/license-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%2Fcontract-lightgray.png?logo=github diff --git a/contract/__manifest__.py b/contract/__manifest__.py index 28ee218d32..6585f9506d 100644 --- a/contract/__manifest__.py +++ b/contract/__manifest__.py @@ -11,7 +11,7 @@ { "name": "Recurring - Contracts Management", - "version": "16.0.2.14.3", + "version": "16.0.2.15.0", "category": "Contract Management", "license": "AGPL-3", "author": "Tecnativa, ACSONE SA/NV, Odoo Community Association (OCA)", diff --git a/contract/i18n/am.po b/contract/i18n/am.po index 5ac4f28767..d8266dc16c 100644 --- a/contract/i18n/am.po +++ b/contract/i18n/am.po @@ -30,8 +30,8 @@ msgid "" "

\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -40,8 +40,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"

\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -40,8 +40,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" #~ "   REFERENCES
\n" -#~ "   Contract:
\n" +#~ "   Contract:
\n" #~ " \n" #~ "   Contract Date Start:
\n" @@ -2520,8 +2534,8 @@ msgstr "" #~ " \n" #~ " \n" #~ "   Your Contact: \n" +#~ "href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, " +#~ "object.name)\" t-out=\"object.user_id.name\"/>\n" #~ " \n" #~ " \n" #~ "   Your Contact: \n" #~ "

If you have any questions, do not hesitate to contact " #~ "us.

\n" -#~ "

Thank you for choosing !

\n" +#~ "

Thank you for choosing !

\n" #~ "
\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ "
\n" +#~ "
\n" #~ " \n" #~ " \n" #~ " \n" @@ -2589,8 +2604,8 @@ msgstr "" #~ "30px;\">\n" #~ "   REFERÈNCIES
\n" -#~ "   Contracte:
\n" +#~ "   Contracte:
\n" #~ " \n" #~ "   Data d'inici del contracte: " #~ "
\n" @@ -2599,8 +2614,8 @@ msgstr "" #~ " \n" #~ " \n" #~ "   El teu contacte: \n" +#~ "href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, " +#~ "object.name)\" t-out=\"object.user_id.name\"/>\n" #~ " \n" #~ " \n" #~ "   El teu contacte: \n" #~ " \n" -#~ "
\n" +#~ "
\n" #~ " \n" #~ " \n" #~ " \n" @@ -2717,16 +2733,16 @@ msgstr "" #~ "5px 5px; background-repeat: repeat no-repeat;\">\n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ " \n" #~ " %endif\n" #~ "

\n" @@ -2768,9 +2784,9 @@ msgstr "" #~ "\n" #~ " % if object.user_id:\n" #~ " % if object.user_id.email:\n" -#~ "   Persona de contacte: ${object.user_id.name}\n" +#~ "   Persona de contacte: $" +#~ "{object.user_id.name}\n" #~ " % else:\n" #~ "   El seu contracte: ${object.user_id.name}\n" #~ " % endif\n" @@ -2788,16 +2804,16 @@ msgstr "" #~ "5px 5px; background-repeat: repeat no-repeat;\">\n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ " \n" #~ " %endif\n" #~ "

\n" @@ -2937,16 +2953,16 @@ msgstr "" #~ "5px 5px; background-repeat: repeat no-repeat;\">\n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ " \n" #~ " %endif\n" #~ "

\n" @@ -2983,9 +2999,9 @@ msgstr "" #~ "\n" #~ " % if object.user_id:\n" #~ " % if object.user_id.email:\n" -#~ "   El seu contacte: ${object.user_id.name}\n" +#~ "   El seu contacte: $" +#~ "{object.user_id.name}\n" #~ " % else:\n" #~ "   El seu contacte: ${object.user_id.name}\n" #~ " % endif\n" @@ -3003,16 +3019,16 @@ msgstr "" #~ "5px 5px; background-repeat: repeat no-repeat;\">\n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ " \n" #~ " %endif\n" #~ "

\n" diff --git a/contract/i18n/ca_ES.po b/contract/i18n/ca_ES.po index 61a9f2510f..3d54768a8e 100644 --- a/contract/i18n/ca_ES.po +++ b/contract/i18n/ca_ES.po @@ -26,8 +26,8 @@ msgid "" "

\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -36,8 +36,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"

\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -40,8 +40,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -40,8 +40,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -42,8 +42,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Vertrag:
\n" +"   Vertrag:
\n" " \n" "   Vertragsbeginn:
\n" @@ -118,8 +119,8 @@ msgstr "" " \n" " \n" "   Ihr Kontakt: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Ihr Kontakt: \n" "

Wenn Sie Fragen haben, zögern Sie nicht, uns zu " "kontaktieren.

\n" -"

Vielen Dank, dass Sie sich für entschieden haben.!

\n" +"

Vielen Dank, dass Sie sich für entschieden haben.!

\n" "
\n" "
\n" "
\n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ " \n" #~ " %endif\n" #~ "

\n" @@ -2787,16 +2802,16 @@ msgstr "" #~ "5px 5px; background-repeat: repeat no-repeat;\">\n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ " \n" #~ " %endif\n" #~ "

\n" diff --git a/contract/i18n/el_GR.po b/contract/i18n/el_GR.po index 1fea69a47f..59875c5a78 100644 --- a/contract/i18n/el_GR.po +++ b/contract/i18n/el_GR.po @@ -31,8 +31,8 @@ msgid "" "

\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"

\n" +"
\n" " \n" " \n" "
, 2017\n" -"Language-Team: English (United Kingdom) (https://www.transifex.com/oca/" -"teams/23907/en_GB/)\n" +"Language-Team: English (United Kingdom) (https://www.transifex.com/oca/teams/" +"23907/en_GB/)\n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,8 +31,8 @@ msgid "" "

\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"

\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -42,8 +42,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Fecha de inicio del contratot: " "
\n" @@ -118,8 +119,8 @@ msgstr "" " \n" " \n" "   Your contract: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
Hola,

\n" -"

Le notificamos que hay nuevas modificaciones en el " -"contrato.

\n" +"

Le notificamos que hay nuevas modificaciones en el contrato.\n" " " #. module: contract @@ -831,8 +833,8 @@ msgid "" msgstr "" "Línea de contrato para %(product)s\n" " parado:
\n" -" - Fin: %(old_end)s -- %(new_end)" -"s\n" +" - Fin: %(old_end)s -- " +"%(new_end)s\n" " " #. module: contract @@ -1368,6 +1370,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 "En progreso" @@ -1677,6 +1680,11 @@ msgstr "Mes(es)" msgid "Month(s) last day" msgstr "Mes(es) último día" +#. 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" @@ -2348,6 +2356,13 @@ msgstr "" msgid "To renew" msgstr "Para renovar" +#. module: contract +#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view +#: 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." diff --git a/contract/i18n/es_AR.po b/contract/i18n/es_AR.po index f63fddb1a4..c1acce89c4 100644 --- a/contract/i18n/es_AR.po +++ b/contract/i18n/es_AR.po @@ -11,8 +11,8 @@ msgstr "" "POT-Creation-Date: 2017-11-21 18:22+0000\n" "PO-Revision-Date: 2022-08-02 21:06+0000\n" "Last-Translator: Ignacio Buioli \n" -"Language-Team: Spanish (Argentina) (https://www.transifex.com/oca/" -"teams/23907/es_AR/)\n" +"Language-Team: Spanish (Argentina) (https://www.transifex.com/oca/teams/" +"23907/es_AR/)\n" "Language: es_AR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,8 +32,8 @@ msgid "" "

\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -42,8 +42,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"

\n" +"
\n" " \n" " \n" "
\n" #~ "   REFERENCES
\n" -#~ "   Contract:
\n" +#~ "   Contract:
\n" #~ " \n" #~ "   Contract Date Start:
\n" @@ -2529,8 +2543,8 @@ msgstr "" #~ " \n" #~ " \n" #~ "   Your Contact: \n" +#~ "href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, " +#~ "object.name)\" t-out=\"object.user_id.name\"/>\n" #~ " \n" #~ " \n" #~ "   Your Contact: \n" #~ "

If you have any questions, do not hesitate to contact " #~ "us.

\n" -#~ "

Thank you for choosing !

\n" +#~ "

Thank you for choosing !

\n" #~ "
\n" #~ "
\n" #~ " \n" @@ -2726,16 +2742,16 @@ msgstr "" #~ "5px 5px; background-repeat: repeat no-repeat;\">\n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ " \n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ " \n" #~ " %endif\n" #~ "

\n" @@ -2926,8 +2942,8 @@ msgstr "" #~ msgstr "Fecha del aviso de terminación" #~ msgid "" -#~ "\n" +#~ "\n" #~ " contract to invoice\n" #~ " \n" #~ " " #~ msgstr "" -#~ "\n" +#~ "\n" #~ " contracto a facturar\n" #~ " \n" #~ " \n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ " \n" #~ " %endif\n" #~ "

\n" @@ -3046,16 +3062,16 @@ msgstr "" #~ "5px 5px; background-repeat: repeat no-repeat;\">\n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ "
\n" -#~ " Sitio Web: ${object.company_id.website}\n" +#~ " Sitio Web: $" +#~ "{object.company_id.website}\n" #~ "
\n" #~ " %endif\n" #~ "

\n" diff --git a/contract/i18n/es_CL.po b/contract/i18n/es_CL.po index 217dbe0245..6f8d039b85 100644 --- a/contract/i18n/es_CL.po +++ b/contract/i18n/es_CL.po @@ -28,8 +28,8 @@ msgid "" "

\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -38,8 +38,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"

\n" +"
\n" " \n" " \n" "
\n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ " \n" #~ " %endif\n" #~ "

\n" @@ -2493,16 +2507,16 @@ msgstr "" #~ "5px 5px; background-repeat: repeat no-repeat;\">\n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ " \n" #~ " %endif\n" #~ "

\n" diff --git a/contract/i18n/es_CO.po b/contract/i18n/es_CO.po index b754f08d39..0bb85bb69f 100644 --- a/contract/i18n/es_CO.po +++ b/contract/i18n/es_CO.po @@ -31,8 +31,8 @@ msgid "" "

\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"

\n" +"
\n" " \n" " \n" "
, 2017\n" -"Language-Team: Spanish (Costa Rica) (https://www.transifex.com/oca/" -"teams/23907/es_CR/)\n" +"Language-Team: Spanish (Costa Rica) (https://www.transifex.com/oca/teams/" +"23907/es_CR/)\n" "Language: es_CR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,8 +31,8 @@ msgid "" "

\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"

\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
, 2017\n" -"Language-Team: Spanish (Venezuela) (https://www.transifex.com/oca/" -"teams/23907/es_VE/)\n" +"Language-Team: Spanish (Venezuela) (https://www.transifex.com/oca/teams/" +"23907/es_VE/)\n" "Language: es_VE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,8 +31,8 @@ msgid "" "

\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"

\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -40,8 +40,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -40,8 +40,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -40,8 +40,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" +#~ "\n" #~ " contract to invoice\n" #~ " \n" #~ " " #~ msgstr "" -#~ "\n" +#~ "\n" #~ " laskutettava sopimus\n" #~ " \n" #~ " \n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ " \n" #~ " %endif\n" #~ "

\n" @@ -2644,9 +2658,9 @@ msgstr "" #~ "\n" #~ " % if object.user_id:\n" #~ " % if object.user_id.email:\n" -#~ "   Yhteyshenkilönne: ${object.user_id.name}\n" +#~ "   Yhteyshenkilönne: $" +#~ "{object.user_id.name}\n" #~ " % else:\n" #~ "   Yhteyshenkilönne: ${object.user_id.name}\n" #~ " % endif\n" @@ -2663,16 +2677,16 @@ msgstr "" #~ "5px 5px; background-repeat: repeat no-repeat;\">\n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ "
\n" -#~ " Verkkosivu: ${object.company_id.website}\n" +#~ " Verkkosivu: $" +#~ "{object.company_id.website}\n" #~ "
\n" #~ " %endif\n" #~ "

\n" diff --git a/contract/i18n/fr.po b/contract/i18n/fr.po index 768722b566..da84c66756 100644 --- a/contract/i18n/fr.po +++ b/contract/i18n/fr.po @@ -31,8 +31,8 @@ msgid "" "

\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"

\n" +"
\n" " \n" " \n" "
\n" " & ;nbsp ;& ;nbsp ;REFERENCES
\n" -" & ;nbsp ;& ;nbsp ;Contrat :
\n" +" & ;nbsp ;& ;nbsp ;Contrat :
\n" " \n" " & ;nbsp ;& ;nbsp ;Date de début du contrat : " "
\n" @@ -118,8 +119,8 @@ msgstr "" " \n" " \n" " & ;nbsp ;& ;nbsp ;Votre contact : \n" +"href=\"'mailto :%s ?subject=Contrat %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" " & ;nbsp ;& ;nbsp ;Votre contact : \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" -" Téléphone : \n" +" Téléphone : \n" "
\n" " \n" " \n" "
\n" -" Site web : \n" +" Site web : \n" "
\n" " \n" "
\n" @@ -1365,6 +1367,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 "En cours" @@ -1674,6 +1677,11 @@ msgstr "Mois" msgid "Month(s) last day" msgstr "Dernier jour du mois" +#. 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" @@ -2347,6 +2355,13 @@ msgstr "" msgid "To renew" msgstr "À renouveler" +#. module: contract +#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view +#: 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." @@ -2590,8 +2605,8 @@ msgstr "" #~ "

\n" #~ "   REFERENCES
\n" -#~ "   Contract:
\n" +#~ "   Contract:
\n" #~ " \n" #~ "   Contract Date Start:
\n" @@ -2600,8 +2615,8 @@ msgstr "" #~ " \n" #~ " \n" #~ "   Your Contact: \n" +#~ "href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, " +#~ "object.name)\" t-out=\"object.user_id.name\"/>\n" #~ " \n" #~ " \n" #~ "   Your Contact: \n" #~ "

If you have any questions, do not hesitate to contact " #~ "us.

\n" -#~ "

Thank you for choosing !

\n" +#~ "

Thank you for choosing !

\n" #~ "
\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ "
\n" +#~ "
\n" #~ " \n" #~ " \n" #~ " \n" @@ -2668,8 +2684,8 @@ msgstr "" #~ "

\n" #~ "   RÉFÉRENCES
\n" -#~ "   Contrat :
\n" +#~ "   Contrat :
\n" #~ " \n" #~ "   Date de début :
\n" @@ -2678,8 +2694,8 @@ msgstr "" #~ " \n" #~ " \n" #~ "   Votre contact : \n" +#~ "href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, " +#~ "object.name)\" t-out=\"object.user_id.name\"/>\n" #~ " \n" #~ " \n" #~ "   Votre contact : \n" #~ "\n" -#~ "

\n" +#~ "
\n" #~ "\n" #~ " \n" #~ " \n" @@ -2722,24 +2739,24 @@ msgstr "" #~ "margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: " #~ "0px; padding-left: 0px; \">\n" #~ "\n" -#~ " Téléphone : \n" +#~ " Téléphone : \n" #~ "
\n" #~ " \n" #~ " \n" #~ " \n" #~ " \n" #~ "
\n" #~ "
\n" #~ "\n" -#~ " View " -#~ "contract\n" +#~ " View contract\n" #~ "
\n" #~ " " @@ -2803,16 +2820,16 @@ msgstr "" #~ "5px 5px; background-repeat: repeat no-repeat;\">\n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ " \n" #~ " %endif\n" #~ "

\n" @@ -2873,16 +2890,16 @@ msgstr "" #~ "5px 5px; background-repeat: repeat no-repeat;\">\n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ " \n" #~ " %endif\n" #~ "

\n" @@ -3003,8 +3020,8 @@ msgstr "" #~ msgstr "Date de l'avis de résiliation" #~ msgid "" -#~ "\n" +#~ "\n" #~ " contract to invoice\n" #~ " \n" #~ " " #~ msgstr "" -#~ "\n" +#~ "\n" #~ " contrat à facturer\n" #~ " \n" #~ " \n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ " \n" #~ " %endif\n" #~ "

\n" @@ -3124,16 +3141,16 @@ msgstr "" #~ "5px 5px; background-repeat: repeat no-repeat;\">\n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ "
\n" -#~ " Site web: ${object.company_id.website}\n" +#~ " Site web: $" +#~ "{object.company_id.website}\n" #~ "
\n" #~ " %endif\n" #~ "

\n" diff --git a/contract/i18n/fr_CA.po b/contract/i18n/fr_CA.po index 830d4e443a..3d52558803 100644 --- a/contract/i18n/fr_CA.po +++ b/contract/i18n/fr_CA.po @@ -31,8 +31,8 @@ msgid "" "

\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"

\n" +"
\n" " \n" " \n" "
, 2017\n" -"Language-Team: French (Switzerland) (https://www.transifex.com/oca/" -"teams/23907/fr_CH/)\n" +"Language-Team: French (Switzerland) (https://www.transifex.com/oca/teams/" +"23907/fr_CH/)\n" "Language: fr_CH\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,8 +31,8 @@ msgid "" "

\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"

\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -38,8 +38,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ " \n" #~ " %endif\n" #~ "

\n" @@ -2574,9 +2588,9 @@ msgstr "" #~ "\n" #~ " % if object.user_id :\n" #~ " % if object.user_id.email :\n" -#~ "   Votre contact : ${object.user_id.name}\n" +#~ "   Votre contact : $" +#~ "{object.user_id.name}\n" #~ " % else :\n" #~ "   Votre contact : ${object.user_id.name}\n" #~ " % endif\n" @@ -2594,16 +2608,16 @@ msgstr "" #~ "top-right-radius : 5px 5px ; background-repeat : repeat no-repeat ;\">.\n" #~ "

\n" -#~ " ${objet." -#~ "company_id.name}

\n" +#~ " $" +#~ "{objet.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${objet.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{objet.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone :\n" #~ " \n" #~ " %endif\n" #~ "

\n" diff --git a/contract/i18n/gl.po b/contract/i18n/gl.po index 2dd8e84e66..c9a4a30edc 100644 --- a/contract/i18n/gl.po +++ b/contract/i18n/gl.po @@ -31,8 +31,8 @@ msgid "" "

\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"

\n" +"
\n" " \n" " \n" "
Ola ,

\n" "

Un novo contrato foi creado:

\n" "\n" -"

\n" +"

\n" "   REFERENCES
\n" "   Contract:
\n" @@ -144,16 +145,17 @@ msgstr "" "line-height: 16px; background-color: #F2F2F2;\">\n" " \n" -"

\n" +"
\n" " \n" " \n" "
\n" -" Phone: " -"\n" +" Phone: \n" "
\n" " \n" " \n" @@ -181,8 +183,8 @@ msgid "" " " msgstr "" "

Ola,

\n" -"

Notificámoslle que hai nuevoas modificacións no contrato.

" -"\n" +"

Notificámoslle que hai nuevoas modificacións no contrato.\n" " " #. module: contract @@ -199,8 +201,8 @@ msgstr "" "\n" " contrato a facturar\n" " \n" -"
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"

\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -40,8 +40,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -42,8 +42,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
Invoice" msgstr "" -"Runo izrađen račun za ugovor: Račun" +"Runo izrađen račun za ugovor: Račun" #. module: contract #: model:mail.message.subtype,name:contract.mail_message_subtype_contract_modification @@ -1271,6 +1272,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 "U tijeku" @@ -1577,6 +1579,11 @@ msgstr "Mjesec(i)" msgid "Month(s) last day" msgstr "Mjesec(i) zadnji dan" +#. 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" @@ -2243,6 +2250,13 @@ msgstr "" msgid "To renew" msgstr "" +#. module: contract +#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view +#: 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." diff --git a/contract/i18n/hr_HR.po b/contract/i18n/hr_HR.po index 36937ed639..0b3b2a9382 100644 --- a/contract/i18n/hr_HR.po +++ b/contract/i18n/hr_HR.po @@ -32,8 +32,8 @@ msgid "" "

\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -42,8 +42,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"

\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -40,8 +40,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -40,8 +40,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   RIFERIMENTI
\n" -"   Contratto:
\n" +"   Contratto:
\n" " \n" "   Data inizio contratto:
\n" @@ -117,8 +118,8 @@ msgstr "" " \n" " \n" "   Vostro contratto: \n" +"href=\"'mailto:%s?subject=Contratto %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Vostro contatto: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
%(product)s\n" " arrestata:
\n" -" - Fine:%(old_end)s -- %(new_end)" -"s\n" +" - Fine:%(old_end)s -- " +"%(new_end)s\n" " " #. module: contract @@ -1368,6 +1370,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 "In corso" @@ -1677,6 +1680,11 @@ msgstr "Mese(i)" msgid "Month(s) last day" msgstr "Ultimo giorno del mese" +#. 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" @@ -2346,6 +2354,13 @@ msgstr "" msgid "To renew" msgstr "Da rinnovare" +#. module: contract +#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view +#: 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." @@ -2668,8 +2683,8 @@ msgstr "" #~ msgstr "Data notifica termine" #~ msgid "" -#~ "\n" +#~ "\n" #~ " contract to invoice\n" #~ " \n" #~ " " #~ msgstr "" -#~ "\n" +#~ "\n" #~ " contratto da fatturare\n" #~ " \n" #~ " \n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ " \n" #~ " %endif\n" #~ "

\n" @@ -2766,9 +2781,9 @@ msgstr "" #~ "\n" #~ " % if object.user_id:\n" #~ " % if object.user_id.email:\n" -#~ "   Il tuo contratto: ${object.user_id.name}\n" +#~ "   Il tuo contratto: $" +#~ "{object.user_id.name}\n" #~ " % else:\n" #~ "   Your Contratto: ${object.user_id.name}\n" #~ " % endif\n" @@ -2785,16 +2800,16 @@ msgstr "" #~ "5px 5px; background-repeat: repeat no-repeat;\">\n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ " \n" #~ " %endif\n" #~ "

\n" diff --git a/contract/i18n/ja.po b/contract/i18n/ja.po index edce12055b..167288b157 100644 --- a/contract/i18n/ja.po +++ b/contract/i18n/ja.po @@ -30,8 +30,8 @@ msgid "" "

\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -40,8 +40,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"

\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -40,8 +40,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
, 2017\n" -"Language-Team: Lithuanian (Lithuania) (https://www.transifex.com/oca/" -"teams/23907/lt_LT/)\n" +"Language-Team: Lithuanian (Lithuania) (https://www.transifex.com/oca/teams/" +"23907/lt_LT/)\n" "Language: lt_LT\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,8 +32,8 @@ msgid "" "

\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -42,8 +42,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"

\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -40,8 +40,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -40,8 +40,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract startdatum:
\n" @@ -115,8 +116,8 @@ msgstr "" " \n" " \n" "   Uw contactpersoon: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Uw contactpersoon: \n" "
\n" "

Laat het ons weten als u vragen heeft.

\n" -"

Bedankt dat u gekozen heeft voor !

\n" +"

Bedankt dat u gekozen heeft voor !

\n" "
\n" "
\n" "
\n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ " \n" #~ " %endif\n" #~ "

\n" @@ -2773,16 +2788,16 @@ msgstr "" #~ "5px 5px; background-repeat: repeat no-repeat;\">\n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ "
\n" -#~ " Website: ${object.company_id.website}\n" +#~ " Website: $" +#~ "{object.company_id.website}\n" #~ "
\n" #~ " %endif\n" #~ "

\n" diff --git a/contract/i18n/nl_BE.po b/contract/i18n/nl_BE.po index 08ab4b951e..0b74553ee6 100644 --- a/contract/i18n/nl_BE.po +++ b/contract/i18n/nl_BE.po @@ -31,8 +31,8 @@ msgid "" "

\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"

\n" +"
\n" " \n" " \n" "
, 2017\n" -"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/" -"teams/23907/nl_NL/)\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/" +"23907/nl_NL/)\n" "Language: nl_NL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,8 +31,8 @@ msgid "" "

\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"

\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -42,8 +42,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -42,8 +42,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" +#~ "\n" #~ " contract to invoice\n" #~ " \n" #~ " " #~ msgstr "" -#~ "\n" +#~ "\n" #~ " contract to invoice\n" #~ " \n" #~ " \n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ " \n" #~ " %endif\n" #~ "

\n" @@ -2633,9 +2647,9 @@ msgstr "" #~ "\n" #~ " % if object.user_id:\n" #~ " % if object.user_id.email:\n" -#~ "   O Seu Contacto: ${object.user_id.name}\n" +#~ "   O Seu Contacto: $" +#~ "{object.user_id.name}\n" #~ " % else:\n" #~ "   O Seu Contacto: ${object.user_id.name}\n" #~ " % endif\n" @@ -2653,16 +2667,16 @@ msgstr "" #~ "5px 5px; background-repeat: repeat no-repeat;\">\n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ " \n" #~ " %endif\n" #~ "

\n" diff --git a/contract/i18n/pt_BR.po b/contract/i18n/pt_BR.po index 952ed376be..f00448a993 100644 --- a/contract/i18n/pt_BR.po +++ b/contract/i18n/pt_BR.po @@ -11,8 +11,8 @@ msgstr "" "POT-Creation-Date: 2018-04-27 01:12+0000\n" "PO-Revision-Date: 2023-10-29 07:10+0000\n" "Last-Translator: Adriano Prado \n" -"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/" -"teams/23907/pt_BR/)\n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/" +"23907/pt_BR/)\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,8 +32,8 @@ msgid "" "

\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -42,8 +42,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"

\n" +"
\n" " \n" " \n" "
\n" "   REFERÊNCIAS
\n" -"   Contrato:
\n" +"   Contrato:
\n" " \n" "   Data de início do contrato:
\n" @@ -119,8 +120,8 @@ msgstr "" " \n" " \n" "   Seu contato: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\" object.user_id.name\">\n" " \n" " \n" "   Seu contato: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" +#~ "\n" #~ " contract to invoice\n" #~ " \n" #~ " \n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ " \n" #~ " %endif\n" #~ "

\n" @@ -2789,16 +2804,16 @@ msgstr "" #~ "5px 5px; background-repeat: repeat no-repeat;\">\n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ " \n" #~ " %endif\n" #~ "

\n" diff --git a/contract/i18n/pt_PT.po b/contract/i18n/pt_PT.po index e46f728fb2..aad4bf439c 100644 --- a/contract/i18n/pt_PT.po +++ b/contract/i18n/pt_PT.po @@ -11,8 +11,8 @@ msgstr "" "POT-Creation-Date: 2017-11-21 18:22+0000\n" "PO-Revision-Date: 2018-09-24 22:47+0000\n" "Last-Translator: Daniel Reis \n" -"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/" -"teams/23907/pt_PT/)\n" +"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/teams/" +"23907/pt_PT/)\n" "Language: pt_PT\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,8 +32,8 @@ msgid "" "

\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -42,8 +42,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"

\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -42,8 +42,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -40,8 +40,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -42,8 +42,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -42,8 +42,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENSER
\n" -"   Kontrakt:
\n" +"   Kontrakt:
\n" " \n" "   Kontrakt Startdatum:
\n" @@ -116,8 +117,8 @@ msgstr "" " \n" " \n" "   Din kontakt: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Din kontakt: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" " \n" "
\n" -" Webb: \n" +" Webb: \n" "
\n" " \n" "
\n" @@ -1356,6 +1358,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 "Pågående" @@ -1664,6 +1667,11 @@ msgstr "Månad(er)" msgid "Month(s) last day" msgstr "Månad(er) sista dagen" +#. 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" @@ -2336,6 +2344,13 @@ msgstr "" msgid "To renew" msgstr "Att förnya" +#. module: contract +#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view +#: 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." diff --git a/contract/i18n/th.po b/contract/i18n/th.po index 10ccab6455..309c8807ad 100644 --- a/contract/i18n/th.po +++ b/contract/i18n/th.po @@ -30,8 +30,8 @@ msgid "" "

\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -40,8 +40,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"

\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -42,8 +42,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" #~ "   REFERENCES
\n" -#~ "   Contract:
\n" +#~ "   Contract:
\n" #~ " \n" #~ "   Contract Date Start:
\n" @@ -2484,8 +2498,8 @@ msgstr "" #~ " \n" #~ " \n" #~ "   Your Contact: \n" +#~ "href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, " +#~ "object.name)\" t-out=\"object.user_id.name\"/>\n" #~ " \n" #~ " \n" #~ "   Your Contact: \n" #~ "

If you have any questions, do not hesitate to contact " #~ "us.

\n" -#~ "

Thank you for choosing !

\n" +#~ "

Thank you for choosing !

\n" #~ "
\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ "
\n" +#~ "
\n" #~ " \n" #~ " \n" #~ " \n" @@ -2553,8 +2568,8 @@ msgstr "" #~ "30px;\">\n" #~ "   REFERANSLAR
\n" -#~ "   Sözleşme:
\n" +#~ "   Sözleşme:
\n" #~ " \n" #~ "   Sözleşme Tarihi Başlanma:
\n" @@ -2563,8 +2578,8 @@ msgstr "" #~ " \n" #~ " \n" #~ "   Bağlantınız: \n" +#~ "href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, " +#~ "object.name)\" t-out=\"object.user_id.name\"/>\n" #~ " \n" #~ " \n" #~ "   Bağlantınız: \n" #~ "

Herhangi bir sorunuz varsa, bizimle iletişime " #~ "geçmekten çekinmeyin.

\n" -#~ "

Seçtiğiniz için teşekkürler !

\n" +#~ "

Seçtiğiniz için teşekkürler !

\n" #~ "
\n" #~ "
\n" #~ " \n" #~ " \n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ " \n" #~ " %endif\n" #~ "

\n" diff --git a/contract/i18n/tr_TR.po b/contract/i18n/tr_TR.po index 2d44bfb571..ea3510bf05 100644 --- a/contract/i18n/tr_TR.po +++ b/contract/i18n/tr_TR.po @@ -31,8 +31,8 @@ msgid "" "

\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"

\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -40,8 +40,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
, 2017\n" -"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/oca/" -"teams/23907/vi_VN/)\n" +"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/oca/teams/" +"23907/vi_VN/)\n" "Language: vi_VN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,8 +31,8 @@ msgid "" "

\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"

\n" +"
\n" " \n" " \n" "
\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -42,8 +42,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"
\n" +"
\n" " \n" " \n" "
\n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ " \n" #~ " %endif\n" #~ "

\n" @@ -2628,16 +2642,16 @@ msgstr "" #~ "5px 5px; background-repeat: repeat no-repeat;\">\n" #~ "

\n" -#~ " ${object." -#~ "company_id.name}

\n" +#~ " $" +#~ "{object.company_id.name}\n" #~ "
\n" #~ "
\n" #~ " \n" -#~ " ${object.company_id.partner_id.sudo()." -#~ "with_context(show_address=True, html_format=True).name_get()[0][1] | " -#~ "safe}\n" +#~ " $" +#~ "{object.company_id.partner_id.sudo().with_context(show_address=True, " +#~ "html_format=True).name_get()[0][1] | safe}\n" #~ " \n" #~ " % if object.company_id.phone:\n" #~ "
\n" -#~ " 网址：${object." -#~ "company_id.website}\n" +#~ " 网址：$" +#~ "{object.company_id.website}\n" #~ "
\n" #~ " %endif\n" #~ "

\n" diff --git a/contract/i18n/zh_TW.po b/contract/i18n/zh_TW.po index 6941d10dc7..dbc835f9df 100644 --- a/contract/i18n/zh_TW.po +++ b/contract/i18n/zh_TW.po @@ -31,8 +31,8 @@ msgid "" "

\n" "   REFERENCES
\n" -"   Contract:
\n" +"   Contract:
\n" " \n" "   Contract Date Start:
\n" @@ -41,8 +41,8 @@ msgid "" " \n" " \n" "   Your Contact: \n" +"href=\"'mailto:%s?subject=Contract %s' % (object.user_id.email, object.name)" +"\" t-out=\"object.user_id.name\">\n" " \n" " \n" "   Your Contact: \n" " \n" -"

\n" +"
\n" " \n" " \n" "
- ".join( @@ -932,7 +942,7 @@ def uncancel(self, recurring_next_date): if not all(self.mapped("is_un_cancel_allowed")): raise ValidationError(_("Un-cancel not allowed for this line")) for contract in self.mapped("contract_id"): - lines = self.filtered(lambda l, c=contract: l.contract_id == c) + lines = self.filtered(lambda line, c=contract: line.contract_id == c) msg = _( "Contract line Un-canceled: %s", "
- ".join( @@ -1114,6 +1124,28 @@ def unlink(self): raise ValidationError(_("Contract line must be canceled before delete")) return super().unlink() + monthly_recurring = fields.Monetary( + compute="_compute_monthly_recurring", + store=True, + currency_field="currency_id", + ) + + @api.depends( + "display_type", + "price_subtotal", + "recurring_rule_type", + "recurring_interval", + ) + def _compute_monthly_recurring(self): + for line in self: + if line.display_type: + line.monthly_recurring = 0.0 + continue + months = _MONTHS_PER_RULE.get(line.recurring_rule_type, 1.0) * ( + line.recurring_interval or 1 + ) + line.monthly_recurring = line.price_subtotal / months if months else 0.0 + def _get_quantity_to_invoice( self, period_first_date, period_last_date, invoice_date ): diff --git a/contract/static/description/index.html b/contract/static/description/index.html index 392dde7d06..6be1846905 100644 --- a/contract/static/description/index.html +++ b/contract/static/description/index.html @@ -3,7 +3,7 @@ -Recurring - Contracts Management +README.rst -
-

Recurring - Contracts Management

+
+ + +Odoo Community Association + +
+

Recurring - Contracts Management

-

Production/Stable License: AGPL-3 OCA/contract Translate me on Weblate Try me on Runboat

+

Production/Stable License: AGPL-3 OCA/contract Translate me on Weblate Try me on Runboat

This module enables contracts management with recurring invoicing functions. Also you can print and send by email contract report.

It works for customer contract and supplier contracts.

@@ -390,13 +395,13 @@

Recurring - Contracts Management

-

Configuration

+

Configuration

To view discount field in contract line, you need to set Discount on lines in user access rights.

Contracts can be viewed on the portal (list and detail) if the user logged into the portal is a follower of the contract.

-

Usage

+

Usage

  1. Contracts are in Invoicing -> Customers -> Customer and Invoicing -> Vendors -> Supplier Contracts
  2. When creating a contract, fill fields for selecting the invoicing parameters:
      @@ -432,14 +437,14 @@

      Usage

      https://raw.githubusercontent.com/OCA/contract/16.0/contract/static/src/screenshots/portal-detail.png
-

Known issues / Roadmap

+

Known issues / Roadmap

  • Recover states and others functional fields in Contracts.
  • Add recurrence flag at template level.
-

Bug Tracker

+

Bug Tracker

Bugs are tracked on GitHub 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 @@ -447,16 +452,16 @@

Bug Tracker

Do not contact contributors directly about support or help with technical issues.

-

Credits

+

Credits

-

Authors

+

Authors

  • Tecnativa
  • ACSONE SA/NV
-

Contributors

+

Contributors

-

Maintainers

+

Maintainers

This module is maintained by the OCA.

Odoo Community Association @@ -508,5 +513,6 @@

Maintainers

+
diff --git a/contract/views/contract.xml b/contract/views/contract.xml index c9d894094c..8fd59a6aa5 100644 --- a/contract/views/contract.xml +++ b/contract/views/contract.xml @@ -242,6 +242,11 @@ groups="product.group_discount_per_so_line" /> + + + @@ -195,6 +200,7 @@ contract.line + @@ -208,6 +214,11 @@ + @@ -236,6 +247,17 @@ + @@ -257,7 +279,7 @@ tree,form [('contract_id.contract_type', '=', 'purchase')] - {'search_default_group_by_contract': 1} + {'search_default_group_by_contract': 1, 'search_default_in_progress': 1} @@ -269,7 +291,7 @@ tree,form [('contract_id.contract_type', '=', 'sale')] - {'search_default_group_by_contract': 1} + {'search_default_group_by_contract': 1, 'search_default_in_progress': 1}