feat: Se agrega traducción

.dev/install_module.sh

@@ -7,7 +7,7 @@
 [ ! -d "$SRC" ] && die "no se ubica ruta en SRC"
 
 # dependencias minimas
-pip3 install psycopg2 proteus==6.8 inotify honcho
+pip3 install psycopg2 proteus inotify honcho
 
 # instalar dependencias de tryton desde paquete
 python3 setup.py install

.woodpecker.yml

@@ -1,3 +1,4 @@
+# 
 # variables que puedo usar? https://woodpecker-ci.org/docs/0.15/usage/environment#built-in-environment-variables
 
 steps:
@@ -32,7 +33,7 @@ steps:
       <p>${CI_COMMIT_AUTHOR}: <a href="${CI_BUILD_LINK}">Task ${CI_BUILD_NUMBER}</a> <font color="green"><b>TODO BIEN EN ${CI_REPO}</b></font></p>
       <pre><a href="${CI_COMMIT_LINK}">${CI_COMMIT_MESSAGE}</a></pre>
     when:
-      status: [success]
+      status: [ success ]
 
   notify-failure:
     image: plugins/matrix
@@ -48,7 +49,7 @@ steps:
       <p>${CI_COMMIT_AUTHOR}: <a href="${CI_BUILD_LINK}">Task ${CI_BUILD_NUMBER}</a> <font color="red"><b>!!!TODO MAL EN ${CI_REPO} </b></font></p>
       <pre><a href="${CI_COMMIT_LINK}">${CI_COMMIT_MESSAGE}</a></pre>
     when:
-      status: [failure]
+      status: [ failure ]
 
 services:
   postgres:

Dockerfile

@@ -3,7 +3,7 @@ FROM node as builder-node
 
 ENV SERIES 6.8
 RUN npm install -g bower
-RUN curl https://downloads.tryton.org/${SERIES}/tryton-sao-6.8.4.tgz | tar zxf - -C /
+RUN curl https://downloads.tryton.org/${SERIES}/tryton-sao-last.tgz | tar zxf - -C /
 RUN cd /package && bower install --allow-root
 
 FROM python:3.9-bullseye

__init__.py

@@ -1,62 +1,41 @@
 from trytond.pool import Pool
-
-# Prospect Core
-from core.Prospect.models.prospect import Prospect
-from core.Prospect.models.contact_method import ContactMethod
-from core.Prospect.wizards.assign_operator \
-    import AssignOperator, AssignOperatorStart
-from core.Prospect.wizards.reassign_prospect_by_prospect \
-    import ReasignProspectByProspect, ReassignProspectByProspectStart
-from core.Prospect.wizards.reassign_prospect_by_operator \
-    import ReassignProspectByOperator, ReassignProspectByOperatorStart
-
-# Prospect Trace Core
-from core.ProspectTrace.wizards.make_call \
-    import MakeCall, MakeCallAsk, MakeCallAskTask, MakeCallStart
-from core.ProspectTrace.wizards.schedule_call \
-    import ScheduleCall, ScheduleCallStart
-from core.ProspectTrace.models.prospect_trace \
-    import ProspectTrace
-
-# Call Core
-from core.Call.models.call import Call
-from core.Call.models.pending_call import PendingCall
-from core.Call.models.pending_task import PendingTask
-
-# Role core
-from core.Role.models.user import User
-
-from locations import city
-from locations import department
+from . import prospect
+from . import prospect_trace
+from . import call
+from . import pending_call
+from . import user
+from .locations import city
+from .locations import department
 
 __all__ = ['register']
 
 
 def register():
     Pool.register(
-        User,
-        PendingCall,
-        Call,
-        PendingTask,
+        user.User,
+        pending_call.PendingCall,
+        call.Call,
+        call.PendingTask,
         department.Department,
         city.City,
-        ContactMethod,
-        Prospect,
-        ProspectTrace,
-        AssignOperatorStart,
-        ScheduleCallStart,
-        MakeCallStart,
-        MakeCallAsk,
-        MakeCallAskTask,
-        ReassignProspectByOperatorStart,
-        ReassignProspectByProspectStart,
+        prospect.ContactMethod,
+        prospect.Prospect,
+        prospect_trace.ProspectTrace,
+        prospect.AssignOperatorStart,
+        prospect_trace.ScheduleCallStart,
+        prospect_trace.MakeCallStart,
+        prospect_trace.MakeCallAsk,
+        prospect_trace.MakeCallAskTask,
+        prospect.ReassignProspectByOperatorStart,
+        prospect.ReassignProspectByProspectStart,
+        call.PendingTask_ContactMethod,
         module='sale_opportunity_management', type_='model')
     Pool.register(
-        ScheduleCall,
-        AssignOperator,
-        MakeCall,
-        ReassignProspectByOperator,
-        ReasignProspectByProspect,
+        prospect_trace.ScheduleCall,
+        prospect.AssignOperator,
+        prospect_trace.MakeCall,
+        prospect.ReassignProspectByOperator,
+        prospect.ReasignProspectByProspect,
         module='sale_opportunity_management', type_='wizard')
     Pool.register(
         module='sale_opportunity_management', type_='report')

call.py

