From e887a4273620773bd55266cb80ce3e861bca7e2e Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Tue, 2 Jun 2020 09:07:53 +0200 Subject: [PATCH] [FIX] contract: Currency is not editable + pricelist from partner Previous related field was not accurated nor editable. Now the field is got properly from a computed field. Reviewing this, as the currency was taken (and it continues being taken) from the partner pricelist if no pricelist is explicitly set, automatic price should use the same logic for using partner pricelist. Also remove roadmap as already attended --- contract/README.rst | 2 -- contract/__manifest__.py | 2 +- contract/i18n/am.po | 12 +++++----- contract/i18n/ar.po | 12 +++++----- contract/i18n/bg.po | 12 +++++----- contract/i18n/bs.po | 12 +++++----- contract/i18n/ca.po | 12 +++++----- contract/i18n/contract.pot | 12 +++++----- contract/i18n/cs.po | 12 +++++----- contract/i18n/da.po | 12 +++++----- contract/i18n/de.po | 12 +++++----- contract/i18n/el_GR.po | 12 +++++----- contract/i18n/en_GB.po | 12 +++++----- contract/i18n/es.po | 12 +++++----- contract/i18n/es_AR.po | 12 +++++----- contract/i18n/es_CL.po | 12 +++++----- contract/i18n/es_CO.po | 12 +++++----- contract/i18n/es_CR.po | 12 +++++----- contract/i18n/es_DO.po | 12 +++++----- contract/i18n/es_EC.po | 12 +++++----- contract/i18n/es_ES.po | 12 +++++----- contract/i18n/es_MX.po | 12 +++++----- contract/i18n/es_PY.po | 12 +++++----- contract/i18n/es_VE.po | 12 +++++----- contract/i18n/et.po | 12 +++++----- contract/i18n/eu.po | 12 +++++----- contract/i18n/fa.po | 12 +++++----- contract/i18n/fi.po | 12 +++++----- contract/i18n/fr.po | 12 +++++----- contract/i18n/fr_CA.po | 12 +++++----- contract/i18n/fr_CH.po | 12 +++++----- contract/i18n/gl.po | 12 +++++----- contract/i18n/gl_ES.po | 12 +++++----- contract/i18n/he.po | 12 +++++----- contract/i18n/hi_IN.po | 12 +++++----- contract/i18n/hr.po | 12 +++++----- contract/i18n/hr_HR.po | 12 +++++----- contract/i18n/hu.po | 12 +++++----- contract/i18n/id.po | 12 +++++----- contract/i18n/it.po | 12 +++++----- contract/i18n/ja.po | 12 +++++----- contract/i18n/ko.po | 12 +++++----- contract/i18n/lt.po | 12 +++++----- contract/i18n/lt_LT.po | 12 +++++----- contract/i18n/lv.po | 12 +++++----- contract/i18n/mk.po | 12 +++++----- contract/i18n/mn.po | 12 +++++----- contract/i18n/nb.po | 12 +++++----- contract/i18n/nb_NO.po | 12 +++++----- contract/i18n/nl.po | 12 +++++----- contract/i18n/nl_BE.po | 12 +++++----- contract/i18n/nl_NL.po | 12 +++++----- contract/i18n/pl.po | 12 +++++----- contract/i18n/pt.po | 12 +++++----- contract/i18n/pt_BR.po | 12 +++++----- contract/i18n/pt_PT.po | 12 +++++----- contract/i18n/ro.po | 12 +++++----- contract/i18n/ru.po | 12 +++++----- contract/i18n/sk.po | 12 +++++----- contract/i18n/sk_SK.po | 12 +++++----- contract/i18n/sl.po | 12 +++++----- contract/i18n/sr.po | 12 +++++----- contract/i18n/sr@latin.po | 12 +++++----- contract/i18n/sv.po | 12 +++++----- contract/i18n/th.po | 12 +++++----- contract/i18n/tr.po | 12 +++++----- contract/i18n/tr_TR.po | 12 +++++----- contract/i18n/uk.po | 12 +++++----- contract/i18n/vi.po | 12 +++++----- contract/i18n/vi_VN.po | 12 +++++----- contract/i18n/zh_CN.po | 12 +++++----- contract/i18n/zh_TW.po | 12 +++++----- contract/models/abstract_contract_line.py | 8 ++++++- contract/models/contract.py | 28 +++++++++++++++++------ contract/readme/ROADMAP.rst | 2 -- contract/static/description/index.html | 2 -- 76 files changed, 449 insertions(+), 435 deletions(-) diff --git a/contract/README.rst b/contract/README.rst index be8ff73b7..8dbbfda0f 100644 --- a/contract/README.rst +++ b/contract/README.rst @@ -74,8 +74,6 @@ Known issues / Roadmap ====================== * Recover states and others functional fields in Contracts. -* Depending on the contract lines, some sections of contract - line have no meaning that they are propagated to certain invoices Bug Tracker =========== diff --git a/contract/__manifest__.py b/contract/__manifest__.py index 915a8a653..95667771b 100644 --- a/contract/__manifest__.py +++ b/contract/__manifest__.py @@ -9,7 +9,7 @@ { 'name': 'Recurring - Contracts Management', - 'version': '12.0.7.2.0', + 'version': '12.0.7.2.1', 'category': 'Contract Management', 'license': 'AGPL-3', 'author': "OpenERP SA, " diff --git a/contract/i18n/am.po b/contract/i18n/am.po index a70898ba2..d36e7b547 100644 --- a/contract/i18n/am.po +++ b/contract/i18n/am.po @@ -388,7 +388,7 @@ msgid "Company" msgstr "" #. module: contract -#: code:addons/contract/models/contract.py:346 +#: code:addons/contract/models/contract.py:360 #, python-format msgid "Compose Email" msgstr "" @@ -602,7 +602,7 @@ msgid "Contract lines" msgstr "" #. module: contract -#: code:addons/contract/models/contract.py:488 +#: code:addons/contract/models/contract.py:502 #, python-format msgid "" "Contract manually invoiced: Invoice" msgstr "" @@ -745,7 +745,7 @@ msgid "Discount (%)" msgstr "" #. module: contract -#: code:addons/contract/models/abstract_contract_line.py:235 +#: code:addons/contract/models/abstract_contract_line.py:241 #, python-format msgid "Discount should be less or equal to 100" msgstr "" @@ -1211,7 +1211,7 @@ msgid "Planned" msgstr "" #. module: contract -#: code:addons/contract/models/contract.py:299 +#: code:addons/contract/models/contract.py:318 #, python-format msgid "Please define a %s journal for the company '%s'." msgstr "" @@ -1523,7 +1523,7 @@ msgid "Technical field for UX purpose." msgstr "" #. module: contract -#: code:addons/contract/models/contract.py:516 +#: code:addons/contract/models/contract.py:530 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view #, python-format @@ -1720,7 +1720,7 @@ msgid "Year(s)" msgstr "" #. module: contract -#: code:addons/contract/models/contract.py:530 +#: code:addons/contract/models/contract.py:544 #, python-format msgid "You are not allowed to terminate contracts." msgstr "" diff --git a/contract/i18n/cs.po b/contract/i18n/cs.po index 9d7bc1ef2..680120080 100644 --- a/contract/i18n/cs.po +++ b/contract/i18n/cs.po @@ -388,7 +388,7 @@ msgid "Company" msgstr "" #. module: contract -#: code:addons/contract/models/contract.py:346 +#: code:addons/contract/models/contract.py:360 #, python-format msgid "Compose Email" msgstr "" @@ -602,7 +602,7 @@ msgid "Contract lines" msgstr "" #. module: contract -#: code:addons/contract/models/contract.py:488 +#: code:addons/contract/models/contract.py:502 #, python-format msgid "" "Contract manually invoiced: Known issues / Roadmap