diff --git a/contract/i18n/am.po b/contract/i18n/am.po
index c48438851..a3178b461 100644
--- a/contract/i18n/am.po
+++ b/contract/i18n/am.po
@@ -318,7 +318,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/ar.po b/contract/i18n/ar.po
index 5535b0631..bea07f380 100644
--- a/contract/i18n/ar.po
+++ b/contract/i18n/ar.po
@@ -319,7 +319,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/bg.po b/contract/i18n/bg.po
index 962eb6cb5..4f6c0841f 100644
--- a/contract/i18n/bg.po
+++ b/contract/i18n/bg.po
@@ -318,7 +318,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/bs.po b/contract/i18n/bs.po
index 56889ed21..16cfe800b 100644
--- a/contract/i18n/bs.po
+++ b/contract/i18n/bs.po
@@ -319,7 +319,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/ca.po b/contract/i18n/ca.po
index e0a7bc55e..4796e2ae8 100644
--- a/contract/i18n/ca.po
+++ b/contract/i18n/ca.po
@@ -385,7 +385,7 @@ msgid "Company"
 msgstr "Empresa"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr "Redacta Email"
diff --git a/contract/i18n/contract.pot b/contract/i18n/contract.pot
index 975365105..4ab9a4112 100644
--- a/contract/i18n/contract.pot
+++ b/contract/i18n/contract.pot
@@ -299,7 +299,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/cs.po b/contract/i18n/cs.po
index 2ddc7ac34..61a1c319c 100644
--- a/contract/i18n/cs.po
+++ b/contract/i18n/cs.po
@@ -318,7 +318,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/da.po b/contract/i18n/da.po
index b45b34632..ad029a47b 100644
--- a/contract/i18n/da.po
+++ b/contract/i18n/da.po
@@ -318,7 +318,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/de.po b/contract/i18n/de.po
index 735650217..4538f79ad 100644
--- a/contract/i18n/de.po
+++ b/contract/i18n/de.po
@@ -392,7 +392,7 @@ msgid "Company"
 msgstr "Unternehmen"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr "E-Mail verfassen"
diff --git a/contract/i18n/el_GR.po b/contract/i18n/el_GR.po
index 4cd66458a..e41536f39 100644
--- a/contract/i18n/el_GR.po
+++ b/contract/i18n/el_GR.po
@@ -321,7 +321,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/en_GB.po b/contract/i18n/en_GB.po
index f78573bad..612c2a8e1 100644
--- a/contract/i18n/en_GB.po
+++ b/contract/i18n/en_GB.po
@@ -319,7 +319,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/es.po b/contract/i18n/es.po
index a34510533..db44b3026 100644
--- a/contract/i18n/es.po
+++ b/contract/i18n/es.po
@@ -387,7 +387,7 @@ msgid "Company"
 msgstr "Compañía"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr "Componer correo electrónico"