@@ -0,0 +1,103 @@
+from trytond.model import ModelSQL, ModelView, fields
+from trytond.pyson import Eval
+from datetime import date
+from .selections.interest import Interest
+from .selections.call_types import CallTypes
+from .selections.call_results import CallResults
+
+
+class Call(ModelSQL, ModelView):
+    'Llamada'
+    __name__ = 'sale.call'
+    _order_name = 'date'
+    _states = {'readonly': True}
+
+    date = fields.Date('Date', states=_states)
+    description = fields.Text('Description', strip=True)
+
+    prospect_trace = fields.Many2One(
+        'sale.prospect_trace', 'Prospect trace', required=True, states=_states)
+
+    interest = fields.Selection(
+        Interest.get_interest_levels(), 'Interest', required=True)
+
+    call_type = fields.Selection(
+        CallTypes.get_call_types(), 'Call type', states=_states)
+    call_result = fields.Selection(
+        CallResults.get_call_results(),
+        'Call result', states=_states)
+    call_business_unit = fields.Selection(
+        [('brigade', 'Brigade'),
+         ('optics', 'Optics'),
+         ('equipment', 'Equipment')],
+        'Business unit', states=_states
+    )
+    operator_who_called = fields.Many2One(
+        'res.user', "Operator who called", states=_states)
+
+    @classmethod
+    def __setup__(cls):
+        super(Call, cls).__setup__()
+
+        cls._order = [
+            ('date', 'DESC NULLS FIRST')
+        ]
+
+    @classmethod
+    def default_date(cls):
+        return date.today()
+
+
+class PendingTask(ModelSQL, ModelView):
+    'Tarea a realizar a un seguimiento de prospecto'
+    __name__ = "sale.pending_task"
+
+    description = fields.Text(
+        'Description', required=True,
+        states={
+            'readonly': Eval('state') == 'done'
+        })
+
+    state = fields.Selection(
+        [('pending', 'Pending'),
+        ('done', 'Done')],
+        'State')
+
+    prospect_trace = fields.Many2One(
+        'sale.prospect_trace', 'Prospect trace',
+        required=True, readonly=True)
+
+    contacts = fields.Many2Many(
+        'sale.pendingtask_contactmethod',
+        'pending_task_id', 'contact_method_id',
+        'Contact Methods')
+
+    @classmethod
+    def __setup__(cls):
+        super(PendingTask, cls).__setup__()
+        cls._buttons.update({
+            'close_task': {
+                'invisible': Eval('state') == 'done',
+                'depends': ['state'],
+                }
+            })
+
+    @classmethod
+    @ModelView.button
+    def close_task(cls, tasks):
+        for task in tasks:
+            task.state = 'done'
+            task.save()
+
+    @classmethod
+    def default_state(cls):
+        return 'pending'
+
+
+class PendingTask_ContactMethod(ModelSQL):
+    'Relacion muchos a muchos entre tareas pendientes y mecanismos de contacto'
+    __name__ = "sale.pendingtask_contactmethod"
+
+    pending_task_id = fields.Many2One('sale.pending_task', 'Pending task id')
+    contact_method_id = fields.Many2One(
+        'prospect.contact_method', 'Contact method id')

core/Call/models/call.py

@@ -1,50 +0,0 @@
-# This file is part of Tryton.  The COPYRIGHT file at the top level of
-# this repository contains the full copyright notices and license terms.
-
-from trytond.model import ModelSQL, ModelView, fields
-from datetime import date
-from selections.interest import Interest
-from selections.call_types import CallTypes
-from selections.call_results import CallResults
-
-
-class Call(ModelSQL, ModelView):
-    'Llamada'
-    __name__ = 'sale.call'
-    _order_name = 'date'
-    _states = {'readonly': True}
-
-    date = fields.Date('Date', states=_states)
-    description = fields.Text('Description', strip=True)
-
-    prospect_trace = fields.Many2One(
-        'sale.prospect_trace', 'Prospect trace', required=True, states=_states)
-
-    interest = fields.Selection(
-        Interest.get_interest_levels(), 'Interest', required=True)
-
-    call_type = fields.Selection(
-        CallTypes.get_call_types(), 'Call type', states=_states)
-    call_result = fields.Selection(
-        CallResults.get_call_results(),
-        'Call result', states=_states)
-    call_business_unit = fields.Selection(
-        [('brigade', 'Brigade'),
-         ('optics', 'Optics'),
-         ('equipment', 'Equipment')],
-        'Business unit', states=_states
-    )
-    operator_who_called = fields.Many2One(
-        'res.user', "Operator who called", states=_states)
-
-    @classmethod
-    def __setup__(cls):
-        super(Call, cls).__setup__()
-
-        cls._order = [
-            ('date', 'DESC NULLS FIRST')
-        ]
-
-    @classmethod
-    def default_date(cls):
-        return date.today()

core/Call/models/pending_task.py

@@ -1,45 +0,0 @@
-# This file is part of Tryton.  The COPYRIGHT file at the top level of
-# this repository contains the full copyright notices and license terms.
-
-from trytond.model import ModelSQL, ModelView, fields
-from trytond.pyson import Eval
-
-
-class PendingTask(ModelSQL, ModelView):
-    'Tarea a realizar a un seguimiento de prospecto'
-    __name__ = "sale.pending_task"
-
-    description = fields.Text(
-        'Description', required=True,
-        states={
-            'readonly': Eval('state') == 'done'
-        })
-
-    state = fields.Selection(
-        [('pending', 'Pending'),
-        ('done', 'Done')],
-        'State')
-
-    prospect_trace = fields.Many2One(
-        'sale.prospect_trace', 'Prospect trace',
-        required=True, readonly=True)
-
-    @classmethod
-    def __setup__(cls):
-        super(PendingTask, cls).__setup__()
-        cls._buttons.update({
-            'close_task': {
-                'invisible': Eval('state') == 'done'
-                }
-            })
-
-    @classmethod
-    @ModelView.button
-    def close_task(cls, tasks):
-        for task in tasks:
-            task.state = 'done'
-            task.save()
-
-    @classmethod
-    def default_state(cls):
-        return 'pending'

core/Prospect/models/contact_method.py

