[TYPO] Set the right category for the Point Of Sale

[odoo/odoo.git] / addons / crm / res_partner.py

diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index a00a25f..acf212a 100644 (file)
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -24,21 +24,30 @@ from osv import fields,osv
 class res_partner(osv.osv):
     """ Inherits partner and adds CRM information in the partner form """
     _inherit = 'res.partner'
+
+    def _opportunity_meeting_count(self, cr, uid, ids, field_name, arg, context=None):
+        res = {}
+        for partner in self.browse(cr, uid, ids, context):
+            res[partner.id] = {
+                'opportunity_count': len(partner.opportunity_ids),
+                'meeting_count': len(partner.meeting_ids),
+            }
+        return res
+
     _columns = {
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'opportunity_ids': fields.one2many('crm.lead', 'partner_id',\
-            'Leads and Opportunities'),
-        'meeting_ids': fields.one2many('crm.meeting', 'partner_id',\
+            'Leads and Opportunities', domain=[('state','in', ('draft','open','pending'))]),
+        'meeting_ids': fields.many2many('crm.meeting', 'crm_meeting_partner_rel','partner_id', 'meeting_id',
             'Meetings'),
         'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id',\
             'Phonecalls'),
+        'opportunity_count': fields.function(_opportunity_meeting_count, string="Opportunity", type='integer', multi='opp_meet'),
+        'meeting_count': fields.function(_opportunity_meeting_count, string="Meeting", type='integer', multi='opp_meet'),
     }
 
     def redirect_partner_form(self, cr, uid, partner_id, context=None):
-        model_data = self.pool.get('ir.model.data')
-        result = model_data._get_id(cr, uid, 'base', 'view_res_partner_filter')
-        res = model_data.read(cr, uid, result, ['res_id'])
-
+        search_view = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'view_res_partner_filter')
         value = {
             'domain': "[]",
             'view_type': 'form',
@@ -48,30 +57,27 @@ class res_partner(osv.osv):
             'view_id': False,
             'context': context,
             'type': 'ir.actions.act_window',
-            'search_view_id': res['res_id']
+            'search_view_id': search_view and search_view[1] or False
         }
         return value
 
     def make_opportunity(self, cr, uid, ids, opportunity_summary, planned_revenue=0.0, probability=0.0, partner_id=None, context=None):
-        categ = self.pool.get('crm.case.categ')
-        address = self.address_get(cr, uid, ids)
-        categ_ids = categ.search(cr, uid, [('object_id.model','=','crm.lead')])
-        lead = self.pool.get('crm.lead')
+        categ_obj = self.pool.get('crm.case.categ')
+        categ_ids = categ_obj.search(cr, uid, [('object_id.model','=','crm.lead')])
+        lead_obj = self.pool.get('crm.lead')
         opportunity_ids = {}
         for partner in self.browse(cr, uid, ids, context=context):
-            address = self.address_get(cr, uid, [partner.id])['default']
             if not partner_id:
                 partner_id = partner.id
-            opportunity_id = lead.create(cr, uid, {
+            opportunity_id = lead_obj.create(cr, uid, {
                 'name' : opportunity_summary,
                 'planned_revenue' : planned_revenue,
                 'probability' : probability,
                 'partner_id' : partner_id,
-                'partner_address_id' : address,
                 'categ_id' : categ_ids and categ_ids[0] or '',
                 'state' :'draft',
                 'type': 'opportunity'
-            })
+            }, context=context)
             opportunity_ids[partner_id] = opportunity_id
         return opportunity_ids
 res_partner()