diff --git a/contract/i18n/es_AR.po b/contract/i18n/es_AR.po
index d8917ddd2..3463209a2 100644
--- a/contract/i18n/es_AR.po
+++ b/contract/i18n/es_AR.po
@@ -319,7 +319,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/es_CO.po b/contract/i18n/es_CO.po
index f52a0be10..9e67e24d3 100644
--- a/contract/i18n/es_CO.po
+++ b/contract/i18n/es_CO.po
@@ -319,7 +319,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/es_CR.po b/contract/i18n/es_CR.po
index e1ea54412..6dc81c14f 100644
--- a/contract/i18n/es_CR.po
+++ b/contract/i18n/es_CR.po
@@ -319,7 +319,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/es_DO.po b/contract/i18n/es_DO.po
index e582eb089..ee891dade 100644
--- a/contract/i18n/es_DO.po
+++ b/contract/i18n/es_DO.po
@@ -319,7 +319,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/es_EC.po b/contract/i18n/es_EC.po
index 9451392c1..b05449b7f 100644
--- a/contract/i18n/es_EC.po
+++ b/contract/i18n/es_EC.po
@@ -319,7 +319,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/es_ES.po b/contract/i18n/es_ES.po
index 6331ca47e..c74257c40 100644
--- a/contract/i18n/es_ES.po
+++ b/contract/i18n/es_ES.po
@@ -319,7 +319,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/es_MX.po b/contract/i18n/es_MX.po
index 1a110f1cf..969f754b4 100644
--- a/contract/i18n/es_MX.po
+++ b/contract/i18n/es_MX.po
@@ -321,7 +321,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/es_PY.po b/contract/i18n/es_PY.po
index a63fee28b..561b5a3c1 100644
--- a/contract/i18n/es_PY.po
+++ b/contract/i18n/es_PY.po
@@ -319,7 +319,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/es_VE.po b/contract/i18n/es_VE.po
index 24258cbc9..34c5e512c 100644
--- a/contract/i18n/es_VE.po
+++ b/contract/i18n/es_VE.po
@@ -319,7 +319,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/et.po b/contract/i18n/et.po
index 68f0ee70e..dd33a1196 100644
--- a/contract/i18n/et.po
+++ b/contract/i18n/et.po
@@ -318,7 +318,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/eu.po b/contract/i18n/eu.po
index c9cff2de5..1e12f8262 100644
--- a/contract/i18n/eu.po
+++ b/contract/i18n/eu.po
@@ -318,7 +318,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/fa.po b/contract/i18n/fa.po
index ae4529123..48f738590 100644
--- a/contract/i18n/fa.po
+++ b/contract/i18n/fa.po
@@ -318,7 +318,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/fi.po b/contract/i18n/fi.po
index 7bf1bbaee..93937713d 100644
--- a/contract/i18n/fi.po
+++ b/contract/i18n/fi.po
@@ -320,7 +320,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/fr.po b/contract/i18n/fr.po
index b11e723c5..844015c77 100644
--- a/contract/i18n/fr.po
+++ b/contract/i18n/fr.po
@@ -386,7 +386,7 @@ msgid "Company"
 msgstr "Entreprise"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr "Rédiger courriel"
diff --git a/contract/i18n/fr_CA.po b/contract/i18n/fr_CA.po
index 2fd4c8fa9..5ac74ee60 100644
--- a/contract/i18n/fr_CA.po
+++ b/contract/i18n/fr_CA.po
@@ -319,7 +319,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/fr_CH.po b/contract/i18n/fr_CH.po
index 2f027928e..bc44c8820 100644
--- a/contract/i18n/fr_CH.po
+++ b/contract/i18n/fr_CH.po
@@ -319,7 +319,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/gl.po b/contract/i18n/gl.po
index c36436e4f..60c658b6a 100644
--- a/contract/i18n/gl.po
+++ b/contract/i18n/gl.po
@@ -383,7 +383,7 @@ msgid "Company"
 msgstr "Compañía"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr "Compoñer correo electrónico"
diff --git a/contract/i18n/gl_ES.po b/contract/i18n/gl_ES.po
index 5619ecf31..094806706 100644
--- a/contract/i18n/gl_ES.po
+++ b/contract/i18n/gl_ES.po
@@ -319,7 +319,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/he.po b/contract/i18n/he.po
index e29400fa5..6a84d8f57 100644
--- a/contract/i18n/he.po
+++ b/contract/i18n/he.po
@@ -318,7 +318,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/hi_IN.po b/contract/i18n/hi_IN.po
index 3d7fb52c3..6003db3f6 100644
--- a/contract/i18n/hi_IN.po
+++ b/contract/i18n/hi_IN.po
@@ -321,7 +321,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/hr.po b/contract/i18n/hr.po
index 365e41d27..88c181add 100644
--- a/contract/i18n/hr.po
+++ b/contract/i18n/hr.po
@@ -16,8 +16,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
-"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 3.9.1\n"
 
 #. module: contract
