From 434c657a1f9f60ec5260dba853f50ce462558739 Mon Sep 17 00:00:00 2001
From: oscar alvarez <oscar.alvarez.montero@gmail.com>
Date: Fri, 19 May 2023 07:52:41 -0500
Subject: [PATCH] Fix

---
 opportunity.py            |  8 ++------
 tryton.cfg                |  2 +-
 view/opportunity_form.xml | 12 ++++--------
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/opportunity.py b/opportunity.py
index dddd01c..e905682 100644
--- a/opportunity.py
+++ b/opportunity.py
@@ -55,10 +55,6 @@ class Opportunity(
         states={
             'readonly': Eval('state').in_(['converted', 'won', 'cancelled', 'lost'])
         })
-    # kind_opportunity = fields.Many2One('crm.opportunity_kind_concept', 'Opportunity Kind Concept', select=True,
-    # states={
-    #     'readonly': ~Eval('state').in_(['prospecting', 'quote_revision', 'review'])
-    # })
     party = fields.Many2One(
         'party.party', "Party", select=True,
         states={
@@ -125,7 +121,7 @@ class Opportunity(
     description = fields.Char('Description',
           states={
               'readonly': Eval('state').in_(['won', 'lost']),
-              # 'required': ~Eval('state').in_(['lead', 'lost', 'cancelled']),
+              'required': ~Eval('state').in_(['lead', 'lost', 'cancelled']),
           })
     comment = fields.Text('Comment', states=_states_stop, depends=_depends_stop)
     lines = fields.One2Many('crm.opportunity.line', 'opportunity', 'Lines',
@@ -740,7 +736,7 @@ class CrmOpportunityFollowUp(sequence_ordered(), ModelSQL, ModelView):
     opportunity = fields.Many2One('crm.opportunity', 'Opportunity', required=True )
     follow_date = fields.Date('Follow Date')
     action = fields.Char('Action')
-    notes = fields.Char('Notes')
+    notes = fields.Text('Notes')
     done_by = fields.Many2One('res.user', 'Done By')
 
 
diff --git a/tryton.cfg b/tryton.cfg
index 9984298..165a541 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=6.0.3
+version=6.0.4
 depends:
     party
     sale
diff --git a/view/opportunity_form.xml b/view/opportunity_form.xml
index e9a7e67..9f76a90 100644
--- a/view/opportunity_form.xml
+++ b/view/opportunity_form.xml
@@ -12,8 +12,6 @@ this repository contains the full copyright notices and license terms. -->
     <field name="address"/>
     <label name="agent"/>
     <field name="agent"/>
-    <label name="description"/>
-    <field name="description"/>
     <label name="type"/>
     <field name="type"/>
     <label name="source"/>
@@ -22,13 +20,14 @@ this repository contains the full copyright notices and license terms. -->
     <field name="reference"/>
     <label name="amount"/>
     <field name="amount" symbol="currency"/>
+    <label name="description"/>
+    <field name="description" colspan="3"/>
     <label name="conversion_probability"/>
     <group id="conversion_probability">
         <field name="conversion_probability" factor="100" xexpand="0"/>
         <label name="conversion_probability" string="%"
             xalign="0.0" xexpand="1"/>
     </group>
-
     <notebook colspan="6">
         <page string="Opportunity" id="opportunity">
             <label name="payment_term"/>
@@ -39,11 +38,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="start_date"/>
             <label name="end_date"/>
             <field name="end_date"/>
-            <label name="cancelled_reason"/>
-            <field name="cancelled_reason"/>
             <field name="follow_ups" colspan="4"/>
             <separator name="comment" colspan="4"/>
             <field name="comment" colspan="4"/>
+            <label name="cancelled_reason"/>
+            <field name="cancelled_reason"/>
         </page>
         <page name="lines">
             <field name="lines"/>
@@ -55,9 +54,6 @@ this repository contains the full copyright notices and license terms. -->
         <page name="sales">
             <field name="sales" colspan="4"/>
         </page>
-        <!-- <page name="traceability">
-            <field name="traceability" colspan="4"/>
-        </page> -->
 
     </notebook>
     <label name="state"/>