From 337953a2597a2fe20961f09ea1f95d823ab42da1 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Mon, 30 Dec 2019 15:11:55 +0500 Subject: [PATCH 001/134] [i18n] update --- i18n/ru.po | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/i18n/ru.po b/i18n/ru.po index b48285f..b4c50ac 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: 2019-12-28 10:32+0000\n" -"PO-Revision-Date: 2019-12-28 10:32+0000\n" +"POT-Creation-Date: 2019-12-30 10:11+0000\n" +"PO-Revision-Date: 2019-12-30 10:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -268,7 +268,6 @@ msgid "Created by" msgstr "Создано" #. module: client_contracts -#: code:addons/client_contracts/models/res_partner_contract.py:40 #: 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_field_create_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_transient_create_date @@ -276,7 +275,6 @@ msgstr "Создано" #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_annex_create_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_contract_create_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_create_date -#, python-format msgid "Created on" msgstr "Создан" @@ -365,8 +363,8 @@ msgid "Function" msgstr "Должность" #. module: client_contracts -#: model:ir.model.fields,field_description:client_contracts.field_res_partner_function_parent_case -#: model:ir.model.fields,field_description:client_contracts.field_res_users_function_parent_case +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_function_genitive +#: model:ir.model.fields,field_description:client_contracts.field_res_users_function_genitive #: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_function_parent #: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_function_parent msgid "Function Genitive" @@ -488,16 +486,16 @@ msgid "Name" msgstr "Название" #. module: client_contracts -#: model:ir.model.fields,field_description:client_contracts.field_res_partner_name_parent_case -#: model:ir.model.fields,field_description:client_contracts.field_res_users_name_parent_case +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_name_genitive +#: model:ir.model.fields,field_description:client_contracts.field_res_users_name_genitive #: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_name_parent #: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_name_parent msgid "Name Genitive" msgstr "Имя (род.падеж)" #. module: client_contracts -#: model:ir.model.fields,field_description:client_contracts.field_res_partner_name_initials_case -#: model:ir.model.fields,field_description:client_contracts.field_res_users_name_initials_case +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_name_initials +#: model:ir.model.fields,field_description:client_contracts.field_res_users_name_initials #: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_name_initials #: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_name_initials msgid "Name Initials" From 16dcc0ee893b39a7342ed51c6a9f6009945bfe43 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Mon, 30 Dec 2019 15:16:29 +0500 Subject: [PATCH 002/134] [FIX] incorrect domain --- views/res_partner.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/res_partner.xml b/views/res_partner.xml index 43a0884..2867506 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -42,7 +42,7 @@ - + From c0ebd07d6b3f29943eb4826f74518248048f1c4d Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Mon, 30 Dec 2019 15:27:24 +0500 Subject: [PATCH 003/134] [FIX] _() is not defined --- data/fields_default.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index 4446eba..6c20677 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -46,7 +46,7 @@ ctx = { "yyyy": yyyy, "seller_name": seller.name, - "seller_company_form": _(dict(seller._fields['company_form'].selection).get(seller.company_form)), + "seller_company_form": seller.read(["company_form"])[0]['company_form'], "seller_representer_name": seller.representative_id.name, "seller_representer_name_parent": seller.representative_id.name_genitive, "seller_representer_name_initials": seller.representative_id.name_initials, @@ -90,7 +90,7 @@ if not partner.is_company: else: # Company ctx.update({ - "partner_company_form": _(dict(partner._fields['company_form'].selection).get(partner.company_form)), + "partner_company_form": partner.read(["company_form"])[0]['company_form'], "partner_representer_name": partner.representative_id.name, "partner_representer_name_parent": partner.representative_id.name_genitive, "partner_representer_name_initials": partner.representative_id.name_initials, From 3e2f796964f7d4d7f1d6755a2136d2897066a804 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Mon, 30 Dec 2019 15:42:12 +0500 Subject: [PATCH 004/134] Revert "[FIX] _() is not defined" This reverts commit c0ebd07d6b3f29943eb4826f74518248048f1c4d. --- data/fields_default.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index 6c20677..4446eba 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -46,7 +46,7 @@ ctx = { "yyyy": yyyy, "seller_name": seller.name, - "seller_company_form": seller.read(["company_form"])[0]['company_form'], + "seller_company_form": _(dict(seller._fields['company_form'].selection).get(seller.company_form)), "seller_representer_name": seller.representative_id.name, "seller_representer_name_parent": seller.representative_id.name_genitive, "seller_representer_name_initials": seller.representative_id.name_initials, @@ -90,7 +90,7 @@ if not partner.is_company: else: # Company ctx.update({ - "partner_company_form": partner.read(["company_form"])[0]['company_form'], + "partner_company_form": _(dict(partner._fields['company_form'].selection).get(partner.company_form)), "partner_representer_name": partner.representative_id.name, "partner_representer_name_parent": partner.representative_id.name_genitive, "partner_representer_name_initials": partner.representative_id.name_initials, From 607dd42dd16b8527a76292f20395f271a4663413 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Mon, 30 Dec 2019 15:42:36 +0500 Subject: [PATCH 005/134] Revert "[FIX] not found function _()" This reverts commit f9fa8aac891b981d0edb2054a21a2f443b0ce632. --- data/fields_default.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/fields_default.xml b/data/fields_default.xml index 4446eba..7f8d3a7 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -20,6 +20,7 @@ seller = self.company_id seller_bank = seller.bank_ids and seller.bank_ids[0] # Functions +_ = self._ get_date = self.get_date # Parse date @@ -138,6 +139,7 @@ seller_bank = seller.bank_ids and seller.bank_ids[0] partner_bank = partner.bank_ids and partner.bank_ids[0] # Functions +_ = self.contract_id._ get_date = self.contract_id.get_date # Parse date From 467b1b200c1d0f2d633d15af47300ac0cbf8700b Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Mon, 30 Dec 2019 15:42:46 +0500 Subject: [PATCH 006/134] Revert "[RM] _() from action context" This reverts commit 9e226228b7c9ac9b5c6ac1846fda1e8f339a1ad1. --- data/fields_default.xml | 6 +++--- models/res_partner_contract.py | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index 7f8d3a7..25b5abc 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -166,7 +166,7 @@ ctx = { "yyyy": yyyy, "seller_name": seller.name, - "seller_company_form": seller.read(["company_form"])[0]['company_form'], + "seller_company_form": _(dict(seller._fields['company_form'].selection).get(seller.company_form)), "seller_representer_name": seller.representative_id.name, "seller_representer_name_parent": seller.representative_id.name_genitive, "seller_representer_name_initials": seller.representative_id.name_initials, @@ -204,7 +204,7 @@ if seller_bank: # Person if not partner.is_company: ctx.update({ - "partner_representer_name_initials": partner.name_initials, + "partner_representer_name_initials": partner.name_initials, # TODO: remove 'case' "partner_representer_passport_number": partner.passport_number, "partner_representer_passport_date": partner.passport_date, "partner_representer_passport_department": partner.passport_department, @@ -212,7 +212,7 @@ if not partner.is_company: else: # Company ctx.update({ - "partner_company_form": partner.read(["company_form"])[0]['company_form'], + "partner_company_form": _(dict(partner._fields['company_form'].selection).get(partner.company_form)), "partner_representer_name_parent": partner.representative_id.name_genitive, "partner_representer_document_parent": partner.representative_document, }) diff --git a/models/res_partner_contract.py b/models/res_partner_contract.py index 3afef6d..3844346 100644 --- a/models/res_partner_contract.py +++ b/models/res_partner_contract.py @@ -115,6 +115,14 @@ class PartnerContract(models.Model): date = datetime.datetime.strptime(date, DEFAULT_SERVER_DATETIME_FORMAT) return date + def _(self, arg): + """Uses in xml action (data/fields_default) + + Arguments: + arg {str} -- String to translate + """ + return _(arg) + class PrintTemplate(models.Model): _name = "res.partner.template.print" From 0204140430a6e105966f64239e992c80007088da Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Mon, 30 Dec 2019 16:01:44 +0500 Subject: [PATCH 007/134] [ADD] whatsapp and telegram phone --- models/res_partner.py | 6 ++++++ views/res_partner.xml | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/models/res_partner.py b/models/res_partner.py index 6ed46e7..c5123c7 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -24,6 +24,12 @@ class ResPartner(models.Model): string="Representative acts on the basis of", help="Parent Case", ) signature = fields.Binary(string="Client signature") + phone_whatsup = fields.Char( + string="WhatsApp", help="If a contact have a WhatsApp number", + ) + phone_telegram = fields.Char( + string="Telegram", help="If a contact have a Telegram number or identifier", + ) @api.depends("street", "street2", "city", "state_id", "zip", "country_id") def _compute_full_address(self): diff --git a/views/res_partner.xml b/views/res_partner.xml index 2867506..d0bcd92 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -52,6 +52,11 @@ + + + + + From be3339e8d46c0cd4d31627260328f8d8c03e7817 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Mon, 30 Dec 2019 16:02:07 +0500 Subject: [PATCH 008/134] [STYLE] black --- models/res_partner_contract.py | 4 +++- models/res_partner_contract_annex.py | 4 +++- utils/__init__.py | 2 +- wizard/res_partner_contract_wizard.py | 15 ++++++++++++--- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/models/res_partner_contract.py b/models/res_partner_contract.py index 3844346..51c8368 100644 --- a/models/res_partner_contract.py +++ b/models/res_partner_contract.py @@ -90,7 +90,9 @@ class PartnerContract(models.Model): @api.multi def action_print_form(self): - view = self.env.ref("{}.res_partner_wizard_print_contract_view".format(MODULE_NAME)) + view = self.env.ref( + "{}.res_partner_wizard_print_contract_view".format(MODULE_NAME) + ) return { "name": _("Print Form of Contract"), "type": "ir.actions.act_window", diff --git a/models/res_partner_contract_annex.py b/models/res_partner_contract_annex.py index 6aa8b38..d416506 100644 --- a/models/res_partner_contract_annex.py +++ b/models/res_partner_contract_annex.py @@ -58,7 +58,9 @@ class ContractOrderAnnex(models.Model): @api.multi def action_print_form(self): - view = self.env.ref("{}.res_partner_wizard_print_annex_view".format(MODULE_NAME)) + view = self.env.ref( + "{}.res_partner_wizard_print_annex_view".format(MODULE_NAME) + ) return { "name": _("Print Form of Contract Annex"), "type": "ir.actions.act_window", diff --git a/utils/__init__.py b/utils/__init__.py index 5b306d3..6d0f55e 100644 --- a/utils/__init__.py +++ b/utils/__init__.py @@ -1 +1 @@ -MODULE_NAME = __package__.split('.')[-2] +MODULE_NAME = __package__.split(".")[-2] diff --git a/wizard/res_partner_contract_wizard.py b/wizard/res_partner_contract_wizard.py index 65e0d14..7815afb 100644 --- a/wizard/res_partner_contract_wizard.py +++ b/wizard/res_partner_contract_wizard.py @@ -77,8 +77,12 @@ class ContractWizard(models.TransientModel): self.partner_id = partner_id model_to_action = { - "res.partner.contract": "{}.action_get_contract_context".format(MODULE_NAME), - "res.partner.contract.annex": "{}.action_get_annex_context".format(MODULE_NAME), + "res.partner.contract": "{}.action_get_contract_context".format( + MODULE_NAME + ), + "res.partner.contract.annex": "{}.action_get_annex_context".format( + MODULE_NAME + ), } action = model_to_action[active_model] @@ -98,7 +102,12 @@ class ContractWizard(models.TransientModel): .id, 0, ) - for field, value in sorted(contract_context_values.items(), key=lambda tpl: self.env.ref("{}.contract_field_{}".format(MODULE_NAME, tpl[0])).sequence) + for field, value in sorted( + contract_context_values.items(), + key=lambda tpl: self.env.ref( + "{}.contract_field_{}".format(MODULE_NAME, tpl[0]) + ).sequence, + ) ] # Set up template domain From 4e2ae235d674c945d43800d7437f14afccf49aef Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Thu, 9 Jan 2020 08:32:13 +0500 Subject: [PATCH 009/134] [IMP] rename whatsup to whatsapp --- models/res_partner.py | 2 +- views/res_partner.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/models/res_partner.py b/models/res_partner.py index c5123c7..7867e4b 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -24,7 +24,7 @@ class ResPartner(models.Model): string="Representative acts on the basis of", help="Parent Case", ) signature = fields.Binary(string="Client signature") - phone_whatsup = fields.Char( + phone_whatsapp = fields.Char( string="WhatsApp", help="If a contact have a WhatsApp number", ) phone_telegram = fields.Char( diff --git a/views/res_partner.xml b/views/res_partner.xml index d0bcd92..6f54c01 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -52,7 +52,7 @@ - + From 7037f5f24d26a5dce7253c9e5827474d9763890a Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Thu, 9 Jan 2020 08:32:23 +0500 Subject: [PATCH 010/134] [i18n] update --- i18n/ru.po | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/i18n/ru.po b/i18n/ru.po index b4c50ac..8174312 100644 --- a/i18n/ru.po +++ b/i18n/ru.po @@ -6,10 +6,10 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0-20191106\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-30 10:11+0000\n" -"PO-Revision-Date: 2019-12-30 10:11+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" +"POT-Creation-Date: 2020-01-09 03:29+0000\n" +"PO-Revision-Date: 2020-01-09 03:29+0000\n" +"Last-Translator: Stepan Savelyev\n" +"Language-Team: RYDLAB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -63,7 +63,7 @@ msgid "Amount Whole Part" msgstr "Целая часть суммы" #. module: client_contracts -#: code:addons/client_contracts/wizard/res_partner_contract_wizard.py:139 +#: code:addons/client_contracts/wizard/res_partner_contract_wizard.py:148 #: model:ir.ui.menu,name:client_contracts.res_partner_menu_contracts_templates_annex #, python-format msgid "Annex" @@ -169,7 +169,7 @@ msgid "Contact" msgstr "Контакт" #. module: client_contracts -#: code:addons/client_contracts/wizard/res_partner_contract_wizard.py:136 +#: code:addons/client_contracts/wizard/res_partner_contract_wizard.py:145 #: model:ir.model,name:client_contracts.model_res_partner_contract #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_annex_contract_id #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_transient__contract_wizard_id @@ -405,6 +405,18 @@ msgstr "ИП Выдан" msgid "IP Number" msgstr "ИП Серия и номер" +#. module: client_contracts +#: model:ir.model.fields,help:client_contracts.field_res_partner_phone_telegram +#: model:ir.model.fields,help:client_contracts.field_res_users_phone_telegram +msgid "If a contact have a Telegram number or identifier" +msgstr "Номер или идентификатор в Telegram" + +#. module: client_contracts +#: model:ir.model.fields,help:client_contracts.field_res_partner_phone_whatsapp +#: model:ir.model.fields,help:client_contracts.field_res_users_phone_whatsapp +msgid "If a contact have a WhatsApp number" +msgstr "Номер в WhatsApp" + #. module: client_contracts #: selection:res.partner.template.print,company_type:0 #: selection:res.partner.template.print.annex,company_type:0 @@ -660,13 +672,13 @@ msgid "Print" msgstr "Печать" #. module: client_contracts -#: code:addons/client_contracts/models/res_partner_contract.py:95 +#: code:addons/client_contracts/models/res_partner_contract.py:97 #, python-format msgid "Print Form of Contract" msgstr "Форма печати договора" #. module: client_contracts -#: code:addons/client_contracts/models/res_partner_contract_annex.py:63 +#: code:addons/client_contracts/models/res_partner_contract_annex.py:65 #, python-format msgid "Print Form of Contract Annex" msgstr "Форма печати приложения к договору" @@ -816,6 +828,12 @@ msgstr "Ссылка" msgid "Technical Name" msgstr "Техническое название" +#. module: client_contracts +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_phone_telegram +#: model:ir.model.fields,field_description:client_contracts.field_res_users_phone_telegram +msgid "Telegram" +msgstr "Telegram" + #. module: client_contracts #: model:ir.ui.view,arch_db:client_contracts.res_partner_wizard_print_annex_view #: model:ir.ui.view,arch_db:client_contracts.res_partner_wizard_print_contract_view @@ -854,6 +872,12 @@ msgstr "Номер приложения" msgid "Value" msgstr "Значение" +#. module: client_contracts +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_phone_whatsapp +#: model:ir.model.fields,field_description:client_contracts.field_res_users_phone_whatsapp +msgid "WhatsApp" +msgstr "WhatsApp" + #. module: client_contracts #: model:res.partner.contract.field,description:client_contracts.contract_field_MM msgid "Word" From 0ba04cdb17ac78ad02973cf46a17244fad862631 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Thu, 9 Jan 2020 09:20:04 +0500 Subject: [PATCH 011/134] [ADD] passport department code --- data/fields_default.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/data/fields_default.xml b/data/fields_default.xml index 25b5abc..045d22d 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -87,6 +87,7 @@ if not partner.is_company: "partner_representer_passport_number": partner.passport_number, "partner_representer_passport_date": partner.passport_date, "partner_representer_passport_department": partner.passport_department, + "partner_representer_passport_department_code": partner.passport_department_code, }) else: # Company @@ -107,6 +108,7 @@ else: "partner_representer_passport_number": partner.representative_id.passport_number, "partner_representer_passport_date": partner.representative_id.passport_date, "partner_representer_passport_department": partner.representative_id.passport_department, + "partner_representer_passport_department_code": partner.representative_id.passport_department_code, }) if partner.company_form == 'plc': # Private Limited Company @@ -401,6 +403,13 @@ action = ctx 144 + + Passport Department Code + seller_representer_passport_department_code + Seller Representative + 146 + + INN seller_inn @@ -579,6 +588,13 @@ action = ctx 344 + + Passport Department Code + partner_representer_passport_department_code + Partner Representative + 346 + + INN partner_inn From 1b39f2e049ee9a11ea0ad574d18f4bc5f17ff3e9 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Thu, 9 Jan 2020 09:24:57 +0500 Subject: [PATCH 012/134] [IMP] remove attr related from name of template model --- models/res_partner_contract.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/res_partner_contract.py b/models/res_partner_contract.py index 51c8368..b754a51 100644 --- a/models/res_partner_contract.py +++ b/models/res_partner_contract.py @@ -130,7 +130,7 @@ class PrintTemplate(models.Model): _name = "res.partner.template.print" _description = "Print Template" - name = fields.Char(related="attachment_id.name",) + name = fields.Char() attachment_id = fields.Many2one( "ir.attachment", string="Template Attachment", required=True, ) From ae66dc348d1c59bcc8f6b99495cb1796b8b6d09a Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Thu, 9 Jan 2020 10:53:42 +0500 Subject: [PATCH 013/134] [ADD] name of contact uses in contracts --- data/fields_default.xml | 4 ++-- i18n/ru.po | 37 +++++++++++++++++++++++++++---------- models/res_partner.py | 4 ++++ views/res_partner.xml | 2 +- 4 files changed, 34 insertions(+), 13 deletions(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index 045d22d..e3e0ded 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -46,7 +46,7 @@ ctx = { "yy": yy, "yyyy": yyyy, - "seller_name": seller.name, + "seller_name": seller.name_write, "seller_company_form": _(dict(seller._fields['company_form'].selection).get(seller.company_form)), "seller_representer_name": seller.representative_id.name, "seller_representer_name_parent": seller.representative_id.name_genitive, @@ -59,7 +59,7 @@ ctx = { "seller_phone": seller.phone, "seller_email": seller.email, - "partner_name": partner.name, + "partner_name": partner.name_write, "partner_inn": partner.vat, "partner_business_address": partner.full_address, "partner_phone": partner.phone, diff --git a/i18n/ru.po b/i18n/ru.po index 8174312..51dcc84 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 03:29+0000\n" -"PO-Revision-Date: 2020-01-09 03:29+0000\n" +"POT-Creation-Date: 2020-01-09 05:51+0000\n" +"PO-Revision-Date: 2020-01-09 05:51+0000\n" "Last-Translator: Stepan Savelyev\n" "Language-Team: RYDLAB\n" "MIME-Version: 1.0\n" @@ -89,13 +89,6 @@ msgstr "Приложения" msgid "Annexes to this contract" msgstr "Приложения к договору" -#. module: client_contracts -#: 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 -msgid "Attachment Name" -msgstr "Название вложения" - #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_partner_bic #: model:res.partner.contract.field,name:client_contracts.contract_field_seller_bic @@ -490,12 +483,17 @@ 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 "Название" +msgstr "Наименование" #. module: client_contracts #: model:ir.model.fields,field_description:client_contracts.field_res_partner_name_genitive @@ -596,10 +594,17 @@ msgstr "Партнёр; Сертификат о регистрации ИП" #: model:res.partner.contract.field,description:client_contracts.contract_field_partner_representer_name_parent #: model:res.partner.contract.field,description:client_contracts.contract_field_partner_representer_passport_date #: model:res.partner.contract.field,description:client_contracts.contract_field_partner_representer_passport_department +#: model:res.partner.contract.field,description:client_contracts.contract_field_partner_representer_passport_department_code #: model:res.partner.contract.field,description:client_contracts.contract_field_partner_representer_passport_number msgid "Partner Representative" msgstr "Представитель Партнёра" +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_passport_department_code +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_passport_department_code +msgid "Passport Department Code" +msgstr "Код подразделения, выдавшего паспорт" + #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_passport_department #: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_passport_department @@ -781,6 +786,7 @@ msgstr "Продавец; Сертификат о регистрации ИП" #: model:res.partner.contract.field,description:client_contracts.contract_field_seller_representer_name_parent #: model:res.partner.contract.field,description:client_contracts.contract_field_seller_representer_passport_date #: model:res.partner.contract.field,description:client_contracts.contract_field_seller_representer_passport_department +#: model:res.partner.contract.field,description:client_contracts.contract_field_seller_representer_passport_department_code #: model:res.partner.contract.field,description:client_contracts.contract_field_seller_representer_passport_number msgid "Seller Representative" msgstr "Представитель Продавца" @@ -867,6 +873,12 @@ msgstr "Шаблоны" msgid "The Number of Annex" msgstr "Номер приложения" +#. module: client_contracts +#: model:ir.model.fields,help:client_contracts.field_res_partner_name_write +#: model:ir.model.fields,help:client_contracts.field_res_users_name_write +msgid "This name uses in contracts" +msgstr "Наименование, используемое при заполнении договоров" + #. module: client_contracts #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_transient_value msgid "Value" @@ -889,6 +901,11 @@ msgstr "Слово" msgid "Year" msgstr "Год" +#. module: client_contracts +#: model:ir.ui.view,arch_db:client_contracts.res_partner_contract_info_inherit_view +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" diff --git a/models/res_partner.py b/models/res_partner.py index 7867e4b..01ce1e3 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -4,6 +4,10 @@ from odoo import api, fields, models class ResPartner(models.Model): _inherit = "res.partner" + name_write = fields.Char( + string="Name", + help="This name uses in contracts", + ) name_genitive = fields.Char(string="Name Genitive",) name_initials = fields.Char(string="Name Initials",) function_genitive = fields.Char(string="Function Genitive",) diff --git a/views/res_partner.xml b/views/res_partner.xml index 6f54c01..d969b82 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -36,7 +36,7 @@ - + From 89172598211407e77dcea02145fd79b4c555f0d7 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Thu, 9 Jan 2020 10:55:58 +0500 Subject: [PATCH 014/134] [IMP] use is_company instead of company_type --- views/res_partner.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/views/res_partner.xml b/views/res_partner.xml index d969b82..321a5b1 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -37,13 +37,13 @@ - - + + - - + + From bc6f13172b938fb479faa5cfa0342894f82bee5b Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Thu, 9 Jan 2020 16:58:54 +0500 Subject: [PATCH 015/134] [FIX] res_model is required but null because of bug with mail_followers --- models/res_partner_contract.py | 1 + 1 file changed, 1 insertion(+) diff --git a/models/res_partner_contract.py b/models/res_partner_contract.py index b754a51..d6efe68 100644 --- a/models/res_partner_contract.py +++ b/models/res_partner_contract.py @@ -36,6 +36,7 @@ class PartnerContract(models.Model): """Returns timestamp of now by local datetime""" return datetime.datetime.now().timestamp() + res_model = fields.Char(default=lambda self: self._name) name = fields.Char(string="Contract number", default=_get_default_name,) create_date = fields.Datetime(string="Created on") create_date_ts = fields.Char(default=_get_default_create_date_ts) From 29bcc527cbcd1d8c30412b16cb43d7a73e45f6c2 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Fri, 10 Jan 2020 09:54:04 +0500 Subject: [PATCH 016/134] [IMP] move button from form to tree --- views/res_partner_contract.xml | 5 ++++- views/res_partner_contract_annex.xml | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/views/res_partner_contract.xml b/views/res_partner_contract.xml index 143ba07..e38d2d9 100644 --- a/views/res_partner_contract.xml +++ b/views/res_partner_contract.xml @@ -42,7 +42,10 @@ - + + +