[IMP] contract_variable_quantity: Recompute price when changing qty

If you have contract lines with automatic price and your pricelist contains different prices per quantity, the price is not changed when computing quantity. This PR fixes this.
2025-02-13 17:57:24 +02:00 · 2018-04-24 13:22:37 +02:00
parent d7e008ed06
commit 9ff3806838
13 changed files with 270 additions and 171 deletions
--- a/contract/manifest.py
+++ b/contract/manifest.py
@@ -1,5 +1,5 @@
 # Copyright 2004-2010 OpenERP SA
-# Copyright 2014-2017 Tecnativa - Pedro M. Baeza
+# Copyright 2014-2018 Tecnativa - Pedro M. Baeza
 # Copyright 2015 Domatix
 # Copyright 2016-2018 Tecnativa - Carlos Dauden
 # Copyright 2017 Tecnativa - Vicent Cubells
@@ -8,7 +8,7 @@

 {
    'name': 'Contracts Management - Recurring',
-    'version': '11.0.2.0.1',
+    'version': '11.0.2.0.2',
    'category': 'Contract Management',
    'license': 'AGPL-3',
    'author': "OpenERP SA, "
--- 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-04-06 21:09+0000\n"
-"PO-Revision-Date: 2018-04-06 21:09+0000\n"
+"POT-Creation-Date: 2018-04-27 01:12+0000\n"
+"PO-Revision-Date: 2018-04-27 01:12+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"
@@ -313,7 +313,7 @@ msgid "Discount (%)"
 msgstr "Rabatt (%)"

 #. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:177
+#: code:addons/contract/models/account_analytic_invoice_line.py:179
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "Rabatt muss kleiner oder gleich 100 sein"
--- a/contract/i18n/es.po
+++ b/contract/i18n/es.po
@@ -9,8 +9,8 @@ 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"
+"POT-Creation-Date: 2018-04-27 01:12+0000\n"
+"PO-Revision-Date: 2018-04-27 01:12+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"
@@ -360,7 +360,7 @@ msgid "Discount (%)"
 msgstr "Descuento (%)"

 #. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:177
+#: code:addons/contract/models/account_analytic_invoice_line.py:179
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "El descuento debería ser menor o igual a 100"
--- 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-04-06 21:09+0000\n"
-"PO-Revision-Date: 2018-04-06 21:09+0000\n"
+"POT-Creation-Date: 2018-04-27 01:12+0000\n"
+"PO-Revision-Date: 2018-04-27 01:12+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"
@@ -312,7 +312,7 @@ msgid "Discount (%)"
 msgstr "Popust (%)"

 #. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:177
+#: code:addons/contract/models/account_analytic_invoice_line.py:179
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "Popusti bi trebali biti manji ili jednaki 100"
--- 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-04-06 21:09+0000\n"
-"PO-Revision-Date: 2018-04-06 21:09+0000\n"
+"POT-Creation-Date: 2018-04-27 01:12+0000\n"
+"PO-Revision-Date: 2018-04-27 01:12+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"
@@ -312,7 +312,7 @@ msgid "Discount (%)"
 msgstr "Popust (%)"

 #. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:177
+#: code:addons/contract/models/account_analytic_invoice_line.py:179
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "Popust treba biti manji ili jednak 100"
--- 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-04-06 21:09+0000\n"
-"PO-Revision-Date: 2018-04-06 21:09+0000\n"
+"POT-Creation-Date: 2018-04-27 01:12+0000\n"
+"PO-Revision-Date: 2018-04-27 01:12+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"
@@ -312,7 +312,7 @@ msgid "Discount (%)"
 msgstr "Sconto (%)"

 #. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:177
+#: code:addons/contract/models/account_analytic_invoice_line.py:179
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "Lo sconto dovrebbe essere minore o uguale a 100"
--- 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-04-06 21:09+0000\n"
-"PO-Revision-Date: 2018-04-06 21:09+0000\n"
+"POT-Creation-Date: 2018-04-27 01:12+0000\n"
+"PO-Revision-Date: 2018-04-27 01:12+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"
@@ -312,7 +312,7 @@ msgid "Discount (%)"
 msgstr "Korting (%)"

 #. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:177
+#: code:addons/contract/models/account_analytic_invoice_line.py:179
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "De korting moet kleiner of gelijk aan 100 zijn"
--- a/contract/i18n/pt.po
+++ b/contract/i18n/pt.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-17 02:41+0000\n"
-"PO-Revision-Date: 2018-04-17 02:41+0000\n"
+"POT-Creation-Date: 2018-04-27 01:12+0000\n"
+"PO-Revision-Date: 2018-04-27 01:12+0000\n"
 "Last-Translator: Pedro Castro Silva <pedrocs@exo.pt>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/oca/teams/23907/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -362,7 +362,7 @@ msgid "Discount (%)"
 msgstr "Desconto (%)"

 #. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:177
+#: code:addons/contract/models/account_analytic_invoice_line.py:179
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "O desconto deve ser igual ou inferior a 100"
--- 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-04-06 21:09+0000\n"
-"PO-Revision-Date: 2018-04-06 21:09+0000\n"
+"POT-Creation-Date: 2018-04-27 01:12+0000\n"
+"PO-Revision-Date: 2018-04-27 01:12+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"
@@ -312,7 +312,7 @@ msgid "Discount (%)"
 msgstr "Desconto (%)"

 #. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:177
+#: code:addons/contract/models/account_analytic_invoice_line.py:179
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "Desconto deve ser menor ou igual a 100"
--- a/contract/i18n/tr.po
+++ b/contract/i18n/tr.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
+# Ediz Duman <neps1192@gmail.com>, 2017
 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: OCA Transbot <transbot@odoo-community.org>, 2017\n"
+"POT-Creation-Date: 2018-04-28 02:01+0000\n"
+"PO-Revision-Date: 2018-04-28 02:01+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>, 2017\n"
 "Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -70,73 +71,121 @@ msgid ""
 "</div>\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>Merhaba ${object.partner_id.name or ''},</p>\n"
+"    <p>Yeni bir sözleşme oluşturuldu: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERANSLAR</strong><br />\n"
+"       &nbsp;&nbsp;Sözleşme: <strong>${object.name}</strong><br />\n"
+"       % if object.date_start:\n"
+"       &nbsp;&nbsp;Sözleşme Başlama Tarihi: ${object.date_start or ''}<br />\n"
+"       % endif\n"
+"\n"
+"       % if object.user_id:\n"
+"       % if object.user_id.email:\n"
+"       &nbsp;&nbsp;İletişim: <a href=\"mailto:${object.user_id.email or ''}?subject=Contract%20${object.name}\">${object.user_id.name}</a>\n"
+"       % else:\n"
+"       &nbsp;&nbsp;İletişim: ${object.user_id.name}\n"
+"       % endif\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>Herhangi bir sorunuz varsa, bizimle iletişime geçmekten çekinmeyin.</p>\n"
+"    <p>Bizi seçtiğiniz için teşekkürler ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: #DDD;\">\n"
+"            <strong style=\"text-transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"            ${object.company_id.partner_id.sudo().with_context(show_address=True, html_format=True).name_get()[0][1] | safe}\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; \">\n"
+"                Phone: ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web: <a href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"        "

 #. module: contract
 #: model:mail.template,subject:contract.email_contract_template
 msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
-msgstr ""
+msgstr "${object.company_id.name} Sözleşme (Ref ${object.name or 'n/a'})"

 #. module: contract
 #: 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 "<strong>#END#</strong>: End date of the invoiced period"
-msgstr "<strong>#SON#</strong>: Faturalanmış dönemin bitiş tarihi"
+msgstr "<strong>#SONLANMA#</strong>: Faturalanma dönemin bitiş tarihi"

 #. module: contract
 #: 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 "<strong>#START#</strong>: Start date of the invoiced period"
-msgstr "<strong>#BAŞLAMA#</strong>: Faturalandırılan süre başlangıç tarihi"
+msgstr "<strong>#BAŞLAMA#</strong>: Faturalanma dönemin başlama tarihi"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Contract: </strong>"
-msgstr ""
+msgstr "<strong>Sözleşme: </strong>"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Date Start: </strong>"
-msgstr ""
+msgstr "<strong>Başlama Tarihi : </strong>"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Description</strong>"
-msgstr ""
+msgstr "<strong>Açıklama</strong>"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Partner:</strong>"
-msgstr ""
+msgstr "<strong>İş Ortağı:</strong>"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Price</strong>"
-msgstr ""
+msgstr "<strong>Fiyat</strong>"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Quantity</strong>"
-msgstr ""
+msgstr "<strong>Miktar</strong>"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Recurring Items</strong>"
-msgstr ""
+msgstr "<strong>Yinelenen Öğeler</strong>"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Responsible: </strong>"
-msgstr ""
+msgstr "<strong>Sorumlu: </strong>"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Total</strong>"
-msgstr ""
+msgstr "<strong>Toplam</strong>"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Unit Price</strong>"
-msgstr ""
+msgstr "<strong>Birim Fiyat</strong>"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
@@ -154,7 +203,7 @@ msgstr "Analitik Hesap"
 #: 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 ""
+msgstr "Otomatik Fiyat?"

 #. module: contract
 #: model:ir.actions.act_window,help:contract.account_analytic_contract_action
@@ -169,18 +218,18 @@ msgstr "Yeni bir sözleşme oluşturmak için tıklayın."
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_company_id
 msgid "Company"
-msgstr ""
+msgstr "Firma"

 #. module: contract
 #: code:addons/contract/models/account_analytic_account.py:332
 #, python-format
 msgid "Compose Email"
-msgstr ""
+msgstr "E-posta Oluştur"

 #. module: contract
 #: model:ir.model,name:contract.model_res_partner
 msgid "Contact"
-msgstr ""
+msgstr "Kontak"

 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
@@ -194,12 +243,12 @@ msgstr "Sözleşme"
 #: code:addons/contract/models/account_analytic_account.py:138
 #, python-format
 msgid "Contract '%s' start date can't be later than end date"
-msgstr ""
+msgstr "Sözleşme '%s' başlangıç tarihi, bitiş tarihinden sonra olamaz"

 #. module: contract
 #: model:ir.model,name:contract.model_account_analytic_contract_line
 msgid "Contract Lines"
-msgstr ""
+msgstr "Sözleşme Satırları"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_account_contract_template_id
@@ -230,7 +279,7 @@ msgstr "Sözleşmeler"
 #: model:ir.model.fields,field_description:contract.field_account_analytic_account_create_invoice_visibility
 #: model:ir.model.fields,field_description:contract.field_project_project_create_invoice_visibility
 msgid "Create Invoice Visibility"
-msgstr ""
+msgstr "Fatura Görünürlüğü Oluştur"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
@@ -256,7 +305,7 @@ msgstr "Oluşturuldu"
 #: model:ir.model.fields,field_description:contract.field_project_project_date_end
 #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
 msgid "Date End"
-msgstr ""
+msgstr "Sonlanma Tarihi"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_from
@@ -267,7 +316,7 @@ msgstr ""
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_account_date_start
 msgid "Date Start"
-msgstr ""
+msgstr "Başlama Tarihi"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_to
@@ -312,7 +361,7 @@ msgid "Discount (%)"
 msgstr "İndirim (%)"

 #. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:177
+#: code:addons/contract/models/account_analytic_invoice_line.py:179
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "İndirim 100'den az veya ona eşit olmalıdır"
@@ -336,14 +385,14 @@ msgstr "Ad Görünümü"
 #. module: contract
 #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
 msgid "Finished"
-msgstr ""
+msgstr "Sonlanmış"

 #. module: contract
 #: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
 #: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
 #: model:ir.cron,name:contract.account_analytic_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
-msgstr ""
+msgstr "Sözleşmelerden Tekrarlanan Faturalar Oluşturun"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_invoices
@@ -371,6 +420,8 @@ msgid ""
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
+"Bu işaretliyse, Fiyat fiyat listesinden ürüne otomatik olarak uygulayarak "
+"elde edilir. Değilse, manuel fiyat uygulayabilirsiniz."

 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
@@ -475,13 +526,13 @@ msgstr "Lütfen '%s' firması için bir satış yevmiyesi tanımlayın."
 #: selection:account.analytic.account,recurring_invoicing_type:0
 #: selection:account.analytic.contract,recurring_invoicing_type:0
 msgid "Post-paid"
-msgstr ""
+msgstr "Sonradan-Ödemeli"

 #. module: contract
 #: selection:account.analytic.account,recurring_invoicing_type:0
 #: selection:account.analytic.contract,recurring_invoicing_type:0
 msgid "Pre-paid"
-msgstr ""
+msgstr "Ön-Ödemeli"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_account_pricelist_id
@@ -522,30 +573,30 @@ msgstr "Tekrarlayan Faturalar"
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_recurring_interval
 #: model:ir.model.fields,field_description:contract.field_project_project_recurring_interval
 msgid "Repeat Every"
-msgstr ""
+msgstr "Tekrar Aralığı"

 #. module: contract
 #: model:ir.model.fields,help:contract.field_account_analytic_account_recurring_interval
 #: model:ir.model.fields,help:contract.field_account_analytic_contract_recurring_interval
 #: model:ir.model.fields,help:contract.field_project_project_recurring_interval
 msgid "Repeat every (Days/Week/Month/Year)"
-msgstr ""
+msgstr "Tekrarlama Her (Gün / Hafta / Ay / Yıl) "

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_account_user_id
 msgid "Responsible"
-msgstr ""
+msgstr "Sorumlu"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
 msgid "Send by Email"
-msgstr ""
+msgstr "E-posta ile Gönderme"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_sequence
 #: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_sequence
 msgid "Sequence"
-msgstr ""
+msgstr "Sıra"

 #. module: contract
 #: model:ir.model.fields,help:contract.field_account_analytic_contract_line_sequence
@@ -556,7 +607,7 @@ msgstr ""
 #. module: contract
 #: model:ir.ui.view,arch_db:contract.view_partner_form
 msgid "Show the contracts for this partner"
-msgstr ""
+msgstr "Bu iş ortağı için sözleşmeleri göster"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_specific_price
@@ -599,12 +650,12 @@ msgstr "Ölçü Birimi"
 #. module: contract
 #: model:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
-msgstr ""
+msgstr "KDV:"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
 msgid "Valid"
-msgstr ""
+msgstr "Geçerli"

 #. module: contract
 #: selection:account.analytic.account,recurring_rule_type:0
--- 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-04-06 21:09+0000\n"
-"PO-Revision-Date: 2018-04-06 21:09+0000\n"
+"POT-Creation-Date: 2018-04-27 01:12+0000\n"
+"PO-Revision-Date: 2018-04-27 01:12+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"
@@ -313,7 +313,7 @@ msgid "Discount (%)"
 msgstr "İndirim (%)"

 #. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:177
+#: code:addons/contract/models/account_analytic_invoice_line.py:179
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "İndirim 100'den az veya ona eşit olmalıdır"
--- a/contract/i18n/zh.po
+++ b/contract/i18n/zh.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-17 02:41+0000\n"
-"PO-Revision-Date: 2018-04-17 02:41+0000\n"
+"POT-Creation-Date: 2018-04-27 01:12+0000\n"
+"PO-Revision-Date: 2018-04-27 01:12+0000\n"
 "Last-Translator: DIT INTL <ditintlgroup@gmail.com>, 2018\n"
 "Language-Team: Chinese (https://www.transifex.com/oca/teams/23907/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -72,118 +72,162 @@ msgid ""
 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>您好！</p>"
+"<p>您好！${object.partner_id.name or ''},</p>\n"
+"<p>新的合同已经被创建：</p>\n"
+"\n"
+"<p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" &nbsp;&nbsp;<strong>参照</strong><br />\n"
+"&nbsp;&nbsp;合同：<strong>${object.name}</strong><br />\n"
+"% if object.date_start:\n"
+"&nbsp;&nbsp;合同开始日期：${object.date_start or ''}<br />\n"
+"% endif\n"
+"\n"
+"% if object.user_id:\n"
+"% if object.user_id.email:\n"
+"&nbsp;&nbsp;您的合同：<a href=\"mailto:${object.user_id.email or ''}?subject=Contract%20${object.name}\">${object.user_id.name}</a>\n"
+"% else:\n"
+" &nbsp;&nbsp;您的合同：${object.user_id.name}\n"
+" % endif\n"
+" % endif\n"
+"</p>\n"
+"\n"
+"<br/>\n"
+"<p>如果您有如何疑问，请随时与我们联系。</p>\n"
+"<p>${object.company_id.name or 'us'}!</p>\n"
+"<br/>\n"
+"<br/>\n"
+"<div style=\"width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;\">\n"
+"     <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: #DDD;\">\n"
+"         <strong style=\"text-transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"</div>\n"
+"<div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;\">\n"
+"    <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"       ${object.company_id.partner_id.sudo().with_context(show_address=True, html_format=True).name_get()[0][1] | safe}\n"
+"      </span>\n"
+"      % if object.company_id.phone:\n"
+"           <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; \">\n"
+"            电话：${object.company_id.phone}\n"
+"            </div>\n"
+"      % endif\n"
+"      % if object.company_id.website:\n"
+"            <div>\n"
+"              网站：<a href=\"${object.company_id.website}\"> ${object.company_id.website}</a>\n"
+"              </div>\n"
+"              %e ndif\n"
+"             <p></p>\n"
+"        </div>\n"
+"</div>"

 #. module: contract
 #: model:mail.template,subject:contract.email_contract_template
 msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
-msgstr ""
+msgstr "${object.company_id.name} 合同 (Ref ${object.name or 'n/a'})"

 #. module: contract
 #: 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 "<strong>#END#</strong>: End date of the invoiced period"
-msgstr ""
+msgstr "<strong>#END#</strong>: 发票期间的结束日期"

 #. module: contract
 #: 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 "<strong>#START#</strong>: Start date of the invoiced period"
-msgstr ""
+msgstr "<strong>#START#</strong>: 发票期间的开始日期"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Contract: </strong>"
-msgstr ""
+msgstr "<strong>合同: </strong>"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Date Start: </strong>"
-msgstr ""
+msgstr "<strong>开始日期: </strong>"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Description</strong>"
-msgstr ""
+msgstr "<strong>描述</strong>"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Partner:</strong>"
-msgstr ""
+msgstr "<strong>合作伙伴:</strong>"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Price</strong>"
-msgstr ""
+msgstr "<strong>价格</strong>"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Quantity</strong>"
-msgstr ""
+msgstr "<strong>数量</strong>"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Recurring Items</strong>"
-msgstr ""
+msgstr "<strong>复发项目</strong>"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Responsible: </strong>"
-msgstr ""
+msgstr "<strong>负责人: </strong>"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Total</strong>"
-msgstr ""
+msgstr "<strong>总额</strong>"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Unit Price</strong>"
-msgstr ""
+msgstr "<strong>单价</strong>"

 #. module: contract
 #: 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 "Account Analytic Lines"
-msgstr ""
+msgstr "分析会计明细行"

 #. module: contract
 #: model:ir.model,name:contract.model_account_analytic_account
 #: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_analytic_account_id
 msgid "Analytic Account"
-msgstr ""
+msgstr "分析会计"

 #. 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 ""
+msgstr "自动价格？"

 #. module: contract
 #: model:ir.actions.act_window,help:contract.account_analytic_contract_action
 msgid "Click to create a new contract template."
-msgstr ""
+msgstr "单击创建合同模版"

 #. module: contract
 #: model:ir.actions.act_window,help:contract.action_account_analytic_overdue_all
 msgid "Click to create a new contract."
-msgstr ""
+msgstr "单击创建新合同"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_company_id
 msgid "Company"
-msgstr ""
+msgstr "公司"

 #. module: contract
 #: code:addons/contract/models/account_analytic_account.py:332
 #, python-format
 msgid "Compose Email"
-msgstr ""
+msgstr "撰写新邮件"

 #. module: contract
 #: model:ir.model,name:contract.model_res_partner
 msgid "Contact"
-msgstr ""
+msgstr "联系人"

 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
@@ -191,25 +235,25 @@ msgstr ""
 #: model:ir.model.fields,field_description:contract.field_account_invoice_contract_id
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
-msgstr ""
+msgstr "合同"

 #. module: contract
 #: code:addons/contract/models/account_analytic_account.py:138
 #, python-format
 msgid "Contract '%s' start date can't be later than end date"
-msgstr ""
+msgstr "合同 '%s' 开始日期必须不能小于结束日期"

 #. module: contract
 #: model:ir.model,name:contract.model_account_analytic_contract_line
 msgid "Contract Lines"
-msgstr ""
+msgstr "合同明细行"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_account_contract_template_id
 #: model:ir.model.fields,field_description:contract.field_project_project_contract_template_id
 #: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
 msgid "Contract Template"
-msgstr ""
+msgstr "合同模版"

 #. module: contract
 #: model:ir.actions.act_window,name:contract.account_analytic_contract_action
@@ -217,7 +261,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
 #: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
 msgid "Contract Templates"
-msgstr ""
+msgstr "合同模版"

 #. module: contract
 #: model:ir.actions.act_window,name:contract.action_account_analytic_overdue_all
@@ -227,98 +271,98 @@ msgstr ""
 #: model:ir.ui.menu,name:contract.menu_config_contract
 #: model:ir.ui.view,arch_db:contract.view_partner_form
 msgid "Contracts"
-msgstr ""
+msgstr "合同"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_account_create_invoice_visibility
 #: model:ir.model.fields,field_description:contract.field_project_project_create_invoice_visibility
 msgid "Create Invoice Visibility"
-msgstr ""
+msgstr "创建可见性发票"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
 msgid "Create invoices"
-msgstr ""
+msgstr "创建发票"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_create_uid
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_create_uid
 #: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_create_uid
 msgid "Created by"
-msgstr ""
+msgstr "创建人"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_create_date
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_create_date
 #: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_create_date
 msgid "Created on"
-msgstr ""
+msgstr "创建于"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_account_date_end
 #: model:ir.model.fields,field_description:contract.field_project_project_date_end
 #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
 msgid "Date End"
-msgstr ""
+msgstr "结束于"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_from
 #: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_from
 msgid "Date From"
-msgstr ""
+msgstr "开始于"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_account_date_start
 msgid "Date Start"
-msgstr ""
+msgstr "由"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_to
 #: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_to
 msgid "Date To"
-msgstr ""
+msgstr "到"

 #. module: contract
 #: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_from
 #: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_from
 msgid "Date from invoiced period"
-msgstr ""
+msgstr "由发票期间"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_next_date
 #: model:ir.model.fields,field_description:contract.field_project_project_recurring_next_date
 msgid "Date of Next Invoice"
-msgstr ""
+msgstr "下次发票开票日期"

 #. module: contract
 #: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_to
 #: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_to
 msgid "Date to invoiced period"
-msgstr ""
+msgstr "到发票期间"

 #. module: contract
 #: selection:account.analytic.account,recurring_rule_type:0
 #: selection:account.analytic.contract,recurring_rule_type:0
 msgid "Day(s)"
-msgstr ""
+msgstr "天"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_name
 #: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_name
 msgid "Description"
-msgstr ""
+msgstr "描述"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_discount
 #: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_discount
 msgid "Discount (%)"
-msgstr ""
+msgstr "折扣比例（%）"

 #. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:177
+#: code:addons/contract/models/account_analytic_invoice_line.py:179
 #, python-format
 msgid "Discount should be less or equal to 100"
-msgstr ""
+msgstr "折扣比例必须小于或等于100"

 #. module: contract
 #: model:ir.model.fields,help:contract.field_account_analytic_contract_line_discount
@@ -326,44 +370,44 @@ msgstr ""
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
-msgstr ""
+msgstr "折扣比例应用于通用发票，必须小于或等于100"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_display_name
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_display_name
 #: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_display_name
 msgid "Display Name"
-msgstr ""
+msgstr "显示名"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
 msgid "Finished"
-msgstr ""
+msgstr "已完成"

 #. module: contract
 #: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
 #: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
 #: model:ir.cron,name:contract.account_analytic_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
-msgstr ""
+msgstr "从合同生成复发发票"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_invoices
 #: model:ir.model.fields,field_description:contract.field_project_project_recurring_invoices
 msgid "Generate recurring invoices automatically"
-msgstr ""
+msgstr "自动生成复发发票"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
 msgid "Group By..."
-msgstr ""
+msgstr "分组"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_id
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_id
 #: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_id
 msgid "ID"
-msgstr ""
+msgstr "ID"

 #. module: contract
 #: model:ir.model.fields,help:contract.field_account_analytic_contract_line_automatic_price
@@ -372,12 +416,12 @@ 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 ""
+msgstr "如果选中此选项，将自动从本产品的价格列表中获取价格；如果不选，您将可以使用手动的价格。"

 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "发票"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_invoice_line_ids
@@ -385,12 +429,12 @@ msgstr ""
 #: model:ir.model.fields,field_description:contract.field_project_project_recurring_invoice_line_ids
 #: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
 msgid "Invoice Lines"
-msgstr ""
+msgstr "发票明细"

 #. module: contract
 #: model:ir.actions.act_window,name:contract.act_recurring_invoices
 msgid "Invoices"
-msgstr ""
+msgstr "发票"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_invoicing_type
@@ -398,7 +442,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:contract.field_project_project_recurring_invoicing_type
 #: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
 msgid "Invoicing type"
-msgstr ""
+msgstr "发票类型"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_account_journal_id
@@ -406,84 +450,84 @@ msgstr ""
 #: model:ir.model.fields,field_description:contract.field_project_project_journal_id
 #: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
 msgid "Journal"
-msgstr ""
+msgstr "日记凭证"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract___last_update
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line___last_update
 #: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line___last_update
 msgid "Last Modified on"
-msgstr ""
+msgstr "最后修改于"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_write_uid
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_write_uid
 #: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_write_uid
 msgid "Last Updated by"
-msgstr ""
+msgstr "最好修改人"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_write_date
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_write_date
 #: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_write_date
 msgid "Last Updated on"
-msgstr ""
+msgstr "最后更新于"

 #. module: contract
 #: 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 ""
+msgstr "图例（用于发票行描述内的标记）"

 #. module: contract
 #: selection:account.analytic.account,recurring_rule_type:0
 #: selection:account.analytic.contract,recurring_rule_type:0
 msgid "Month(s)"
-msgstr ""
+msgstr "月"

 #. module: contract
 #: selection:account.analytic.account,recurring_rule_type:0
 #: selection:account.analytic.contract,recurring_rule_type:0
 msgid "Month(s) last day"
-msgstr ""
+msgstr "月底"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_name
 msgid "Name"
-msgstr ""
+msgstr "名称"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
 msgid "Next Invoice"
-msgstr ""
+msgstr "下一发票"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_partner_id
 msgid "Partner (always False)"
-msgstr ""
+msgstr "合作伙伴（总为假）"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
 msgid "Partner and dependents"
-msgstr ""
+msgstr "合作伙伴或依赖人"

 #. module: contract
 #: code:addons/contract/models/account_analytic_account.py:214
 #, python-format
 msgid "Please define a sale journal for the company '%s'."
-msgstr ""
+msgstr "请定义一个销售凭证，公司 '%s'."

 #. module: contract
 #: selection:account.analytic.account,recurring_invoicing_type:0
 #: selection:account.analytic.contract,recurring_invoicing_type:0
 msgid "Post-paid"
-msgstr ""
+msgstr "后付"

 #. module: contract
 #: selection:account.analytic.account,recurring_invoicing_type:0
 #: selection:account.analytic.contract,recurring_invoicing_type:0
 msgid "Pre-paid"
-msgstr ""
+msgstr "预付"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_account_pricelist_id
@@ -491,19 +535,19 @@ msgstr ""
 #: model:ir.model.fields,field_description:contract.field_project_project_pricelist_id
 #: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
 msgid "Pricelist"
-msgstr ""
+msgstr "价格表"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_product_id
 #: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_product_id
 msgid "Product"
-msgstr ""
+msgstr "产品"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_quantity
 #: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_quantity
 msgid "Quantity"
-msgstr ""
+msgstr "数量"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_rule_type
@@ -511,127 +555,127 @@ msgstr ""
 #: model:ir.model.fields,field_description:contract.field_project_project_recurring_rule_type
 #: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
 msgid "Recurrence"
-msgstr ""
+msgstr "重复"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
 #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
 msgid "Recurring Invoices"
-msgstr ""
+msgstr "复发发票"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_interval
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_recurring_interval
 #: model:ir.model.fields,field_description:contract.field_project_project_recurring_interval
 msgid "Repeat Every"
-msgstr ""
+msgstr "重复间隔"

 #. module: contract
 #: model:ir.model.fields,help:contract.field_account_analytic_account_recurring_interval
 #: model:ir.model.fields,help:contract.field_account_analytic_contract_recurring_interval
 #: model:ir.model.fields,help:contract.field_project_project_recurring_interval
 msgid "Repeat every (Days/Week/Month/Year)"
-msgstr ""
+msgstr "重复间隔（年／月／周／天）"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_account_user_id
 msgid "Responsible"
-msgstr ""
+msgstr "负责人"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
 msgid "Send by Email"
-msgstr ""
+msgstr "通过邮件发送"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_sequence
 #: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_sequence
 msgid "Sequence"
-msgstr ""
+msgstr "次序"

 #. module: contract
 #: model:ir.model.fields,help:contract.field_account_analytic_contract_line_sequence
 #: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_sequence
 msgid "Sequence of the contract line when displaying contracts"
-msgstr ""
+msgstr "当显示合同时显示合同明细行的序号"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.view_partner_form
 msgid "Show the contracts for this partner"
-msgstr ""
+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 ""
+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
 #: model:ir.model.fields,help:contract.field_project_project_recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
-msgstr ""
+msgstr "为自动生成合同设定间隔"

 #. module: contract
 #: model:ir.model.fields,help:contract.field_account_analytic_account_recurring_invoicing_type
 #: 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 ""
+msgstr "指定处理日期是从'开始'还是'开始'到开票日期"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_price_subtotal
 #: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_price_subtotal
 msgid "Sub Total"
-msgstr ""
+msgstr "小计"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_price_unit
 #: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_price_unit
 msgid "Unit Price"
-msgstr ""
+msgstr "单价"

 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_uom_id
 #: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_uom_id
 msgid "Unit of Measure"
-msgstr ""
+msgstr "单位"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
-msgstr ""
+msgstr "增值税："

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
 msgid "Valid"
-msgstr ""
+msgstr "有效"

 #. module: contract
 #: selection:account.analytic.account,recurring_rule_type:0
 #: selection:account.analytic.contract,recurring_rule_type:0
 msgid "Week(s)"
-msgstr ""
+msgstr "周"

 #. module: contract
 #: selection:account.analytic.account,recurring_rule_type:0
 #: selection:account.analytic.contract,recurring_rule_type:0
 msgid "Year(s)"
-msgstr ""
+msgstr "年"

 #. 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 ""
+msgstr "在合同开始之前您不能有下一个开票日期 '%s'"

 #. module: contract
 #: code:addons/contract/models/account_analytic_account.py:206
 #, python-format
 msgid "You must first select a Customer for Contract %s!"
-msgstr ""
+msgstr "您必须先选择一个客户作为合同 %s!"

 #. module: contract
 #: code:addons/contract/models/account_analytic_account.py:284
@@ -640,36 +684,38 @@ msgid ""
 "You must review start and end dates!\n"
 "%s"
 msgstr ""
+"您必须查看开始和结束日期！\n"
+"%s"

 #. module: contract
 #: code:addons/contract/models/account_analytic_account.py:102
 #, python-format
 msgid "You must supply a customer for the contract '%s'"
-msgstr ""
+msgstr "您必须为合同提供客户 '%s'"

 #. module: contract
 #: code:addons/contract/models/account_analytic_account.py:120
 #, python-format
 msgid "You must supply a next invoicing date for contract '%s'"
-msgstr ""
+msgstr "您必须为合同设置下一个开票日期 '%s'"

 #. module: contract
 #: code:addons/contract/models/account_analytic_account.py:129
 #, python-format
 msgid "You must supply a start date for contract '%s'"
-msgstr ""
+msgstr "您必须为合同设置开始日期'%s'"

 #. module: contract
 #: model:ir.model,name:contract.model_account_analytic_contract
 msgid "account.analytic.contract"
-msgstr ""
+msgstr "分析会计合同"

 #. module: contract
 #: model:ir.model,name:contract.model_account_analytic_invoice_line
 msgid "account.analytic.invoice.line"
-msgstr ""
+msgstr "分析会计合同明细行"

 #. module: contract
 #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
 msgid "⇒ Show recurring invoices"
-msgstr ""
+msgstr "⇒ 显示复发发票"
--- a/contract/models/account_analytic_invoice_line.py
+++ b/contract/models/account_analytic_invoice_line.py
@@ -3,7 +3,7 @@
 # Copyright 2014 Angel Moya <angel.moya@domatix.com>
 # Copyright 2016 Carlos Dauden <carlos.dauden@tecnativa.com>
 # Copyright 2016-2017 LasLabs Inc.
-# Copyright 2015-2017 Tecnativa - Pedro M. Baeza
+# Copyright 2015-2018 Tecnativa - Pedro M. Baeza
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

 from dateutil.relativedelta import relativedelta
@@ -98,7 +98,9 @@ class AccountAnalyticInvoiceLine(models.Model):
        for line in self:
            if line.automatic_price:
                product = line.product_id.with_context(
-                    quantity=line.quantity,
+                    quantity=line.env.context.get(
+                        'contract_line_qty', line.quantity,
+                    ),
                    pricelist=line.analytic_account_id.pricelist_id.id,
                    partner=line.analytic_account_id.partner_id.id,
                    date=line.env.context.get('old_date', fields.Date.today()),