From c8aa5e3a68dfb701355aaadd0c8b83e72333de73 Mon Sep 17 00:00:00 2001 From: Ronald Portier Date: Sat, 22 Dec 2018 11:09:50 +0100 Subject: [PATCH] [FIX] contract. Optimize insertion of dates in invoice and lines. --- contract_sale_generation/i18n/ca.po | 10 +----- .../i18n/contract_sale_generation.pot | 9 +---- contract_sale_generation/i18n/de.po | 10 +----- contract_sale_generation/i18n/el_GR.po | 10 +----- contract_sale_generation/i18n/es.po | 19 +++++----- contract_sale_generation/i18n/es_MX.po | 10 +----- contract_sale_generation/i18n/fi.po | 10 +----- contract_sale_generation/i18n/fr.po | 19 +++++----- contract_sale_generation/i18n/gl.po | 10 +----- contract_sale_generation/i18n/hi_IN.po | 10 +----- contract_sale_generation/i18n/hr.po | 19 +++++----- contract_sale_generation/i18n/hr_HR.po | 10 +----- contract_sale_generation/i18n/hu.po | 10 +----- contract_sale_generation/i18n/it.po | 10 +----- contract_sale_generation/i18n/nl.po | 10 +----- contract_sale_generation/i18n/nl_NL.po | 10 +----- contract_sale_generation/i18n/pt.po | 19 +++++----- contract_sale_generation/i18n/pt_BR.po | 10 +----- contract_sale_generation/i18n/pt_PT.po | 10 +----- contract_sale_generation/i18n/ro.po | 10 +----- contract_sale_generation/i18n/ru.po | 19 +++++----- contract_sale_generation/i18n/sk_SK.po | 10 +----- contract_sale_generation/i18n/sl.po | 10 +----- contract_sale_generation/i18n/tr.po | 19 +++++----- contract_sale_generation/i18n/tr_TR.po | 10 +----- contract_sale_generation/i18n/zh_CN.po | 10 +----- .../models/account_analytic_account.py | 35 ++++--------------- .../tests/test_contract_sale.py | 8 +++++ 28 files changed, 83 insertions(+), 273 deletions(-) diff --git a/contract_sale_generation/i18n/ca.po b/contract_sale_generation/i18n/ca.po index 574be249f..f0a483d42 100644 --- a/contract_sale_generation/i18n/ca.po +++ b/contract_sale_generation/i18n/ca.po @@ -58,19 +58,11 @@ msgid "Type" msgstr "" #. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:54 +#: code:addons/contract_sale_generation/models/account_analytic_account.py:46 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "" -#. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:113 -#, python-format -msgid "" -"You must review start and end dates!\n" -"%s" -msgstr "" - #. module: contract_sale_generation #: model:ir.model,name:contract_sale_generation.model_account_analytic_contract msgid "account.analytic.contract" diff --git a/contract_sale_generation/i18n/contract_sale_generation.pot b/contract_sale_generation/i18n/contract_sale_generation.pot index 59c657b7a..45f0c8f6c 100644 --- a/contract_sale_generation/i18n/contract_sale_generation.pot +++ b/contract_sale_generation/i18n/contract_sale_generation.pot @@ -53,18 +53,11 @@ msgid "Type" msgstr "" #. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:54 +#: code:addons/contract_sale_generation/models/account_analytic_account.py:46 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "" -#. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:113 -#, python-format -msgid "You must review start and end dates!\n" -"%s" -msgstr "" - #. module: contract_sale_generation #: model:ir.model,name:contract_sale_generation.model_account_analytic_contract msgid "account.analytic.contract" diff --git a/contract_sale_generation/i18n/de.po b/contract_sale_generation/i18n/de.po index 98fae6700..0c02cb78d 100644 --- a/contract_sale_generation/i18n/de.po +++ b/contract_sale_generation/i18n/de.po @@ -58,19 +58,11 @@ msgid "Type" msgstr "" #. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:54 +#: code:addons/contract_sale_generation/models/account_analytic_account.py:46 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "Sie müssen zunächst einen Kunden für den Vertrag '%s' auswählen." -#. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:113 -#, python-format -msgid "" -"You must review start and end dates!\n" -"%s" -msgstr "" - #. module: contract_sale_generation #: model:ir.model,name:contract_sale_generation.model_account_analytic_contract msgid "account.analytic.contract" diff --git a/contract_sale_generation/i18n/el_GR.po b/contract_sale_generation/i18n/el_GR.po index 8565534ab..ae084a123 100644 --- a/contract_sale_generation/i18n/el_GR.po +++ b/contract_sale_generation/i18n/el_GR.po @@ -59,19 +59,11 @@ msgid "Type" msgstr "" #. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:54 +#: code:addons/contract_sale_generation/models/account_analytic_account.py:46 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "" -#. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:113 -#, python-format -msgid "" -"You must review start and end dates!\n" -"%s" -msgstr "" - #. module: contract_sale_generation #: model:ir.model,name:contract_sale_generation.model_account_analytic_contract msgid "account.analytic.contract" diff --git a/contract_sale_generation/i18n/es.po b/contract_sale_generation/i18n/es.po index ba979c4ee..3057e9932 100644 --- a/contract_sale_generation/i18n/es.po +++ b/contract_sale_generation/i18n/es.po @@ -59,21 +59,11 @@ msgid "Type" msgstr "Tipo" #. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:54 +#: code:addons/contract_sale_generation/models/account_analytic_account.py:46 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "¡Seleccione un cliente para este contrato %s!" -#. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:113 -#, python-format -msgid "" -"You must review start and end dates!\n" -"%s" -msgstr "" -"Debe revisar las fechas de inicio y de fin\n" -"%s" - #. module: contract_sale_generation #: model:ir.model,name:contract_sale_generation.model_account_analytic_contract msgid "account.analytic.contract" @@ -83,3 +73,10 @@ msgstr "account.analytic.contract" #: model:ir.ui.view,arch_db:contract_sale_generation.account_analytic_account_recurring_sale_form msgid "⇒ Show recurring sales" msgstr "⇒ Mostrar ventas recurrentes" + +#~ msgid "" +#~ "You must review start and end dates!\n" +#~ "%s" +#~ msgstr "" +#~ "Debe revisar las fechas de inicio y de fin\n" +#~ "%s" diff --git a/contract_sale_generation/i18n/es_MX.po b/contract_sale_generation/i18n/es_MX.po index e011ea931..be6b46db3 100644 --- a/contract_sale_generation/i18n/es_MX.po +++ b/contract_sale_generation/i18n/es_MX.po @@ -59,19 +59,11 @@ msgid "Type" msgstr "" #. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:54 +#: code:addons/contract_sale_generation/models/account_analytic_account.py:46 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "" -#. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:113 -#, python-format -msgid "" -"You must review start and end dates!\n" -"%s" -msgstr "" - #. module: contract_sale_generation #: model:ir.model,name:contract_sale_generation.model_account_analytic_contract msgid "account.analytic.contract" diff --git a/contract_sale_generation/i18n/fi.po b/contract_sale_generation/i18n/fi.po index 7e081e49a..07b16c328 100644 --- a/contract_sale_generation/i18n/fi.po +++ b/contract_sale_generation/i18n/fi.po @@ -58,19 +58,11 @@ msgid "Type" msgstr "" #. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:54 +#: code:addons/contract_sale_generation/models/account_analytic_account.py:46 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "" -#. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:113 -#, python-format -msgid "" -"You must review start and end dates!\n" -"%s" -msgstr "" - #. module: contract_sale_generation #: model:ir.model,name:contract_sale_generation.model_account_analytic_contract msgid "account.analytic.contract" diff --git a/contract_sale_generation/i18n/fr.po b/contract_sale_generation/i18n/fr.po index 2f54eac38..f96ccd58d 100644 --- a/contract_sale_generation/i18n/fr.po +++ b/contract_sale_generation/i18n/fr.po @@ -59,21 +59,11 @@ msgid "Type" msgstr "Type" #. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:54 +#: code:addons/contract_sale_generation/models/account_analytic_account.py:46 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "Vous devez d'abord sélectionner un Client pour le contrat %s!" -#. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:113 -#, python-format -msgid "" -"You must review start and end dates!\n" -"%s" -msgstr "" -"Vous devez vérifier vos dates de début et de fin!\n" -"%s" - #. module: contract_sale_generation #: model:ir.model,name:contract_sale_generation.model_account_analytic_contract msgid "account.analytic.contract" @@ -83,3 +73,10 @@ msgstr "account.analytic.contract" #: model:ir.ui.view,arch_db:contract_sale_generation.account_analytic_account_recurring_sale_form msgid "⇒ Show recurring sales" msgstr "⇒ Voir les commandes récurrentes" + +#~ msgid "" +#~ "You must review start and end dates!\n" +#~ "%s" +#~ msgstr "" +#~ "Vous devez vérifier vos dates de début et de fin!\n" +#~ "%s" diff --git a/contract_sale_generation/i18n/gl.po b/contract_sale_generation/i18n/gl.po index 78fd3210b..69c15c055 100644 --- a/contract_sale_generation/i18n/gl.po +++ b/contract_sale_generation/i18n/gl.po @@ -58,19 +58,11 @@ msgid "Type" msgstr "" #. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:54 +#: code:addons/contract_sale_generation/models/account_analytic_account.py:46 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "" -#. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:113 -#, python-format -msgid "" -"You must review start and end dates!\n" -"%s" -msgstr "" - #. module: contract_sale_generation #: model:ir.model,name:contract_sale_generation.model_account_analytic_contract msgid "account.analytic.contract" diff --git a/contract_sale_generation/i18n/hi_IN.po b/contract_sale_generation/i18n/hi_IN.po index dee15ea2d..80c855d90 100644 --- a/contract_sale_generation/i18n/hi_IN.po +++ b/contract_sale_generation/i18n/hi_IN.po @@ -59,19 +59,11 @@ msgid "Type" msgstr "" #. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:54 +#: code:addons/contract_sale_generation/models/account_analytic_account.py:46 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "" -#. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:113 -#, python-format -msgid "" -"You must review start and end dates!\n" -"%s" -msgstr "" - #. module: contract_sale_generation #: model:ir.model,name:contract_sale_generation.model_account_analytic_contract msgid "account.analytic.contract" diff --git a/contract_sale_generation/i18n/hr.po b/contract_sale_generation/i18n/hr.po index 295653f4b..827cdeb31 100644 --- a/contract_sale_generation/i18n/hr.po +++ b/contract_sale_generation/i18n/hr.po @@ -60,21 +60,11 @@ msgid "Type" msgstr "Tip" #. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:54 +#: code:addons/contract_sale_generation/models/account_analytic_account.py:46 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "Prvo morate odabrati partnera ua ugovor %s!" -#. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:113 -#, python-format -msgid "" -"You must review start and end dates!\n" -"%s" -msgstr "" -"Morate revidirati početni i završni datum ugovora!!\n" -"%s" - #. module: contract_sale_generation #: model:ir.model,name:contract_sale_generation.model_account_analytic_contract msgid "account.analytic.contract" @@ -84,3 +74,10 @@ msgstr "account.analytic.contract" #: model:ir.ui.view,arch_db:contract_sale_generation.account_analytic_account_recurring_sale_form msgid "⇒ Show recurring sales" msgstr "⇒ Prikaži ponavljajuće ponude" + +#~ msgid "" +#~ "You must review start and end dates!\n" +#~ "%s" +#~ msgstr "" +#~ "Morate revidirati početni i završni datum ugovora!!\n" +#~ "%s" diff --git a/contract_sale_generation/i18n/hr_HR.po b/contract_sale_generation/i18n/hr_HR.po index ac652e773..0e92d5854 100644 --- a/contract_sale_generation/i18n/hr_HR.po +++ b/contract_sale_generation/i18n/hr_HR.po @@ -61,19 +61,11 @@ msgid "Type" msgstr "" #. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:54 +#: code:addons/contract_sale_generation/models/account_analytic_account.py:46 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "Prvo morate odabrati partnera za Ugovor %s!" -#. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:113 -#, python-format -msgid "" -"You must review start and end dates!\n" -"%s" -msgstr "" - #. module: contract_sale_generation #: model:ir.model,name:contract_sale_generation.model_account_analytic_contract msgid "account.analytic.contract" diff --git a/contract_sale_generation/i18n/hu.po b/contract_sale_generation/i18n/hu.po index 8e33f36a6..a3cdebf01 100644 --- a/contract_sale_generation/i18n/hu.po +++ b/contract_sale_generation/i18n/hu.po @@ -58,19 +58,11 @@ msgid "Type" msgstr "" #. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:54 +#: code:addons/contract_sale_generation/models/account_analytic_account.py:46 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "" -#. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:113 -#, python-format -msgid "" -"You must review start and end dates!\n" -"%s" -msgstr "" - #. module: contract_sale_generation #: model:ir.model,name:contract_sale_generation.model_account_analytic_contract msgid "account.analytic.contract" diff --git a/contract_sale_generation/i18n/it.po b/contract_sale_generation/i18n/it.po index 3cbc77db8..653a2f3ad 100644 --- a/contract_sale_generation/i18n/it.po +++ b/contract_sale_generation/i18n/it.po @@ -59,19 +59,11 @@ msgid "Type" msgstr "" #. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:54 +#: code:addons/contract_sale_generation/models/account_analytic_account.py:46 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "Bisogna prima selezionare un cliente per il contratto %s!" -#. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:113 -#, python-format -msgid "" -"You must review start and end dates!\n" -"%s" -msgstr "" - #. module: contract_sale_generation #: model:ir.model,name:contract_sale_generation.model_account_analytic_contract msgid "account.analytic.contract" diff --git a/contract_sale_generation/i18n/nl.po b/contract_sale_generation/i18n/nl.po index 0e34d8c04..83600fa24 100644 --- a/contract_sale_generation/i18n/nl.po +++ b/contract_sale_generation/i18n/nl.po @@ -59,19 +59,11 @@ msgid "Type" msgstr "" #. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:54 +#: code:addons/contract_sale_generation/models/account_analytic_account.py:46 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr " Er moet eerst een klant worden ingesteld op contract %s!" -#. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:113 -#, python-format -msgid "" -"You must review start and end dates!\n" -"%s" -msgstr "" - #. module: contract_sale_generation #: model:ir.model,name:contract_sale_generation.model_account_analytic_contract msgid "account.analytic.contract" diff --git a/contract_sale_generation/i18n/nl_NL.po b/contract_sale_generation/i18n/nl_NL.po index ae48d94ce..4a19bb362 100644 --- a/contract_sale_generation/i18n/nl_NL.po +++ b/contract_sale_generation/i18n/nl_NL.po @@ -59,19 +59,11 @@ msgid "Type" msgstr "" #. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:54 +#: code:addons/contract_sale_generation/models/account_analytic_account.py:46 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "" -#. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:113 -#, python-format -msgid "" -"You must review start and end dates!\n" -"%s" -msgstr "" - #. module: contract_sale_generation #: model:ir.model,name:contract_sale_generation.model_account_analytic_contract msgid "account.analytic.contract" diff --git a/contract_sale_generation/i18n/pt.po b/contract_sale_generation/i18n/pt.po index 14c94083e..e8554adc9 100644 --- a/contract_sale_generation/i18n/pt.po +++ b/contract_sale_generation/i18n/pt.po @@ -60,21 +60,11 @@ msgid "Type" msgstr "" #. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:54 +#: code:addons/contract_sale_generation/models/account_analytic_account.py:46 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "Deve primeiro selecionar um Cliente para o Contrato %s!" -#. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:113 -#, python-format -msgid "" -"You must review start and end dates!\n" -"%s" -msgstr "" -"Tem que rever as datas de início e fim!\n" -"%s" - #. module: contract_sale_generation #: model:ir.model,name:contract_sale_generation.model_account_analytic_contract msgid "account.analytic.contract" @@ -84,3 +74,10 @@ msgstr "account.analytic.contract" #: model:ir.ui.view,arch_db:contract_sale_generation.account_analytic_account_recurring_sale_form msgid "⇒ Show recurring sales" msgstr "" + +#~ msgid "" +#~ "You must review start and end dates!\n" +#~ "%s" +#~ msgstr "" +#~ "Tem que rever as datas de início e fim!\n" +#~ "%s" diff --git a/contract_sale_generation/i18n/pt_BR.po b/contract_sale_generation/i18n/pt_BR.po index 7282b5692..f5857be65 100644 --- a/contract_sale_generation/i18n/pt_BR.po +++ b/contract_sale_generation/i18n/pt_BR.po @@ -60,19 +60,11 @@ msgid "Type" msgstr "" #. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:54 +#: code:addons/contract_sale_generation/models/account_analytic_account.py:46 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "Primeiro você deve selecionar um Cliente para o contrato %s!" -#. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:113 -#, python-format -msgid "" -"You must review start and end dates!\n" -"%s" -msgstr "" - #. module: contract_sale_generation #: model:ir.model,name:contract_sale_generation.model_account_analytic_contract msgid "account.analytic.contract" diff --git a/contract_sale_generation/i18n/pt_PT.po b/contract_sale_generation/i18n/pt_PT.po index 597049ee6..82bf581a6 100644 --- a/contract_sale_generation/i18n/pt_PT.po +++ b/contract_sale_generation/i18n/pt_PT.po @@ -59,19 +59,11 @@ msgid "Type" msgstr "" #. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:54 +#: code:addons/contract_sale_generation/models/account_analytic_account.py:46 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "" -#. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:113 -#, python-format -msgid "" -"You must review start and end dates!\n" -"%s" -msgstr "" - #. module: contract_sale_generation #: model:ir.model,name:contract_sale_generation.model_account_analytic_contract msgid "account.analytic.contract" diff --git a/contract_sale_generation/i18n/ro.po b/contract_sale_generation/i18n/ro.po index 2d3c7dcf9..01edb7708 100644 --- a/contract_sale_generation/i18n/ro.po +++ b/contract_sale_generation/i18n/ro.po @@ -60,19 +60,11 @@ msgid "Type" msgstr "" #. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:54 +#: code:addons/contract_sale_generation/models/account_analytic_account.py:46 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "" -#. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:113 -#, python-format -msgid "" -"You must review start and end dates!\n" -"%s" -msgstr "" - #. module: contract_sale_generation #: model:ir.model,name:contract_sale_generation.model_account_analytic_contract msgid "account.analytic.contract" diff --git a/contract_sale_generation/i18n/ru.po b/contract_sale_generation/i18n/ru.po index 67be0e198..e130f169b 100644 --- a/contract_sale_generation/i18n/ru.po +++ b/contract_sale_generation/i18n/ru.po @@ -61,21 +61,11 @@ msgid "Type" msgstr "" #. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:54 +#: code:addons/contract_sale_generation/models/account_analytic_account.py:46 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "" -#. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:113 -#, python-format -msgid "" -"You must review start and end dates!\n" -"%s" -msgstr "" -"Вы должны проверить даты начала и окончания!\n" -"%s" - #. module: contract_sale_generation #: model:ir.model,name:contract_sale_generation.model_account_analytic_contract msgid "account.analytic.contract" @@ -85,3 +75,10 @@ msgstr "" #: model:ir.ui.view,arch_db:contract_sale_generation.account_analytic_account_recurring_sale_form msgid "⇒ Show recurring sales" msgstr "" + +#~ msgid "" +#~ "You must review start and end dates!\n" +#~ "%s" +#~ msgstr "" +#~ "Вы должны проверить даты начала и окончания!\n" +#~ "%s" diff --git a/contract_sale_generation/i18n/sk_SK.po b/contract_sale_generation/i18n/sk_SK.po index f6286155e..e44ee01cb 100644 --- a/contract_sale_generation/i18n/sk_SK.po +++ b/contract_sale_generation/i18n/sk_SK.po @@ -59,19 +59,11 @@ msgid "Type" msgstr "" #. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:54 +#: code:addons/contract_sale_generation/models/account_analytic_account.py:46 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "" -#. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:113 -#, python-format -msgid "" -"You must review start and end dates!\n" -"%s" -msgstr "" - #. module: contract_sale_generation #: model:ir.model,name:contract_sale_generation.model_account_analytic_contract msgid "account.analytic.contract" diff --git a/contract_sale_generation/i18n/sl.po b/contract_sale_generation/i18n/sl.po index d72a37721..610c771fc 100644 --- a/contract_sale_generation/i18n/sl.po +++ b/contract_sale_generation/i18n/sl.po @@ -59,19 +59,11 @@ msgid "Type" msgstr "" #. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:54 +#: code:addons/contract_sale_generation/models/account_analytic_account.py:46 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "" -#. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:113 -#, python-format -msgid "" -"You must review start and end dates!\n" -"%s" -msgstr "" - #. module: contract_sale_generation #: model:ir.model,name:contract_sale_generation.model_account_analytic_contract msgid "account.analytic.contract" diff --git a/contract_sale_generation/i18n/tr.po b/contract_sale_generation/i18n/tr.po index 5e7ebc057..40748f007 100644 --- a/contract_sale_generation/i18n/tr.po +++ b/contract_sale_generation/i18n/tr.po @@ -58,21 +58,11 @@ msgid "Type" msgstr "Türü" #. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:54 +#: code:addons/contract_sale_generation/models/account_analytic_account.py:46 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "Önce Sözleşme %s için bir Müşteri seçmelisiniz!" -#. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:113 -#, python-format -msgid "" -"You must review start and end dates!\n" -"%s" -msgstr "" -"Başlangıç ve bitiş tarihlerini incelemelisiniz!\n" -"%s" - #. module: contract_sale_generation #: model:ir.model,name:contract_sale_generation.model_account_analytic_contract msgid "account.analytic.contract" @@ -82,3 +72,10 @@ msgstr "account.analytic.contract" #: model:ir.ui.view,arch_db:contract_sale_generation.account_analytic_account_recurring_sale_form msgid "⇒ Show recurring sales" msgstr "⇒ Tekrarlayan Satışları Göster" + +#~ msgid "" +#~ "You must review start and end dates!\n" +#~ "%s" +#~ msgstr "" +#~ "Başlangıç ve bitiş tarihlerini incelemelisiniz!\n" +#~ "%s" diff --git a/contract_sale_generation/i18n/tr_TR.po b/contract_sale_generation/i18n/tr_TR.po index 7086aa476..714751ab1 100644 --- a/contract_sale_generation/i18n/tr_TR.po +++ b/contract_sale_generation/i18n/tr_TR.po @@ -59,19 +59,11 @@ msgid "Type" msgstr "" #. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:54 +#: code:addons/contract_sale_generation/models/account_analytic_account.py:46 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "Önce bir Müşteri Sözleşmesi seçmelisiniz %s!" -#. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:113 -#, python-format -msgid "" -"You must review start and end dates!\n" -"%s" -msgstr "" - #. module: contract_sale_generation #: model:ir.model,name:contract_sale_generation.model_account_analytic_contract msgid "account.analytic.contract" diff --git a/contract_sale_generation/i18n/zh_CN.po b/contract_sale_generation/i18n/zh_CN.po index 6b6ea57c4..eb7c2b94d 100644 --- a/contract_sale_generation/i18n/zh_CN.po +++ b/contract_sale_generation/i18n/zh_CN.po @@ -59,19 +59,11 @@ msgid "Type" msgstr "" #. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:54 +#: code:addons/contract_sale_generation/models/account_analytic_account.py:46 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "" -#. module: contract_sale_generation -#: code:addons/contract_sale_generation/models/account_analytic_account.py:113 -#, python-format -msgid "" -"You must review start and end dates!\n" -"%s" -msgstr "" - #. module: contract_sale_generation #: model:ir.model,name:contract_sale_generation.model_account_analytic_contract msgid "account.analytic.contract" diff --git a/contract_sale_generation/models/account_analytic_account.py b/contract_sale_generation/models/account_analytic_account.py index c07d6b0d9..79405fd75 100644 --- a/contract_sale_generation/models/account_analytic_account.py +++ b/contract_sale_generation/models/account_analytic_account.py @@ -6,7 +6,8 @@ # Copyright 2016-2017 LasLabs Inc. # Copyright 2017 Pesol () # Copyright 2017 Angel Moya -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +# Copyright 2018 Therp BV . +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from odoo import api, models, fields from odoo.exceptions import ValidationError @@ -29,16 +30,7 @@ class AccountAnalyticAccount(models.Model): sale_line.product_id_change() sale_line_vals = sale_line._convert_to_write(sale_line._cache) # Insert markers - name = line.name - contract = line.analytic_account_id - if 'old_date' in self.env.context and 'next_date' in self.env.context: - lang_obj = self.env['res.lang'] - lang = lang_obj.search( - [('code', '=', contract.partner_id.lang)]) - date_format = lang.date_format or '%m/%d/%Y' - name = self._insert_markers( - line, self.env.context['old_date'], - self.env.context['next_date'], date_format) + name = self._insert_markers(line.name) sale_line_vals.update({ 'name': name, 'discount': line.discount, @@ -106,26 +98,13 @@ class AccountAnalyticAccount(models.Model): """ sales = self.env['sale.order'] for contract in self: - ref_date = contract.recurring_next_date or fields.Date.today() - if (contract.date_start > ref_date or - contract.date_end and contract.date_end < ref_date): - raise ValidationError( - _("You must review start and end dates!\n%s") % - contract.name) - old_date = fields.Date.from_string(ref_date) - new_date = old_date + self.get_relative_delta( - contract.recurring_rule_type, contract.recurring_interval) - ctx = self.env.context.copy() - ctx.update({ - 'old_date': old_date, - 'next_date': new_date, - # Force company for correct evaluate domain access rules - 'force_company': contract.company_id.id, - }) + if not contract.check_dates_valid(): + continue # Re-read contract with correct company + ctx = contract.get_invoice_context() sales |= contract.with_context(ctx)._create_sale() contract.write({ - 'recurring_next_date': new_date.strftime('%Y-%m-%d') + 'recurring_next_date': fields.Date.to_string(ctx['next_date']) }) return sales diff --git a/contract_sale_generation/tests/test_contract_sale.py b/contract_sale_generation/tests/test_contract_sale.py index b64286b54..035ca8b97 100644 --- a/contract_sale_generation/tests/test_contract_sale.py +++ b/contract_sale_generation/tests/test_contract_sale.py @@ -98,3 +98,11 @@ class TestContractSale(TransactionCase): } del self.template_vals['name'] self.assertDictEqual(res, self.template_vals) + + def test_check_cron_ended_contract(self): + self.contract.recurring_next_date = '2016-02-29' + self.contract.recurring_rule_type = 'yearly' + self.contract.date_end = '2016-02-28' + sale_orders = self.contract.with_context( + cron=True).recurring_create_sale() + self.assertFalse(sale_orders)