diff --git a/prospect_trace.py b/prospect_trace.py index aa65dfe..685423c 100644 --- a/prospect_trace.py +++ b/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( - 'prospect', 'prospect_city', 'prospect_contact', 'prospect_contacts') + @fields.depends('prospect', 'prospect_city', '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') diff --git a/tests/scenario_sale_opportunity_management.rst b/tests/scenario_sale_opportunity_management.rst index b2c434f..bef5494 100644 --- a/tests/scenario_sale_opportunity_management.rst +++ b/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 diff --git a/view/contact_method_tree.xml b/view/contact_method_tree.xml index 58c50ff..8a39f72 100644 --- a/view/contact_method_tree.xml +++ b/view/contact_method_tree.xml @@ -4,7 +4,6 @@ this repository contains the full copyright notices and license terms. --> - diff --git a/view/prospect_trace_form.xml b/view/prospect_trace_form.xml index 43c8865..3104677 100644 --- a/view/prospect_trace_form.xml +++ b/view/prospect_trace_form.xml @@ -7,8 +7,6 @@ this repository contains the full copyright notices and license terms. -->