[FIX] Schedule jobs even if their next time has passed.

[odoo/odoo.git] / addons / base_contact / base_contact.py

diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index 1729f08..4b07e1a 100644 (file)
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution  
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -20,7 +20,6 @@
 #
 ##############################################################################
 
-import netsvc
 from osv import fields, osv
 
 class res_partner_contact(osv.osv):
@@ -34,6 +33,13 @@ class res_partner_contact(osv.osv):
         res = [(r['shortcut'], r['name']) for r in res if r['domain']=='contact']
         return res
 
+    def _main_job(self, cr, uid, ids, fields, arg, context=None):
+        res = dict.fromkeys(ids, False)
+        for contact in self.browse(cr, uid, ids, context):
+            if contact.job_ids:
+                res[contact.id] = contact.job_ids[0].name_get()[0]
+        return res
+
     _columns = {
         'name': fields.char('Last Name', size=30,required=True),
         'first_name': fields.char('First Name', size=30),
@@ -47,7 +53,7 @@ class res_partner_contact(osv.osv):
         'active' : fields.boolean('Active'),
         'partner_id':fields.related('job_ids','address_id','partner_id',type='many2one', relation='res.partner', string='Main Employer'),
         'function_id':fields.related('job_ids','function_id',type='many2one', relation='res.partner.function', string='Main Function'),
-        'job_id':fields.related('job_ids',type='many2one', relation='res.partner.job', string='Main Job'),
+        'job_id': fields.function(_main_job, method=True, type='many2one', relation='res.partner.job', string='Main Job'),
         'email': fields.char('E-Mail', size=240),
     }
     _defaults = {
@@ -66,17 +72,28 @@ class res_partner_contact(osv.osv):
             addr += (r.get('first_name', '') or '')
             res.append((r['id'], addr))
         return res
+    def name_search(self, cr, uid, name='', args=None, operator='ilike', context=None, limit=None):
+        if not args:
+            args = []
+        if context is None:
+            context = {}
+        if name:
+            ids = self.search(cr, uid, ['|',('name', operator, name),('first_name', operator, name)] + args, limit=limit, context=context)
+        else:
+            ids = self.search(cr, uid, args, limit=limit, context=context)
+        return self.name_get(cr, uid, ids, context=context)
 res_partner_contact()
 
 class res_partner_address(osv.osv):
 
+
     #overriding of the name_get defined in base in order to remove the old contact name
     def name_get(self, cr, user, ids, context={}):
         if not len(ids):
             return []
         res = []
         for r in self.read(cr, user, ids, ['zip','city','partner_id', 'street']):
-            if context.get('contact_display', 'contact')=='partner':
+            if context.get('contact_display', 'contact')=='partner' and r['partner_id']:
                 res.append((r['id'], r['partner_id'][1]))
             else:
                 addr = str('')
@@ -100,24 +117,17 @@ class res_partner_job(osv.osv):
             return []
         res = []
         for r in self.browse(cr, uid, ids):
-            res.append((r.id, self.pool.get('res.partner.contact').name_get(cr, uid, [r.contact_id.id])[0][1] +", "+ r.function_id.name))
+            funct = r.function_id and (", " + r.function_id.name) or ""
+            res.append((r.id, self.pool.get('res.partner.contact').name_get(cr, uid, [r.contact_id.id])[0][1] + funct))
         return res
 
-    def search(self, cr, user, args, offset=0, limit=None, order=None,
-            context=None, count=False):
-        for arg in args:
-            if arg[0]=='address_id':
-                self._order = 'sequence_partner'
-            if arg[0]=='contact_id':
-                self._order = 'sequence_contact'
-        return super(res_partner_job,self).search(cr, user, args, offset, limit, order, context, count)
-
     _name = 'res.partner.job'
     _description ='Contact Partner Function'
     _order = 'sequence_contact'
     _columns = {
-        'name': fields.related('address_id','partner_id', type='many2one', relation='res.partner', string='Partner'),
-        'address_id':fields.many2one('res.partner.address','Address'),
+        'name': fields.related('address_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'),
+        'address_id':fields.many2one('res.partner.address','Address',
+                                     domain="[('partner_id', '=', name)]"),
         'contact_id':fields.many2one('res.partner.contact','Contact', required=True, ondelete='cascade'),
         'function_id': fields.many2one('res.partner.function','Partner Function'),
         'sequence_contact':fields.integer('Contact Seq.',help='Order of importance of this address in the list of addresses of the linked contact'),
@@ -134,8 +144,20 @@ class res_partner_job(osv.osv):
 
     _defaults = {
         'sequence_contact' : lambda *a: 0,
-        'state' : lambda *a: 'current', 
+        'state' : lambda *a: 'current',
     }
+
+    def onchange_partner(self, cr, uid, _, partner_id, context=None):
+        return {'value': {'address_id': False}}
+
+    def onchange_address(self, cr, uid, _, address_id, context=None):
+        partner_id = False
+        if address_id:
+            address = self.pool.get('res.partner.address')\
+                        .browse(cr, uid, address_id, context)
+            partner_id = address.partner_id.id
+        return {'value': {'name': partner_id}}
+
 res_partner_job()