chore: Se remueve código muerto y se da orden a las vistas, closed #54

prospect_trace.py

@@ -27,9 +27,6 @@ class ProspectTrace(DeactivableMixin, ModelSQL, ModelView):
         'prospect.contact_method', 'prospect_trace', 'Prospect contacts',
         states=_states)
 
-    prospect_contact = fields.Many2One(
-        'prospect.contact_method', 'Contact method',
-        domain=[('prospect', '=', Eval('prospect'))])
     prospect_city = fields.Many2One('sale.city', 'City',
                                     states=_states)
 
@@ -76,12 +73,10 @@ class ProspectTrace(DeactivableMixin, ModelSQL, ModelView):
     def wizard_make_call(cls, prospect_traces):
         pass
 
-    @fields.depends(
+    @fields.depends('prospect', 'prospect_city', 'prospect_contacts')
-        'prospect', 'prospect_city', 'prospect_contact', 'prospect_contacts')
     def on_change_prospect(self):
         if not self.prospect:
             self.prospect_city = None
-            self.prospect_contact = None
             self.prospect_business_unit = None
             return
 
@@ -89,10 +84,6 @@ class ProspectTrace(DeactivableMixin, ModelSQL, ModelView):
         self.prospect_business_unit = self.prospect.business_unit
         self.prospect_contacts = tuple(self._get_prospect_contacts())
 
-        mobile_contact = self._get_prospect_mobile_contact()
-        if mobile_contact:
-            self.prospect_contact = mobile_contact
-
     def get_rec_name(self, name):
         if self.prospect:
             return '[' + str(self.id) + '] ' + self.prospect.name
@@ -101,18 +92,6 @@ class ProspectTrace(DeactivableMixin, ModelSQL, ModelView):
         if self.calls:
             return self.calls[-1].interest
 
-    def _get_prospect_mobile_contact(self):
-        pool = Pool()
-        ContactMethod = pool.get('prospect.contact_method')
-
-        contact_mobile = ContactMethod.search(
-            [('prospect', '=', self.prospect.id),
-            ('contact_type', '=', 'mobile')],
-            limit=1)
-
-        if contact_mobile:
-            return contact_mobile[0]
-
     def _get_prospect_contacts(self):
         pool = Pool()
         ContactMethod = pool.get('prospect.contact_method')

tests/scenario_sale_opportunity_management.rst

@@ -192,12 +192,7 @@ Crear seguimiento de prospecto::
     'Medellín'
     >>> prospect_trace.prospect_contacts
     [proteus.Model.get('prospect.contact_method')(1), proteus.Model.get('prospect.contact_method')(2), proteus.Model.get('prospect.contact_method')(3)]
-    >>> prospect_trace.prospect_contact.value
+
-    '31223425234'
-    >>> prospect_trace.prospect_contact.contact_type
-    'mobile'
-    >>> prospect_trace.prospect_contact.job
-    'Gerente R.H'
 
 Crear llamadas a un seguimiento de prospecto::
     >>> make_call = Wizard('sale.prospect_trace.make_call', [prospect_trace])
@@ -258,18 +253,6 @@ Crear una llamada agendada previamente:
     >>> prospect_trace.state
     'open'
 
-Cuando se asigna prospecto sin método de contacto mobile, el contacto en el seguimiento es vacío::
-    >>> prospect4 = Prospect()
-    >>> prospect4.name = 'Sin celulares S.A.S'
-    >>> contact_method = prospect4.contact_methods.new(contact_type='mail', value='felpucio@sincelulares.org', name='felpucio', job='Supervisor')
-    >>> prospect4.business_unit = 'equipment'
-    >>> prospect4.save()
-
-    >>> prospect_trace2 = ProspectTrace()
-    >>> prospect_trace2.prospect = prospect4
-    >>> prospect_trace2.save()
-
-    >>> prospect_trace2.prospect_contact
 
 
 

view/contact_method_tree.xml

@@ -4,7 +4,6 @@ this repository contains the full copyright notices and license terms. -->
 <tree editable="1">
     <field name="contact_type" expand="1"/>
     <field name="value" expand="1"/>
-    <field name="prospect" expand="1"/>
     <field name="name" expand="1"/>
     <field name="job" expand="1"/>
 </tree>

view/prospect_trace_form.xml

@@ -7,8 +7,6 @@ this repository contains the full copyright notices and license terms. -->
         <field name="prospect"/>
         <label name="prospect_business_unit"/>
         <field name="prospect_business_unit"/>
-        <!-- <label name="prospect_contact"/>
-        <field name="prospect_contact"/> -->
         <label name="prospect_city"/>
         <field name="prospect_city"/>
     </group>
@@ -16,26 +14,26 @@ this repository contains the full copyright notices and license terms. -->
     <group col="6" colspan="5" id="trace_data" yalign="0">
         <label name="current_interest"/>
         <field name="current_interest"/>
-        <label name="pending_call"/>
-        <field name="pending_call"/>
         <label name="active"/>
         <field name="active" xexpand="0" width="25"/>
     </group>
 
-    <field name="prospect_contacts" colspan="6"/>
-
     <newline/>
-    <group col="-1" colspan="6" id="buttons">
-	    <button name="wizard_make_call" icon="tryton-tel"/>
-	    <button name="wizard_schedule" icon="tryton-calendar"/>
-    </group> 
     <notebook colspan="6">
         <page string="Calls - Oldest to Newest" id="calls">
             <field name="calls" colspan="2"/>
         </page>
     </notebook>
+    <group col="-1" colspan="6" id="buttons">
+	    <button name="wizard_make_call" icon="tryton-tel"/>
+	    <button name="wizard_schedule" icon="tryton-calendar"/>
+    </group> 
+    <newline/>
 
+    <field name="prospect_contacts" colspan="6"/>
 
+    <label name="pending_call"/>
+    <field name="pending_call"/>
     <label name="state"/>
     <field name="state"/>
 </form>

view/prospect_trace_tree.xml

@@ -4,7 +4,6 @@ this repository contains the full copyright notices and license terms. -->
 <tree>
     <field name="prospect" expand="1"/>
     <field name="prospect_business_unit" expand="1"/>
-    <field name="prospect_contact" expand="1"/>
     <field name="prospect_city" expand="1"/>
     <field name="current_interest" expand="1"/>
     <field name="calls" expand="1"/>