[imp] minor improvement for future bug fix

[odoo/odoo.git] / addons / crm_partner_assign / partner_geo_assign.py

diff --git a/addons/crm_partner_assign/partner_geo_assign.py b/addons/crm_partner_assign/partner_geo_assign.py
index 1e7168f..f522cc6 100644 (file)
--- a/addons/crm_partner_assign/partner_geo_assign.py
+++ b/addons/crm_partner_assign/partner_geo_assign.py
@@ -57,6 +57,16 @@ class res_partner_grade(osv.osv):
     }
 res_partner_grade()
 
+class res_partner_activation(osv.osv):
+    _name = 'res.partner.activation'
+    _order = 'sequence'
+
+    _columns = {
+        'sequence' : fields.integer('Sequence'),
+        'name' : fields.char('Name', size=32, required=True),
+    }
+
+res_partner_activation()
 
 class res_partner(osv.osv):
     _inherit = "res.partner"
@@ -68,7 +78,11 @@ class res_partner(osv.osv):
             help="Gives the probability to assign a lead to this partner. (0 means no assignation.)"),
         'opportunity_assigned_ids': fields.one2many('crm.lead', 'partner_assigned_id',\
             'Assigned Opportunities'),
-        'grade_id': fields.many2one('res.partner.grade', 'Partner Grade')
+        'grade_id': fields.many2one('res.partner.grade', 'Partner Grade'),
+        'activation' : fields.many2one('res.partner.activation', 'Activation', select=1),
+        'date_partnership' : fields.date('Partnership Date'),
+        'date_review' : fields.date('Latest Partner Review'),
+        'date_review_next' : fields.date('Next Partner Review'),
     }
     _defaults = {
         'partner_weight': lambda *args: 0
@@ -88,7 +102,7 @@ class res_partner(osv.osv):
                 self.write(cr, uid, [partner.id], {
                     'partner_latitude': result[0],
                     'partner_longitude': result[1],
-                    'date_localization': time.strftime('%Y-%m-%d')
+                    'date_localization': fields.date.context_today(self,cr,uid,context=context)
                 }, context=context)
         return True
 res_partner()
@@ -114,22 +128,32 @@ class crm_lead(osv.osv):
             partners = self.pool.get('res.partner').browse(cr, uid, [partner_assigned_id], context=context)
             user_id = partners[0] and partners[0].user_id.id or False
             return {'value':
-                        {'date_assign': time.strftime('%Y-%m-%d'),
+                        {'date_assign': fields.date.context_today(self,cr,uid,context=context),
                          'user_id' : user_id}
                    }
 
-    def assign_partner(self, cr, uid, ids, partner_id=None, context=None):
+    def action_assign_partner(self, cr, uid, ids, context=None):
+        return self.assign_partner(cr, uid, ids, partner_id=False, context=context)
+
+    def assign_partner(self, cr, uid, ids, partner_id=False, context=None):
         partner_ids = {}
         res = False
-        if partner_id is None:
+        res_partner = self.pool.get('res.partner')
+        if not partner_id:
             partner_ids = self.search_geo_partner(cr, uid, ids, context=context)
         for lead in self.browse(cr, uid, ids, context=context):
             if not partner_id:
                 partner_id = partner_ids.get(lead.id, False)
-            res = super(crm_lead, self).assign_partner(cr, uid, [lead.id], partner_id, context=context)
-            self.write(cr, uid, [lead.id], {'date_assign': time.strftime('%Y-%m-%d'), 'partner_assigned_id': partner_id}, context=context)
+            if not partner_id:
+                continue
+            self.assign_geo_localize(cr, uid, [lead.id], lead.partner_latitude, lead.partner_longitude, context=context)
+            partner = res_partner.browse(cr, uid, partner_id, context=context)
+            if partner.user_id:
+                for lead_id in ids:
+                    self.allocate_salesman(cr, uid, [lead_id], [partner.user_id.id], context=context)
+            self.write(cr, uid, [lead.id], {'date_assign': fields.date.context_today(self,cr,uid,context=context), 'partner_assigned_id': partner_id}, context=context)
         return res
-        
+
 
     def assign_geo_localize(self, cr, uid, ids, latitude=False, longitude=False, context=None):
         for lead in self.browse(cr, uid, ids, context=context):
@@ -184,7 +208,7 @@ class crm_lead(osv.osv):
                 # 5. fifth way: anywhere in same country
                 if not partner_ids:
                     # still haven't found any, let's take all partners in the country!
-                    partner_ids = partner.search(cr, uid, [
+                    partner_ids = res_partner.search(cr, uid, [
                         ('partner_weight', '>', 0),
                         ('country', '=', lead.country_id.id),
                     ], context=context)
@@ -217,3 +241,5 @@ class crm_lead(osv.osv):
         return res_partner_ids
 crm_lead()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: