diff --git a/contract/i18n/de.po b/contract/i18n/de.po
index 2eace3128..56ac26f98 100644
--- a/contract/i18n/de.po
+++ b/contract/i18n/de.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-30 11:59+0000\n"
-"PO-Revision-Date: 2018-03-30 11:59+0000\n"
+"POT-Creation-Date: 2018-04-06 21:09+0000\n"
+"PO-Revision-Date: 2018-04-06 21:09+0000\n"
 "Last-Translator: Ricardo Gross <rwgross@gmail.com>, 2017\n"
 "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n"
 "MIME-Version: 1.0\n"
@@ -151,6 +151,12 @@ msgstr "Kostenrechnungspositionen"
 msgid "Analytic Account"
 msgstr "Kostenstelle"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_automatic_price
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_automatic_price
+msgid "Auto-price?"
+msgstr ""
+
 #. module: contract
 #: model:ir.actions.act_window,help:contract.account_analytic_contract_action
 msgid "Click to create a new contract template."
@@ -167,7 +173,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:312
+#: code:addons/contract/models/account_analytic_account.py:332
 #, python-format
 msgid "Compose Email"
 msgstr "E-Mail verfassen"
@@ -307,7 +313,7 @@ msgid "Discount (%)"
 msgstr "Rabatt (%)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:135
+#: code:addons/contract/models/account_analytic_invoice_line.py:177
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "Rabatt muss kleiner oder gleich 100 sein"
@@ -358,6 +364,15 @@ msgstr "Gruppiere..."
 msgid "ID"
 msgstr "ID"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_automatic_price
+#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_automatic_price
+msgid ""
+"If this is marked, the price will be obtained automatically applying the "
+"pricelist to the product. If not, you will be able to introduce a manual "
+"price"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
@@ -441,6 +456,11 @@ msgstr "Name"
 msgid "Next Invoice"
 msgstr "Nächste Rechnung"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_partner_id
+msgid "Partner (always False)"
+msgstr ""
+
 #. module: contract
 #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
 msgid "Partner and dependents"
@@ -539,6 +559,12 @@ msgstr ""
 msgid "Show the contracts for this partner"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_specific_price
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_specific_price
+msgid "Specific Price"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,help:contract.field_account_analytic_account_recurring_rule_type
 #: model:ir.model.fields,help:contract.field_account_analytic_contract_recurring_rule_type
@@ -607,7 +633,7 @@ 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
-#: code:addons/contract/models/account_analytic_account.py:264
+#: code:addons/contract/models/account_analytic_account.py:284
 #, python-format
 msgid ""
 "You must review start and end dates!\n"
diff --git a/contract/i18n/es.po b/contract/i18n/es.po
index ab9d78dce..628208726 100644
--- a/contract/i18n/es.po
+++ b/contract/i18n/es.po
@@ -5,24 +5,24 @@
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2017
-#	* contract
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-30 11:59+0000\n"
-"PO-Revision-Date: 2018-03-30 11:59+0000\n"
+"POT-Creation-Date: 2018-04-06 21:09+0000\n"
+"PO-Revision-Date: 2018-04-06 21:09+0000\n"
 "Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: contract
 #: model:mail.template,body_html:contract.email_contract_template
-msgid "\n"
+msgid ""
+"\n"
 "<div style=\"font-family: 'Lucida Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "    <p>Hello ${object.partner_id.name or ''},</p>\n"
 "    <p>A new contract has been created: </p>\n"
@@ -70,7 +70,8 @@ msgid "\n"
 "    </div>\n"
 "</div>\n"
 "        "
-msgstr "\n"
+msgstr ""
+"\n"
 "<div style=\"font-family: 'Lucida Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
 "    <p>Hola ${object.partner_id.name or ''},</p>\n"
 "    <p>Se ha creado un nuevo contrato: </p>\n"
@@ -218,7 +219,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:312
+#: code:addons/contract/models/account_analytic_account.py:332
 #, python-format
 msgid "Compose Email"
 msgstr "Componer correo electrónico"
@@ -240,7 +241,8 @@ msgstr "Contrato"
 #: code:addons/contract/models/account_analytic_account.py:138
 #, python-format
 msgid "Contract '%s' start date can't be later than end date"