@@ -325,7 +325,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/hr_HR.po b/contract/i18n/hr_HR.po
index 6a0db7063..e5503cbe2 100644
--- a/contract/i18n/hr_HR.po
+++ b/contract/i18n/hr_HR.po
@@ -322,7 +322,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/hu.po b/contract/i18n/hu.po
index 2909cee27..711085ea9 100644
--- a/contract/i18n/hu.po
+++ b/contract/i18n/hu.po
@@ -320,7 +320,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/id.po b/contract/i18n/id.po
index dcc855eae..cacf05f15 100644
--- a/contract/i18n/id.po
+++ b/contract/i18n/id.po
@@ -318,7 +318,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/it.po b/contract/i18n/it.po
index 6dce221b6..ebf03218b 100644
--- a/contract/i18n/it.po
+++ b/contract/i18n/it.po
@@ -389,7 +389,7 @@ msgid "Company"
 msgstr "Azienda"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr "Comporre email"
diff --git a/contract/i18n/ja.po b/contract/i18n/ja.po
index df60027f2..b7607291a 100644
--- a/contract/i18n/ja.po
+++ b/contract/i18n/ja.po
@@ -318,7 +318,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/ko.po b/contract/i18n/ko.po
index ae6ac0267..d2f3e3183 100644
--- a/contract/i18n/ko.po
+++ b/contract/i18n/ko.po
@@ -318,7 +318,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/lt.po b/contract/i18n/lt.po
index c9b2c1e10..446645ebc 100644
--- a/contract/i18n/lt.po
+++ b/contract/i18n/lt.po
@@ -319,7 +319,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/lt_LT.po b/contract/i18n/lt_LT.po
index 14bf01808..fdeed569d 100644
--- a/contract/i18n/lt_LT.po
+++ b/contract/i18n/lt_LT.po
@@ -320,7 +320,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/lv.po b/contract/i18n/lv.po
index f6d4ffc02..113647022 100644
--- a/contract/i18n/lv.po
+++ b/contract/i18n/lv.po
@@ -319,7 +319,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/mk.po b/contract/i18n/mk.po
index 5bc4f9925..35208b4a1 100644
--- a/contract/i18n/mk.po
+++ b/contract/i18n/mk.po
@@ -318,7 +318,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/mn.po b/contract/i18n/mn.po
index e8dcf8196..08c42d1d7 100644
--- a/contract/i18n/mn.po
+++ b/contract/i18n/mn.po
@@ -318,7 +318,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/nb.po b/contract/i18n/nb.po
index ec7377911..b4cdb2067 100644
--- a/contract/i18n/nb.po
+++ b/contract/i18n/nb.po
@@ -319,7 +319,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/nb_NO.po b/contract/i18n/nb_NO.po
index 28b256722..4ebf16b74 100644
--- a/contract/i18n/nb_NO.po
+++ b/contract/i18n/nb_NO.po
@@ -319,7 +319,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/nl.po b/contract/i18n/nl.po
index 97339e01f..87bf47b82 100644
--- a/contract/i18n/nl.po
+++ b/contract/i18n/nl.po
@@ -395,7 +395,7 @@ msgid "Company"
 msgstr "Bedrijf"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr "Email opstellen"
diff --git a/contract/i18n/nl_BE.po b/contract/i18n/nl_BE.po
index 62930960f..76ff3a890 100644
--- a/contract/i18n/nl_BE.po
+++ b/contract/i18n/nl_BE.po
@@ -319,7 +319,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/nl_NL.po b/contract/i18n/nl_NL.po
index 4509da5f8..8f742c108 100644
--- a/contract/i18n/nl_NL.po
+++ b/contract/i18n/nl_NL.po
@@ -319,7 +319,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/pl.po b/contract/i18n/pl.po
index 947fcf063..39e9f66dd 100644
--- a/contract/i18n/pl.po
+++ b/contract/i18n/pl.po
@@ -320,7 +320,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/pt.po b/contract/i18n/pt.po
index 73ca2d179..e2d11bba1 100644
--- a/contract/i18n/pt.po
+++ b/contract/i18n/pt.po
@@ -387,7 +387,7 @@ msgid "Company"
 msgstr "Empresa"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr "Escrever E-mail"
