From d1d78d8f3d1b639305c1bbdcdc8b9c93208cbc12 Mon Sep 17 00:00:00 2001
From: Remi <remi@le-filament.com>
Date: Fri, 20 Sep 2019 13:09:32 +0200
Subject: [PATCH] Fix errors at prospect creation
---
models/res_partner.py | 5 +++--
views/res_partner_cooperative.xml | 9 +++++----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/models/res_partner.py b/models/res_partner.py
index 7fb62c9..5bb4765 100644
--- a/models/res_partner.py
+++ b/models/res_partner.py
@@ -249,7 +249,7 @@ class ScopPartner(models.Model):
on_delete='restrict')
revision_last_date = fields.Date("Dernier exercice révisé")
revision_next_date = fields.Date("Prochain exercice révisable")
- revision_staff_id = fields.Integer(string='Effectif révision')
+ revision_staff = fields.Integer(string='Effectif révision')
revision_ids = fields.One2many(
comodel_name='scop.revision',
@@ -326,7 +326,8 @@ class ScopPartner(models.Model):
@api.model
def _compute_siren(self):
for company in self:
- company.siren = company.siret[:9]
+ if company.siret:
+ company.siren = company.siret[:9]
class ResPartneCertification(models.Model):
diff --git a/views/res_partner_cooperative.xml b/views/res_partner_cooperative.xml
index de5d55a..05f926b 100644
--- a/views/res_partner_cooperative.xml
+++ b/views/res_partner_cooperative.xml
@@ -59,7 +59,7 @@
<field name="activity_state" />
<progressbar field="activity_state" colors='{"planned": "success", "today": "warning", "overdue": "danger"}' />
</xpath>
- <xpath expr="//div[@class='oe_kanban_partner_links']" position="after">
+ <xpath expr="//div[hasclass('oe_kanban_partner_links')]" position="after">
<field name="activity_ids" widget="kanban_activity"/>
</xpath>
</field>
@@ -72,7 +72,7 @@
<field name="arch" type="xml">
<form string="Cooperatives">
<header>
- <button string="Nouvelle période" type="action" name="%(cgscop_partner.scop_period_wizard_create_action)d" class="oe_highlight"/>
+ <button string="Nouvelle période" type="action" name="%(cgscop_partner.scop_period_wizard_create_action)d" class="oe_highlight" attrs="{'invisible': [('write_date', '=', False)]}"/>
<field name="project_status" widget="statusbar" options="{'clickable': '0'}" statusbar_visible="1_information,2_pre-diagnostic,3_accompagnement,4_adhesion,5_suivi"/>
</header>
<sheet>
@@ -90,9 +90,10 @@
<field name="commercial_partner_id" invisible="1"/>
<field name="parent_id" invisible="1"/>
<field name="is_cooperative" invisible="1"/>
+ <field name="write_date" invisible="1"/>
<field name="type" attrs="{'invisible': [('parent_id','=', False)]}" groups="base.group_no_one"/>
<h1>
- <field name="name" default_focus="1" placeholder="Name" readonly="True"/>
+ <field name="name" default_focus="1" placeholder="Raison Sociale" attrs="{'readonly': [('write_date', '!=', False)]}"/>
</h1>
<div class="oe_bloc_cgscop">
<div class="o_row d-flex">
@@ -309,7 +310,7 @@
<group>
<field name="revision_type"/>
<field name="revision_format_id"/>
- <field name="revision_staff_id"/>
+ <field name="revision_staff"/>
<field name="revision_last_date"/>
<field name="revision_next_date"/>
</group>
--
GitLab