@@ -1,37 +0,0 @@
-# This file is part of Tryton.  The COPYRIGHT file at the top level of
-# this repository contains the full copyright notices and license terms.
-
-from trytond.model import ModelSQL, ModelView, fields
-
-
-class ContactMethod(ModelSQL, ModelView):
-    'Mecanismo de contacto'
-    __name__ = 'prospect.contact_method'
-
-    contact_type = fields.Selection([
-        ('phone', 'Phone'),
-        ('mobile', 'Mobile'),
-        ('mail', 'Mail')
-        ], 'Contact type', required=True)
-
-    value = fields.Char('Value', required=True)
-    name = fields.Char('Name')
-    job = fields.Char('Job')
-
-    prospect = fields.Many2One('sale.prospect', 'Prospect', required=True)
-    prospect_trace = fields.Many2One(
-        'sale.prospect_trace', 'Prospect Trace', required=False)
-
-    @classmethod
-    def default_contact_type(cls):
-        return 'mobile'
-
-    def get_rec_name(self, name):
-        fields = [self.name, self.job, self.value]
-        contact_rec_name = ''
-
-        for field in fields:
-            if field:
-                contact_rec_name += ' [' + str(field) + '] '
-
-        return contact_rec_name

core/Prospect/models/prospect.py

@@ -1,61 +0,0 @@
-# This file is part of Tryton.  The COPYRIGHT file at the top level of
-# this repository contains the full copyright notices and license terms.
-
-from trytond.model import ModelSQL, ModelView, fields, DeactivableMixin
-from trytond.pyson import Eval, If
-
-
-class Prospect(ModelSQL, ModelView, DeactivableMixin):
-    'Prospecto'
-    __name__ = 'sale.prospect'
-    _rec_name = 'name'
-
-    name = fields.Char('Name', required=True)
-
-    business_unit = fields.Selection(
-        [('brigade', 'Brigade'),
-         ('optics', 'Optics'),
-         ('equipment', 'Equipment')],
-        'Business unit', required=True
-    )
-
-    contact_methods = fields.One2Many(
-        'prospect.contact_method',
-        'prospect', 'Contact methods', required=True)
-
-    department = fields.Many2One('sale.department', 'Department')
-    city = fields.Many2One('sale.city', 'City',
-                           domain=[If(Eval('department'),
-                                    ('parent', '=', Eval('department')))])
-
-    assigned_operator = fields.Many2One(
-        'res.user', "Assigned operator", readonly=True)
-
-    state = fields.Selection([
-        ('unassigned', 'Unsassigned'),
-        ('assigned', 'Assigned')], "State", readonly=True)
-
-    prospect_trace = fields.Many2One('sale.prospect_trace', 'Prospect trace')
-
-    rating = fields.Selection(
-        [(None, None),
-         ('1', '1'),
-         ('2', '2'),
-         ('3', '3'),
-         ('4', '4'),
-         ('5', '5')], 'Rating (1-5)')
-    comments = fields.Text('Comments')
-
-    @classmethod
-    def default_state(cls):
-        return 'unassigned'
-
-    @fields.depends('prospect_trace', 'contact_methods')
-    def on_change_contact_methods(self):
-        for contact in self.contact_methods:
-            contact.prospect_trace = self.prospect_trace
-
-    @fields.depends('city', 'department')
-    def on_change_city(self):
-        if self.city:
-            self.department = self.city.parent

core/Prospect/wizards/assign_operator.py

@@ -1,83 +0,0 @@
-# This file is part of Tryton.  The COPYRIGHT file at the top level of
-# this repository contains the full copyright notices and license terms.
-
-
-from trytond.wizard import Wizard, StateView, Button, StateTransition
-from trytond.model import ModelView, fields
-from trytond.pyson import Eval
-from trytond.pool import Pool
-
-
-class AssignOperatorStart(ModelView):
-    'Inicio de asignación de operador'
-    __name__ = 'sale.prospect.assign.start'
-
-    prospects_chunk = fields.Integer(
-        'Prospects chunk', required=True,
-        states={
-            'readonly': ~Eval('business_unit', False)})
-
-    operator = fields.Many2One('res.user', 'Operator', required=True)
-    prospects = fields.One2Many(
-        'sale.prospect', None, 'Prospects', readonly=True)
-
-    business_unit = fields.Selection(
-        [('brigade', 'Brigade'),
-         ('optics', 'Optics'),
-         ('equipment', 'Equipment')],
-        'Business unit',
-        states={
-            'readonly': Eval('prospects_chunk', False)}
-    )
-
-    @classmethod
-    def default_prospects_chunk(cls):
-        return 0
-
-    @fields.depends('prospects_chunk', 'prospects', 'business_unit')
-    def on_change_prospects_chunk(self):
-        pool = Pool()
-        Prospect = pool.get('sale.prospect')
-
-        if self.prospects_chunk >= 1:
-            self.prospects = []
-            self.prospects = Prospect.search(
-                [('state', '=', 'unassigned'),
-                 ('business_unit', '=', self.business_unit)],
-                limit=self.prospects_chunk)
-
-
-class AssignOperator(Wizard):
-    'Asignar operador a prospecto'
-    __name__ = 'sale.prospect.assign'
-
-    start = StateView(
-        'sale.prospect.assign.start',
-        'sale_opportunity_management.assign_start_view_form', [
-            Button("Cancel", 'end', 'tryton-cancel'),
-            Button("Assign", 'assign', 'tryton-ok', default=True)])
-
-    assign = StateTransition()
-
-    def transition_assign(self):
-        pool = Pool()
-        ProspectTrace = pool.get('sale.prospect_trace')
-
-        for prospect in self.start.prospects:
-            prospect.assigned_operator = self.start.operator
-            prospect.state = 'assigned'
-            prospect.save()
-
-            prospect_trace = ProspectTrace(
-                prospect=prospect,
-                prospect_city=prospect.city,
-                prospect_business_unit=prospect.business_unit,
-                prospect_assigned_operator=prospect.assigned_operator,
-                prospect_contacts=prospect.contact_methods
-            )
-            prospect_trace.save()
-
-            prospect.prospect_trace = prospect_trace
-            prospect.save()
-
-        return 'end'

core/Prospect/wizards/reassign_prospect_by_operator.py