-msgstr "La fecha de inicio del contrato '%s' no puede ser superior a la fecha de fin"
+msgstr ""
+"La fecha de inicio del contrato '%s' no puede ser superior a la fecha de fin"
 
 #. module: contract
 #: model:ir.model,name:contract.model_account_analytic_contract_line
@@ -358,7 +360,7 @@ msgid "Discount (%)"
 msgstr "Descuento (%)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:135
+#: code:addons/contract/models/account_analytic_invoice_line.py:177
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "El descuento debería ser menor o igual a 100"
@@ -366,8 +368,12 @@ msgstr "El descuento debería ser menor o igual a 100"
 #. module: contract
 #: model:ir.model.fields,help:contract.field_account_analytic_contract_line_discount
 #: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_discount
-msgid "Discount that is applied in generated invoices. It should be less or equal to 100"
-msgstr "Descuento que es aplicado en las facturas generadas. Debería ser menor o igual a 100"
+msgid ""
+"Discount that is applied in generated invoices. It should be less or equal "
+"to 100"
+msgstr ""
+"Descuento que es aplicado en las facturas generadas. Debería ser menor o "
+"igual a 100"
 
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_display_name
@@ -409,8 +415,13 @@ msgstr "ID (identificación)"
 #. module: contract
 #: model:ir.model.fields,help:contract.field_account_analytic_contract_line_automatic_price
 #: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_automatic_price
-msgid "If this is marked, the price will be obtained automatically applying the pricelist to the product. If not, you will be able to introduce a manual price"
-msgstr "Si está marcado, el precio se obtendrá automáticamente aplicando la tarifa al producto. Si no, podrá introducir un precio manual"
+msgid ""
+"If this is marked, the price will be obtained automatically applying the "
+"pricelist to the product. If not, you will be able to introduce a manual "
+"price"
+msgstr ""
+"Si está marcado, el precio se obtendrá automáticamente aplicando la tarifa "
+"al producto. Si no, podrá introducir un precio manual"
 
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
@@ -471,7 +482,8 @@ msgstr "Última actualización en"
 #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
 #: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
 msgid "Legend (for the markers inside invoice lines description)"
-msgstr "Leyenda (para los marcadores dentro de descripción en lineas de factura)"
+msgstr ""
+"Leyenda (para los marcadores dentro de descripción en lineas de factura)"
 
 #. module: contract
 #: selection:account.analytic.account,recurring_rule_type:0
@@ -495,11 +507,6 @@ msgstr "Nombre"
 msgid "Next Invoice"
 msgstr "Próxima factura"
 
-#. module: contract
-#: model:ir.model,name:contract.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
-
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_partner_id
 msgid "Partner (always False)"
@@ -621,7 +628,8 @@ msgstr "Especifica el intervalo para la generación de facturas automática."
 #: model:ir.model.fields,help:contract.field_account_analytic_contract_recurring_invoicing_type
 #: model:ir.model.fields,help:contract.field_project_project_recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
-msgstr "Especifica si la fecha de proceso es desde o hasta la fecha de facturación"
+msgstr ""
+"Especifica si la fecha de proceso es desde o hasta la fecha de facturación"
 
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_price_subtotal
@@ -666,8 +674,11 @@ msgstr "Año(s)"
 #. module: contract
 #: code:addons/contract/models/account_analytic_account.py:111
 #, python-format
-msgid "You can't have a next invoicing date before the start of the contract '%s'"
-msgstr "No puede tener una fecha de próxima factura anterior a la fecha de inicio del contrato '%s'"
+msgid ""
+"You can't have a next invoicing date before the start of the contract '%s'"
+msgstr ""
+"No puede tener una fecha de próxima factura anterior a la fecha de inicio "
+"del contrato '%s'"
 
 #. module: contract
 #: code:addons/contract/models/account_analytic_account.py:206
@@ -676,11 +687,13 @@ msgid "You must first select a Customer for Contract %s!"
 msgstr "¡Seleccione un cliente para este contrato %s!"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:264
+#: code:addons/contract/models/account_analytic_account.py:284
 #, python-format
-msgid "You must review start and end dates!\n"
+msgid ""
+"You must review start and end dates!\n"
 "%s"
