diff --git a/models/res_partner.py b/models/res_partner.py index 2237e1ddb01ba29163d91b13d46243f401223712..79f156bfcca058642ba25a3f7debf8ac708b50af 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -122,7 +122,7 @@ class ResPartner(models.Model): # ------------------------------------------------------ @api.model def _get_default_address_format_simple(self): - return "%(street)s\n%(street2)s\n%(city)s %(zip)s\n" + return "%(street)s\n%(street2)s\n%(street3)s\n%(city)s %(zip)s\n" @api.model def _get_address_format_simple(self): diff --git a/views/res_partner.xml b/views/res_partner.xml index 67b292da482b5305a9bf6be3c48feee61f03631b..3c71ed399e59f6c22c36ed2751cb4d341b60215c 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -386,18 +386,6 @@ attrs="{'invisible': ['|', ('parent_id', '!=', False), ('is_company', '!=', False)]}" readonly="1" /> - <field - name="release_receipt_id" - options="{'no_open': True, 'no_create': True}" - attrs="{'invisible': [('parent_id', '=', False)]}" - widget="selection" - /> - <field - name="agroforestry_involvement_id" - options="{'no_open': True, 'no_create': True}" - attrs="{'invisible': [('parent_id', '=', False)]}" - widget="selection" - /> </xpath> <xpath expr="//field[@name='function']" position="before"> <field @@ -417,6 +405,18 @@ attrs="{'invisible': [('parent_id', '=', False)]}" options="{'no_open': True, 'no_create': True}" /> + <field + name="release_receipt_id" + options="{'no_open': True, 'no_create': True}" + attrs="{'invisible': [('parent_id', '=', False)]}" + widget="selection" + /> + <field + name="agroforestry_involvement_id" + options="{'no_open': True, 'no_create': True}" + attrs="{'invisible': [('parent_id', '=', False)]}" + widget="selection" + /> </xpath> <xpath expr="//field[@name='child_ids']" position="attributes"> <attribute @@ -476,11 +476,29 @@ <field name="is_legal_representative" widget="boolean_toggle" /> <field name="mandate_id" /> </xpath> + <xpath + expr="//field[@name='child_ids']/form/sheet/group/group/field[@name='mobile']" + position="after" + > + <field name="phone3" widget="phone" /> + </xpath> <xpath expr="//field[@name='child_ids']/form/sheet/group/group/field[@name='function']" position="after" > <field name="service_department" /> + <field + name="release_receipt_id" + options="{'no_open': True, 'no_create': True}" + attrs="{'invisible': [('parent_id', '=', False)]}" + widget="selection" + /> + <field + name="agroforestry_involvement_id" + options="{'no_open': True, 'no_create': True}" + attrs="{'invisible': [('parent_id', '=', False)]}" + widget="selection" + /> </xpath> <xpath expr="//field[@name='child_ids']/form/sheet/group/group/field[@name='comment']"