@@ -1,61 +0,0 @@
-# This file is part of Tryton.  The COPYRIGHT file at the top level of
-# this repository contains the full copyright notices and license terms.
-
-
-from trytond.wizard import Wizard, StateView, Button, StateTransition
-from trytond.model import ModelView, fields
-from trytond.pool import Pool
-
-
-class ReassignProspectByOperatorStart(ModelView):
-    'Inicio de reasignación de prospecto por operario'
-    __name__ = 'sale.prospect.reassign_by_operator.start'
-
-    current_operator = fields.Many2One(
-        'res.user', "Current operator", required=True)
-    new_operator = fields.Many2One(
-        'res.user', "New operator", required=True)
-    prospects = fields.One2Many(
-        'sale.prospect', None, 'Prospects', readonly=True)
-
-    @fields.depends('current_operator', 'prospects')
-    def on_change_current_operator(self):
-        pool = Pool()
-        Prospect = pool.get('sale.prospect')
-
-        self.prospects = []
-        self.prospects = Prospect.search(
-            [('state', '=', 'assigned'),
-             ('assigned_operator', '=', self.current_operator)])
-
-
-class ReassignProspectByOperator(Wizard):
-    'Reasignar todos los prospectos de un operario, a otro operario'
-    __name__ = 'sale.prospect.reassign_by_operator'
-
-    start = StateView(
-        'sale.prospect.reassign_by_operator.start',
-        'sale_opportunity_management.reassign_by_operator_start_view_form',
-        [Button("Cancel", 'end', 'tryton-cancel'),
-         Button("Reassign", 'reassign_by_operator', 'tryton-ok', default=True)
-         ])
-
-    reassign_by_operator = StateTransition()
-
-    def transition_reassign_by_operator(self):
-        pool = Pool()
-        ProspectTrace = pool.get('sale.prospect_trace')
-
-        for prospect in self.start.prospects:
-            prospect.assigned_operator = self.start.new_operator
-
-            if prospect.prospect_trace:
-                prospect_trace, = ProspectTrace.search(
-                    [('prospect', '=', prospect)])
-                prospect_trace.prospect_assigned_operator =\
-                    self.start.new_operator
-                prospect_trace.save()
-
-            prospect.save()
-
-        return 'end'

core/Prospect/wizards/reassign_prospect_by_prospect.py

@@ -1,48 +0,0 @@
-# This file is part of Tryton.  The COPYRIGHT file at the top level of
-# this repository contains the full copyright notices and license terms.
-
-
-from trytond.wizard import Wizard, StateView, Button, StateTransition
-from trytond.model import ModelView, fields
-from trytond.pool import Pool
-
-
-class ReassignProspectByProspectStart(ModelView):
-    'Inicio de reasignación de un prospecto en específico'
-    __name__ = 'sale.prospect.reassign_by_prospect.start'
-
-    prospect = fields.Many2One(
-        'sale.prospect', 'Prospect', required=True,
-        domain=[('assigned_operator', '!=', None)])
-
-    new_operator = fields.Many2One('res.user', "New operator", required=True)
-
-
-class ReasignProspectByProspect(Wizard):
-    'Reasignar un prospecto en específico a un nuevo operario'
-    __name__ = 'sale.prospect.reassign_by_prospect'
-
-    start = StateView(
-        'sale.prospect.reassign_by_prospect.start',
-        'sale_opportunity_management.reassign_by_prospect_start_view_form',
-        [Button("Cancel", 'end', 'tryton-cancel'),
-         Button("Reassign", 'reassign_by_prospect', 'tryton-ok', default=True)
-         ])
-
-    reassign_by_prospect = StateTransition()
-
-    def transition_reassign_by_prospect(self):
-        pool = Pool()
-        ProspectTrace = pool.get('sale.prospect_trace')
-
-        self.start.prospect.assigned_operator = self.start.new_operator
-
-        if self.start.prospect.prospect_trace:
-            prospect_trace, = ProspectTrace.search(
-                [('prospect', '=', self.start.prospect)])
-            prospect_trace.prospect_assigned_operator =\
-                self.start.new_operator
-            prospect_trace.save()
-
-        self.start.prospect.save()
-        return 'end'

core/ProspectTrace/models/prospect_trace.py

@@ -1,106 +0,0 @@
-# This file is part of Tryton.  The COPYRIGHT file at the top level of
-# this repository contains the full copyright notices and license terms.
-
-from trytond.model import ModelSQL, ModelView, fields
-from trytond.pyson import Eval
-from selections.interest import Interest
-
-
-class ProspectTrace(ModelSQL, ModelView):
-    'Seguimiento de un prospecto'
-    __name__ = 'sale.prospect_trace'
-
-    _states = {'readonly': True}
-
-    prospect = fields.Many2One(
-        'sale.prospect', 'Prospect', required=True, states=_states)
-    prospect_business_unit = fields.Selection(
-        [('brigade', 'Brigade'),
-         ('optics', 'Optics'),
-         ('equipment', 'Equipment')],
-        'Business unit', states=_states
-    )
-    prospect_contacts = fields.One2Many(
-        'prospect.contact_method', 'prospect_trace',
-        'Prospect contacts', required=True)
-    prospect_city = fields.Many2One('sale.city', 'City',
-                                    states=_states)
-
-    prospect_assigned_operator = fields.Many2One(
-        'res.user', "Assigned operator", states=_states)
-
-    calls = fields.One2Many(
-        'sale.call', 'prospect_trace', 'Calls', states=_states)
-    pending_call = fields.Many2One(
-        'sale.pending_call', 'Pending call', states=_states)
-
-    current_interest = fields.Selection(
-        Interest.get_interest_levels(), 'Current interest',
-        states=_states)
-
-    state = fields.Selection([
-            ('unassigned', 'Unassigned'),
-            ('open', 'Open'),
-            ('with_pending_calls', 'With pending calls'),
-            ('closed', 'Closed')
-            ], 'State',
-            states=_states)
-
-    @fields.depends('prospect_contacts', 'prospect')
-    def on_change_prospect_contacts(self):
-        for contact in self.prospect_contacts:
-            contact.prospect = self.prospect
-
-    @classmethod
-    def __setup__(cls):
-        super(ProspectTrace, cls).__setup__()
-        cls._buttons.update({
-            'wizard_schedule': {
-                'invisible': Eval('state') == 'with_pending_calls',
-            },
-            'wizard_make_call': {},
-            'close_trace': {
-                'invisible': Eval('state') == 'closed',
-                'depends': ['state']
-            },
-            'reopen_trace': {
-                'invisible': (Eval('state') == 'open')
-                | (Eval('state') == 'with_pending_calls'),
-
-                'depends': ['state']
-            }
-        })
-
-    @classmethod
-    def default_state(cls):
-        return 'open'
-
-    @classmethod
-    @ModelView.button_action(
-        'sale_opportunity_management.schedule_call_wizard')
-    def wizard_schedule(cls, prospect_traces):
-        pass
-
-    @classmethod
-    @ModelView.button_action(
-        'sale_opportunity_management.make_call_wizard')
-    def wizard_make_call(cls, prospect_traces):
-        pass
-
-    @classmethod
-    @ModelView.button
-    def close_trace(cls, prospect_traces):
-        for prospect_trace in prospect_traces:
-            prospect_trace.state = 'closed'
-            prospect_trace.save()
-
-    @classmethod
-    @ModelView.button
-    def reopen_trace(cls, prospect_traces):
-        for prospect_trace in prospect_traces:
-            prospect_trace.state = 'open'
-            prospect_trace.save()
-
-    def get_rec_name(self, name):
-        if self.prospect:
-            return '[' + str(self.id) + '] ' + self.prospect.name