-msgstr "Debe revisar las fechas de inicio y de fin\n"
+msgstr ""
+"Debe revisar las fechas de inicio y de fin\n"
 "%s"
 
 #. module: contract
@@ -715,4 +728,3 @@ msgstr "account.analytic.invoice.line"
 #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
 msgid "⇒ Show recurring invoices"
 msgstr "⇒ Mostrar facturas recurrentes"
-
diff --git a/contract/i18n/hr.po b/contract/i18n/hr.po
index e8d2f30ed..7a2109e28 100644
--- a/contract/i18n/hr.po
+++ b/contract/i18n/hr.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-30 11:59+0000\n"
-"PO-Revision-Date: 2018-03-30 11:59+0000\n"
+"POT-Creation-Date: 2018-04-06 21:09+0000\n"
+"PO-Revision-Date: 2018-04-06 21:09+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -150,6 +150,12 @@ msgstr "Stavke analitike"
 msgid "Analytic Account"
 msgstr "Analitički konto"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_automatic_price
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_automatic_price
+msgid "Auto-price?"
+msgstr ""
+
 #. module: contract
 #: model:ir.actions.act_window,help:contract.account_analytic_contract_action
 msgid "Click to create a new contract template."
@@ -166,7 +172,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:312
+#: code:addons/contract/models/account_analytic_account.py:332
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -306,7 +312,7 @@ msgid "Discount (%)"
 msgstr "Popust (%)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:135
+#: code:addons/contract/models/account_analytic_invoice_line.py:177
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "Popusti bi trebali biti manji ili jednaki 100"
@@ -358,6 +364,15 @@ msgstr "Grupiraj po..."
 msgid "ID"
 msgstr "ID"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_automatic_price
+#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_automatic_price
+msgid ""
+"If this is marked, the price will be obtained automatically applying the "
+"pricelist to the product. If not, you will be able to introduce a manual "
+"price"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
@@ -441,6 +456,11 @@ msgstr "Naziv"
 msgid "Next Invoice"
 msgstr "Sljedeći račun"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_partner_id
+msgid "Partner (always False)"
+msgstr ""
+
 #. module: contract
 #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
 msgid "Partner and dependents"
@@ -539,6 +559,12 @@ msgstr ""
 msgid "Show the contracts for this partner"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_specific_price
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_specific_price
+msgid "Specific Price"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,help:contract.field_account_analytic_account_recurring_rule_type
 #: model:ir.model.fields,help:contract.field_account_analytic_contract_recurring_rule_type
@@ -607,7 +633,7 @@ msgid "You must first select a Customer for Contract %s!"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:264
+#: code:addons/contract/models/account_analytic_account.py:284
 #, python-format
 msgid ""
 "You must review start and end dates!\n"
diff --git a/contract/i18n/hr_HR.po b/contract/i18n/hr_HR.po
index be6459734..705381fec 100644
--- a/contract/i18n/hr_HR.po
+++ b/contract/i18n/hr_HR.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-30 11:59+0000\n"
-"PO-Revision-Date: 2018-03-30 11:59+0000\n"
+"POT-Creation-Date: 2018-04-06 21:09+0000\n"
+"PO-Revision-Date: 2018-04-06 21:09+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n"
 "MIME-Version: 1.0\n"
@@ -150,6 +150,12 @@ msgstr "Stavke analitičkog dnevnika"
 msgid "Analytic Account"
 msgstr "Konto analitike"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_automatic_price
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_automatic_price
+msgid "Auto-price?"
+msgstr ""
+
 #. module: contract
 #: model:ir.actions.act_window,help:contract.account_analytic_contract_action
 msgid "Click to create a new contract template."
@@ -166,7 +172,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:312
+#: code:addons/contract/models/account_analytic_account.py:332
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -306,7 +312,7 @@ msgid "Discount (%)"
 msgstr "Popust (%)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:135
+#: code:addons/contract/models/account_analytic_invoice_line.py:177
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "Popust treba biti manji ili jednak 100"
@@ -358,6 +364,15 @@ msgstr "Grupiraj po..."
 msgid "ID"
 msgstr "ID"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_automatic_price
+#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_automatic_price
+msgid ""
+"If this is marked, the price will be obtained automatically applying the "
+"pricelist to the product. If not, you will be able to introduce a manual "
+"price"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
@@ -441,6 +456,11 @@ msgstr "Naziv"
 msgid "Next Invoice"
 msgstr "Sljedeći račun"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_partner_id
+msgid "Partner (always False)"
+msgstr ""
+
 #. module: contract
 #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
 msgid "Partner and dependents"
@@ -539,6 +559,12 @@ msgstr ""
 msgid "Show the contracts for this partner"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_specific_price
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_specific_price
+msgid "Specific Price"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,help:contract.field_account_analytic_account_recurring_rule_type
 #: model:ir.model.fields,help:contract.field_account_analytic_contract_recurring_rule_type
@@ -607,7 +633,7 @@ msgid "You must first select a Customer for Contract %s!"
 msgstr "Prvo morate odabrati partnera za Ugovor %s!"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:264
+#: code:addons/contract/models/account_analytic_account.py:284
 #, python-format
 msgid ""
 "You must review start and end dates!\n"
diff --git a/contract/i18n/it.po b/contract/i18n/it.po
index 04c50b68d..47f5d0d76 100644
--- a/contract/i18n/it.po
+++ b/contract/i18n/it.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-30 11:59+0000\n"
-"PO-Revision-Date: 2018-03-30 11:59+0000\n"
+"POT-Creation-Date: 2018-04-06 21:09+0000\n"
+"PO-Revision-Date: 2018-04-06 21:09+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n"
 "MIME-Version: 1.0\n"
@@ -150,6 +150,12 @@ msgstr "Righe analitiche"
 msgid "Analytic Account"
 msgstr "Conto Analitico"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_automatic_price
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_automatic_price
+msgid "Auto-price?"
+msgstr ""
+
 #. module: contract
 #: model:ir.actions.act_window,help:contract.account_analytic_contract_action
 msgid "Click to create a new contract template."
@@ -166,7 +172,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:312
+#: code:addons/contract/models/account_analytic_account.py:332
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -306,7 +312,7 @@ msgid "Discount (%)"
 msgstr "Sconto (%)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:135
+#: code:addons/contract/models/account_analytic_invoice_line.py:177
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "Lo sconto dovrebbe essere minore o uguale a 100"
@@ -358,6 +364,15 @@ msgstr "Raggruppa per..."
 msgid "ID"
 msgstr "ID"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_automatic_price
+#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_automatic_price
+msgid ""
+"If this is marked, the price will be obtained automatically applying the "
+"pricelist to the product. If not, you will be able to introduce a manual "
+"price"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
@@ -442,6 +457,11 @@ msgstr "Nome"
 msgid "Next Invoice"
 msgstr "Prossima fattura"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_partner_id
+msgid "Partner (always False)"
+msgstr ""
+
 #. module: contract
 #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
 msgid "Partner and dependents"
@@ -540,6 +560,12 @@ msgstr ""
 msgid "Show the contracts for this partner"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_specific_price
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_specific_price
+msgid "Specific Price"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,help:contract.field_account_analytic_account_recurring_rule_type
 #: model:ir.model.fields,help:contract.field_account_analytic_contract_recurring_rule_type
@@ -609,7 +635,7 @@ msgid "You must first select a Customer for Contract %s!"
 msgstr "Bisogna prima selezionare un cliente per il contratto %s!"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:264
+#: code:addons/contract/models/account_analytic_account.py:284
 #, python-format
 msgid ""
 "You must review start and end dates!\n"
diff --git a/contract/i18n/nl.po b/contract/i18n/nl.po
index 37f1034cb..090f59de1 100644
--- a/contract/i18n/nl.po
+++ b/contract/i18n/nl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-30 11:59+0000\n"
-"PO-Revision-Date: 2018-03-30 11:59+0000\n"
+"POT-Creation-Date: 2018-04-06 21:09+0000\n"
+"PO-Revision-Date: 2018-04-06 21:09+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/oca/teams/23907/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -150,6 +150,12 @@ msgstr "Kostenplaatsenboekingen"
 msgid "Analytic Account"
 msgstr "Kostenplaats"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_automatic_price
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_automatic_price
+msgid "Auto-price?"
+msgstr ""
+
 #. module: contract
 #: model:ir.actions.act_window,help:contract.account_analytic_contract_action
 msgid "Click to create a new contract template."
