diff --git a/data/fields_default.xml b/data/fields_default.xml index b2fb87a..25b5abc 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -49,8 +49,8 @@ ctx = { "seller_name": seller.name, "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_parent_case, - "seller_representer_name_initials": seller.representative_id.name_initials_case, + "seller_representer_name_parent": seller.representative_id.name_genitive, + "seller_representer_name_initials": seller.representative_id.name_initials, "seller_representer_document_parent": seller.representative_document, "seller_inn": seller.vat, "seller_kpp": seller.iec, @@ -83,7 +83,7 @@ if seller_bank: # Person if not partner.is_company: ctx.update({ - "partner_representer_name_initials": partner.name_initials_case, # TODO: remove 'case' + "partner_representer_name_initials": partner.name_initials, "partner_representer_passport_number": partner.passport_number, "partner_representer_passport_date": partner.passport_date, "partner_representer_passport_department": partner.passport_department, @@ -93,8 +93,8 @@ else: ctx.update({ "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_parent_case, - "partner_representer_name_initials": partner.representative_id.name_initials_case, + "partner_representer_name_parent": partner.representative_id.name_genitive, + "partner_representer_name_initials": partner.representative_id.name_initials, "partner_representer_document_parent": partner.representative_document, }) @@ -168,8 +168,8 @@ ctx = { "seller_name": seller.name, "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_parent_case, - "seller_representer_name_initials": seller.representative_id.name_initials_case, + "seller_representer_name_parent": seller.representative_id.name_genitive, + "seller_representer_name_initials": seller.representative_id.name_initials, "seller_inn": seller.vat, "seller_kpp": seller.iec, @@ -180,7 +180,7 @@ ctx = { "partner_name": partner.name, "partner_representer_name": partner.representative_id.name, - "partner_representer_name_initials": partner.representative_id.name_initials_case, # TODO: remove 'case' + "partner_representer_name_initials": partner.representative_id.name_initials, "partner_inn": partner.vat, "partner_business_address": partner.full_address, "partner_phone": partner.phone, @@ -204,7 +204,7 @@ if seller_bank: # Person if not partner.is_company: ctx.update({ - "partner_representer_name_initials": partner.name_initials_case, # TODO: remove 'case' + "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, @@ -213,7 +213,7 @@ else: # Company ctx.update({ "partner_company_form": _(dict(partner._fields['company_form'].selection).get(partner.company_form)), - "partner_representer_name_parent": partner.representative_id.name_parent_case, + "partner_representer_name_parent": partner.representative_id.name_genitive, "partner_representer_document_parent": partner.representative_document, }) diff --git a/models/res_partner.py b/models/res_partner.py index 2ba4261..6ed46e7 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -4,9 +4,9 @@ from odoo import api, fields, models class ResPartner(models.Model): _inherit = "res.partner" - name_parent_case = fields.Char(string="Name Genitive",) - name_initials_case = fields.Char(string="Name Initials",) - function_parent_case = fields.Char(string="Function Genitive",) + name_genitive = fields.Char(string="Name Genitive",) + name_initials = fields.Char(string="Name Initials",) + function_genitive = fields.Char(string="Function Genitive",) client_contract_ids = fields.One2many( "res.partner.contract", "partner_id", string="Contracts", ) diff --git a/views/res_partner.xml b/views/res_partner.xml index c2d63ec..ccb7203 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -37,8 +37,8 @@ - - + + @@ -49,7 +49,7 @@ - +