core/ProspectTrace/wizards/schedule_call.py

@@ -1,40 +0,0 @@
-# This file is part of Tryton.  The COPYRIGHT file at the top level of
-# this repository contains the full copyright notices and license terms.
-
-from trytond.wizard import Wizard, StateView, Button, StateTransition
-from trytond.model import ModelView, fields
-from trytond.pyson import Eval
-from datetime import datetime
-from core.ProspectTrace.wizards.make_call import MakeCall
-
-
-class ScheduleCallStart(ModelView):
-    'Inicio agendar llamada a seguimiento de prospecto'
-    __name__ = 'sale.prospect_trace.schedule.start'
-
-    currency_date = fields.DateTime('Currency Date', readonly=True)
-    date_time = fields.DateTime('Date time', domain=[
-        ('date_time', '>=', Eval('currency_date'))])
-
-    @classmethod
-    def default_currency_date(cls):
-        date = datetime.now()
-
-        return date
-
-
-class ScheduleCall(Wizard):
-    'Agendar llamada a seguimiento de prospecto'
-    __name__ = 'sale.prospect_trace.schedule'
-
-    start = StateView(
-        'sale.prospect_trace.schedule.start',
-        'sale_opportunity_management.schedule_start_view_form', [
-            Button("Cancel", 'end', 'tryton-cancel'),
-            Button("Schedule", 'schedule', 'tryton-ok', default=True)])
-
-    schedule = StateTransition()
-
-    def transition_schedule(self):
-        MakeCall.create_schedule_call(self.start.date_time, self.record)
-        return 'end'

locale/es.po

@@ -246,6 +246,10 @@ msgctxt "field:sale.pending_task,prospect_trace:"
 msgid "Prospect trace"
 msgstr "Seguimiento de prospecto"
 
+msgctxt "field:sale.pending_task,contacts:"
+msgid "Contact Methods"
+msgstr "Métodos de Contacto"
+
 msgctxt "field:sale.prospect_trace.make_call.start,schedule_task:"
 msgid "Schedule task?"
 msgstr "¿Agendar tarea?"

pending_call.py

@@ -1,6 +1,5 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
-
 from trytond.model import ModelSQL, ModelView, fields
 
 

prospect.py

