diff --git a/__manifest__.py b/__manifest__.py index 5c5d87209fc872df5fd1ab22a307d25dabf744a3..4c1338812fb3b006702c6ef7a65a86609cb118ab 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -18,7 +18,7 @@ 'version': '12.0.1.0.0', 'license': "AGPL-3", - 'depends': ['base', 'account'], + 'depends': ['l10n_fr'], 'data': [ 'security/ir.model.access.csv', diff --git a/models/res_partner.py b/models/res_partner.py index 6e2f5875f2a3fec1e5897cc2623efb3559128da8..0046c7009fc8019fc97a9052278807f89b9cf9c2 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -36,7 +36,7 @@ class AutreResPartner(models.Model): # Societe statuts = fields.Many2one('res.partner.statut', string="Statut") num_of = fields.Char('Numéro OF') - financement = fields.Selection([('direct', 'direct'), ('agfiph', 'AGFIPH'), ('piphfp','PIPHFP'), ('eoth' ,'EOTH')], string='Fincancement') + financement = fields.Selection([('direct', 'direct'), ('agfiph', 'AGFIPH'), ('piphfp','PIPHFP'), ('eoth' ,'EOTH')], string='Financement') preference_email = fields.Boolean('E-mail') preference_courrier = fields.Boolean('Courrier') preference_chorus = fields.Boolean('Chorus Pro') diff --git a/views/res_partner_view.xml b/views/res_partner_view.xml index d28412dac1423445229b638e42e84a41e995cf56..e93c18b6a602b7563dc07f97b8769c30189f6677 100644 --- a/views/res_partner_view.xml +++ b/views/res_partner_view.xml @@ -121,13 +121,13 @@ <field name="email" widget="email" context="{'gravatar_image': True}" /> </group> <group string="Contacts Pros"> + <field name="role" widget="many2many_tags" attrs="{'invisible': ['|', ('is_company','!=', False),('beneficiaire','!=',False)]}"/> <field name="function" attrs="{'invisible': [('is_company','=', True)]}"/> <field name="phone_pro" widget="phone"/> <field name="mobile_pro" widget="phone"/> <field name="email_pro" widget="email" context="{'gravatar_image': True}" /> <field name="website" widget="url" placeholder="e.g. www.odoo.com"/> <field name="category_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}" placeholder="Tags..."/> - <field name="role" widget="many2many_tags" attrs="{'invisible': ['|', ('is_company','!=', False),('beneficiaire','!=',False)]}"/> </group> </group> <group attrs="{'invisible': [('is_company','!=', True)]}"> @@ -244,6 +244,23 @@ </sheet> </form> </xpath> + <xpath expr="//field[@name='vat']" position="after"> + <field name="siret" string="SIREN" attrs="{'invisible': [('is_company', '=', False)]}"/> + </xpath> + </field> + </record> + + <record id="autrement_res_partner_form_l10n_fr" model="ir.ui.view"> + <field name="name">autrement.res.partner.form.l10n.fr</field> + <field name="model">res.partner</field> + <field name="inherit_id" ref="l10n_fr.res_partner_form_l10n_fr"/> + <field name="arch" type="xml"> + <data> + <xpath expr="//field[@name='siret']" position="replace"> + + </xpath> + + </data> </field> </record>