From 0f40b3bc8f9c50e6e4361901eb9c024ba76851a3 Mon Sep 17 00:00:00 2001 From: Randhir Mayatra rma-openerp Date: Mon, 24 Mar 2014 10:39:21 +0530 Subject: [PATCH] [IMP] convert button into stat button for project_issue and stock_claim bzr revid: rma@tinyerp.com-20140324050921-qxn3n4getus3il6c --- .../claim_from_delivery/claim_delivery_view.xml | 7 ++++--- addons/crm/crm_lead.py | 11 ++++++++++- addons/crm/crm_lead_view.xml | 17 +++++++++-------- addons/crm_claim/crm_claim.py | 9 +++++++++ addons/crm_claim/res_partner_view.xml | 8 ++++---- addons/crm_project_issue/project_issue_view.xml | 3 ++- addons/project_issue/project_issue.py | 5 ++--- addons/stock/stock.py | 12 ++++++++++-- 8 files changed, 50 insertions(+), 22 deletions(-) diff --git a/addons/claim_from_delivery/claim_delivery_view.xml b/addons/claim_from_delivery/claim_delivery_view.xml index 9187b1d11ca..852d602c269 100644 --- a/addons/claim_from_delivery/claim_delivery_view.xml +++ b/addons/claim_from_delivery/claim_delivery_view.xml @@ -9,7 +9,6 @@ {'default_ref': 'stock.picking.out,'+str(context.get('active_id', False))} [('ref','=','stock.picking.out,'+str(context.get('active_id',False)))] - crm.claim.from_delivery.form stock.picking.out @@ -17,11 +16,13 @@
-
- diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 4da0a509ed1..b972fe34255 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -214,7 +214,14 @@ class crm_lead(format_address, osv.osv): duration = len(no_days) res[lead.id][field] = abs(int(duration)) return res - + def _meeting_count(self, cr, uid, ids, field_name, arg, context=None): + res = dict(map(lambda x: (x,0), ids)) + try: + for meeting in self.browse(cr, uid, ids, context=context): + res[meeting.id] = len(meeting.opportunity_ids) + except: + pass + return res _columns = { 'partner_id': fields.many2one('res.partner', 'Partner', ondelete='set null', track_visibility='onchange', select=True, help="Linked partner (optional). Usually created when converting the lead."), @@ -289,6 +296,8 @@ class crm_lead(format_address, osv.osv): 'payment_mode': fields.many2one('crm.payment.mode', 'Payment Mode', \ domain="[('section_id','=',section_id)]"), 'planned_cost': fields.float('Planned Costs'), + 'opportunity_ids': fields.one2many('calendar.event', 'opportunity_id', 'Opportunities'), + 'meeting_count': fields.function(_meeting_count, string='# Meetings', type='integer'), } _defaults = { diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index a33b215fb8f..17c7f58c4fe 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -103,9 +103,8 @@
-