diff --git a/models/crm_lead.py b/models/crm_lead.py index 446643222f6cc1689b239cfc655445e44210d0e9..d220b54adf9408e5089df9e5fc73b1435f2742a7 100644 --- a/models/crm_lead.py +++ b/models/crm_lead.py @@ -1,53 +1,42 @@ # Copyright 2019 Le Filament (<http://www.le-filament.com>) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - from odoo import models, fields class CRMleadMVH(models.Model): _inherit = 'crm.lead' -# Critères du début Go/NoGo budget = fields.Float(string="Budget au m²") - eco_responsable = fields.Selection([('yes', 'Oui'), ('no', 'Non')], - string='Eco-responsable') + eco_responsable = fields.Boolean(string='Eco-responsable ?') elements_metriques = fields.Text(string="Eléments métriques") lieu = fields.Char(string="Lieu") propriete = fields.Text(string="Propriété") - renovation_neuf = fields.Selection([('renovation', 'Rénovation'), - ('neuf', 'Neuf')], - string="Projet") - visite_payante = fields.Selection([('yes', 'Oui'), ('no', 'Non')], - string='Visite payante') - envie_achat = fields.Selection([('yes', 'Oui'), ('no', 'Non')], - string="Envie d'achat") - presence_plan = fields.Selection([('yes', 'Oui'), ('no', 'Non')], - string="Plan") - presence_planning = fields.Selection([('yes', 'Oui'), ('no', 'Non')], - string="Planning réalisation") - presence_permis = fields.Selection([('yes', 'Oui'), ('no', 'Non')], - string="Permis de construire") - presence_etude = fields.Selection([('yes', 'Oui'), ('no', 'Non')], - string="Etude de sol") - -# Adresse du chantier + renovation_neuf = fields.Selection( + [('renovation', 'Rénovation'), ('neuf', 'Neuf')], + string="Projet") + visite_payante = fields.Boolean('Visite payante') + envie_achat = fields.Boolean("Envie d'achat") + presence_plan = fields.Boolean("Plan") + presence_planning = fields.Boolean("Planning réalisation") + presence_permis = fields.Boolean("Permis de construire") + presence_etude = fields.Boolean("Etude de sol") + # Adresse du chantier rue = fields.Char('Rue') rue2 = fields.Char('Rue2') code_postal = fields.Char('Code postal', change_default=True) ville = fields.Char('Ville') - -# Prescription technique + # Prescription technique prescription_technique = fields.Text(string="Prescriptions techniques") - -# Partenaires projet - supplier_ids = fields.Many2many('res.partner', - string="Architecte et fournisseurs") - -# Visite de chantier - description_technique = fields.Text(string="Description technique", - track_visibility='onchange') - reflexion_technique = fields.Text(string="Reflexion technique", - track_visibility='onchange') - presentation_detaillee = fields.Text(string="Présentation détaillée", - track_visibility='onchange') + # Partenaires projet + supplier_ids = fields.Many2many( + comodel_name='res.partner', + string="Architecte et fournisseurs") + # Visite de chantier + description_technique = fields.Text( + string="Description technique", + track_visibility='onchange') + reflexion_technique = fields.Text( + string="Reflexion technique", + track_visibility='onchange') + presentation_detaillee = fields.Text(string="Présentation détaillée") diff --git a/views/crm_lead_view.xml b/views/crm_lead_view.xml index 6bace63562496eebec6f57c8b9c032074668a314..e4fd4592c0acf2f1363ac92a6a7f94bf381e0827 100644 --- a/views/crm_lead_view.xml +++ b/views/crm_lead_view.xml @@ -11,7 +11,6 @@ <attribute name="invisible">True</attribute> </field> - <xpath expr="//page[1]" position="attributes"> <attribute name="string">Descriptif court</attribute> </xpath> @@ -21,16 +20,16 @@ <group> <group string="Infos générales"> <field name="budget"/> - <field name="eco_responsable" widget="radio" options="{'horizontal': true}"/> + <field name="eco_responsable" widget="boolean_toggle"/> <field name="renovation_neuf" widget="radio" options="{'horizontal': true}"/> - <field name="visite_payante" widget="radio" options="{'horizontal': true}"/> + <field name="visite_payante" widget="boolean_toggle"/> </group> <group string="Statut du projet"> - <field name="envie_achat" widget="radio" options="{'horizontal': true}"/> - <field name="presence_plan" widget="radio" options="{'horizontal': true}"/> - <field name="presence_planning" widget="radio" options="{'horizontal': true}"/> - <field name="presence_permis" widget="radio" options="{'horizontal': true}"/> - <field name="presence_etude" widget="radio" options="{'horizontal': true}"/> + <field name="envie_achat" widget="boolean_toggle"/> + <field name="presence_plan" widget="boolean_toggle"/> + <field name="presence_planning" widget="boolean_toggle"/> + <field name="presence_permis" widget="boolean_toggle"/> + <field name="presence_etude" widget="boolean_toggle"/> </group> </group> </page> @@ -38,8 +37,8 @@ <div class="o_address_format"> <field name="rue" placeholder="Rue..." class="o_address_street"/> <field name="rue2" placeholder="Rue 2..." class="o_address_street"/> - <field name="ville" placeholder="Ville" class="o_address_city"/> <field name="code_postal" placeholder="Code postal" class="o_address_zip"/> + <field name="ville" placeholder="Ville" class="o_address_city"/> </div> </page> <page string="Prescriptions techniques"> @@ -49,8 +48,7 @@ </page> <page string="Partenaires du client"> <group> - <field name="supplier_ids" widget="many2many_kanban" - mode="kanban"/> + <field name="supplier_ids" widget="many2many_kanban" mode="kanban" options="{'no_create': True}"/> </group> </page> <page string="Visite de chantier"> @@ -60,17 +58,8 @@ <field name="presentation_detaillee"/> </group> </page> - </xpath> -<!-- <notebook position="inside"> - <page string="Contacts"> - <group> - <field name="child_ids" mode="tree"/> - </group> - </page> - </notebook> --> - </field> </record> diff --git a/views/res_partner_view.xml b/views/res_partner_view.xml index b4ee147160bf27a3463107aa3a302cbff2784b9b..bc9d57d22ce880d579a47f1a193343df76aec6f9 100644 --- a/views/res_partner_view.xml +++ b/views/res_partner_view.xml @@ -6,23 +6,13 @@ <field name="model">res.partner</field> <field name="inherit_id" ref="base.view_partner_form"/> <field name="arch" type="xml"> - - <xpath expr="//notebook/page" position="before"> - <page string="Projets liés"> - <field name="opportunite"/> - </page> - </xpath> - + <xpath expr="//notebook/page" position="before"> + <page string="Projets liés"> + <field name="opportunite" readonly="1"/> + </page> + </xpath> </field> </record> -<!-- <record id="mvh_res_partner_search" model="ir.ui.view"> - <field name="name">mvh.res.partner.search</field> - <field name="model">res.partner</field> - <field name="inherit_id" ref="base.view_res_partner_filter"/> - <field name="arch" type="xml"> - </field> - </record> --> - </data> </odoo> \ No newline at end of file