Merge branch 'development' into staging
This commit is contained in:
commit
92942a7f05
@ -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':
|
||||
|
@ -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"
|
||||
|
@ -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",
|
||||
)
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -36,6 +36,10 @@
|
||||
<field name="name_initials" attrs="{'invisible': [('is_company', '=', True)]}"/>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//field[@name='function']" position="after">
|
||||
<field name="function_genitive" attrs="{'invisible': [('is_company', '=', True)]}"/>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//field[@name='category_id']" position="after">
|
||||
<field name="representative_id" domain="[('is_company', '=', False)]" attrs="{'invisible': [('is_company', '=', False)]}"/>
|
||||
<field name="representative_document" attrs="{'invisible': [('is_company', '=', False)]}"/>
|
||||
|
Loading…
x
Reference in New Issue
Block a user