@@ -0,0 +1,279 @@
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+from trytond.wizard import Wizard, StateView, Button, StateTransition
+from trytond.model import ModelSQL, ModelView, fields, DeactivableMixin
+from trytond.pyson import Eval, If
+from trytond.pool import Pool
+
+
+class Prospect(ModelSQL, ModelView, DeactivableMixin):
+    'Prospecto'
+    __name__ = 'sale.prospect'
+    _rec_name = 'name'
+
+    name = fields.Char('Name', required=True)
+
+    business_unit = fields.Selection(
+        [('brigade', 'Brigade'),
+         ('optics', 'Optics'),
+         ('equipment', 'Equipment')],
+        'Business unit', required=True
+    )
+
+    contact_methods = fields.One2Many(
+        'prospect.contact_method',
+        'prospect', 'Contact methods', required=True)
+
+    department = fields.Many2One('sale.department', 'Department')
+    city = fields.Many2One('sale.city', 'City',
+                           domain=[If(Eval('department'),
+                                    ('parent', '=', Eval('department')))])
+
+    assigned_operator = fields.Many2One(
+        'res.user', "Assigned operator", readonly=True)
+
+    state = fields.Selection([
+        ('unassigned', 'Unsassigned'),
+        ('assigned', 'Assigned')], "State", readonly=True)
+
+    prospect_trace = fields.Many2One('sale.prospect_trace', 'Prospect trace')
+
+    rating = fields.Selection(
+        [(None, None),
+         ('1', '1'),
+         ('2', '2'),
+         ('3', '3'),
+         ('4', '4'),
+         ('5', '5')], 'Rating (1-5)')
+    comments = fields.Text('Comments')
+
+    @classmethod
+    def default_state(cls):
+        return 'unassigned'
+
+    @fields.depends('prospect_trace', 'contact_methods')
+    def on_change_contact_methods(self):
+        for contact in self.contact_methods:
+            contact.update_collaborators(changed_from='prospect')
+
+    @fields.depends('city', 'department')
+    def on_change_city(self):
+        if self.city:
+            self.department = self.city.parent
+
+
+class ContactMethod(ModelSQL, ModelView):
+    'Mecanismo de contacto'
+    __name__ = 'prospect.contact_method'
+
+    contact_type = fields.Selection([
+        ('phone', 'Phone'),
+        ('mobile', 'Mobile'),
+        ('mail', 'Mail')
+        ], 'Contact type', required=True)
+
+    value = fields.Char('Value', required=True)
+    name = fields.Char('Name')
+    job = fields.Char('Job')
+
+    prospect = fields.Many2One('sale.prospect', 'Prospect', required=True)
+    prospect_trace = fields.Many2One(
+        'sale.prospect_trace', 'Prospect Trace', required=False)
+
+    tasks = fields.Many2Many(
+        'sale.pendingtask_contactmethod',
+        'contact_method_id', 'pending_task_id',
+        'Tasks')
+
+    @classmethod
+    def default_contact_type(cls):
+        return 'mobile'
+
+    def update_collaborators(self, changed_from):
+        if (changed_from == 'prospect'):
+            self.prospect_trace = self.prospect.prospect_trace
+            if (self.prospect_trace):
+                self.tasks = self.prospect.prospect_trace.tasks
+        if (changed_from == 'prospect_trace'):
+            self.prospect = self.prospect_trace.prospect
+            self.tasks = self.prospect_trace.tasks
+
+    def get_rec_name(self, name):
+        fields = [self.name, self.job, self.value]
+        contact_rec_name = ''
+
+        for field in fields:
+            if field:
+                contact_rec_name += ' [' + str(field) + '] '
+
+        return contact_rec_name
+
+
+class AssignOperatorStart(ModelView):
+    'Inicio de asignación de operador'
+    __name__ = 'sale.prospect.assign.start'
+
+    prospects_chunk = fields.Integer(
+        'Prospects chunk', required=True,
+        states={
+            'readonly': ~Eval('business_unit', False)})
+
+    operator = fields.Many2One('res.user', 'Operator', required=True)
+    prospects = fields.One2Many(
+        'sale.prospect', None, 'Prospects', readonly=True)
+
+    business_unit = fields.Selection(
+        [('brigade', 'Brigade'),
+         ('optics', 'Optics'),
+         ('equipment', 'Equipment')],
+        'Business unit',
+        states={
+            'readonly': Eval('prospects_chunk', False)}
+    )
+
+    @classmethod
+    def default_prospects_chunk(cls):
+        return 0
+
+    @fields.depends('prospects_chunk', 'prospects', 'business_unit')
+    def on_change_prospects_chunk(self):
+        pool = Pool()
+        Prospect = pool.get('sale.prospect')
+
+        if self.prospects_chunk >= 1:
+            self.prospects = []
+            self.prospects = Prospect.search(
+                [('state', '=', 'unassigned'),
+                 ('business_unit', '=', self.business_unit)],
+                limit=self.prospects_chunk)
+
+
+class AssignOperator(Wizard):
+    'Asignar operador a prospecto'
+    __name__ = 'sale.prospect.assign'
+
+    start = StateView(
+        'sale.prospect.assign.start',
+        'sale_opportunity_management.assign_start_view_form', [
+            Button("Cancel", 'end', 'tryton-cancel'),
+            Button("Assign", 'assign', 'tryton-ok', default=True)])
+
+    assign = StateTransition()
+
+    def transition_assign(self):
+        pool = Pool()
+        ProspectTrace = pool.get('sale.prospect_trace')
+
+        for prospect in self.start.prospects:
+            prospect.assigned_operator = self.start.operator
+            prospect.state = 'assigned'
+            prospect.save()
+
+            prospect_trace = ProspectTrace(
+                prospect=prospect,
+                prospect_city=prospect.city,
+                prospect_business_unit=prospect.business_unit,
+                prospect_assigned_operator=prospect.assigned_operator,
+                prospect_contacts=prospect.contact_methods
+            )
+            prospect_trace.save()
+
+            prospect.prospect_trace = prospect_trace
+            prospect.save()
+
+        return 'end'
+
+
+class ReassignProspectByOperatorStart(ModelView):
+    'Inicio de reasignación de prospecto por operario'
+    __name__ = 'sale.prospect.reassign_by_operator.start'
+
+    current_operator = fields.Many2One(
+        'res.user', "Current operator", required=True)
+    new_operator = fields.Many2One(
+        'res.user', "New operator", required=True)
+    prospects = fields.One2Many(
+        'sale.prospect', None, 'Prospects', readonly=True)
+
+    @fields.depends('current_operator', 'prospects')
+    def on_change_current_operator(self):
+        pool = Pool()
+        Prospect = pool.get('sale.prospect')
+
+        self.prospects = []
+        self.prospects = Prospect.search(
+            [('state', '=', 'assigned'),
+             ('assigned_operator', '=', self.current_operator)])
+
+
+class ReassignProspectByOperator(Wizard):
+    'Reasignar todos los prospectos de un operario, a otro operario'
+    __name__ = 'sale.prospect.reassign_by_operator'
+
+    start = StateView(
+        'sale.prospect.reassign_by_operator.start',
+        'sale_opportunity_management.reassign_by_operator_start_view_form',
+        [Button("Cancel", 'end', 'tryton-cancel'),
+         Button("Reassign", 'reassign_by_operator', 'tryton-ok', default=True)
+         ])
+
+    reassign_by_operator = StateTransition()
+
+    def transition_reassign_by_operator(self):
+        pool = Pool()
+        ProspectTrace = pool.get('sale.prospect_trace')
+
+        for prospect in self.start.prospects:
+            prospect.assigned_operator = self.start.new_operator
+
+            if prospect.prospect_trace:
+                prospect_trace, = ProspectTrace.search(
+                    [('prospect', '=', prospect)])
+                prospect_trace.prospect_assigned_operator =\
+                    self.start.new_operator
+                prospect_trace.save()
+
+            prospect.save()
+
+        return 'end'
+
+
+class ReassignProspectByProspectStart(ModelView):
+    'Inicio de reasignación de un prospecto en específico'
+    __name__ = 'sale.prospect.reassign_by_prospect.start'
+
+    prospect = fields.Many2One(
+        'sale.prospect', 'Prospect', required=True,
+        domain=[('assigned_operator', '!=', None)])
+
+    new_operator = fields.Many2One('res.user', "New operator", required=True)
+
+
+class ReasignProspectByProspect(Wizard):
+    'Reasignar un prospecto en específico a un nuevo operario'
+    __name__ = 'sale.prospect.reassign_by_prospect'
+
+    start = StateView(
+        'sale.prospect.reassign_by_prospect.start',
+        'sale_opportunity_management.reassign_by_prospect_start_view_form',
+        [Button("Cancel", 'end', 'tryton-cancel'),
+         Button("Reassign", 'reassign_by_prospect', 'tryton-ok', default=True)
+         ])
+
+    reassign_by_prospect = StateTransition()
+
+    def transition_reassign_by_prospect(self):
+        pool = Pool()
+        ProspectTrace = pool.get('sale.prospect_trace')
+
+        self.start.prospect.assigned_operator = self.start.new_operator
+
+        if self.start.prospect.prospect_trace:
+            prospect_trace, = ProspectTrace.search(
+                [('prospect', '=', self.start.prospect)])
+            prospect_trace.prospect_assigned_operator =\
+                self.start.new_operator
+            prospect_trace.save()
+
+        self.start.prospect.save()
+        return 'end'