diff --git a/contract/i18n/pt_BR.po b/contract/i18n/pt_BR.po
index d8ff9b05f..41f9371d0 100644
--- a/contract/i18n/pt_BR.po
+++ b/contract/i18n/pt_BR.po
@@ -392,7 +392,7 @@ msgid "Company"
 msgstr "Empresa"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr "Escrever E-mail"
diff --git a/contract/i18n/pt_PT.po b/contract/i18n/pt_PT.po
index d264d457d..eb1cbe1e2 100644
--- a/contract/i18n/pt_PT.po
+++ b/contract/i18n/pt_PT.po
@@ -322,7 +322,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/ro.po b/contract/i18n/ro.po
index d2b1dea9b..d60eeb607 100644
--- a/contract/i18n/ro.po
+++ b/contract/i18n/ro.po
@@ -321,7 +321,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/ru.po b/contract/i18n/ru.po
index d553df317..e3135b9d1 100644
--- a/contract/i18n/ru.po
+++ b/contract/i18n/ru.po
@@ -320,7 +320,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/sk.po b/contract/i18n/sk.po
index 40b80abe6..cde4510a2 100644
--- a/contract/i18n/sk.po
+++ b/contract/i18n/sk.po
@@ -318,7 +318,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/sk_SK.po b/contract/i18n/sk_SK.po
index 50cf67e66..8cf4aca9c 100644
--- a/contract/i18n/sk_SK.po
+++ b/contract/i18n/sk_SK.po
@@ -321,7 +321,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/sl.po b/contract/i18n/sl.po
index 92d509135..8d6d7e1fb 100644
--- a/contract/i18n/sl.po
+++ b/contract/i18n/sl.po
@@ -321,7 +321,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/sr.po b/contract/i18n/sr.po
index c371dca89..6d0cf2117 100644
--- a/contract/i18n/sr.po
+++ b/contract/i18n/sr.po
@@ -319,7 +319,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/sr@latin.po b/contract/i18n/sr@latin.po
index 677bcca51..4f1df3492 100644
--- a/contract/i18n/sr@latin.po
+++ b/contract/i18n/sr@latin.po
@@ -320,7 +320,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/sv.po b/contract/i18n/sv.po
index ebe3bde37..1a4d6aa2f 100644
--- a/contract/i18n/sv.po
+++ b/contract/i18n/sv.po
@@ -318,7 +318,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/th.po b/contract/i18n/th.po
index 03156cf3e..20b73fab6 100644
--- a/contract/i18n/th.po
+++ b/contract/i18n/th.po
@@ -318,7 +318,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/tr.po b/contract/i18n/tr.po
index 5e465a636..59e56e6ae 100644
--- a/contract/i18n/tr.po
+++ b/contract/i18n/tr.po
@@ -387,7 +387,7 @@ msgid "Company"
 msgstr "Firma"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr "E-posta Oluştur"
diff --git a/contract/i18n/tr_TR.po b/contract/i18n/tr_TR.po
index 0c9a27cbc..444009399 100644
--- a/contract/i18n/tr_TR.po
+++ b/contract/i18n/tr_TR.po
@@ -322,7 +322,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/uk.po b/contract/i18n/uk.po
index 26683510a..5f3b1b5f0 100644
--- a/contract/i18n/uk.po
+++ b/contract/i18n/uk.po
@@ -319,7 +319,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/vi.po b/contract/i18n/vi.po
index 773fef0a3..ff511983e 100644
--- a/contract/i18n/vi.po
+++ b/contract/i18n/vi.po
@@ -318,7 +318,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/vi_VN.po b/contract/i18n/vi_VN.po
index 9dc99d63e..09c3427ce 100644
--- a/contract/i18n/vi_VN.po
+++ b/contract/i18n/vi_VN.po
@@ -319,7 +319,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/i18n/zh_CN.po b/contract/i18n/zh_CN.po
index 67b99679e..3d7aeaa40 100644
--- a/contract/i18n/zh_CN.po
+++ b/contract/i18n/zh_CN.po
@@ -379,7 +379,7 @@ msgid "Company"
 msgstr "公司"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr "编写Email"
