Yaltik/docx_report_generation
2
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

[IMP] rename fields

Browse Source
This commit is contained in:
Stepan Savelyev 2019-12-30 10:21:33 +05:00
parent 501a0ee92b
commit e5da79e35a
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
data/fields_default.xml
View File

@ -49,8 +49,8 @@ ctx = {
"seller_name": seller.name, "seller_name": seller.name,
"seller_company_form": _(dict(seller._fields['company_form'].selection).get(seller.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": seller.representative_id.name,
"seller_representer_name_parent": seller.representative_id.name_parent_case, "seller_representer_name_parent": seller.representative_id.name_genitive,
"seller_representer_name_initials": seller.representative_id.name_initials_case, "seller_representer_name_initials": seller.representative_id.name_initials,
"seller_representer_document_parent": seller.representative_document, "seller_representer_document_parent": seller.representative_document,
"seller_inn": seller.vat, "seller_inn": seller.vat,
"seller_kpp": seller.iec, "seller_kpp": seller.iec,
@ -83,7 +83,7 @@ if seller_bank:
# Person # Person
if not partner.is_company: if not partner.is_company:
ctx.update({ 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_number": partner.passport_number,
"partner_representer_passport_date": partner.passport_date, "partner_representer_passport_date": partner.passport_date,
"partner_representer_passport_department": partner.passport_department, "partner_representer_passport_department": partner.passport_department,
@ -93,8 +93,8 @@ else:
ctx.update({ ctx.update({
"partner_company_form": _(dict(partner._fields['company_form'].selection).get(partner.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": partner.representative_id.name,
"partner_representer_name_parent": partner.representative_id.name_parent_case, "partner_representer_name_parent": partner.representative_id.name_genitive,
"partner_representer_name_initials": partner.representative_id.name_initials_case, "partner_representer_name_initials": partner.representative_id.name_initials,
"partner_representer_document_parent": partner.representative_document, "partner_representer_document_parent": partner.representative_document,
}) })
@ -168,8 +168,8 @@ ctx = {
"seller_name": seller.name, "seller_name": seller.name,
"seller_company_form": _(dict(seller._fields['company_form'].selection).get(seller.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": seller.representative_id.name,
"seller_representer_name_parent": seller.representative_id.name_parent_case, "seller_representer_name_parent": seller.representative_id.name_genitive,
"seller_representer_name_initials": seller.representative_id.name_initials_case, "seller_representer_name_initials": seller.representative_id.name_initials,
"seller_inn": seller.vat, "seller_inn": seller.vat,
"seller_kpp": seller.iec, "seller_kpp": seller.iec,
@ -180,7 +180,7 @@ ctx = {
"partner_name": partner.name, "partner_name": partner.name,
"partner_representer_name": partner.representative_id.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_inn": partner.vat,
"partner_business_address": partner.full_address, "partner_business_address": partner.full_address,
"partner_phone": partner.phone, "partner_phone": partner.phone,
@ -204,7 +204,7 @@ if seller_bank:
# Person # Person
if not partner.is_company: if not partner.is_company:
ctx.update({ 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_number": partner.passport_number,
"partner_representer_passport_date": partner.passport_date, "partner_representer_passport_date": partner.passport_date,
"partner_representer_passport_department": partner.passport_department, "partner_representer_passport_department": partner.passport_department,
@ -213,7 +213,7 @@ else:
# Company # Company
ctx.update({ ctx.update({
"partner_company_form": _(dict(partner._fields['company_form'].selection).get(partner.company_form)), "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, "partner_representer_document_parent": partner.representative_document,
}) })

6
models/res_partner.py
View File

@ -4,9 +4,9 @@ from odoo import api, fields, models
class ResPartner(models.Model): class ResPartner(models.Model):
_inherit = "res.partner" _inherit = "res.partner"
name_parent_case = fields.Char(string="Name Genitive",) name_genitive = fields.Char(string="Name Genitive",)
name_initials_case = fields.Char(string="Name Initials",) name_initials = fields.Char(string="Name Initials",)
function_parent_case = fields.Char(string="Function Genitive",) function_genitive = fields.Char(string="Function Genitive",)
client_contract_ids = fields.One2many( client_contract_ids = fields.One2many(
"res.partner.contract", "partner_id", string="Contracts", "res.partner.contract", "partner_id", string="Contracts",
) )

6
views/res_partner.xml
View File

@ -37,8 +37,8 @@
<xpath expr="//field[@name='type']" position="before"> <xpath expr="//field[@name='type']" position="before">
<field name="name" attrs="{'invisible': [('company_type', '=', 'company')]}"/> <field name="name" attrs="{'invisible': [('company_type', '=', 'company')]}"/>
<field name="name_parent_case" attrs="{'invisible': [('company_type', '=', 'company')]}"/> <field name="name_genitive" attrs="{'invisible': [('company_type', '=', 'company')]}"/>
<field name="name_initials_case" attrs="{'invisible': [('company_type', '=', 'company')]}"/> <field name="name_initials" attrs="{'invisible': [('company_type', '=', 'company')]}"/>
</xpath> </xpath>
<xpath expr="//field[@name='category_id']" position="after"> <xpath expr="//field[@name='category_id']" position="after">
@ -49,7 +49,7 @@
</xpath> </xpath>
<xpath expr="//field[@name='function']" position="after"> <xpath expr="//field[@name='function']" position="after">
<field name="function_parent_case" attrs="{'invisible': [('is_company','=', True)]}"/> <field name="function_genitive" attrs="{'invisible': [('is_company','=', True)]}"/>
</xpath> </xpath>
</field> </field>