diff --git a/addons/account/partner.py b/addons/account/partner.py
index 447753bc977..cad285def84 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -179,6 +179,9 @@ class res_partner(osv.osv):
def _test_percent(self, cr, uid, ids, field_name, arg, context=None):
return {partner.id: random.random()*100 for partner in self.browse(cr, uid, ids, context)}
+ def _journal_item_count(self, cr, uid, ids, field_name, arg, context=None):
+ return {partner.id: len(partner.journal_items_ids) for partner in self.browse(cr, uid, ids, context)}
+
def has_something_to_reconcile(self, cr, uid, partner_id, context=None):
'''
at least a debit, a credit and a line older than the last reconciliation date of the partner
@@ -210,6 +213,7 @@ class res_partner(osv.osv):
'invoices_stat_button': fields.function(_invoices_stat_button, string="Invoices", type='html'),
'testpercent': fields.function(_test_percent, string="TestPercent", type='float'),
'journal_items_ids': fields.one2many('account.move.line', 'partner_id', 'Journal Items'),
+ 'journal_item_count': fields.function(_journal_item_count, string="Journal Items", type="integer"),
'property_account_payable': fields.property(
type='many2one',
relation='account.account',
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index b773af94376..472e14a806f 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -64,15 +64,16 @@
-
-
-
-
-
+
+
diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index bc914120ae8..453afdbbba4 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -25,7 +25,7 @@ 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):
+ def _opportunity_meeting_phonecall_count(self, cr, uid, ids, field_name, arg, context=None):
res = dict(map(lambda x: (x,{'opportunity_count': 0, 'meeting_count': 0}), ids))
# the user may not have access rights for opportunities or meetings
try:
@@ -33,6 +33,7 @@ class res_partner(osv.osv):
res[partner.id] = {
'opportunity_count': len(partner.opportunity_ids),
'meeting_count': len(partner.meeting_ids),
+ 'phonecall_count': len(partner.meeting_ids),
}
except:
pass
@@ -46,8 +47,9 @@ class res_partner(osv.osv):
'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="# Meetings", type='integer', multi='opp_meet'),
+ 'opportunity_count': fields.function(_opportunity_meeting_phonecall_count, string="Opportunity", type='integer', multi='opp_meet'),
+ 'meeting_count': fields.function(_opportunity_meeting_phonecall_count, string="# Meetings", type='integer', multi='opp_meet'),
+ 'phonecall_count': fields.function(_opportunity_meeting_phonecall_count, string="Phonecalls", type="integer", multi='opp_meet'),
}
def copy(self, cr, uid, record_id, default=None, context=None):
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index e86e12c9592..f1c1ca8295a 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -90,25 +90,25 @@
-
-
-
-
+
+
+