diff --git a/data/fields_default.xml b/data/fields_default.xml index 98fe889..12633a3 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -56,6 +56,8 @@ ctx = { "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, + "seller_representer_function": seller.representative_id.function, + "seller_representer_function_parent": seller.representative_id.function_genitive, "seller_representer_document_parent": seller.representative_document, "seller_inn": seller.vat, "seller_kpp": seller.iec, @@ -113,6 +115,8 @@ else: "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, + "partner_representer_function": partner.representative_id.function, + "partner_representer_function_parent": partner.representative_id.function_genitive, "partner_representer_document_parent": partner.representative_document, }) @@ -208,6 +212,8 @@ ctx = { "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, + "seller_representer_function": seller.representative_id.function, + "seller_representer_function_parent": seller.representative_id.function_genitive, "seller_inn": seller.vat, "seller_kpp": seller.iec, @@ -261,6 +267,8 @@ else: "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, + "partner_representer_function": partner.representative_id.function, + "partner_representer_function_parent": partner.representative_id.function_genitive, }) if partner.company_form == 'sp': diff --git a/i18n/ru.po b/i18n/ru.po index a1ca1c4..4356772 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-20 08:56+0000\n" -"PO-Revision-Date: 2020-01-20 08:56+0000\n" +"POT-Creation-Date: 2020-01-21 14:27+0000\n" +"PO-Revision-Date: 2020-01-21 14:27+0000\n" "Last-Translator: Stepan Savelyev\n" "Language-Team: RYDLAB\n" "MIME-Version: 1.0\n" @@ -263,11 +263,6 @@ msgstr "Информация" msgid "Contracts" msgstr "Договоры" -#. module: client_contracts -#: model:ir.model.fields,field_description:client_contracts.field_crm_lead_cost_price -msgid "Cost Price" -msgstr "Себестоимость" - #. module: client_contracts #: model:ir.model.fields,help:client_contracts.field_res_partner_contract_contract_annex_number msgid "Counter for generate Annex name" diff --git a/models/res_partner.py b/models/res_partner.py index 2efb81d..7a9f426 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -9,9 +9,7 @@ class ResPartner(models.Model): ) name_genitive = fields.Char(string="Name Genitive",) name_initials = fields.Char(string="Name Initials",) - function_genitive = fields.Char( - string="Function Genitive", - ) # TODO: have no use of this + function_genitive = fields.Char(string="Function Genitive",) client_contract_ids = fields.One2many( "res.partner.contract", "partner_id", string="Contracts", ) diff --git a/static/assets/documents/person/addition_act_1_person.docx b/static/assets/documents/person/addition_act_1_person.docx index 8e7ca10..0a6d808 100644 Binary files a/static/assets/documents/person/addition_act_1_person.docx and b/static/assets/documents/person/addition_act_1_person.docx differ diff --git a/static/assets/documents/person/addition_act_2_person.docx b/static/assets/documents/person/addition_act_2_person.docx index 5eccbbc..35474c0 100644 Binary files a/static/assets/documents/person/addition_act_2_person.docx and b/static/assets/documents/person/addition_act_2_person.docx differ diff --git a/static/assets/documents/person/bill_person.docx b/static/assets/documents/person/bill_person.docx index 87e449e..ced8f83 100644 Binary files a/static/assets/documents/person/bill_person.docx and b/static/assets/documents/person/bill_person.docx differ diff --git a/static/assets/documents/person/contract_postavki_person.docx b/static/assets/documents/person/contract_postavki_person.docx index fb9243d..6f47f5a 100644 Binary files a/static/assets/documents/person/contract_postavki_person.docx and b/static/assets/documents/person/contract_postavki_person.docx differ diff --git a/static/assets/documents/plc/addition_act_1_plc.docx b/static/assets/documents/plc/addition_act_1_plc.docx index 4b4c53e..37bb07d 100644 Binary files a/static/assets/documents/plc/addition_act_1_plc.docx and b/static/assets/documents/plc/addition_act_1_plc.docx differ diff --git a/static/assets/documents/plc/addition_act_2_plc.docx b/static/assets/documents/plc/addition_act_2_plc.docx index e58fccd..29c4c3e 100644 Binary files a/static/assets/documents/plc/addition_act_2_plc.docx and b/static/assets/documents/plc/addition_act_2_plc.docx differ diff --git a/static/assets/documents/plc/bill_plc.docx b/static/assets/documents/plc/bill_plc.docx index 4ca442f..5e63f8c 100644 Binary files a/static/assets/documents/plc/bill_plc.docx and b/static/assets/documents/plc/bill_plc.docx differ diff --git a/static/assets/documents/plc/contract_postavki_plc.docx b/static/assets/documents/plc/contract_postavki_plc.docx index fb6e6ca..2fdadd3 100644 Binary files a/static/assets/documents/plc/contract_postavki_plc.docx and b/static/assets/documents/plc/contract_postavki_plc.docx differ diff --git a/static/assets/documents/sp/addition_act_1_sp.docx b/static/assets/documents/sp/addition_act_1_sp.docx index 4b27d4e..da01acc 100644 Binary files a/static/assets/documents/sp/addition_act_1_sp.docx and b/static/assets/documents/sp/addition_act_1_sp.docx differ diff --git a/static/assets/documents/sp/addition_act_2_sp.docx b/static/assets/documents/sp/addition_act_2_sp.docx index 254863f..0bd89ea 100644 Binary files a/static/assets/documents/sp/addition_act_2_sp.docx and b/static/assets/documents/sp/addition_act_2_sp.docx differ diff --git a/static/assets/documents/sp/bill_sp.docx b/static/assets/documents/sp/bill_sp.docx index 3a0c245..021c43a 100644 Binary files a/static/assets/documents/sp/bill_sp.docx and b/static/assets/documents/sp/bill_sp.docx differ diff --git a/static/assets/documents/sp/contract_postavki_sp.docx b/static/assets/documents/sp/contract_postavki_sp.docx index 94c2614..d819a83 100644 Binary files a/static/assets/documents/sp/contract_postavki_sp.docx and b/static/assets/documents/sp/contract_postavki_sp.docx differ diff --git a/views/res_partner.xml b/views/res_partner.xml index 381a2e0..fa0fb71 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -36,6 +36,10 @@ + + + +