prospect_trace.py

@@ -1,15 +1,149 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
-
 from trytond.wizard import Wizard, StateView, Button, StateTransition
-from trytond.model import ModelView, fields
+from trytond.model import ModelSQL, ModelView, fields
 from trytond.pool import Pool
 from trytond.pyson import Eval
-from selections.call_types import CallTypes
-from selections.interest import Interest
+from .selections.call_types import CallTypes
+from .selections.interest import Interest
 from datetime import datetime
 
 
+class ProspectTrace(ModelSQL, ModelView):
+    'Seguimiento de un prospecto'
+    __name__ = 'sale.prospect_trace'
+
+    _states = {'readonly': True}
+
+    prospect = fields.Many2One(
+        'sale.prospect', 'Prospect', required=True, states=_states)
+    prospect_business_unit = fields.Selection(
+        [('brigade', 'Brigade'),
+         ('optics', 'Optics'),
+         ('equipment', 'Equipment')],
+        'Business unit', states=_states
+    )
+    prospect_contacts = fields.One2Many(
+        'prospect.contact_method', 'prospect_trace',
+        'Prospect contacts', required=True)
+    prospect_city = fields.Many2One('sale.city', 'City',
+                                    states=_states)
+
+    prospect_assigned_operator = fields.Many2One(
+        'res.user', "Assigned operator", states=_states)
+
+    calls = fields.One2Many(
+        'sale.call', 'prospect_trace', 'Calls', states=_states)
+    pending_call = fields.Many2One(
+        'sale.pending_call', 'Pending call', states=_states)
+    tasks = fields.One2Many(
+        'sale.pending_task', 'prospect_trace',
+        'Pending Tasks', states=_states)
+
+    current_interest = fields.Selection(
+        Interest.get_interest_levels(), 'Current interest',
+        states=_states)
+
+    state = fields.Selection([
+            ('unassigned', 'Unassigned'),
+            ('open', 'Open'),
+            ('with_pending_calls', 'With pending calls'),
+            ('closed', 'Closed')
+            ], 'State',
+            states=_states)
+
+    @fields.depends('prospect_contacts', 'prospect')
+    def on_change_prospect_contacts(self):
+        for contact in self.prospect_contacts:
+            contact.update_collaborators(changed_from='prospect_trace')
+
+    @classmethod
+    def __setup__(cls):
+        super(ProspectTrace, cls).__setup__()
+        cls._buttons.update({
+            'wizard_schedule': {
+                'invisible': Eval('state') == 'with_pending_calls',
+            },
+            'wizard_make_call': {},
+            'close_trace': {
+                'invisible': Eval('state') == 'closed',
+                'depends': ['state']
+            },
+            'reopen_trace': {
+                'invisible': (Eval('state') == 'open')
+                | (Eval('state') == 'with_pending_calls'),
+
+                'depends': ['state']
+            }
+        })
+
+    @classmethod
+    def default_state(cls):
+        return 'open'
+
+    @classmethod
+    @ModelView.button_action(
+        'sale_opportunity_management.schedule_call_wizard')
+    def wizard_schedule(cls, prospect_traces):
+        pass
+
+    @classmethod
+    @ModelView.button_action(
+        'sale_opportunity_management.make_call_wizard')
+    def wizard_make_call(cls, prospect_traces):
+        pass
+
+    @classmethod
+    @ModelView.button
+    def close_trace(cls, prospect_traces):
+        for prospect_trace in prospect_traces:
+            prospect_trace.state = 'closed'
+            prospect_trace.save()
+
+    @classmethod
+    @ModelView.button
+    def reopen_trace(cls, prospect_traces):
+        for prospect_trace in prospect_traces:
+            prospect_trace.state = 'open'
+            prospect_trace.save()
+
+    def get_rec_name(self, name):
+        if self.prospect:
+            return '[' + str(self.id) + '] ' + self.prospect.name
+
+
+class ScheduleCallStart(ModelView):
+    'Inicio agendar llamada a seguimiento de prospecto'
+    __name__ = 'sale.prospect_trace.schedule.start'
+
+    currency_date = fields.DateTime('Currency Date', readonly=True)
+    date_time = fields.DateTime('Date time', domain=[
+        ('date_time', '>=', Eval('currency_date'))])
+
+    @classmethod
+    def default_currency_date(cls):
+        date = datetime.now()
+
+        return date
+
+
+class ScheduleCall(Wizard):
+    'Agendar llamada a seguimiento de prospecto'
+    __name__ = 'sale.prospect_trace.schedule'
+
+    start = StateView(
+        'sale.prospect_trace.schedule.start',
+        'sale_opportunity_management.schedule_start_view_form', [
+            Button("Cancel", 'end', 'tryton-cancel'),
+            Button("Schedule", 'schedule', 'tryton-ok', default=True)])
+
+    schedule = StateTransition()
+
+    def transition_schedule(self):
+        MakeCall.create_schedule_call(self.start.date_time, self.record)
+        return 'end'
+
+
 class MakeCallStart(ModelView):
     'Inicio de creación de llamada a seguimiento de prospecto'
     __name__ = 'sale.prospect_trace.make_call.start'