diff --git a/contract/i18n/zh_TW.po b/contract/i18n/zh_TW.po
index f42e0bc80..91a4c71df 100644
--- a/contract/i18n/zh_TW.po
+++ b/contract/i18n/zh_TW.po
@@ -319,7 +319,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:310
+#: code:addons/contract/models/contract.py:317
 #, python-format
 msgid "Compose Email"
 msgstr ""
diff --git a/contract/models/contract.py b/contract/models/contract.py
index 85272ae2b..616b69ee4 100644
--- a/contract/models/contract.py
+++ b/contract/models/contract.py
@@ -281,19 +281,26 @@ class ContractContract(models.Model):
         invoice_type = 'out_invoice'
         if self.contract_type == 'purchase':
             invoice_type = 'in_invoice'
-        return {
-            'name': self.code,
-            'type': invoice_type,
+        vinvoice = self.env['account.invoice'].new({
             'partner_id': self.invoice_partner_id.id,
+            'type': invoice_type,
+        })
+        vinvoice._onchange_partner_id()
+        invoice_vals = vinvoice._convert_to_write(vinvoice._cache)
+        invoice_vals.update({
+            'name': self.code,
             'currency_id': currency.id,
             'date_invoice': date_invoice,
             'journal_id': journal.id,
             'origin': self.name,
             'company_id': self.company_id.id,
             'user_id': self.user_id.id,
-            'payment_term_id': self.payment_term_id.id,
-            'fiscal_position_id': self.fiscal_position_id.id,
-        }
+        })
+        if self.payment_term_id:
+            invoice_vals['payment_term_id'] = self.payment_term_id.id
+        if self.fiscal_position_id:
+            invoice_vals['fiscal_position_id'] = self.fiscal_position_id.id
+        return invoice_vals
 
     @api.multi
     def action_contract_send(self):
@@ -354,12 +361,6 @@ class ContractContract(models.Model):
 
     @api.model
     def _finalize_invoice_creation(self, invoices):
-        for invoice in invoices:
-            payment_term = invoice.payment_term_id
-            fiscal_position = invoice.fiscal_position_id
-            invoice._onchange_partner_id()
-            invoice.payment_term_id = payment_term
-            invoice.fiscal_position_id = fiscal_position
         invoices.compute_taxes()
 
     @api.model
diff --git a/contract/tests/test_contract.py b/contract/tests/test_contract.py
index 74adae517..76ea41449 100644
--- a/contract/tests/test_contract.py
+++ b/contract/tests/test_contract.py
@@ -631,7 +631,7 @@ class TestContract(TestContractBase):
         self.acct_line.write({'date_end': False, 'is_auto_renew': False})
         self.assertFalse(self.contract.date_end)
 
-    def test_stop_contract_line(self):
+    def test_cancel_contract_line(self):
         """It should raise a validation error"""
         self.acct_line.cancel()
         with self.assertRaises(ValidationError):
@@ -1808,7 +1808,7 @@ class TestContract(TestContractBase):
         self.contract._compute_invoice_count()
         self.assertEqual(self.contract.invoice_count, 3)
 
-    def test_contract_count_invoice(self):
+    def test_contract_count_invoice_2(self):
         invoices = self.env['account.invoice']
         invoices |= self.contract.recurring_create_invoice()
         invoices |= self.contract.recurring_create_invoice()