@@ -166,7 +172,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:312
+#: code:addons/contract/models/account_analytic_account.py:332
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -306,7 +312,7 @@ msgid "Discount (%)"
 msgstr "Korting (%)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:135
+#: code:addons/contract/models/account_analytic_invoice_line.py:177
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "De korting moet kleiner of gelijk aan 100 zijn"
@@ -358,6 +364,15 @@ msgstr "Groepeer op..."
 msgid "ID"
 msgstr "ID"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_automatic_price
+#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_automatic_price
+msgid ""
+"If this is marked, the price will be obtained automatically applying the "
+"pricelist to the product. If not, you will be able to introduce a manual "
+"price"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
@@ -441,6 +456,11 @@ msgstr "Naam"
 msgid "Next Invoice"
 msgstr "Volgende factuur"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_partner_id
+msgid "Partner (always False)"
+msgstr ""
+
 #. module: contract
 #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
 msgid "Partner and dependents"
@@ -539,6 +559,12 @@ msgstr ""
 msgid "Show the contracts for this partner"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_specific_price
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_specific_price
+msgid "Specific Price"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,help:contract.field_account_analytic_account_recurring_rule_type
 #: model:ir.model.fields,help:contract.field_account_analytic_contract_recurring_rule_type
@@ -609,7 +635,7 @@ msgid "You must first select a Customer for Contract %s!"
 msgstr " Er moet eerst een klant worden ingesteld op contract %s!"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:264
+#: code:addons/contract/models/account_analytic_account.py:284
 #, python-format
 msgid ""
 "You must review start and end dates!\n"
diff --git a/contract/i18n/pt.po b/contract/i18n/pt.po
index ac2751235..701298aa9 100644
--- a/contract/i18n/pt.po
+++ b/contract/i18n/pt.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-30 11:59+0000\n"
-"PO-Revision-Date: 2018-03-30 11:59+0000\n"
+"POT-Creation-Date: 2018-04-06 21:09+0000\n"
+"PO-Revision-Date: 2018-04-06 21:09+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/oca/teams/23907/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -150,6 +150,12 @@ msgstr "Linhas de Conta Analítica"
 msgid "Analytic Account"
 msgstr "Conta Analítica"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_automatic_price
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_automatic_price
+msgid "Auto-price?"
+msgstr ""
+
 #. module: contract
 #: model:ir.actions.act_window,help:contract.account_analytic_contract_action
 msgid "Click to create a new contract template."
@@ -166,7 +172,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:312
+#: code:addons/contract/models/account_analytic_account.py:332
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -306,7 +312,7 @@ msgid "Discount (%)"
 msgstr "Desconto (%)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:135
+#: code:addons/contract/models/account_analytic_invoice_line.py:177
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "O desconto deve ser igual ou inferior a 100"
@@ -358,6 +364,15 @@ msgstr "Agrupar Por..."
 msgid "ID"
 msgstr "ID"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_automatic_price
+#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_automatic_price
+msgid ""
+"If this is marked, the price will be obtained automatically applying the "
+"pricelist to the product. If not, you will be able to introduce a manual "
+"price"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
@@ -441,6 +456,11 @@ msgstr "Nome"
 msgid "Next Invoice"
 msgstr "Próxima Fatura"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_partner_id
+msgid "Partner (always False)"
+msgstr ""
+
 #. module: contract
 #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
 msgid "Partner and dependents"
@@ -539,6 +559,12 @@ msgstr ""
 msgid "Show the contracts for this partner"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_specific_price
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_specific_price
+msgid "Specific Price"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,help:contract.field_account_analytic_account_recurring_rule_type
 #: model:ir.model.fields,help:contract.field_account_analytic_contract_recurring_rule_type
@@ -609,7 +635,7 @@ msgid "You must first select a Customer for Contract %s!"
 msgstr "Deve primeiro selecionar um Cliente para o Contrato %s!"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:264
+#: code:addons/contract/models/account_analytic_account.py:284
 #, python-format
 msgid ""
 "You must review start and end dates!\n"