@@ -132,6 +266,7 @@ class MakeCall(Wizard):
         task = Task()
         task.description = description
         task.prospect_trace = prospect_trace
+        task.contacts = prospect_trace.prospect_contacts
         task.save()
 
     @classmethod

tests/scenario_assign_prospect_to_me.rst

@@ -1,35 +0,0 @@
-.. Importaciones::
-
-..     >>> from proteus import Model, Wizard
-..     >>> from trytond.tests.tools import activate_modules
-
-.. Activar módulos::
-
-..     >>> config = activate_modules('sale_opportunity_management')
-
-
-.. Crear operario::
-..     >>> User = Model.get('res.user')
-..     >>> operator = User(name="Operario", login="operario")
-
-.. Crear prospecto::
-
-..     >>> Prospect = Model.get('sale.prospect')
-..     >>> prospect = Prospect()
-
-..     >>> prospect.name = 'Assignable To Me S.A.S'
-..     >>> contact_method = prospect.contact_methods.new(value='123123123', name='Ricardo', job='Infraestructura')  
-..     >>> prospect.business_unit = 'brigade'
-..     >>> prospect.save()
-
-..     [ Se abre una ventana preguntandole al usuario si quiere asignarse a sí mismo el prospecto recién creado ]
-..     >>> assign_to_me_wizard = Wizard('sale.prospect.assign_to_me', [prospect])
-..     >>> assign_to_me_wizard.form.assign_to_me = true
-..     >>> assign_to_me_wizard.execute('assign_to_me')
-
-..     [ Se inició seguimiento, asignado al operador que lo creó ]
-..     >>> ProspectTrace = Model.get('sale.prospect_trace')
-..     >>> prospect_trace, = ProspectTrace.find([('prospect', '=', prospect)])
-..     >>> prospect_trace.prospect_assigned_operator.id
-..     operator.id 
-

tests/scenario_sale_opportunity_management.rst

@@ -287,16 +287,42 @@ Hacer llamada y programar tarea::
     >>> make_call.execute('schedule_task')
 
     >>> Task = Model.get('sale.pending_task')
-    >>> task, = Task.find([('description', '=', 'I have to send a mail to prospect offering him this services...')])
-    >>> task
-    proteus.Model.get('sale.pending_task')(1)
+    >>> task1, = Task.find([('description', '=', 'I have to send a mail to prospect offering him this services...')])
 
-    >>> task.state
+    >>> task1
+    proteus.Model.get('sale.pending_task')(1)
+    >>> task1.state
     'pending'
 
-    >>> task.click('close_task') 
-    >>> task.state
+    >>> task1.click('close_task')
+ 
+    >>> task1.state
     'done'
+    >>> task1.contacts[0].value
+    '12345678910'
+
+Programar segunda tarea al mismo seguimiento::
+    >>> make_call = Wizard('sale.prospect_trace.make_call', [prospect_trace])
+    >>> make_call.form.description = 'Prospect told me to send him an SMS'
+    >>> make_call.form.interest = '3'
+    >>> make_call.form.schedule_call = 'no'
+    >>> make_call.form.schedule_task = 'yes'
+    >>> make_call.execute('make_call')
+    >>> make_call.form.task_description = 'I have to send a SMS to prospect offering him this services...'
+    >>> make_call.execute('schedule_task')
+
+    >>> task1.save()
+    >>> Task = Model.get('sale.pending_task')
+    >>> task2, = Task.find([('description', '=', 'I have to send a SMS to prospect offering him this services...')])
+    >>> task2
+    proteus.Model.get('sale.pending_task')(2)
+
+    >>> task2.state
+    'pending'
+    >>> task2.contacts[0].value 
+    '12345678910'
+    >>> task1.contacts[0].value
+    '12345678910'
 
 Hacer llamada y cerrar venta (Seguimiento de prospecto)::
     >>> make_call = Wizard('sale.prospect_trace.make_call', [prospect_trace])
@@ -347,7 +373,6 @@ Reasignar prospectos por prospecto::
     >>> reassign_by_prospect.form.prospect = prospect1
     >>> reassign_by_prospect.form.new_operator = user
     >>> reassign_by_prospect.execute('reassign_by_prospect')
-    
 
     >>> prospect1.reload()
     >>> prospect1.assigned_operator.name
@@ -364,7 +389,7 @@ Crear un usuario de rol administrador::
     >>> admin.save()
     >>> admin.user_admin == True
     True
-    
+
 Agregar un nuevo método de contacto desde prospecto
     >>> contact_method = prospect1.contact_methods.new(value='0000000000', name='Nuevo', job='Puesto increíble') 
     >>> prospect1.save()

user.py

@@ -1,6 +1,6 @@
+
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
-
 from trytond.model import fields
 from trytond.pool import PoolMeta
 

view/pending_task_form.xml

@@ -8,5 +8,8 @@ this repository contains the full copyright notices and license terms. -->
         <newline/>
         <label name="description"/>
         <field name="description"/>
+        <newline/>
+        <label name="contacts"/>
+        <field name="contacts"/>
     </group>
 </form>

view/pending_task_tree.xml

@@ -4,5 +4,6 @@ this repository contains the full copyright notices and license terms. -->
 <tree>
     <field name="prospect_trace" expand="1"/>
     <field name="description" expand="1"/>
+    <field name="contacts" expand="1"/>
     <button name="close_task"/>
 </tree>