Browse Source

Merge PR #836 into 12.0

Signed-off-by NL66278
12.0
OCA-git-bot 5 years ago
parent
commit
44a4c87cf3
  1. 7
      partner_company_type/models/res_partner_company_type.py
  2. 1
      partner_company_type/readme/CONTRIBUTORS.rst
  3. 1
      partner_company_type/views/res_partner.xml
  4. 2
      partner_company_type/views/res_partner_company_type.xml

7
partner_company_type/models/res_partner_company_type.py

@ -18,6 +18,13 @@ class ResPartnerCompanyType(models.Model):
string='Abbreviation', string='Abbreviation',
translate=True, translate=True,
) )
country_id = fields.Many2one(
comodel_name="res.country",
string="Country",
help="Allows this company type to be selected on partners from this "
"country only. "
"Leave it blank if you want it to appear on any partner.",
)
_sql_constraints = [('name_uniq', 'unique (name)', _sql_constraints = [('name_uniq', 'unique (name)',
"Partner Company Type already exists!")] "Partner Company Type already exists!")]

1
partner_company_type/readme/CONTRIBUTORS.rst

@ -1,2 +1,3 @@
* Denis Roussel <denis.roussel@acsone.eu> (https://acsone.eu) * Denis Roussel <denis.roussel@acsone.eu> (https://acsone.eu)
* Gilles Meyomesse <gilles.meyomesse@acsone.eu> (https://acsone.eu) * Gilles Meyomesse <gilles.meyomesse@acsone.eu> (https://acsone.eu)
* Quentin Groulard <quentin.groulard@acsone.eu> (https://acsone.eu)

1
partner_company_type/views/res_partner.xml

@ -10,6 +10,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="title" position="after"> <field name="title" position="after">
<field name="partner_company_type_id" options='{"no_open": True}' <field name="partner_company_type_id" options='{"no_open": True}'
domain="['|', ('country_id', '=', False), ('country_id', '=', country_id)]"
attrs="{'invisible': [('is_company', '=', False)]}"/> attrs="{'invisible': [('is_company', '=', False)]}"/>
</field> </field>
</field> </field>

2
partner_company_type/views/res_partner_company_type.xml

@ -11,6 +11,7 @@
<group col="4"> <group col="4">
<field name="name"/> <field name="name"/>
<field name="shortcut"/> <field name="shortcut"/>
<field name="country_id"/>
</group> </group>
</form> </form>
</field> </field>
@ -33,6 +34,7 @@
<tree> <tree>
<field name="name"/> <field name="name"/>
<field name="shortcut"/> <field name="shortcut"/>
<field name="country_id"/>
</tree> </tree>
</field> </field>
</record> </record>

Loading…
Cancel
Save