diff --git a/contract/i18n/pt_BR.po b/contract/i18n/pt_BR.po
index d8865549f..2a6b4ea57 100644
--- a/contract/i18n/pt_BR.po
+++ b/contract/i18n/pt_BR.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-30 11:59+0000\n"
-"PO-Revision-Date: 2018-03-30 11:59+0000\n"
+"POT-Creation-Date: 2018-04-06 21:09+0000\n"
+"PO-Revision-Date: 2018-04-06 21:09+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -150,6 +150,12 @@ msgstr ""
 msgid "Analytic Account"
 msgstr "Conta analítica"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_automatic_price
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_automatic_price
+msgid "Auto-price?"
+msgstr ""
+
 #. module: contract
 #: model:ir.actions.act_window,help:contract.account_analytic_contract_action
 msgid "Click to create a new contract template."
@@ -166,7 +172,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:312
+#: code:addons/contract/models/account_analytic_account.py:332
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -306,7 +312,7 @@ msgid "Discount (%)"
 msgstr "Desconto (%)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:135
+#: code:addons/contract/models/account_analytic_invoice_line.py:177
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "Desconto deve ser menor ou igual a 100"
@@ -357,6 +363,15 @@ msgstr "Agrupar por..."
 msgid "ID"
 msgstr "Identificação"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_automatic_price
+#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_automatic_price
+msgid ""
+"If this is marked, the price will be obtained automatically applying the "
+"pricelist to the product. If not, you will be able to introduce a manual "
+"price"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
@@ -440,6 +455,11 @@ msgstr "Nome"
 msgid "Next Invoice"
 msgstr "Próxima fatura"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_partner_id
+msgid "Partner (always False)"
+msgstr ""
+
 #. module: contract
 #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
 msgid "Partner and dependents"
@@ -538,6 +558,12 @@ msgstr ""
 msgid "Show the contracts for this partner"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_specific_price
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_specific_price
+msgid "Specific Price"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,help:contract.field_account_analytic_account_recurring_rule_type
 #: model:ir.model.fields,help:contract.field_account_analytic_contract_recurring_rule_type
@@ -606,7 +632,7 @@ msgid "You must first select a Customer for Contract %s!"
 msgstr "Primeiro você deve selecionar um Cliente para o contrato %s!"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:264
+#: code:addons/contract/models/account_analytic_account.py:284
 #, python-format
 msgid ""
 "You must review start and end dates!\n"
diff --git a/contract/i18n/tr.po b/contract/i18n/tr.po
index 43ac28e21..072b4e551 100644
--- a/contract/i18n/tr.po
+++ b/contract/i18n/tr.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-30 11:59+0000\n"
-"PO-Revision-Date: 2018-03-30 11:59+0000\n"
+"POT-Creation-Date: 2018-04-06 21:09+0000\n"
+"PO-Revision-Date: 2018-04-06 21:09+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -150,6 +150,12 @@ msgstr "Analitik Hesap Satırı"
 msgid "Analytic Account"
 msgstr "Analitik Hesap"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_automatic_price
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_automatic_price
+msgid "Auto-price?"
+msgstr ""
+
 #. module: contract
 #: model:ir.actions.act_window,help:contract.account_analytic_contract_action
 msgid "Click to create a new contract template."
@@ -166,7 +172,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:312
+#: code:addons/contract/models/account_analytic_account.py:332
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -306,7 +312,7 @@ msgid "Discount (%)"
 msgstr "İndirim (%)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:135
+#: code:addons/contract/models/account_analytic_invoice_line.py:177
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "İndirim 100'den az veya ona eşit olmalıdır"
@@ -357,6 +363,15 @@ msgstr "Grupla ..."
 msgid "ID"
 msgstr "ID"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_automatic_price
+#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_automatic_price
+msgid ""
+"If this is marked, the price will be obtained automatically applying the "
+"pricelist to the product. If not, you will be able to introduce a manual "
+"price"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
@@ -440,6 +455,11 @@ msgstr "Adı"
 msgid "Next Invoice"
 msgstr "Sonraki Fatura"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_partner_id
+msgid "Partner (always False)"
+msgstr ""
+
 #. module: contract
 #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
 msgid "Partner and dependents"
@@ -538,6 +558,12 @@ msgstr ""
 msgid "Show the contracts for this partner"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_specific_price
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_specific_price
+msgid "Specific Price"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,help:contract.field_account_analytic_account_recurring_rule_type
 #: model:ir.model.fields,help:contract.field_account_analytic_contract_recurring_rule_type
