From ecebb78aad29943487ef09c03cfb81a705294bdc Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Mon, 13 Jan 2020 15:46:07 +0500 Subject: [PATCH] [IMP] changed placeholder of title of a contact (name -> name(in ERP)), changed string of name of a contact (name -> name(in contracts)) --- i18n/ru.po | 48 ++++++++++++++++++------------------------- models/res_partner.py | 2 +- views/res_partner.xml | 4 ++++ 3 files changed, 25 insertions(+), 29 deletions(-) diff --git a/i18n/ru.po b/i18n/ru.po index e02efe7..194f3dd 100644 --- a/i18n/ru.po +++ b/i18n/ru.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0-20191106\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-09 05:51+0000\n" -"PO-Revision-Date: 2020-01-09 05:51+0000\n" +"POT-Creation-Date: 2020-01-13 10:35+0000\n" +"PO-Revision-Date: 2020-01-13 10:35+0000\n" "Last-Translator: Stepan Savelyev\n" "Language-Team: RYDLAB\n" "MIME-Version: 1.0\n" @@ -47,11 +47,6 @@ msgstr "Оплата в 3 этапа" msgid "Actual Address" msgstr "Актуальный адрес" -#. module: client_contracts -#: model:ir.model.fields,help:client_contracts.field_res_users_okpo -msgid "All-Russian Classifier of Enterprises and Organizations" -msgstr "Общероссийский классификатор предприятий и организаций" - #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_amount_fractional msgid "Amount Fractional Part" @@ -251,6 +246,7 @@ msgstr "Создать документ" #. module: client_contracts #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_annex_create_uid +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_create_uid #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_create_uid #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_transient_create_uid #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_wizard_create_uid @@ -262,6 +258,7 @@ msgstr "Создано" #. module: client_contracts #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_annex_create_date +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_create_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_create_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_transient_create_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_wizard_create_date @@ -373,6 +370,7 @@ msgstr "Generate Context for Contract" #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_annex_id #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_id #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_transient_id +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_id #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_wizard_id #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_annex_id #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_contract_id @@ -451,6 +449,7 @@ msgstr "Последнее изменение" #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_transient_write_uid #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_write_uid #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_wizard_write_uid +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_write_uid #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_annex_write_uid #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_contract_write_uid #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_write_uid @@ -462,6 +461,7 @@ msgstr "Последний раз обновлено" #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_transient_write_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_write_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_wizard_write_date +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_write_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_annex_write_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_contract_write_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_write_date @@ -483,16 +483,25 @@ msgstr "Месяц" #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_annex_name #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_name #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_transient_name -#: model:ir.model.fields,field_description:client_contracts.field_res_partner_name_write #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_annex_name #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_contract_name #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_name -#: model:ir.model.fields,field_description:client_contracts.field_res_users_name_write #: model:res.partner.contract.field,name:client_contracts.contract_field_partner_name #: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_name #: model:res.partner.contract.field,name:client_contracts.contract_field_seller_name #: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_name msgid "Name" +msgstr "Наименование" + +#. module: client_contracts +#: model:ir.ui.view,arch_db:client_contracts.res_partner_contract_info_inherit_view +msgid "Name (in ERP)" +msgstr "Наименование (для ERP)" + +#. module: client_contracts +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_name_write +#: model:ir.model.fields,field_description:client_contracts.field_res_users_name_write +msgid "Name (in contracts)" msgstr "Наименование (для договора)" #. module: client_contracts @@ -529,7 +538,6 @@ msgid "Number" msgstr "Число" #. module: client_contracts -#: model:ir.model.fields,field_description:client_contracts.field_res_users_okpo #: model:res.partner.contract.field,name:client_contracts.contract_field_partner_okpo #: model:res.partner.contract.field,name:client_contracts.contract_field_seller_okpo msgid "OKPO" @@ -671,13 +679,12 @@ msgid "Prepaid Expense" msgstr "Аванс" #. module: client_contracts -#: model:ir.ui.view,arch_db:client_contracts.res_partner_contract_annex_view_form #: model:ir.ui.view,arch_db:client_contracts.res_partner_contract_form msgid "Print" msgstr "Печать" #. module: client_contracts -#: code:addons/client_contracts/models/res_partner_contract.py:97 +#: code:addons/client_contracts/models/res_partner_contract.py:98 #, python-format msgid "Print Form of Contract" msgstr "Форма печати договора" @@ -723,7 +730,7 @@ msgstr "Общество с ограниченной ответственнос #. module: client_contracts #: model:ir.model,name:client_contracts.model_sale_order msgid "Quotation" -msgstr "Предложение цен" +msgstr "Оферта" #. module: client_contracts #: model:ir.ui.view,arch_db:client_contracts.res_partner_contract_form @@ -906,26 +913,11 @@ msgstr "Год" msgid "i.e. Ural Bank for Reconstruction and Development" msgstr "напр. «Уральский банк реконструкции и развития»" -#. module: client_contracts -#: model:ir.model,name:client_contracts.model_res_partner_contract_annex_line -msgid "res.partner.contract.annex.line" -msgstr "res.partner.contract.annex.line" - -#. module: client_contracts -#: model:ir.model,name:client_contracts.model_res_partner_contract_annex_type -msgid "res.partner.contract.annex.type" -msgstr "res.partner.contract.annex.type" - #. module: client_contracts #: model:ir.actions.act_window,name:client_contracts.res_partner_contract_field_action msgid "res.partner.contract.field.action" msgstr "res.partner.contract.field.action" -#. module: client_contracts -#: model:ir.model,name:client_contracts.model_res_partner_contract_template -msgid "res.partner.contract.template" -msgstr "res.partner.contract.template" - #. module: client_contracts #: model:ir.model,name:client_contracts.model_res_partner_contract_wizard msgid "res.partner.contract.wizard" diff --git a/models/res_partner.py b/models/res_partner.py index 4216245..8e73032 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -5,7 +5,7 @@ class ResPartner(models.Model): _inherit = "res.partner" name_write = fields.Char( - string="Name", + string="Name (in contracts)", help="This name uses in contracts", ) name_genitive = fields.Char(string="Name Genitive",) diff --git a/views/res_partner.xml b/views/res_partner.xml index 913a20e..14d2e48 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -35,6 +35,10 @@ + + Name (in ERP) + +