@@ -606,7 +632,7 @@ 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
-#: code:addons/contract/models/account_analytic_account.py:264
+#: code:addons/contract/models/account_analytic_account.py:284
 #, python-format
 msgid ""
 "You must review start and end dates!\n"
diff --git a/contract/i18n/tr_TR.po b/contract/i18n/tr_TR.po
index 9c2812e52..66a529633 100644
--- a/contract/i18n/tr_TR.po
+++ b/contract/i18n/tr_TR.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-30 11:59+0000\n"
-"PO-Revision-Date: 2018-03-30 11:59+0000\n"
+"POT-Creation-Date: 2018-04-06 21:09+0000\n"
+"PO-Revision-Date: 2018-04-06 21:09+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/tr_TR/)\n"
 "MIME-Version: 1.0\n"
@@ -151,6 +151,12 @@ msgstr "Analitik Hesap Satırları"
 msgid "Analytic Account"
 msgstr "Analitik Hesap"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_automatic_price
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_automatic_price
+msgid "Auto-price?"
+msgstr ""
+
 #. module: contract
 #: model:ir.actions.act_window,help:contract.account_analytic_contract_action
 msgid "Click to create a new contract template."
@@ -167,7 +173,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:312
+#: code:addons/contract/models/account_analytic_account.py:332
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -307,7 +313,7 @@ msgid "Discount (%)"
 msgstr "İndirim (%)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:135
+#: code:addons/contract/models/account_analytic_invoice_line.py:177
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "İndirim 100'den az veya ona eşit olmalıdır"
@@ -358,6 +364,15 @@ msgstr "Grupla ..."
 msgid "ID"
 msgstr "ID"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_automatic_price
+#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_automatic_price
+msgid ""
+"If this is marked, the price will be obtained automatically applying the "
+"pricelist to the product. If not, you will be able to introduce a manual "
+"price"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
@@ -441,6 +456,11 @@ msgstr ""
 msgid "Next Invoice"
 msgstr "Sonraki Fatura"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_partner_id
+msgid "Partner (always False)"
+msgstr ""
+
 #. module: contract
 #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
 msgid "Partner and dependents"
@@ -539,6 +559,12 @@ msgstr ""
 msgid "Show the contracts for this partner"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_specific_price
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_specific_price
+msgid "Specific Price"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,help:contract.field_account_analytic_account_recurring_rule_type
 #: model:ir.model.fields,help:contract.field_account_analytic_contract_recurring_rule_type
@@ -607,7 +633,7 @@ msgid "You must first select a Customer for Contract %s!"
 msgstr "Önce bir Müşteri Sözleşmesi seçmelisiniz %s!"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:264
+#: code:addons/contract/models/account_analytic_account.py:284
 #, python-format
 msgid ""
 "You must review start and end dates!\n"
diff --git a/contract_variable_qty_timesheet/i18n/fr.po b/contract_variable_qty_timesheet/i18n/fr.po
new file mode 100644
index 000000000..8b915ee47
--- /dev/null
+++ b/contract_variable_qty_timesheet/i18n/fr.po
@@ -0,0 +1,34 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * contract_variable_qty_timesheet
+# 
+# Translators:
+# Quentin THEURET <odoo@kerpeo.com>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-04-06 21:09+0000\n"
+"PO-Revision-Date: 2018-04-06 21:09+0000\n"
+"Last-Translator: Quentin THEURET <odoo@kerpeo.com>, 2018\n"
+"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: contract_variable_qty_timesheet
+#: model:contract.line.qty.formula,name:contract_variable_qty_timesheet.contract_line_qty_formula_analytic_same_product
+msgid "Analytic Same Product"
+msgstr "Même produit analytique"
+
+#. module: contract_variable_qty_timesheet
+#: model:contract.line.qty.formula,name:contract_variable_qty_timesheet.contract_line_qty_formula_project_timesheet
+msgid "Project Timesheets"
+msgstr "Feuilles de temps du projet"
+
+#. module: contract_variable_qty_timesheet
+#: model:contract.line.qty.formula,name:contract_variable_qty_timesheet.contract_line_qty_formula_task_timesheet
+msgid "Task Timesheets"
+msgstr "Feuille de temps de la tâche"