From b7bc8b3aa45b66245c1b65461543d8c4f4fed46e Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Wed, 12 Mar 2014 14:23:47 +0100
Subject: [PATCH 01/65] [IMP] change the partner form view to display new stat
 button information in addon account/crm

bzr revid: ged@openerp.com-20140312132347-dyu1i3szlh9r7jq9
---
 addons/account/account_invoice.py |  2 +-
 addons/account/partner.py         | 21 +++++++++++++++++++++
 addons/account/partner_view.xml   | 11 ++++++++---
 addons/crm/res_partner.py         | 18 +++++++++++++++++-
 addons/crm/res_partner_view.xml   | 22 +++++++++++++++-------
 5 files changed, 62 insertions(+), 12 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 06e59232ac9..5a0e1411fe8 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1801,7 +1801,7 @@ class res_partner(osv.osv):
     """ Inherits partner and adds invoice information in the partner form """
     _inherit = 'res.partner'
     _columns = {
-        'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
+        'invoice_ids': fields.one2many('account.invoice', 'partner_id', 'Invoices', readonly=True),
     }
 
     def _find_accounting_partner(self, partner):
diff --git a/addons/account/partner.py b/addons/account/partner.py
index f24ffcf55b4..d3777683f6f 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -162,6 +162,24 @@ class res_partner(osv.osv):
     def _debit_search(self, cr, uid, obj, name, args, context=None):
         return self._asset_difference_search(cr, uid, obj, name, 'payable', args, context=context)
 
+    def _invoices_stat_button(self, cr, uid, ids, field_name, arg, context=None):
+        res = {}
+        obj = self.pool.get('account.invoice')        
+        for partner in self.browse(cr, uid, ids, context):
+            domain = [('id', 'in', map(int, partner.invoice_ids))]
+            group_obj = obj.read_group(cr, uid, domain, ['amount_total'], [''], context=context)
+            total = group_obj[0]['amount_total']
+            res[partner.id] = """
+                    <div><strong>%s</strong> invoices</div>
+                    <div>Total: %s</div>
+            """ % (len(partner.invoice_ids), total)
+        return res
+
+    def _journal_items_stat_button(self, cr, uid, ids, field_name, arg, context=None):
+        html = "<div><strong>%s</strong> Journal Items</div>"
+        return {partner.id: html % len(partner.journal_items_ids) for partner in self.browse(cr, uid, ids, context)}
+        res = {}
+
     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
@@ -190,6 +208,9 @@ class res_partner(osv.osv):
             fnct_search=_credit_search, string='Total Receivable', multi='dc', help="Total amount this customer owes you."),
         'debit': fields.function(_credit_debit_get, fnct_search=_debit_search, string='Total Payable', multi='dc', help="Total amount you have to pay to this supplier."),
         'debit_limit': fields.float('Payable Limit'),
+        'invoices_stat_button': fields.function(_invoices_stat_button, string="Invoices", type='html'),
+        'journal_items_ids': fields.one2many('account.move.line', 'partner_id', 'Journal Items'),
+        'journal_items_stat_button': fields.function(_journal_items_stat_button, string='Journal Items', type='html'),
         '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 6a58bc7f77e..448a093570f 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -64,10 +64,15 @@
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
-                    <button type="action" string="Invoices" 
+                    <statbutton type="action" 
                         name="%(account.action_invoice_tree)d" 
-                        context="{'search_default_partner_id': active_id,'default_partner_id': active_id}" groups="account.group_account_invoice"/>
-                    <button type="action" string="Journal Items" name="%(account.action_account_moves_all_tree)d" groups="account.group_account_user"/>
+                        icon="fa-pencil-square-o"
+                        context="{'search_default_partner_id': active_id,'default_partner_id': active_id}" groups="account.group_account_invoice">
+                        <field string="Invoices" name="invoices_stat_button" attrs="{'readonly':1}"/>
+                    </statbutton>
+                    <statbutton type="action" name="%(account.action_account_moves_all_tree)d" groups="account.group_account_user" icon="fa-book">
+                        <field string="Journal Items" name="journal_items_stat_button" attrs="{'readonly':1}"/>                        
+                    </statbutton>
                     <button type="action" string="Contracts" name="%(account.action_open_partner_analytic_accounts)d"
                             groups="analytic.group_analytic_accounting"/>
                 </xpath>
diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index c2eecb7c4e7..30f2b8244b3 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -38,14 +38,30 @@ class res_partner(osv.osv):
             pass
         return res
 
+    def _opportunities_stat_button(self, cr, uid, ids, field_name, arg, context=None):
+        html = "<div><strong>%s</strong> opportunities</div>"
+        return {partner.id: html % len(partner.opportunity_ids) for partner in self.browse(cr, uid, ids, context)}
+        res = {}
+
+    def _meetings_stat_button(self, cr, uid, ids, field_name, arg, context=None):
+        html = "<div><strong>%s</strong> meetings</div>"
+        return {partner.id: html % len(partner.meeting_ids) for partner in self.browse(cr, uid, ids, context)}
+
+    def _calls_stat_button(self, cr, uid, ids, field_name, arg, context=None):
+        html = "<div><strong>%s</strong> calls</div>"
+        return {partner.id: html % len(partner.phonecall_ids) for partner in self.browse(cr, uid, ids, context)}
+
     _columns = {
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'opportunity_ids': fields.one2many('crm.lead', 'partner_id',\
             'Leads and Opportunities', domain=[('probability', 'not in', ['0', '100'])]),
-        'meeting_ids': fields.many2many('calendar.event', 'calendar_event_partner_rel','partner_id', 'meeting_id',
+        'opportunities_stat_button': fields.function(_opportunities_stat_button, string="Opportunities", type='html'),
+        'meeting_ids': fields.many2many('calendar.event', 'calendar_event_res_partner_rel','res_partner_id', 'calendar_event_id',
             'Meetings'),
+        'meetings_stat_button': fields.function(_meetings_stat_button, string="Meetings", type='html'),
         'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id',\
             'Phonecalls'),
+        'calls_stat_button': fields.function(_calls_stat_button, string="Calls", type='html'),
         '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'),
     }
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 7613c2161fc..b42db32107b 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -90,17 +90,25 @@
                         <field name="section_id" completion="1" groups="base.group_multi_salesteams"/>
                     </field>
                     <xpath expr="//div[@name='buttons']" position="inside">
-                        <button class="oe_inline" type="action" string="Opportunities"
+                        <statbutton class="oe_inline" type="action"
                             attrs="{'invisible': [('customer', '=', False)]}"
                             name="%(crm.crm_case_category_act_oppor11)d"
-                            context="{'search_default_partner_id': active_id}"/>
-                        <button class="oe_inline" type="action"
-                            string="Meetings"
+                            icon="fa-star"
+                            context="{'search_default_partner_id': active_id}">
+                            <field string="Opportunities" name="opportunities_stat_button"/>
+                        </statbutton>
+                        <statbutton class="oe_inline" type="action"
                             name="%(calendar.action_calendar_event)d"
-                            context="{'search_default_partner_ids': active_id, 'default_partner_ids' : [active_id]}"/>
-                        <button class="oe_inline" type="action" string="Calls" 
+                            icon="fa-calendar"
+                            context="{'search_default_partner_ids': active_id, 'default_partner_ids' : [active_id]}">
+                            <field string="Meetings" name="meetings_stat_button"/>
+                        </statbutton>
+                        <statbutton class="oe_inline" type="action"
                             name="%(crm.crm_case_categ_phone_incoming0)d" 
-                            context="{'search_default_partner_id': active_id, 'default_duration': 1.0}" />
+                            icon="fa-phone"
+                            context="{'search_default_partner_id': active_id, 'default_duration': 1.0}">
+                            <field string="Calls" name="calls_stat_button"/>
+                        </statbutton>
                     </xpath>
                 </data>
             </field>

From 3c835279e8e33d536644c558c20310aa73de1e85 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Thu, 13 Mar 2014 13:52:44 +0100
Subject: [PATCH 02/65] [IMP] removes the field journal_items_stat_button field
 from the res.partner model (the x2many widget replaces its functionality) and
 improves the view.  Also, adds a new field 'testpercent' to res.partner, only
 for testing purposes (addon account)

bzr revid: ged@openerp.com-20140313125244-k4zgsil19gk5sjcz
---
 addons/account/partner.py       | 13 ++++++-------
 addons/account/partner_view.xml |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/addons/account/partner.py b/addons/account/partner.py
index d3777683f6f..447753bc977 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -21,6 +21,7 @@
 
 from operator import itemgetter
 import time
+import random
 
 from openerp.osv import fields, osv
 
@@ -168,17 +169,15 @@ class res_partner(osv.osv):
         for partner in self.browse(cr, uid, ids, context):
             domain = [('id', 'in', map(int, partner.invoice_ids))]
             group_obj = obj.read_group(cr, uid, domain, ['amount_total'], [''], context=context)
-            total = group_obj[0]['amount_total']
+            total = group_obj[0]['amount_total'] or 0
             res[partner.id] = """
-                    <div><strong>%s</strong> invoices</div>
+                    <div><strong>%s</strong> Invoices</div>
                     <div>Total: %s</div>
             """ % (len(partner.invoice_ids), total)
         return res
 
-    def _journal_items_stat_button(self, cr, uid, ids, field_name, arg, context=None):
-        html = "<div><strong>%s</strong> Journal Items</div>"
-        return {partner.id: html % len(partner.journal_items_ids) for partner in self.browse(cr, uid, ids, context)}
-        res = {}
+    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 has_something_to_reconcile(self, cr, uid, partner_id, context=None):
         '''
@@ -209,8 +208,8 @@ class res_partner(osv.osv):
         'debit': fields.function(_credit_debit_get, fnct_search=_debit_search, string='Total Payable', multi='dc', help="Total amount you have to pay to this supplier."),
         'debit_limit': fields.float('Payable Limit'),
         '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_items_stat_button': fields.function(_journal_items_stat_button, string='Journal Items', type='html'),
         '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 448a093570f..b773af94376 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -66,12 +66,12 @@
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <statbutton type="action" 
                         name="%(account.action_invoice_tree)d" 
-                        icon="fa-pencil-square-o"
                         context="{'search_default_partner_id': active_id,'default_partner_id': active_id}" groups="account.group_account_invoice">
+                        <field string="TestPercent" name="testpercent" widget="percentpie" attrs="{'readonly':1}"/>
                         <field string="Invoices" name="invoices_stat_button" attrs="{'readonly':1}"/>
                     </statbutton>
                     <statbutton type="action" name="%(account.action_account_moves_all_tree)d" groups="account.group_account_user" icon="fa-book">
-                        <field string="Journal Items" name="journal_items_stat_button" attrs="{'readonly':1}"/>                        
+                        <field string="Journal Items" name="journal_items_ids" widget="x2many" attrs="{'readonly':1}"/>                        
                     </statbutton>
                     <button type="action" string="Contracts" name="%(account.action_open_partner_analytic_accounts)d"
                             groups="analytic.group_analytic_accounting"/>

From 0cba3bef4789e2eeec565521a986c7886d2e133b Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Thu, 13 Mar 2014 14:18:58 +0100
Subject: [PATCH 03/65] [IMP] removes some useless fields (*stat_button) from
 res_partner in addon crm and uses the new x2many widget in the form view

bzr revid: ged@openerp.com-20140313131858-mp1lfww3osmny27g
---
 addons/crm/res_partner.py       | 16 ----------------
 addons/crm/res_partner_view.xml |  6 +++---
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index 30f2b8244b3..bc914120ae8 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -38,30 +38,14 @@ class res_partner(osv.osv):
             pass
         return res
 
-    def _opportunities_stat_button(self, cr, uid, ids, field_name, arg, context=None):
-        html = "<div><strong>%s</strong> opportunities</div>"
-        return {partner.id: html % len(partner.opportunity_ids) for partner in self.browse(cr, uid, ids, context)}
-        res = {}
-
-    def _meetings_stat_button(self, cr, uid, ids, field_name, arg, context=None):
-        html = "<div><strong>%s</strong> meetings</div>"
-        return {partner.id: html % len(partner.meeting_ids) for partner in self.browse(cr, uid, ids, context)}
-
-    def _calls_stat_button(self, cr, uid, ids, field_name, arg, context=None):
-        html = "<div><strong>%s</strong> calls</div>"
-        return {partner.id: html % len(partner.phonecall_ids) for partner in self.browse(cr, uid, ids, context)}
-
     _columns = {
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'opportunity_ids': fields.one2many('crm.lead', 'partner_id',\
             'Leads and Opportunities', domain=[('probability', 'not in', ['0', '100'])]),
-        'opportunities_stat_button': fields.function(_opportunities_stat_button, string="Opportunities", type='html'),
         'meeting_ids': fields.many2many('calendar.event', 'calendar_event_res_partner_rel','res_partner_id', 'calendar_event_id',
             'Meetings'),
-        'meetings_stat_button': fields.function(_meetings_stat_button, string="Meetings", type='html'),
         'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id',\
             'Phonecalls'),
-        'calls_stat_button': fields.function(_calls_stat_button, string="Calls", type='html'),
         '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'),
     }
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index b42db32107b..e86e12c9592 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -95,19 +95,19 @@
                             name="%(crm.crm_case_category_act_oppor11)d"
                             icon="fa-star"
                             context="{'search_default_partner_id': active_id}">
-                            <field string="Opportunities" name="opportunities_stat_button"/>
+                            <field string="Opportunities" name="opportunity_ids" widget="x2many"/>
                         </statbutton>
                         <statbutton class="oe_inline" type="action"
                             name="%(calendar.action_calendar_event)d"
                             icon="fa-calendar"
                             context="{'search_default_partner_ids': active_id, 'default_partner_ids' : [active_id]}">
-                            <field string="Meetings" name="meetings_stat_button"/>
+                            <field string="Meetings" name="meeting_ids" widget="x2many"/>
                         </statbutton>
                         <statbutton class="oe_inline" type="action"
                             name="%(crm.crm_case_categ_phone_incoming0)d" 
                             icon="fa-phone"
                             context="{'search_default_partner_id': active_id, 'default_duration': 1.0}">
-                            <field string="Calls" name="calls_stat_button"/>
+                            <field string="Calls" name="phonecall_ids" widget="x2many"/>
                         </statbutton>
                     </xpath>
                 </data>

From 6fee78b47548529bd6ab1f28d649159799b89ac9 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Fri, 14 Mar 2014 15:01:14 +0100
Subject: [PATCH 04/65] [IMP] improves the way the res_partner fields are
 displayed in the buttons in form view.  Specifically, uses the widget
 'statinfo' and some related cleanup (addons account, crm)

bzr revid: ged@openerp.com-20140314140114-9t2piu3cpqkldnbo
---
 addons/account/partner.py       |  4 ++++
 addons/account/partner_view.xml | 11 ++++++-----
 addons/crm/res_partner.py       |  8 +++++---
 addons/crm/res_partner_view.xml | 18 +++++++++---------
 4 files changed, 24 insertions(+), 17 deletions(-)

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 @@
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
-                    <statbutton type="action" 
+                    <button type="action" 
+                        class="oe_stat_button"
                         name="%(account.action_invoice_tree)d" 
                         context="{'search_default_partner_id': active_id,'default_partner_id': active_id}" groups="account.group_account_invoice">
                         <field string="TestPercent" name="testpercent" widget="percentpie" attrs="{'readonly':1}"/>
                         <field string="Invoices" name="invoices_stat_button" attrs="{'readonly':1}"/>
-                    </statbutton>
-                    <statbutton type="action" name="%(account.action_account_moves_all_tree)d" groups="account.group_account_user" icon="fa-book">
-                        <field string="Journal Items" name="journal_items_ids" widget="x2many" attrs="{'readonly':1}"/>                        
-                    </statbutton>
+                    </button>
+                    <button type="action" class="oe_stat_button" name="%(account.action_account_moves_all_tree)d" groups="account.group_account_user" icon="fa-book">
+                        <field string="Journal Items" name="journal_item_count" widget="statinfo"/>                        
+                    </button>
                     <button type="action" string="Contracts" name="%(account.action_open_partner_analytic_accounts)d"
                             groups="analytic.group_analytic_accounting"/>
                 </xpath>
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 @@
                         <field name="section_id" completion="1" groups="base.group_multi_salesteams"/>
                     </field>
                     <xpath expr="//div[@name='buttons']" position="inside">
-                        <statbutton class="oe_inline" type="action"
+                        <button class="oe_inline oe_stat_button" type="action"
                             attrs="{'invisible': [('customer', '=', False)]}"
                             name="%(crm.crm_case_category_act_oppor11)d"
                             icon="fa-star"
                             context="{'search_default_partner_id': active_id}">
-                            <field string="Opportunities" name="opportunity_ids" widget="x2many"/>
-                        </statbutton>
-                        <statbutton class="oe_inline" type="action"
+                            <field string="Opportunities" name="opportunity_count" widget="statinfo"/>
+                        </button>
+                        <button class="oe_inline oe_stat_button" type="action"
                             name="%(calendar.action_calendar_event)d"
                             icon="fa-calendar"
                             context="{'search_default_partner_ids': active_id, 'default_partner_ids' : [active_id]}">
-                            <field string="Meetings" name="meeting_ids" widget="x2many"/>
-                        </statbutton>
-                        <statbutton class="oe_inline" type="action"
+                            <field string="Meetings" name="meeting_count" widget="statinfo"/>
+                        </button>
+                        <button class="oe_inline oe_stat_button" type="action"
                             name="%(crm.crm_case_categ_phone_incoming0)d" 
                             icon="fa-phone"
                             context="{'search_default_partner_id': active_id, 'default_duration': 1.0}">
-                            <field string="Calls" name="phonecall_ids" widget="x2many"/>
-                        </statbutton>
+                            <field string="Calls" name="phonecall_count" widget="statinfo"/>
+                        </button>
                     </xpath>
                 </data>
             </field>

From aac67e8bc528ea9c7bc771428bba952c984bf8ab Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Mon, 17 Mar 2014 16:28:28 +0100
Subject: [PATCH 05/65] [IMP] removes the testing field testpercent in
 res.partner and improves the way the buttons are displayed in form view
 (addon account)

bzr revid: ged@openerp.com-20140317152828-v2den23s32kzaqxh
---
 addons/account/partner.py       | 21 +++------------------
 addons/account/partner_view.xml |  4 ++--
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/addons/account/partner.py b/addons/account/partner.py
index cad285def84..b0092e5403a 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -21,7 +21,6 @@
 
 from operator import itemgetter
 import time
-import random
 
 from openerp.osv import fields, osv
 
@@ -163,21 +162,8 @@ class res_partner(osv.osv):
     def _debit_search(self, cr, uid, obj, name, args, context=None):
         return self._asset_difference_search(cr, uid, obj, name, 'payable', args, context=context)
 
-    def _invoices_stat_button(self, cr, uid, ids, field_name, arg, context=None):
-        res = {}
-        obj = self.pool.get('account.invoice')        
-        for partner in self.browse(cr, uid, ids, context):
-            domain = [('id', 'in', map(int, partner.invoice_ids))]
-            group_obj = obj.read_group(cr, uid, domain, ['amount_total'], [''], context=context)
-            total = group_obj[0]['amount_total'] or 0
-            res[partner.id] = """
-                    <div><strong>%s</strong> Invoices</div>
-                    <div>Total: %s</div>
-            """ % (len(partner.invoice_ids), total)
-        return res
-
-    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 _invoice_count(self, cr, uid, ids, field_name, arg, context=None):
+        return {partner.id: len(partner.invoice_ids) 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)}
@@ -210,8 +196,7 @@ class res_partner(osv.osv):
             fnct_search=_credit_search, string='Total Receivable', multi='dc', help="Total amount this customer owes you."),
         'debit': fields.function(_credit_debit_get, fnct_search=_debit_search, string='Total Payable', multi='dc', help="Total amount you have to pay to this supplier."),
         'debit_limit': fields.float('Payable Limit'),
-        'invoices_stat_button': fields.function(_invoices_stat_button, string="Invoices", type='html'),
-        'testpercent': fields.function(_test_percent, string="TestPercent", type='float'),
+        'invoice_count': fields.function(_invoice_count, string="Invoices", type='html'),
         '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(
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 472e14a806f..b64f2a4f88c 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -66,10 +66,10 @@
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <button type="action" 
                         class="oe_stat_button"
+                        icon="fa-pencil-square-o"
                         name="%(account.action_invoice_tree)d" 
                         context="{'search_default_partner_id': active_id,'default_partner_id': active_id}" groups="account.group_account_invoice">
-                        <field string="TestPercent" name="testpercent" widget="percentpie" attrs="{'readonly':1}"/>
-                        <field string="Invoices" name="invoices_stat_button" attrs="{'readonly':1}"/>
+                        <field string="Invoices" name="invoice_count" widget="statinfo" attrs="{'readonly':1}"/>
                     </button>
                     <button type="action" class="oe_stat_button" name="%(account.action_account_moves_all_tree)d" groups="account.group_account_user" icon="fa-book">
                         <field string="Journal Items" name="journal_item_count" widget="statinfo"/>                        

From 649198db8a5f754b642a09fa21769575331f1eeb Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Mon, 17 Mar 2014 16:59:26 +0100
Subject: [PATCH 06/65] [IMP] compute the 'invoice_count' and
 'journal_item_count' field in one pass instead of two separate calls (addon
 account)

bzr revid: ged@openerp.com-20140317155926-2l5542cqcaw997hl
---
 addons/account/partner.py | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/addons/account/partner.py b/addons/account/partner.py
index b0092e5403a..0089ac2a66d 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -162,11 +162,18 @@ class res_partner(osv.osv):
     def _debit_search(self, cr, uid, obj, name, args, context=None):
         return self._asset_difference_search(cr, uid, obj, name, 'payable', args, context=context)
 
-    def _invoice_count(self, cr, uid, ids, field_name, arg, context=None):
-        return {partner.id: len(partner.invoice_ids) 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 _invoice_journal_item_count(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict(map(lambda x: (x,{'invoice_count': 0, 'journal_item_count': 0}), ids))
+        # the user may not have access rights 
+        try:
+            for partner in self.browse(cr, uid, ids, context):
+                res[partner.id] = {
+                    'invoice_count': len(partner.invoice_ids),
+                    'journam_item_count': len(partner.journal_item_ids),
+                }
+        except:
+            pass
+        return res
 
     def has_something_to_reconcile(self, cr, uid, partner_id, context=None):
         '''
@@ -196,9 +203,9 @@ class res_partner(osv.osv):
             fnct_search=_credit_search, string='Total Receivable', multi='dc', help="Total amount this customer owes you."),
         'debit': fields.function(_credit_debit_get, fnct_search=_debit_search, string='Total Payable', multi='dc', help="Total amount you have to pay to this supplier."),
         'debit_limit': fields.float('Payable Limit'),
-        'invoice_count': fields.function(_invoice_count, string="Invoices", type='html'),
+        'invoice_count': fields.function(_invoice_journal_item_count, string="Invoices", type='html', multi="invoice_journal"),
         '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"),
+        'journal_item_count': fields.function(_invoice_journal_item_count, string="Journal Items", type="integer", multi="invoice_journal"),
         'property_account_payable': fields.property(
             type='many2one',
             relation='account.account',

From d9ef089939170cadc1adda15b82c9044d11504f7 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Tue, 18 Mar 2014 11:10:34 +0100
Subject: [PATCH 07/65] [FIX] fix a typo and uses the correct type in the
 invoice_count functional field of res_partner (addon account)

bzr revid: ged@openerp.com-20140318101034-0w72fjd2sxgy963q
---
 addons/account/partner.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/partner.py b/addons/account/partner.py
index 0089ac2a66d..04926a12785 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -169,7 +169,7 @@ class res_partner(osv.osv):
             for partner in self.browse(cr, uid, ids, context):
                 res[partner.id] = {
                     'invoice_count': len(partner.invoice_ids),
-                    'journam_item_count': len(partner.journal_item_ids),
+                    'journal_item_count': len(partner.journal_item_ids),
                 }
         except:
             pass
@@ -203,7 +203,7 @@ class res_partner(osv.osv):
             fnct_search=_credit_search, string='Total Receivable', multi='dc', help="Total amount this customer owes you."),
         'debit': fields.function(_credit_debit_get, fnct_search=_debit_search, string='Total Payable', multi='dc', help="Total amount you have to pay to this supplier."),
         'debit_limit': fields.float('Payable Limit'),
-        'invoice_count': fields.function(_invoice_journal_item_count, string="Invoices", type='html', multi="invoice_journal"),
+        'invoice_count': fields.function(_invoice_journal_item_count, string="Invoices", type='integer', multi="invoice_journal"),
         'journal_items_ids': fields.one2many('account.move.line', 'partner_id', 'Journal Items'),
         'journal_item_count': fields.function(_invoice_journal_item_count, string="Journal Items", type="integer", multi="invoice_journal"),
         'property_account_payable': fields.property(

From 871c346f5f745e8e3705282ae62cfa3e3e3d5a20 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Tue, 18 Mar 2014 13:34:59 +0100
Subject: [PATCH 08/65] [FIX] fix a typo (journal_items_ids ->
 journal_item_ids) in addon accont

bzr revid: ged@openerp.com-20140318123459-uszascvxdbfwyw3g
---
 addons/account/partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/partner.py b/addons/account/partner.py
index 04926a12785..0c3395de1b2 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -204,7 +204,7 @@ class res_partner(osv.osv):
         'debit': fields.function(_credit_debit_get, fnct_search=_debit_search, string='Total Payable', multi='dc', help="Total amount you have to pay to this supplier."),
         'debit_limit': fields.float('Payable Limit'),
         'invoice_count': fields.function(_invoice_journal_item_count, string="Invoices", type='integer', multi="invoice_journal"),
-        'journal_items_ids': fields.one2many('account.move.line', 'partner_id', 'Journal Items'),
+        'journal_item_ids': fields.one2many('account.move.line', 'partner_id', 'Journal Items'),
         'journal_item_count': fields.function(_invoice_journal_item_count, string="Journal Items", type="integer", multi="invoice_journal"),
         'property_account_payable': fields.property(
             type='many2one',

From fbb5eea4ba6278b8910f73e20dff2922ff40d236 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rajmyt@gmail.com>
Date: Thu, 20 Mar 2014 15:16:14 +0530
Subject: [PATCH 09/65] [IMP] convert button into stat button for project

bzr revid: rajmyt@gmail.com-20140320094614-53ix0c0fdgrzbmsc
---
 addons/project/project.py                     | 35 +++++++++++--------
 addons/project/project_view.xml               | 11 ++++--
 addons/project_issue/project_issue.py         | 27 ++++++++------
 addons/project_issue/project_issue_view.xml   |  5 ++-
 .../project_long_term_view.xml                |  7 ++--
 .../project_timesheet_view.xml                |  5 ++-
 6 files changed, 56 insertions(+), 34 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index e5dcf5de2cf..ee6390e4b87 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -187,19 +187,23 @@ class project(osv.osv):
             res[id] = (project_attachments or 0) + (task_attachments or 0)
         return res
 
-    def _task_count(self, cr, uid, ids, field_name, arg, context=None):
-        """ :deprecated: this method will be removed with OpenERP v8. Use task_ids
-                         fields instead. """
-        if context is None:
-            context = {}
-        res = dict.fromkeys(ids, 0)
-        ctx = context.copy()
-        ctx['active_test'] = False
-        task_ids = self.pool.get('project.task').search(cr, uid, [('project_id', 'in', ids)], context=ctx)
-        for task in self.pool.get('project.task').browse(cr, uid, task_ids, context):
-            res[task.project_id.id] += 1
+#     def _task_count(self, cr, uid, ids, field_name, arg, context=None):
+#         """ :deprecated: this method will be removed with OpenERP v8. Use task_ids
+#                          fields instead. """
+#         if context is None:
+#             context = {}
+#         res = dict.fromkeys(ids, 0)
+#         ctx = context.copy()
+#         ctx['active_test'] = False
+#         task_ids = self.pool.get('project.task').search(cr, uid, [('project_id', 'in', ids)], context=ctx)
+#         for task in self.pool.get('project.task').browse(cr, uid, task_ids, context):
+#             res[task.project_id.id] += 1
+#         return res
+    def _total_task_count(self, cr, uid, ids, field_name, arg, context=None):
+        res={}
+        for tasks in self.browse(cr, uid, ids, context):
+            res[tasks.id] = len(tasks.task_ids)
         return res
-
     def _get_alias_models(self, cr, uid, context=None):
         """ Overriden in project_issue to offer more options """
         return [('project.task', "Tasks")]
@@ -265,8 +269,8 @@ class project(osv.osv):
             }),
         'resource_calendar_id': fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report", states={'close':[('readonly',True)]} ),
         'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'task_count': fields.function(_task_count, type='integer', string="Open Tasks",
-                                      deprecated="This field will be removed in OpenERP v8. Use task_ids one2many field instead."),
+#         'task_count': fields.function(_task_count, type='integer', string="Open Tasks",
+#                                       deprecated="This field will be removed in OpenERP v8. Use task_ids one2many field instead."),
         'task_ids': fields.one2many('project.task', 'project_id',
                                     domain=[('stage_id.fold', '=', False)]),
         'color': fields.integer('Color Index'),
@@ -287,7 +291,8 @@ class project(osv.osv):
                     "- Followers Only: employees see only the followed tasks or issues; if portal\n"
                     "   is activated, portal users see the followed tasks or issues."),
         'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,),
-        'doc_count':fields.function(_get_attached_docs, string="Number of documents attached", type='int')
+        'doc_count':fields.function(_get_attached_docs, string="Number of documents attached", type='int'),
+        'total_task_count': fields.function(_total_task_count, string="Task", type='integer'),
      }
 
     def _get_type_common(self, cr, uid, context):
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 08738227f5a..45fe175f515 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -93,8 +93,13 @@
                         </div>
                     </div>
                     <div class="oe_right oe_button_box" name="buttons" groups="base.group_user">
-                        <field name="tasks" widget="x2many_counter" string="Tasks" attrs="{'invisible':[('use_tasks','=', False)]}" options='{"views": [[false, "kanban"], [false, "tree"], [false, "form"], [false, "calendar"], [false, "gantt"], [false, "graph"]]}'/>
-                        <button name="attachment_tree_view" string="Documents" type="object"/>
+                         <button class="oe_inline oe_stat_button" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}" 
+                            name="%(act_project_project_2_project_task_all)d" icon="fa-tasks">
+                            <field string="Task" name="total_task_count" widget="statinfo"/>
+                        </button>
+                        <button  class="oe_inline oe_stat_button" name="attachment_tree_view"  type="object" icon="fa-files-o">
+                            <field string="Documents" name="doc_count" widget="statinfo"/>
+                        </button>
                     </div>
                     <group>
                         <group>
@@ -238,7 +243,7 @@
                     <field name="user_id"/>
                     <field name="date"/>
                     <field name="color"/>
-                    <field name="task_count"/>
+                    <field name="total_task_count"/>
                     <field name="task_ids"/>
                     <field name="alias_id"/>
                     <field name="doc_count"/>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 6f072f5abd1..69ceb7839ca 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -490,22 +490,27 @@ class project(osv.Model):
     def _get_alias_models(self, cr, uid, context=None):
         return [('project.task', "Tasks"), ("project.issue", "Issues")]
 
-    def _issue_count(self, cr, uid, ids, field_name, arg, context=None):
-        """ :deprecated: this method will be removed with OpenERP v8. Use issue_ids
-                         fields instead. """
-        res = dict.fromkeys(ids, 0)
-        issue_ids = self.pool.get('project.issue').search(cr, uid, [('project_id', 'in', ids)])
-        for issue in self.pool.get('project.issue').browse(cr, uid, issue_ids, context):
-            if issue.stage_id and not issue.stage_id.fold:
-                res[issue.project_id.id] += 1
+#     def _issue_count(self, cr, uid, ids, field_name, arg, context=None):
+#         """ :deprecated: this method will be removed with OpenERP v8. Use issue_ids
+#                          fields instead. """
+#         res = dict.fromkeys(ids, 0)
+#         issue_ids = self.pool.get('project.issue').search(cr, uid, [('project_id', 'in', ids)])
+#         for issue in self.pool.get('project.issue').browse(cr, uid, issue_ids, context):
+#             if issue.stage_id and not issue.stage_id.fold:
+#                 res[issue.project_id.id] += 1
+#         return res
+    def _total_issue_count(self, cr, uid, ids, field_name, arg, context=None):
+        res={}
+        for issues in self.browse(cr, uid, ids, context):
+            res[issues.id] = len(issues.issue_ids)
         return res
-
     _columns = {
         'project_escalation_id': fields.many2one('project.project', 'Project Escalation',
             help='If any issue is escalated from the current Project, it will be listed under the project selected here.',
             states={'close': [('readonly', True)], 'cancelled': [('readonly', True)]}),
-        'issue_count': fields.function(_issue_count, type='integer', string="Unclosed Issues",
-                                       deprecated="This field will be removed in OpenERP v8. Use issue_ids one2many field instead."),
+#         'issue_count': fields.function(_issue_count, type='integer', string="Unclosed Issues",
+#                                        deprecated="This field will be removed in OpenERP v8. Use issue_ids one2many field instead."),
+        'total_issue_count': fields.function(_total_issue_count, string="Issue", type='integer'),
         'issue_ids': fields.one2many('project.issue', 'project_id',
                                      domain=[('stage_id.fold', '=', False)])
     }
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 3af9ee608d6..2b2c48519f9 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -306,7 +306,10 @@
                     <label for="use_issues"/>
                 </xpath>
                 <xpath expr='//div[@name="buttons"]' position='inside'>
-                    <button name="%(act_project_project_2_project_issue_all)d" string="Issues" type="action" attrs="{'invisible':[('use_issues','=', 0)]}"/>
+                    <button class="oe_inline oe_stat_button" type="action" attrs="{'invisible':[('use_issues','=', 0)]}" 
+                        name="%(act_project_project_2_project_issue_all)d" icon="fa-bug">
+                        <field string="Issues" name="total_issue_count" widget="statinfo"/>
+                    </button>
                 </xpath>
                 <xpath expr='//page[@name="project_stages"]' position="attributes">
                     <attribute name="attrs">{'invisible': [('use_tasks', '=', False),('use_issues','=',False)]}</attribute>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 36fb83000ce..d6b118eb323 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -102,9 +102,10 @@
                        <label for="use_phases"/>
                 </xpath>
                 <xpath expr="//div[@name='buttons']" position='inside'>
-                        <button name="%(act_project_phases)d"
-                                string="Phases" type="action"
-                                attrs="{'invisible':[('use_phases','=', 0)]}"/>
+                    <button class="oe_inline oe_stat_button" type="action"
+                        attrs="{'invisible':[('use_phases','=', 0)]}" name="%(act_project_phases)d" icon="fa-qrcode">
+                        <field string="Phases" name="phase_count" widget="statinfo"/>
+                    </button>
                 </xpath>
             </field>
         </record>
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 548264eb07b..a51c7976602 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -30,7 +30,10 @@
                     <label for="use_timesheets"/>
                 </xpath>
                 <xpath expr='//div[@name="buttons"]' position="inside">
-                    <button name="open_timesheets" string="Timesheets" type="object" attrs="{'invisible':[('use_timesheets','=', 0)]}"/>
+                    <button class="oe_inline oe_stat_button" name="open_timesheets" type="object" attrs="{'invisible':[('use_timesheets','=', 0)]}"
+                        icon="fa-calendar" widget="statinfo">
+                        <field name="hours_quantity" string="Timesheets" widget="statinfo"/>
+                    </button>
                 </xpath>
             </field>
         </record>

From 6cd8ef5c6597068cfcca25ddbdcdee0d1ede0a34 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rajmyt@gmail.com>
Date: Thu, 20 Mar 2014 15:19:59 +0530
Subject: [PATCH 10/65] [IMP] add icons for stat buttons

bzr revid: rajmyt@gmail.com-20140320094959-4vki69r7715xvl41
---
 addons/web/static/lib/fontawesome/css/font-awesome.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/web/static/lib/fontawesome/css/font-awesome.css b/addons/web/static/lib/fontawesome/css/font-awesome.css
index 7fa0e6f467b..9e1011e7ef2 100644
--- a/addons/web/static/lib/fontawesome/css/font-awesome.css
+++ b/addons/web/static/lib/fontawesome/css/font-awesome.css
@@ -207,6 +207,9 @@
 .fa-star:before {
   content: "\f005";
 }
+. fa-tasks:before {
+  content: "\f0ae";
+}
 .fa-star-o:before {
   content: "\f006";
 }
@@ -308,6 +311,9 @@
 .fa-qrcode:before {
   content: "\f029";
 }
+.fa-calendar:before {
+  content: "\f073";
+}
 .fa-barcode:before {
   content: "\f02a";
 }

From df53c3f970d948321dc91de7e2818decce94adbe Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Thu, 20 Mar 2014 16:50:17 +0530
Subject: [PATCH 11/65] [IMP] improve code

bzr revid: rma@tinyerp.com-20140320112017-03miv5s8jovz0iac
---
 addons/project/project.py                   | 19 ++-----------------
 addons/project/project_view.xml             |  4 ++--
 addons/project_issue/project_issue.py       | 15 ++-------------
 addons/project_issue/project_issue_view.xml |  2 +-
 4 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index ee6390e4b87..942a47d06a6 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -186,20 +186,7 @@ class project(osv.osv):
             task_attachments = attachment.search(cr, uid, [('res_model', '=', 'project.task'), ('res_id', 'in', task_ids)], context=context, count=True)
             res[id] = (project_attachments or 0) + (task_attachments or 0)
         return res
-
-#     def _task_count(self, cr, uid, ids, field_name, arg, context=None):
-#         """ :deprecated: this method will be removed with OpenERP v8. Use task_ids
-#                          fields instead. """
-#         if context is None:
-#             context = {}
-#         res = dict.fromkeys(ids, 0)
-#         ctx = context.copy()
-#         ctx['active_test'] = False
-#         task_ids = self.pool.get('project.task').search(cr, uid, [('project_id', 'in', ids)], context=ctx)
-#         for task in self.pool.get('project.task').browse(cr, uid, task_ids, context):
-#             res[task.project_id.id] += 1
-#         return res
-    def _total_task_count(self, cr, uid, ids, field_name, arg, context=None):
+    def _task_count(self, cr, uid, ids, field_name, arg, context=None):
         res={}
         for tasks in self.browse(cr, uid, ids, context):
             res[tasks.id] = len(tasks.task_ids)
@@ -269,8 +256,7 @@ class project(osv.osv):
             }),
         'resource_calendar_id': fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report", states={'close':[('readonly',True)]} ),
         'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-#         'task_count': fields.function(_task_count, type='integer', string="Open Tasks",
-#                                       deprecated="This field will be removed in OpenERP v8. Use task_ids one2many field instead."),
+        'task_count': fields.function(_task_count, type='integer', string="Tasks",),
         'task_ids': fields.one2many('project.task', 'project_id',
                                     domain=[('stage_id.fold', '=', False)]),
         'color': fields.integer('Color Index'),
@@ -292,7 +278,6 @@ class project(osv.osv):
                     "   is activated, portal users see the followed tasks or issues."),
         'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,),
         'doc_count':fields.function(_get_attached_docs, string="Number of documents attached", type='int'),
-        'total_task_count': fields.function(_total_task_count, string="Task", type='integer'),
      }
 
     def _get_type_common(self, cr, uid, context):
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 45fe175f515..35d4e1bf64f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -95,7 +95,7 @@
                     <div class="oe_right oe_button_box" name="buttons" groups="base.group_user">
                          <button class="oe_inline oe_stat_button" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}" 
                             name="%(act_project_project_2_project_task_all)d" icon="fa-tasks">
-                            <field string="Task" name="total_task_count" widget="statinfo"/>
+                            <field string="Task" name="task_count" widget="statinfo"/>
                         </button>
                         <button  class="oe_inline oe_stat_button" name="attachment_tree_view"  type="object" icon="fa-files-o">
                             <field string="Documents" name="doc_count" widget="statinfo"/>
@@ -243,7 +243,7 @@
                     <field name="user_id"/>
                     <field name="date"/>
                     <field name="color"/>
-                    <field name="total_task_count"/>
+                    <field name="task_count"/>
                     <field name="task_ids"/>
                     <field name="alias_id"/>
                     <field name="doc_count"/>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 69ceb7839ca..c4c35b2b712 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -490,16 +490,7 @@ class project(osv.Model):
     def _get_alias_models(self, cr, uid, context=None):
         return [('project.task', "Tasks"), ("project.issue", "Issues")]
 
-#     def _issue_count(self, cr, uid, ids, field_name, arg, context=None):
-#         """ :deprecated: this method will be removed with OpenERP v8. Use issue_ids
-#                          fields instead. """
-#         res = dict.fromkeys(ids, 0)
-#         issue_ids = self.pool.get('project.issue').search(cr, uid, [('project_id', 'in', ids)])
-#         for issue in self.pool.get('project.issue').browse(cr, uid, issue_ids, context):
-#             if issue.stage_id and not issue.stage_id.fold:
-#                 res[issue.project_id.id] += 1
-#         return res
-    def _total_issue_count(self, cr, uid, ids, field_name, arg, context=None):
+    def _issue_count(self, cr, uid, ids, field_name, arg, context=None):
         res={}
         for issues in self.browse(cr, uid, ids, context):
             res[issues.id] = len(issues.issue_ids)
@@ -508,9 +499,7 @@ class project(osv.Model):
         'project_escalation_id': fields.many2one('project.project', 'Project Escalation',
             help='If any issue is escalated from the current Project, it will be listed under the project selected here.',
             states={'close': [('readonly', True)], 'cancelled': [('readonly', True)]}),
-#         'issue_count': fields.function(_issue_count, type='integer', string="Unclosed Issues",
-#                                        deprecated="This field will be removed in OpenERP v8. Use issue_ids one2many field instead."),
-        'total_issue_count': fields.function(_total_issue_count, string="Issue", type='integer'),
+        'issue_count': fields.function(_issue_count, type='integer', string="Issues",),
         'issue_ids': fields.one2many('project.issue', 'project_id',
                                      domain=[('stage_id.fold', '=', False)])
     }
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 2b2c48519f9..ace56dd2d5a 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -308,7 +308,7 @@
                 <xpath expr='//div[@name="buttons"]' position='inside'>
                     <button class="oe_inline oe_stat_button" type="action" attrs="{'invisible':[('use_issues','=', 0)]}" 
                         name="%(act_project_project_2_project_issue_all)d" icon="fa-bug">
-                        <field string="Issues" name="total_issue_count" widget="statinfo"/>
+                        <field string="Issues" name="issue_count" widget="statinfo"/>
                     </button>
                 </xpath>
                 <xpath expr='//page[@name="project_stages"]' position="attributes">

From b51066b500e069142df47cf03c045b2b068872a7 Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Thu, 20 Mar 2014 19:14:14 +0530
Subject: [PATCH 12/65] [IMP] convert button into stat button for customer

bzr revid: rma@tinyerp.com-20140320134414-mk1ie8okynrtudsq
---
 addons/account/partner.py                   |  4 +++-
 addons/account/partner_view.xml             |  6 ++++--
 addons/project/res_partner.py               | 11 ++++++++++-
 addons/project/res_partner_view.xml         | 10 ++++++----
 addons/project_issue/project_issue.py       | 17 ++++++++++++++++-
 addons/project_issue/project_issue_view.xml | 11 +++++++----
 addons/sale/res_partner_view.xml            |  7 ++++---
 7 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/addons/account/partner.py b/addons/account/partner.py
index 0c3395de1b2..6ae83368143 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -163,13 +163,14 @@ class res_partner(osv.osv):
         return self._asset_difference_search(cr, uid, obj, name, 'payable', args, context=context)
 
     def _invoice_journal_item_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,{'invoice_count': 0, 'journal_item_count': 0}), ids))
+        res = dict(map(lambda x: (x,{'invoice_count': 0, 'journal_item_count': 0, 'cotracts_count': 0 }), ids))
         # the user may not have access rights 
         try:
             for partner in self.browse(cr, uid, ids, context):
                 res[partner.id] = {
                     'invoice_count': len(partner.invoice_ids),
                     'journal_item_count': len(partner.journal_item_ids),
+                    'cotracts_count': len(partner.contract_ids)
                 }
         except:
             pass
@@ -204,6 +205,7 @@ class res_partner(osv.osv):
         'debit': fields.function(_credit_debit_get, fnct_search=_debit_search, string='Total Payable', multi='dc', help="Total amount you have to pay to this supplier."),
         'debit_limit': fields.float('Payable Limit'),
         'invoice_count': fields.function(_invoice_journal_item_count, string="Invoices", type='integer', multi="invoice_journal"),
+        'cotracts_count': fields.function(_invoice_journal_item_count, string="Contracts", type='integer', multi="invoice_journal"),
         'journal_item_ids': fields.one2many('account.move.line', 'partner_id', 'Journal Items'),
         'journal_item_count': fields.function(_invoice_journal_item_count, string="Journal Items", type="integer", multi="invoice_journal"),
         'property_account_payable': fields.property(
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index b64f2a4f88c..8dbda70ec6b 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -74,8 +74,10 @@
                     <button type="action" class="oe_stat_button" name="%(account.action_account_moves_all_tree)d" groups="account.group_account_user" icon="fa-book">
                         <field string="Journal Items" name="journal_item_count" widget="statinfo"/>                        
                     </button>
-                    <button type="action" string="Contracts" name="%(account.action_open_partner_analytic_accounts)d"
-                            groups="analytic.group_analytic_accounting"/>
+                    <button class="oe_inline oe_stat_button" type="action" name="%(account.action_open_partner_analytic_accounts)d" 
+                        icon="fa-book" groups="analytic.group_analytic_accounting">
+                        <field string="Contracts" name="cotracts_count" widget="statinfo"/>
+                    </button>
                 </xpath>
             </field>
         </record>
diff --git a/addons/project/res_partner.py b/addons/project/res_partner.py
index e49cacf4f89..79af0413385 100644
--- a/addons/project/res_partner.py
+++ b/addons/project/res_partner.py
@@ -22,11 +22,20 @@
 from openerp.osv import fields,osv
 
 class res_partner(osv.osv):
-
+    def _task_count(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict(map(lambda x: (x,0), ids))
+        try:
+            for partner in self.browse(cr, uid, ids, context):
+                res[partner.id] = len(partner.task_ids)
+        except:
+            pass
+        return res
+    
     """ Inherits partner and adds Tasks information in the partner form """
     _inherit = 'res.partner'
     _columns = {
         'task_ids': fields.one2many('project.task', 'partner_id', 'Tasks'),
+        'task_count': fields.function(_task_count, string='# Tasks', type='integer'),
     }
 
     def copy(self, cr, uid, record_id, default=None, context=None):
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index f12189b5163..a77ea467dcb 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -10,11 +10,13 @@
             <field name="priority" eval="50"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
-                    <button class="oe_inline" type="action"
-                        name="%(action_view_task)d"
-                        string="Tasks"
+                    <button class="oe_inline oe_stat_button" type="action" name="%(action_view_task)d" 
                         context="{'search_default_partner_id': active_id, 'default_partner_id': active_id}"
-                        groups="project.group_project_user" />
+                        icon="fa-tasks" groups="project.group_project_user">
+                        <field  string="Tasks" name="task_count" widget="statinfo"/>
+                    </button>     
+                        
+                        
                 </xpath>
             </field>
        </record>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index c4c35b2b712..947aba44242 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -569,5 +569,20 @@ class project_project(osv.Model):
         self._check_create_write_values(cr, uid, vals, context=context)
         return super(project_project, self).write(cr, uid, ids, vals, context=context)
 
-
+class res_partner(osv.osv):
+    def _issue_count(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict(map(lambda x: (x,0), ids))
+        try:
+            for partner in self.browse(cr, uid, ids, context):
+                res[partner.id] = len(partner.issue_ids)
+        except:
+            pass
+        return res
+    
+    """ Inherits partner and adds Tasks information in the partner form """
+    _inherit = 'res.partner'
+    _columns = {
+        'issue_ids': fields.one2many('project.issue', 'partner_id', 'Issues'),
+        'issue_count': fields.function(_issue_count, string='# Issues', type='integer'),
+    }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index ace56dd2d5a..a312b8e78d8 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -378,11 +378,14 @@
             <field name="priority" eval="50"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
-                    <button class="oe_inline" type="action" string="Issues"
-                        attrs="{'invisible': [('customer', '=', False)]}"
-                        name="%(action_view_issues)d"
+                    <button class="oe_inline oe_stat_button" type="action" name="%(action_view_issues)d" 
                         context="{'search_default_partner_id': active_id, 'default_partner_id': active_id}"
-                        groups="project.group_project_user"/>
+                        attrs="{'invisible': [('customer', '=', False)]}"
+                        icon="fa-bug" groups="project.group_project_user">
+                        <field  string="Issues" name="issue_count" widget="statinfo"/>
+                    </button>  
+                        
+                        
                 </xpath>
             </field>
         </record>
diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index 5107f0c17af..049d2e40284 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -48,10 +48,11 @@
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
-                    <button name="%(sale.act_res_partner_2_sale_order)d" type="action"
-                        string="Quotations and Sales"
+                    <button class="oe_inline oe_stat_button" type="action" name="%(sale.act_res_partner_2_sale_order)d" 
                         attrs="{'invisible': [('customer', '=', False)]}"
-                        groups="base.group_sale_salesman"/>
+                        icon="fa-strikethrough" groups="base.group_sale_salesman">
+                        <field string="Quot. and Sales" name="sale_order_count" widget="statinfo"/>
+                    </button>     
                 </xpath>
             </field>
         </record>

From 0f40b3bc8f9c50e6e4361901eb9c024ba76851a3 Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Mon, 24 Mar 2014 10:39:21 +0530
Subject: [PATCH 13/65] [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 @@
             <field name="context">{'default_ref': 'stock.picking.out,'+str(context.get('active_id', False))}</field>
             <field name="domain">[('ref','=','stock.picking.out,'+str(context.get('active_id',False)))]</field>
         </record>
-
         <record id="crm_claim_from_delivery" model="ir.ui.view">
             <field name="name">crm.claim.from_delivery.form</field>
             <field name="model">stock.picking.out</field>
@@ -17,11 +16,13 @@
             <field name="arch" type="xml">
                 <xpath expr="/form/sheet/h1" position="before">
                     <div class="oe_right oe_button_box">
-                        <button name="%(action_claim_from_delivery)d" string="Claims" type="action"/>
+                        <button class="oe_inline oe_stat_button" type="action" 
+                                name="%(action_claim_from_delivery)d" icon="fa-comments" >
+                                <field string="Claims" name="claim_count" widget="statinfo"/>
+                        </button>
                     </div>
                 </xpath>
             </field>
         </record>
-
     </data>
 </openerp>
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 @@
                 </header>
                 <sheet>
                     <div class="oe_right oe_button_box" name="buttons">
-                        <button string="Schedule/Log Call" 
-                                name="%(opportunity2phonecall_act)d"
-                                type="action"/>
+                        <button class="oe_inline oe_stat_button" type="action" name="%(opportunity2phonecall_act)d" icon="fa-phone"  
+                            widget="statinfo" string="Schedule/Log Call"/>
                     </div>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
@@ -389,11 +388,13 @@
                     </header>
                     <sheet>
                         <div class="oe_right oe_button_box">
-                            <button string="Schedule/Log Call" type="action"
-                                name="%(opportunity2phonecall_act)d"/>
-                            <button string="Meeting" type="object"
-                                name="action_makeMeeting"
-                                context="{'search_default_attendee_id': active_id, 'default_attendee_id' : active_id}"/>
+                            <button class="oe_inline oe_stat_button" type="action" name="%(opportunity2phonecall_act)d" icon="fa-phone"  
+                                widget="statinfo" string="Schedule/Log Call"/>
+                            <button class="oe_inline oe_stat_button" type="object" 
+                                context="{'search_default_attendee_id': active_id, 'default_attendee_id' : active_id}"
+                                name="action_makeMeeting" icon="fa-calendar">
+                                <field string="Meeting" name="meeting_count" widget="statinfo"/>
+                            </button>
                         </div>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 50cbe4a6c44..d55036193c4 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -190,8 +190,17 @@ class crm_claim(osv.osv):
 
 class res_partner(osv.osv):
     _inherit = 'res.partner'
+    def _claim_count(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict(map(lambda x: (x,0), ids))
+        try:
+            for partner in self.browse(cr, uid, ids, context=context):
+                res[partner.id] = len(partner.claims_ids)
+        except:
+            pass
+        return res
     _columns = {
         'claims_ids': fields.one2many('crm.claim', 'partner_id', 'Claims'),
+        'claim_count': fields.function(_claim_count, string='# Claims', type='integer'),
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_claim/res_partner_view.xml b/addons/crm_claim/res_partner_view.xml
index 4a5db879311..6d5d54498ee 100644
--- a/addons/crm_claim/res_partner_view.xml
+++ b/addons/crm_claim/res_partner_view.xml
@@ -9,11 +9,11 @@
             <field name="priority" eval="50"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
-                    <button class="oe_inline" type="action"
-                        name="%(crm_case_categ_claim0)d"
-                        string="Claims"
+                    <button class="oe_inline oe_stat_button" type="action" 
                         context="{'search_default_partner_id': active_id, 'default_partner_id': active_id}"
-                        groups="base.group_sale_salesman" />
+                        name="%(crm_case_categ_claim0)d" icon="fa-comments" groups="base.group_sale_salesman">
+                        <field string="Claims" name="claim_count" widget="statinfo"/>
+                    </button>
                 </xpath>
             </field>
         </record>
diff --git a/addons/crm_project_issue/project_issue_view.xml b/addons/crm_project_issue/project_issue_view.xml
index b62e5f74880..bd147378e28 100644
--- a/addons/crm_project_issue/project_issue_view.xml
+++ b/addons/crm_project_issue/project_issue_view.xml
@@ -36,7 +36,8 @@
         <field name="inherit_id" ref="crm.crm_case_form_view_leads" />
         <field name="arch" type="xml">
             <xpath expr="//div[@name='buttons']/button" position="after">
-                    <button name="%(convert_lead2projectissue_wizard_action)d" string="Convert to Issue" type="action" help="Convert to Issue" />
+                    <button class="oe_inline oe_stat_button" type="action" name="%(convert_lead2projectissue_wizard_action)d" icon="fa-bug"  
+                        help="Convert to Issue" widget="statinfo" string="Convert to Issue"/>
             </xpath>
         </field>
     </record>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 947aba44242..79b47ddda97 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -229,7 +229,6 @@ class project_issue(osv.Model):
             if work.task_id:
                 issues += issue_pool.search(cr, uid, [('task_id','=',work.task_id.id)])
         return issues
-
     _columns = {
         'id': fields.integer('ID', readonly=True),
         'name': fields.char('Issue', size=128, required=True),
@@ -573,13 +572,13 @@ class res_partner(osv.osv):
     def _issue_count(self, cr, uid, ids, field_name, arg, context=None):
         res = dict(map(lambda x: (x,0), ids))
         try:
-            for partner in self.browse(cr, uid, ids, context):
+            for partner in self.browse(cr, uid, ids, context=context):
                 res[partner.id] = len(partner.issue_ids)
         except:
             pass
         return res
     
-    """ Inherits partner and adds Tasks information in the partner form """
+    """ Inherits partner and adds Issue information in the partner form """
     _inherit = 'res.partner'
     _columns = {
         'issue_ids': fields.one2many('project.issue', 'partner_id', 'Issues'),
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 7e73d7fcd53..bd0254a81d3 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -636,7 +636,11 @@ class stock_picking(osv.osv):
             vals['name'] = self.pool.get('ir.sequence').get(cr, user, seq_obj_name)
         new_id = super(stock_picking, self).create(cr, user, vals, context)
         return new_id
-
+    def _claim_count(self, cr, uid, ids, field_name, arg, context=None):
+        res = {}
+        claim = self.pool.get('crm.claim').search(cr, uid, [('ref', '=',('stock.picking.out,' + str(ids[0])))], context=context)
+        res[ids[0]] = len(claim)
+        return res
     _columns = {
         'name': fields.char('Reference', size=64, select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
         'origin': fields.char('Source Document', size=64, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="Reference of the document", select=True),
@@ -680,6 +684,7 @@ class stock_picking(osv.osv):
             ("none", "Not Applicable")], "Invoice Control",
             select=True, required=True, readonly=True, track_visibility='onchange', states={'draft': [('readonly', False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
+        'claim_count': fields.function(_claim_count, string='Claims', type='integer'),
     }
     _defaults = {
         'name': lambda self, cr, uid, context: '/',
@@ -3122,7 +3127,9 @@ class stock_picking_out(osv.osv):
         out_defaults = super(stock_picking_out, self).default_get(cr, uid, fields_list, context=context)
         defaults.update(out_defaults)
         return defaults
-
+    def _claim_count(self, cr, uid, ids, field_name, arg, context=None):
+        return super(stock_picking_out, self)._claim_count(cr, uid, ids, field_name, arg, context=context)
+    
     _columns = {
         'backorder_id': fields.many2one('stock.picking.out', 'Back Order of', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="If this shipment was split, then this field links to the shipment which contains the already processed part.", select=True),
         'state': fields.selection(
@@ -3139,6 +3146,7 @@ class stock_picking_out(osv.osv):
                  * Ready to Deliver: products reserved, simply waiting for confirmation.\n
                  * Delivered: has been processed, can't be modified or cancelled anymore\n
                  * Cancelled: has been cancelled, can't be confirmed anymore"""),
+        'claim_count': fields.function(_claim_count, string='Claims', type='integer'),
     }
     _defaults = {
         'type': 'out',

From 96ea9392aab835bb2ea21321b163c105a334bbd1 Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Mon, 24 Mar 2014 19:26:21 +0530
Subject: [PATCH 14/65] [IMP] convert button into stat button for products

bzr revid: rma@tinyerp.com-20140324135621-13t191kmnn6t22jk
---
 .../account_analytic_default.py                | 15 ++++++++++++++-
 .../account_analytic_default_view.xml          |  5 ++++-
 .../account_followup_customers.xml             | 12 ++++++++----
 addons/crm/crm_phonecall.py                    | 11 +++++++++++
 addons/crm/crm_phonecall_view.xml              | 18 +++++++++---------
 addons/hr_timesheet/hr_timesheet_view.xml      |  6 ++----
 addons/mrp/mrp.py                              | 16 ++++++++++++++++
 addons/mrp/mrp_view.xml                        | 15 ++++++++++++---
 addons/procurement/procurement.py              |  9 +++++++++
 addons/procurement/procurement_view.xml        |  5 ++++-
 addons/purchase/purchase.py                    | 11 +++++++++++
 addons/purchase/purchase_view.xml              |  5 ++++-
 addons/sale/sale.py                            | 14 ++++++++++++++
 addons/sale/sale_view.xml                      |  5 ++++-
 addons/stock/product.py                        | 11 ++++++++++-
 addons/stock/product_view.xml                  | 10 ++++++++--
 16 files changed, 140 insertions(+), 28 deletions(-)

diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py
index 563a6a3eb9a..1faf75d5eee 100644
--- a/addons/account_analytic_default/account_analytic_default.py
+++ b/addons/account_analytic_default/account_analytic_default.py
@@ -114,6 +114,19 @@ class sale_order_line(osv.osv):
             if rec:
                 inv_line_obj.write(cr, uid, [line.id], {'account_analytic_id': rec.analytic_id.id}, context=context)
         return create_ids
-
+class product_product(osv.Model):
+    _inherit = 'product.product'
+    def _rules_count(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict(map(lambda x: (x,0), ids))
+        try:
+            for rule in self.browse(cr, uid, ids, context=context):
+                res[rule.id] = len(rule.rules_ids)
+        except:
+            pass
+        return res
+    _columns = {
+        'rules_ids': fields.one2many('account.analytic.default', 'product_id', 'Analytic Rules '),
+        'rules_count': fields.function(_rules_count, string='# Analytic Rules', type='integer'),
+    }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index 8ff323e45c7..38f51a9ef20 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -80,7 +80,10 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
-                    <button string="Analytic Rules" name= "%(action_product_default_list)d" type="action" groups="analytic.group_analytic_accounting" />
+                    <button class="oe_inline oe_stat_button" name= "%(action_product_default_list)d" type="action" 
+                        groups="analytic.group_analytic_accounting" icon="fa-xing">
+                        <field string="Analytic Rules" name="rules_count" widget="statinfo" />
+                    </button>
                 </xpath>
             </field>
         </record>
diff --git a/addons/account_followup/account_followup_customers.xml b/addons/account_followup/account_followup_customers.xml
index fba0bce460b..d503ed4b306 100644
--- a/addons/account_followup/account_followup_customers.xml
+++ b/addons/account_followup/account_followup_customers.xml
@@ -81,10 +81,14 @@
                 <page string="Accounting" position="before" version="7.0">
                     <page string="Payment Follow-up" groups="account.group_account_invoice" name="followup_tab">
                         <div class="oe_right oe_button_box" name="followup_button">
-                            <button name="do_button_print" type="object" string="Print Overdue Payments" groups="account.group_account_user" 
-                                help="Print overdue payments report independent of follow-up line" attrs="{'invisible':[('payment_amount_due', '&lt;=', 0.0)]}" />
-                            <button name="do_partner_mail" type="object" string="Send Overdue Email" groups="account.group_account_user"
-                                help="If not specified by the latest follow-up level, it will send from the default email template" attrs="{'invisible':[('payment_amount_due', '&lt;=', 0.0)]}"/>
+                            <button class="oe_inline oe_stat_button" type="object" name="do_button_print" 
+                                icon="fa-mail" string="Print Overdue Payments" widget="statinfo" groups="account.group_account_user" 
+                                help="Print overdue payments report independent of follow-up line" 
+                                attrs="{'invisible':[('payment_amount_due', '&lt;=', 0.0)]}"/>
+                            <button class="oe_inline oe_stat_button" type="object" name="do_partner_mail" 
+                                icon="fa-print" string="Send Overdue Email" widget="statinfo" 
+                                help="If not specified by the latest follow-up level, it will send from the default email template"
+                                attrs="{'invisible':[('payment_amount_due', '&lt;=', 0.0)]}" groups="account.group_account_user"/>
                         </div>
                         <p attrs="{'invisible':[('latest_followup_date','=', False)]}">
                             The <field name="latest_followup_date"  class = "oe_inline"/>, the latest payment follow-up
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 19bc98c585a..be92fcad2bf 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -31,6 +31,15 @@ class crm_phonecall(osv.osv):
     _description = "Phonecall"
     _order = "id desc"
     _inherit = ['mail.thread']
+    
+    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.meeting_ids)
+        except:
+            pass
+        return res
     _columns = {
         'date_action_last': fields.datetime('Last Action', readonly=1),
         'date_action_next': fields.datetime('Next Action', readonly=1),
@@ -65,6 +74,8 @@ class crm_phonecall(osv.osv):
         'date_closed': fields.datetime('Closed', readonly=True),
         'date': fields.datetime('Date'),
         'opportunity_id': fields.many2one ('crm.lead', 'Lead/Opportunity'),
+        'meeting_ids': fields.one2many('calendar.event', 'phonecall_id', 'Phonecalls'),
+        'meeting_count': fields.function(_meeting_count, string='# Meetings', type='integer'),
     }
 
     def _get_default_state(self, cr, uid, context=None):
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 60b5934ac53..e41040905b2 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -64,15 +64,15 @@
                     <field name="state" nolabel="1" widget="statusbar" clickable="True"/>
                 </header>
                 <sheet string="Phone Call">
-                    <div class="oe_right">
-                        <button string="Convert to Opportunity"
-                            type="object"
-                            name="action_button_convert2opportunity"
-                            attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state', 'not in', ('open', 'done'))]}"/>
-                        <button string="Schedule Other Call"
-                                name="%(phonecall_to_phonecall_act)d"
-                                type="action"/>
-                        <button string="Schedule a Meeting" name="action_make_meeting" type="object"/>
+                    <div class="oe_right oe_button_box">
+                        <button class="oe_inline oe_stat_button" type="object" name="action_button_convert2opportunity" 
+                            icon="fa fa-star fa-fw" string="Convert to Opportunity" 
+                            attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state', 'not in', ('open', 'done'))]}" widget="statinfo"/>
+                        <button class="oe_inline oe_stat_button" type="action" 
+                            name="%(phonecall_to_phonecall_act)d" icon="fa-phone fa-fw" string="Schedule Other Call" widget="statinfo"/>
+                        <button class="oe_inline oe_stat_button" name="action_make_meeting" type="object" icon="fa-calendar fa-fw">
+                              <field string="Schedule a Meeting" name="meeting_count" widget="statinfo" />
+                        </button>
                     </div>
                     <div class="oe_title">
                         <div class="oe_edit_only">
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 0cd8a880a68..0546099e581 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -118,10 +118,8 @@
                     <label for="use_timesheets"/>
                 </xpath>
                 <xpath expr='//div[@name="buttons"]' position='inside'>
-                    <button string="Costs and Revenues"
-                        name="%(act_analytic_cost_revenue)d"
-                        type="action"/>
-
+                    <button class="oe_inline oe_stat_button" type="action" name="%(act_analytic_cost_revenue)d" 
+                        icon="fa-suitcase"  string="Costs and Revenues" widget="statinfo"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 91d50e93236..537e3f5bfda 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1111,8 +1111,24 @@ class mrp_production_product_line(osv.osv):
 
 class product_product(osv.osv):
     _inherit = "product.product"
+    def _bom_count(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict(map(lambda x: (x,{'bom_count': 0, 'mo_count': 0, 'bom_strct':0}), ids))
+        try:
+            for bom in self.browse(cr, uid, ids, context=context):
+                res[bom.id] = {
+                    'bom_count': len(bom.bom_ids),
+                    'mo_count': len(bom.mo_ids),
+                    'bom_strct':len(bom.bom_ids),
+                }
+        except:
+            pass
+        return res
     _columns = {
         'bom_ids': fields.one2many('mrp.bom', 'product_id', 'Bill of Materials'),
+        'mo_ids': fields.one2many('mrp.production', 'product_id', 'Manufacturing Orders'),
+        'bom_count': fields.function(_bom_count, string='# Bill of Material', type='integer', multi="bom_count"),
+        'bom_strct': fields.function(_bom_count, string='# Bill of Material Structure', type='integer', multi="bom_count"),
+        'mo_count': fields.function(_bom_count, string='# Manufacturing Orders', type='integer', multi="bom_count"),
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 6073d02fcc0..feba58568d5 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -1040,9 +1040,18 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
-                    <button string="Bill of Materials" name="%(product_open_bom)d" type="action" attrs="{'invisible':[('type', '=', 'service')]}"/>
-                    <button string="BoM Structure" name="%(act_product_mrp_bom_open)d" type="action" groups="mrp.group_mrp_user" attrs="{'invisible':[('type', '=', 'service')]}"/>
-                    <button string="Manufacturing Orders" name="%(act_product_mrp_production)d" type="action" groups="mrp.group_mrp_user" attrs="{'invisible':[('type', '=', 'service')]}"/>
+                    <button class="oe_inline oe_stat_button" name="%(product_open_bom)d" type="action" 
+                        groups="mrp.group_mrp_user" attrs="{'invisible':[('type', '=', 'service')]}" icon="fa-flask">
+                        <field string="Bill of Materials" name="bom_count" widget="statinfo" />
+                    </button>
+                    <button class="oe_inline oe_stat_button" name="%(act_product_mrp_bom_open)d" type="action" 
+                        groups="mrp.group_mrp_user" attrs="{'invisible':[('type', '=', 'service')]}" icon="fa-flask">
+                        <field string="BoM Structure" name="bom_strct" widget="statinfo" />
+                    </button>
+                    <button class="oe_inline oe_stat_button" name="%(act_product_mrp_production)d" type="action" 
+                        groups="mrp.group_mrp_user" attrs="{'invisible':[('type', '=', 'service')]}" icon="fa-pencil-square-o">
+                        <field string="Manufacturing Orders" name="mo_count" widget="statinfo" />
+                    </button>
                 </xpath>
             </field>
         </record>
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 5e3f8b54752..1f4bc75b45e 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -613,8 +613,17 @@ class product_template(osv.osv):
 
 class product_product(osv.osv):
     _inherit="product.product"
+    def _orderpoint_count(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict(map(lambda x: (x,0), ids))
+        try:
+            for orderpoint in self.browse(cr, uid, ids, context=context):
+                res[orderpoint.id] = len(orderpoint.orderpoint_ids)
+        except:
+            pass
+        return res
     _columns = {
         'orderpoint_ids': fields.one2many('stock.warehouse.orderpoint', 'product_id', 'Minimum Stock Rules'),
+        'orderpoint_count': fields.function(_orderpoint_count, string='# Orderpoints', type='integer'),
     }
 
 
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index faec656cf20..596ce2f0ba0 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -357,7 +357,10 @@
                     <button string="⇒ Request Procurement" name="%(act_make_procurement)d" type="action" class="oe_link"/>
                 </xpath>
                 <xpath expr="//div[@name='buttons']" position="inside">
-                    <button string="Orderpoints" name="%(product_open_orderpoint)d" type="action" attrs="{'invisible':[('type', '=', 'service')]}"/>
+                    <button class="oe_inline oe_stat_button" name="%(product_open_orderpoint)d" type="action" 
+                        attrs="{'invisible':[('type', '=', 'service')]}" icon="fa-pinterest">
+                       <field string="Orderpoints" name="orderpoint_count" widget="statinfo" />
+                   </button>
                 </xpath>
                 <xpath expr="//field[@name='cost_method']" position="before">
                     <field name="procure_method" groups="base.group_user"
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index b47320b1e79..3f31d639947 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -1263,8 +1263,19 @@ class mail_mail(osv.Model):
 class product_template(osv.Model):
     _name = 'product.template'
     _inherit = 'product.template'
+    
+    def _purchase_count(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict(map(lambda x: (x,0), ids))
+        try:
+            for purchase in self.browse(cr, uid, ids, context=context):
+                res[purchase.id] = len(purchase.purchase_ids)
+        except:
+            pass
+        return res
     _columns = {
         'purchase_ok': fields.boolean('Can be Purchased', help="Specify if the product can be selected in a purchase order line."),
+        'purchase_ids': fields.one2many('purchase.order', 'product_id', 'Purchases'),
+        'purchase_count': fields.function(_purchase_count, string='# Purchases', type='integer'),
     }
     _defaults = {
         'purchase_ok': 1,
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 209bad47495..270d70bf380 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -631,7 +631,10 @@
             <field name="inherit_id" ref="account.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
-                   <button string="Purchases" name="%(action_purchase_line_product_tree)d" type="action" groups="purchase.group_purchase_user"/>
+                   <button class="oe_inline oe_stat_button" name="%(action_purchase_line_product_tree)d" type="action" 
+                       groups="purchase.group_purchase_user" icon="fa-money">
+                       <field string="Purchases" name="purchase_count" widget="statinfo" />
+                   </button>
                 </xpath>
                 <field name="property_account_expense" position="replace" >
                      <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" groups="account.group_account_user"/>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 667f15a375d..ce7fc697ad9 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1024,4 +1024,18 @@ class account_invoice(osv.Model):
                 workflow.trg_validate(uid, 'account.invoice', id, 'invoice_cancel', cr)
         return super(account_invoice, self).unlink(cr, uid, ids, context=context)
 
+class product_product(osv.Model):
+    _inherit = 'product.product'
+    def _sales_count(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict(map(lambda x: (x,0), ids))
+        try:
+            for sale in self.browse(cr, uid, ids, context=context):
+                res[sale.id] = len(sale.sales_ids)
+        except:
+            pass
+        return res
+    _columns = {
+        'sales_ids': fields.one2many('sale.order.line', 'product_id', 'Sales '),
+        'sales_count': fields.function(_sales_count, string='# Sales', type='integer'),
+    }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c9ffb94b985..7ea9d441c5c 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -499,7 +499,10 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
-                    <button string="Sales" name="%(action_order_line_product_tree)d" type="action" groups="base.group_sale_salesman"/>
+                    <button class="oe_inline oe_stat_button" name="%(action_order_line_product_tree)d" 
+                        type="action" groups="base.group_sale_salesman" icon="fa-strikethrough">
+                        <field string="Sales" name="sales_count" widget="statinfo" />
+                    </button>
                 </xpath>
             </field>
         </record>
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 3eddf0a1c72..863b7111bb0 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -352,7 +352,14 @@ class product_product(osv.osv):
             for id in ids:
                 res[id][f] = stock.get(id, 0.0)
         return res
-
+    def _move_count(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict(map(lambda x: (x,0), ids))
+        try:
+            for move in self.browse(cr, uid, ids, context=context):
+                res[move.id] = len(move.move_ids)
+        except:
+            pass
+        return res
     _columns = {
         'reception_count': fields.function(_stock_move_count, string="Reception", type='integer', multi='pickings'),
         'delivery_count': fields.function(_stock_move_count, string="Delivery", type='integer', multi='pickings'),
@@ -413,6 +420,8 @@ class product_product(osv.osv):
                                         help="If real-time valuation is enabled for a product, the system will automatically write journal entries corresponding to stock moves." \
                                              "The inventory variation account set on the product category will represent the current inventory value, and the stock input and stock output account will hold the counterpart moves for incoming and outgoing products."
                                         , required=True),
+        'move_ids': fields.one2many('stock.move', 'product_id', 'Moves'),
+        'move_count': fields.function(_move_count, string='# Moves', type='integer'),
     }
 
     _defaults = {
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 11f970d6ddb..a3fa9224bbe 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -73,8 +73,14 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
-                   <button string="Inventory" name="%(action_product_location_tree)d" type="action"  attrs="{'invisible':[('type', '=', 'service')]}" groups="stock.group_locations"/>
-                   <button string="Moves" name= "%(act_product_stock_move_open)d" type="action" attrs="{'invisible':[('type', '=', 'service')]}" groups="stock.group_stock_user"/>
+                   <button class="oe_inline oe_stat_button" 
+                       name="%(action_product_location_tree)d" type="action"  
+                       attrs="{'invisible':[('type', '=', 'service')]}" groups="stock.group_locations" icon="fa-files-o" string="Inventory" />
+                   <button class="oe_inline oe_stat_button" name= "%(act_product_stock_move_open)d" type="action" 
+                       attrs="{'invisible':[('type', '=', 'service')]}" groups="stock.group_stock_user" icon="fa-exchange">
+                       <field  string="Moves"  name="move_count" widget="statinfo"/>
+                   </button>  
+
                 </xpath>
                 <group name="procurement_uom" position="before">
                     <group name="delay" string="Delays">

From bddff0f601ae5cc910c5dbab00043db8d88fef73 Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Mon, 24 Mar 2014 19:29:00 +0530
Subject: [PATCH 15/65] [IMP] add class for icon pencil

bzr revid: rma@tinyerp.com-20140324135900-9mufbqb0w2ftsg46
---
 addons/web/static/lib/fontawesome/css/font-awesome.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/web/static/lib/fontawesome/css/font-awesome.css b/addons/web/static/lib/fontawesome/css/font-awesome.css
index 9e1011e7ef2..9750e3cee13 100644
--- a/addons/web/static/lib/fontawesome/css/font-awesome.css
+++ b/addons/web/static/lib/fontawesome/css/font-awesome.css
@@ -765,6 +765,9 @@
 .fa-pinterest:before {
   content: "\f0d2";
 }
+.fa-pencil-square-o:before {
+  content: "\f044";
+}
 .fa-pinterest-square:before {
   content: "\f0d3";
 }

From bca2c3d8dca419a104ba3cf9127b523e16f323b9 Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Tue, 25 Mar 2014 18:05:25 +0530
Subject: [PATCH 16/65] [IMP] add icon for action

bzr revid: rma@tinyerp.com-20140325123525-5zzvqfyk6mmz6va3
---
 addons/web/static/lib/fontawesome/css/font-awesome.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/web/static/lib/fontawesome/css/font-awesome.css b/addons/web/static/lib/fontawesome/css/font-awesome.css
index 9750e3cee13..5d86a180012 100644
--- a/addons/web/static/lib/fontawesome/css/font-awesome.css
+++ b/addons/web/static/lib/fontawesome/css/font-awesome.css
@@ -240,6 +240,9 @@
 .fa-search-minus:before {
   content: "\f010";
 }
+.fa-adn:before {
+  content: "\f170";
+}
 .fa-power-off:before {
   content: "\f011";
 }

From 3caf59155030727b868f709222858513293204d1 Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Tue, 25 Mar 2014 18:15:31 +0530
Subject: [PATCH 17/65] [IMP] change related button into stat for
 account,project

bzr revid: rma@tinyerp.com-20140325124531-kkwm1v8bhndzs846
---
 addons/account/account_view.xml               |  4 +++-
 addons/account_asset/account_asset.py         | 10 ++++++++-
 addons/account_asset/account_asset_view.xml   |  8 ++++---
 .../account_payment/account_payment_view.xml  |  6 +++---
 .../account_voucher/account_voucher_view.xml  |  4 ++--
 addons/email_template/email_template_view.xml | 10 ++++-----
 addons/project_long_term/project_long_term.py | 10 ++++++++-
 .../project_long_term_view.xml                |  6 +++++-
 addons/purchase/partner.py                    | 21 ++++++++++---------
 addons/purchase/partner_view.xml              | 14 +++++++------
 10 files changed, 60 insertions(+), 33 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 48d6320fbc3..562cd624a56 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1532,7 +1532,9 @@
                     <field name="lines_id" widget="one2many_list"/>
                     <separator string="Legend"/>
                     <field name="legend"/>
-                    <button name="%(action_account_use_model_create_entry)d" string="Create entries" type="action" icon="gtk-execute"/>
+                    <div class="oe_button_box">
+                        <button class="oe_inline oe_button_box oe_stat_button" name="%(action_account_use_model_create_entry)d" string="Create entries" type="action" icon="fa-cogs" widget="statinfo"/>
+                    </div>
                 </form>
             </field>
         </record>
diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index f4e5d17a8e0..6552281e4c2 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -237,9 +237,17 @@ class account_asset_asset(osv.osv):
             if salvage_value:
                 val['value_residual'] = purchase_value - salvage_value
         return {'value': val}    
-
+    def _entry_count(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict(map(lambda x: (x,0), ids))
+        try:
+            for entry in self.browse(cr, uid, ids, context=context):
+                res[entry.id] = len(entry.account_move_line_ids)
+        except:
+            pass
+        return res
     _columns = {
         'account_move_line_ids': fields.one2many('account.move.line', 'asset_id', 'Entries', readonly=True, states={'draft':[('readonly',False)]}),
+        'entry_count': fields.function(_entry_count, string='# Asset Entries', type='integer'),
         'name': fields.char('Asset Name', size=64, required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'code': fields.char('Reference', size=32, readonly=True, states={'draft':[('readonly',False)]}),
         'purchase_value': fields.float('Gross Value', required=True, readonly=True, states={'draft':[('readonly',False)]}),
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index fe1fcf473ba..40d99afd1fe 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -84,7 +84,9 @@
                 </header>
                 <sheet>
                     <div class="oe_button_box oe_right">
-                        <button name="open_entries" string="Entries" type="object" class="oe_inline"/>
+                        <button class="oe_inline oe_stat_button" name="open_entries"  type="object" icon="fa-pencil-square-o">
+                        <field string="Entries" name="entry_count" widget="statinfo" />
+                    </button>
                     </div>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
@@ -117,9 +119,9 @@
                                     <field name="method"/>
                                     <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
                                     <label for="method_time"/>
-                                    <div>
+                                    <div class="oe_button_box">
                                         <field name="method_time" on_change="onchange_method_time(method_time)" class="oe_inline"/>
-                                        <button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="terp-stock_effects-object-colorize" class="oe_inline" colspan="1"/>
+                                        <button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="fa-cogs" class="oe_inline oe_stat_button" colspan="1" widget="statinfo"/>
                                     </div>
                                     <field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/>
                                     <field name="method_number" attrs="{'invisible':[('method_time','=','end')], 'required':[('method_time','=','number')]}"/>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index e49d6dfe93b..4de42a53669 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -70,8 +70,8 @@
                 </header>
                 <sheet string="Payment order">
                     <div class="oe_button_box">
-                        <button name="%(action_create_payment_order)d" string="Select Invoices to Pay"
-                               type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
+                        <button class="oe_inline oe_stat_button oe_right" name="%(action_create_payment_order)d" string="Select Invoices to Pay"
+                               type="action" attrs="{'invisible':[('state','=','done')]}" icon="fa-search" widget="statinfo"/>
                     </div>
                     <div class="oe_title">
                         <label for="reference" class="oe_edit_only"/>
@@ -292,7 +292,7 @@
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
 	            <xpath expr="//div[@name='import_buttons']" position="inside">
-	                <button name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import Payment Lines" type="action" icon="gtk-execute"/>
+	                <button class="oe_inline oe_stat_button" name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import Payment Lines" type="action" icon="fa-cogs" widget="statinfo"/>
 	            </xpath>
             </field>
         </record>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 288f8ce9332..aae4d5dbed4 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -200,9 +200,9 @@
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='import_buttons']" position="inside">
-                    <button name="%(action_view_account_statement_from_invoice_lines)d"
+                    <button class="oe_inline oe_stat_button" name="%(action_view_account_statement_from_invoice_lines)d"
                             string="Import Invoices" type="action"
-                            attrs="{'invisible':[('state','=','confirm')]}"/>
+                            attrs="{'invisible':[('state','=','confirm')]}" widget="statinfo" icon="fa-pencil-square-o"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 4f7828cb531..dfa2697b322 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -14,15 +14,15 @@
                         </div>
                         <div class="oe_right oe_button_box" name="buttons">
                             <field name="ref_ir_act_window" invisible="1"/>
-                            <button name="create_action" string="Add context action" type="object"
-                                    attrs="{'invisible':[('ref_ir_act_window','!=',False)]}"
-                                    help="Display an option on related documents to open a composition wizard with this template"/>
+                            <button class="oe_inline oe_stat_button" name="create_action" string="Add context action" type="object"
+                                    attrs="{'invisible':[('ref_ir_act_window','!=',False)]}" icon="fa-adn"
+                                    help="Display an option on related documents to open a composition wizard with this template" widget="statinfo"/>
                             <button name="unlink_action" string="Remove context action" type="object" 
                                     attrs="{'invisible':[('ref_ir_act_window','=',False)]}"
                                     help="Remove the contextual action to use this template on related documents"/>
-                            <button name="%(wizard_email_template_preview)d" string="Preview"
+                            <button class="oe_inline oe_stat_button" name="%(wizard_email_template_preview)d" icon="fa-search-plus" string="Preview"
                                     type="action" target="new"
-                                    context="{'template_id':active_id}"/>
+                                    context="{'template_id':active_id}" widget="statinfo"/>
                         </div>
                         <notebook>
                             <page string="Mailing Template">
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index a950907fb69..aee4f664fad 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -98,7 +98,14 @@ class project_phase(osv.osv):
             else:
                 res[phase.id] = round(100.0 * done / tot, 2)
         return res
-
+    def _tasks_count(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict(map(lambda x: (x,0), ids))
+        try:
+            for task in self.browse(cr, uid, ids, context=context):
+                res[task.id] = len(task.task_ids)
+        except:
+            pass
+        return res
     _columns = {
         'name': fields.char("Name", size=64, required=True),
         'date_start': fields.datetime('Start Date', select=True, help="It's computed by the scheduler according the project date or the end date of the previous phase.", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
@@ -119,6 +126,7 @@ class project_phase(osv.osv):
                                   help='If the phase is created the status \'Draft\'.\n If the phase is started, the status becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' status.\
                                   \n If the phase is over, the status is set to \'Done\'.'),
         'progress': fields.function(_compute_progress, string='Progress', help="Computed based on related tasks"),
+        'tasks_count': fields.function(_tasks_count, string='# Related Tasks', type='integer'),
      }
     _defaults = {
         'state': 'draft',
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index d6b118eb323..9e4b11c20a1 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -152,7 +152,11 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
                 <sheet>
-                    <button name="%(project_phase_task_list)d" string="Related Tasks" type="action" class="oe_right"/>
+                    <div class="oe_button_box oe_right">
+                    <button class=" oe_inline oe_stat_button " name= "%(project_phase_task_list)d" type="action" icon="fa-tasks">
+                        <field string="Related Tasks" name="tasks_count" widget="statinfo"/>
+                    </button>
+                    </div>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
                         <h1><field name="name"/></h1>
diff --git a/addons/purchase/partner.py b/addons/purchase/partner.py
index d8cda9b20b9..b7757c2f91f 100644
--- a/addons/purchase/partner.py
+++ b/addons/purchase/partner.py
@@ -26,15 +26,14 @@ class res_partner(osv.osv):
     _inherit = 'res.partner'
 
     def _purchase_order_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,0), ids))
-        # this user may not have access to user rights
-        try:
-            for partner in self.browse(cr, uid, ids, context=context):
-                res[partner.id] = len(partner.purchase_order_ids)
-        except:
-            pass
+        res = dict(map(lambda x: (x,{'purchase_order_count': 0, 'supplier_invoice_count': 0}), ids))
+        invoice_ids = self.pool.get('account.invoice').search(cr,uid, [('type', '=', 'in_invoice'), ('partner_id', '=', ids[0])])
+        for partner in self.browse(cr, uid, ids, context=context):
+            res[partner.id] = {
+                    'purchase_order_count': len(partner.purchase_order_ids),
+                    'supplier_invoice_count': len(invoice_ids),
+                }
         return res
-
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}
@@ -53,8 +52,10 @@ class res_partner(osv.osv):
           domain=[('type','=','purchase')],
           string="Purchase Pricelist", 
           help="This pricelist will be used, instead of the default one, for purchases from the current partner"),
-        'purchase_order_count': fields.function(_purchase_order_count, string='# of Purchase Order', type='integer'),
-        'purchase_order_ids': fields.one2many('purchase.order','partner_id','Purchase Order')
+        'purchase_order_count': fields.function(_purchase_order_count, string='# of Purchase Order', type='integer', multi="count"),
+        'purchase_order_ids': fields.one2many('purchase.order','partner_id','Purchase Order'),
+        'invoice_ids': fields.one2many('account.invoice','partner_id','Supplier Invoices'),
+        'supplier_invoice_count': fields.function(_purchase_order_count, string='# Supplier Invoices', type='integer', multi="count"),
     }
 
 
diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml
index 25aeb3d8119..77fe49aeef6 100644
--- a/addons/purchase/partner_view.xml
+++ b/addons/purchase/partner_view.xml
@@ -74,13 +74,15 @@
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
-                    <button name="%(purchase.act_res_partner_2_purchase_order)d" type="action"
-                        string="Purchase Orders"
+                    <button class="oe_inline oe_stat_button" name="%(purchase.act_res_partner_2_purchase_order)d" type="action"
                         attrs="{'invisible': [('supplier', '=', False)]}"
-                        groups="purchase.group_purchase_user"/>
-                    <button name="%(purchase.act_res_partner_2_supplier_invoices)d" type="action"
-                        attrs="{'invisible': [('supplier', '=', False)]}"
-                        string="Supplier Invoices"/>
+                        groups="purchase.group_purchase_user" icon="fa-list-alt">
+                        <field string="Purchase Orders" name="purchase_order_count" widget="statinfo"/>
+                    </button>
+                    <button class="oe_inline oe_stat_button" name="%(purchase.act_res_partner_2_supplier_invoices)d" type="action"
+                        attrs="{'invisible': [('supplier', '=', False)]}" icon="fa-pencil-square-o">
+                        <field string="Supplier Invoices" name="supplier_invoice_count" widget="statinfo"/>
+                    </button>
                 </xpath>
             </field>
         </record>

From 231556d78c99a61466797621ce8a948165a0b59b Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Tue, 25 Mar 2014 19:18:23 +0530
Subject: [PATCH 18/65] [IMP] change related button into stat for tools

bzr revid: rma@tinyerp.com-20140325134823-1pm4f2m7ly921r97
---
 addons/survey/survey_view.xml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 2c43364871d..1e38c181b30 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -28,11 +28,16 @@
                 </header>
                 <sheet>
                     <div class="oe_button_box oe_right">
-                        <button name="test_survey" states="open,draft,close,cancel" string="Test Survey" type="object" icon="gtk-new" context="{'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
-                        <button name="fill_survey" states="open" string="Answer Survey" type="object" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
-                        <button name="action_print_survey" states="open,draft,close,cancel" string="Print Answer" type="object"/>
-                        <button name="edit_survey" states="open,draft,close,cancel"
-                            string="Edit Survey" type="object" context="{'active':True,'edit' : True,'survey_id': active_id}"/>
+                        <button class="oe_inline oe_stat_button" name="test_survey" states="open,draft,close,cancel" 
+                            string="Test Survey" type="object" icon="fa-file-o" context="{'survey_id': active_id}" 
+                            attrs="{'invisible':[('id','=',0)]}"/>
+                        <button class="oe_inline oe_stat_button" name="fill_survey" states="open" string="Answer Survey" 
+                            type="object" icon="fa-star-half-o" context="{'survey_id': active_id}" 
+                            attrs="{'invisible':[('state','!=','open')]}"/>
+                        <button class="oe_inline oe_stat_button" name="action_print_survey" states="open,draft,close,cancel" 
+                            string="Print Answer" type="object" icon="fa-print"/>
+                        <button class="oe_inline oe_stat_button" name="edit_survey" states="open,draft,close,cancel"
+                            string="Edit Survey" type="object" context="{'active':True,'edit' : True,'survey_id': active_id}" icon="fa-cog"/>
 
                     </div>
                     <div class="oe_title">

From 806e2fa2b33829f49bca5031f8d8ce5d5f89f706 Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Wed, 26 Mar 2014 15:34:44 +0530
Subject: [PATCH 19/65] [IMP]improve icon for purchase

bzr revid: rma@tinyerp.com-20140326100444-c25px43rg1glxqrf
---
 addons/purchase/purchase_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 270d70bf380..1b603092028 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -632,7 +632,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
                    <button class="oe_inline oe_stat_button" name="%(action_purchase_line_product_tree)d" type="action" 
-                       groups="purchase.group_purchase_user" icon="fa-money">
+                       groups="purchase.group_purchase_user" icon="fa-shopping-cart">
                        <field string="Purchases" name="purchase_count" widget="statinfo" />
                    </button>
                 </xpath>

From 3897de56b7ca8248ced9ce0dafa9edf5e076c400 Mon Sep 17 00:00:00 2001
From: "Yogesh Parekh (OpenERP)" <ypa@tinyerp.com>
Date: Wed, 26 Mar 2014 17:30:56 +0530
Subject: [PATCH 20/65] [IMP]: Convert buttons into stat buttons in hr modules

bzr revid: ypa@tinyerp.com-20140326120056-qqauj7pmhf0uxhuj
---
 addons/hr/hr.py                               | 39 +++++++++++++++++
 addons/hr_contract/hr_contract_view.xml       |  8 +++-
 addons/hr_evaluation/hr_evaluation_view.xml   |  7 +++-
 addons/hr_holidays/hr_holidays_view.xml       |  8 +++-
 addons/hr_payroll/hr_payroll.py               | 10 +++++
 addons/hr_payroll/hr_payroll_view.xml         | 15 ++++++-
 addons/hr_recruitment/hr_recruitment_view.xml | 42 +++++++++++++++----
 .../hr_timesheet_sheet/hr_timesheet_sheet.py  | 14 +++++++
 .../hr_timesheet_sheet_view.xml               | 13 +++++-
 9 files changed, 140 insertions(+), 16 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index a13a1866493..4efa72e8f5e 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -92,6 +92,17 @@ class hr_job(osv.Model):
                 res.append(employee.job_id.id)
         return res
 
+    def _count_all(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict(map(lambda x: (x,{'documents_count': 0, 'application_count': 0,}), ids))
+        try:
+            for data in self.browse(cr, uid, ids, context=context):
+                res[data.id] = {'documents_count': len(data.document_ids),
+                'application_count': len(data.applicant_ids),
+                }
+        except:
+            pass
+        return res
+
     _name = "hr.job"
     _description = "Job Position"
     _inherit = ['mail.thread', 'ir.needaction_mixin']
@@ -122,6 +133,10 @@ class hr_job(osv.Model):
                                   track_visibility='always',
                                   help="By default 'Closed', set it to 'In Recruitment' if recruitment process is going on for this job position."),
         'write_date': fields.datetime('Update Date', readonly=True),
+        'applicant_ids':fields.one2many('hr.applicant', 'job_id', 'Applications'),
+        'application_count': fields.function(_count_all, type='integer', string='Applications', multi=True),
+        'document_ids': fields.one2many('ir.attachment', 'company_id', 'Documents'),
+        'documents_count': fields.function(_count_all, type='integer', string='Documents', multi=True),
     }
 
     _defaults = {
@@ -186,6 +201,20 @@ class hr_employee(osv.osv):
 
     def _set_image(self, cr, uid, id, name, value, args, context=None):
         return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
+    
+    def _count_all(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict(map(lambda x: (x,{'appraisal_count': 0, 'leaves_count': 0, 'contracts_count': 0, 'timesheet_count': 0, 'payslip_count': 0,}), ids))
+        try:
+            for datas in self.browse(cr, uid, ids, context=context):
+                res[datas.id] = {'appraisal_count': len(datas.appraisal_ids),
+                'leaves_count': len(datas.leave_ids),
+                'contracts_count': len(datas.contract_ids),
+                'timesheet_count': len(datas.timsheet_ids),
+                'payslip_count': len(datas.payslip_ids)
+                }
+        except:
+            pass
+        return res
 
     _columns = {
         #we need a related field in order to be able to sort the employee by name
@@ -237,6 +266,16 @@ class hr_employee(osv.osv):
         'city': fields.related('address_id', 'city', type='char', string='City'),
         'login': fields.related('user_id', 'login', type='char', string='Login', readonly=1),
         'last_login': fields.related('user_id', 'date', type='datetime', string='Latest Connection', readonly=1),
+        'appraisal_ids': fields.one2many('hr.evaluation.interview', 'user_to_review_id', 'Appraisal Interviews'),
+        'leave_ids': fields.one2many('hr.holidays', 'employee_id', 'Leaves'),
+        'contracts_ids': fields.one2many('hr.contract', 'employee_id', 'Contracts'),
+        'timsheet_ids': fields.one2many('hr_timesheet_sheet.sheet', 'employee_id', 'Timesheets'),
+        'payslip_ids': fields.one2many('hr.payslip', 'employee_id', 'Payslips'),
+        'appraisal_count': fields.function(_count_all, type='integer', string='Appraisal Interviews', multi=True),
+        'leaves_count': fields.function(_count_all, type='integer', string='Leaves', multi=True),
+        'contracts_count': fields.function(_count_all, type='integer', string='Contracts', multi=True),
+        'timesheet_count': fields.function(_count_all, type='integer', string='Timsheets', multi=True),
+        'payslip_count': fields.function(_count_all, type='integer', string='Payslips', multi=True),
     }
 
     def _get_default_image(self, cr, uid, context=None):
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index c21690401f2..eb1adaad9fc 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -21,7 +21,13 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="//div[@name='button_box']" position="inside">
-                        <button name="%(act_hr_employee_2_hr_contract)d" string="Contracts" type="action" groups="base.group_hr_manager"/>
+                        <button name="%(act_hr_employee_2_hr_contract)d" 
+                            class="oe_stat_button" 
+                            icon="fa-thumbs-o-up" 
+                            type="action"
+                            groups="base.group_hr_manager">
+                            <field name="contracts_count" widget="statinfo" string="Contracts"/>
+                        </button>
                     </xpath>
                     <xpath expr="//field[@name='coach_id']" position="after">
                         <field name="manager"/>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 28bc4a6c96e..42e48771701 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -145,7 +145,12 @@
                 </group>
             </xpath>
             <xpath expr="//div[@name='button_box']" position="inside">
-                <button name="%(act_hr_employee_2_hr__evaluation_interview)d" string="Appraisal Interviews" type="action"/>
+                <button name="%(act_hr_employee_2_hr__evaluation_interview)d"  
+                    class="oe_stat_button"
+                    icon="fa-briefcase"
+                    type="action">
+                    <field name="appraisal_count" widget="statinfo" string="Appraisal Interviews"/>
+                </button>
             </xpath>
             </field>
         </record>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index d4b84bab012..a15a18d20aa 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -483,7 +483,13 @@
                     </group>
                 </xpath>
                 <xpath expr="//div[@name='button_box']" position="inside">
-                    <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action" groups="base.group_hr_user"/>
+                    <button name="%(act_hr_employee_holiday_request)d" 
+                        type="action"
+                        class="oe_stat_button"
+                        icon="fa-calendar" 
+                        groups="base.group_hr_user">
+                        <field name="leaves_count" widget="statinfo" string="Leaves"/>
+                    </button>
                 </xpath>
             </field>
         </record>
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 081fe226c3a..b3394c455c8 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -258,6 +258,15 @@ class hr_payslip(osv.osv):
         for r in res:
             result[r[0]].append(r[1])
         return result
+    
+    def _count_detail_payslip(self, cr, uid, ids, field_name, arg, context=None):
+        res = {}
+        try:
+            for details in self.browse(cr, uid, ids, context=context):
+                res[details.id] = len(details.line_ids)
+        except:
+            pass
+        return res
 
     _columns = {
         'struct_id': fields.many2one('hr.payroll.structure', 'Structure', readonly=True, states={'draft': [('readonly', False)]}, help='Defines the rules that have to be applied to this payslip, accordingly to the contract chosen. If you let empty the field contract, this field isn\'t mandatory anymore and thus the rules applied will be all the rules set on the structure of all contracts of the employee valid for the chosen period'),
@@ -287,6 +296,7 @@ class hr_payslip(osv.osv):
         'details_by_salary_rule_category': fields.function(_get_lines_salary_rule_category, method=True, type='one2many', relation='hr.payslip.line', string='Details by Salary Rule Category'),
         'credit_note': fields.boolean('Credit Note', help="Indicates this payslip has a refund of another", readonly=True, states={'draft': [('readonly', False)]}),
         'payslip_run_id': fields.many2one('hr.payslip.run', 'Payslip Batches', readonly=True, states={'draft': [('readonly', False)]}),
+        'payslip_count': fields.function(_count_detail_payslip, type='integer', string="Payslip Computation Details"),
     }
     _defaults = {
         'date_from': lambda *a: time.strftime('%Y-%m-01'),
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 4410784c63c..6232f593b90 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -222,7 +222,12 @@
                 </header>
                 <sheet>
                     <div class="oe_right oe_button_box">
-                        <button name="%(act_payslip_lines)d" string="Payslip Computation Details" type="action"/>
+                        <button name="%(act_payslip_lines)d" 
+                            class="oe_stat_button" 
+                            icon="fa-comment" 
+                            type="action">
+                            <field name="payslip_count" widget="statinfo" string="Payslip Computation Details"/>
+                        </button>
                     </div>
                     <div class="oe_title">
                         <label for="employee_id" class="oe_edit_only"/>
@@ -387,7 +392,13 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="//div[@name='button_box']" position="inside">
-                        <button name="%(act_hr_employee_payslip_list)d" string="Payslips" type="action" groups="base.group_hr_user"/>
+                        <button name="%(act_hr_employee_payslip_list)d"  
+                            class="oe_stat_button" 
+                            icon="fa-money" 
+                            type="action" 
+                            groups="base.group_hr_user">
+                            <field name="payslip_count" widget="statinfo" string="Payslips"/>
+                        </button>
                     </xpath>
                 </data>
             </field>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index c9dc0d04ffb..4bf705d9de2 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -74,16 +74,27 @@
             </header>
             <sheet>
                 <div class="oe_right oe_button_box">
-                    <button name="action_makeMeeting" type="object"
-                        string="Schedule Meeting" help="Schedule interview with this applicant"/>
-                    <button name="%(survey.action_view_survey_question_message)d" type="action"
+                    <button name="action_makeMeeting" class="oe_stat_button" icon="fa-calendar" type="object"
+                         string="Schedule Meeting" help="Schedule interview with this applicant"/>
+                    <button name="%(survey.action_view_survey_question_message)d" 
+                        class="oe_stat_button"
+                        icon="fa-pencil-square-o" 
+                        type="action"
                         string="Start Interview" help="Answer related job question"
                         context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant'}"
                         attrs="{'invisible':[('survey','=',False)]}"/>
-                    <button name="action_print_survey" type="object"
+                    <button name="action_print_survey" 
+                        class="oe_stat_button"
+                        icon="fa-pencil-square-o"
+                        type="object"
                         string="Print Interview" help="Print interview report"
                         attrs="{'invisible':[('survey','=',False)]}"/>
-                    <button name="action_get_attachment_tree_view" string="Documents" type="object"/>
+                    <button name="action_get_attachment_tree_view" 
+                        class="oe_stat_button"
+                        icon="fa-pencil-square-o"
+                        type="object">
+                        <field name="attachment_number" widget="statinfo" string="Documents"/>
+                    </button>
                 </div>
                 <div class="oe_title">
                     <label for="name" class="oe_edit_only"/>
@@ -367,10 +378,23 @@
             <xpath expr="//field[@name='department_id']" position="after">
                 <field name="user_id" class="oe_inline"/>
             </xpath>
-            <div name="buttons" position="inside">
-                <button string="Applications" name="%(action_hr_job_applications)d" context="{'default_user_id': user_id}" type="action"/>
-                <button string="Documents" name="action_get_attachment_tree_view" type="object"/>
-            </div>
+            <xpath expr="//div[@name='buttons']" position="inside">
+                <div class="oe_button_box" >
+                    <button class="oe_stat_button" 
+                        icon="fa-file-o"
+                        name="%(action_hr_job_applications)d" 
+                        context="{'default_user_id': user_id}" 
+                        type="action">
+                        <field name="application_count" widget="statinfo" string="Applications"/>
+                    </button>
+                    <button class="oe_stat_button"
+                        icon="fa-book"
+                        name="action_get_attachment_tree_view" 
+                        type="object">
+                        <field name="documents_count" widget="statinfo" string="Documents"/>
+                    </button>
+                </div>
+            </xpath>
         </field>
     </record>
 
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 9226787e908..2560590a7f8 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -103,6 +103,18 @@ class hr_timesheet_sheet(osv.osv):
         for sheet in self.browse(cr, uid, ids, context=context):
             if sheet.employee_id.id not in employee_ids: employee_ids.append(sheet.employee_id.id)
         return hr_employee.attendance_action_change(cr, uid, employee_ids, context=context)
+    
+    def _count_all(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict(map(lambda x: (x,{'timesheet_count': 0, 'attendance_count': 0,}), ids))
+        try:
+           for datas in self.browse(cr, uid, ids, context=context):
+                res[datas.id] = {'appraisal_count': len(datas.appraisal_ids),
+                'timesheet_count': len(datas.timesheet_ids),
+                'attendance_count': len(datas.attendances_ids),
+                }
+        except:
+            pass
+        return res
 
     _columns = {
         'name': fields.char('Note', size=64, select=1,
@@ -134,6 +146,8 @@ class hr_timesheet_sheet(osv.osv):
         'account_ids': fields.one2many('hr_timesheet_sheet.sheet.account', 'sheet_id', 'Analytic accounts', readonly=True),
         'company_id': fields.many2one('res.company', 'Company'),
         'department_id':fields.many2one('hr.department','Department'),
+        'timesheet_count': fields.function(_count_all, type='integer', string='Timesheet Activities', multi=True),
+        'attendance_count': fields.function(_count_all, type='integer', string="Attendances", multi=True),
     }
 
     def _default_date_from(self, cr, uid, context=None):
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 644586ec502..fd7570c17df 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -73,7 +73,10 @@
                     <div class="oe_right oe_button_box" name="buttons">
                         <button type="action"
                             name="%(act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet)d"
-                            string="Timesheet Activities" />
+                            class="oe_stat_button"
+                            icon="fa-times">
+                            <field name="timesheet_count" widget="statinfo" string="Timesheet Activities"/>
+                        </button>
                         <button type="action" groups="base.group_hr_attendance"
                             name="%(act_hr_timesheet_sheet_sheet_2_hr_attendance)d"
                             string="Attendances" />
@@ -365,7 +368,13 @@
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_employee_extd_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='button_box']" position="inside">
-                    <button name="%(act_hr_employee_2_hr_timesheet)d" string="Timesheets" type="action" groups="base.group_hr_manager"/>
+                    <button name="%(act_hr_employee_2_hr_timesheet)d" 
+                        type="action"
+                        class="oe_stat_button"
+                        icon="fa-clock-o" 
+                        groups="base.group_hr_manager">
+                        <field name="timesheet_count" widget="statinfo" string="Timesheets"/>
+                    </button>
                 </xpath>
             </field>
         </record>

From b86c9ccd13e803a74b7da93cf41a1e2d7136c0dc Mon Sep 17 00:00:00 2001
From: "Yogesh Parekh (OpenERP)" <ypa@tinyerp.com>
Date: Wed, 26 Mar 2014 17:41:08 +0530
Subject: [PATCH 21/65] [IMP]: Convert buttons into stat button in event module

bzr revid: ypa@tinyerp.com-20140326121108-odkq61lnf1cuyog5
---
 addons/event/event.py       | 14 ++++++++++++++
 addons/event/event_view.xml | 15 +++++++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index d13d455bc73..5a058257d27 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -135,6 +135,17 @@ class event_event(osv.osv):
                         res[event.id]= True
                         continue
         return res
+    
+    def _count_all(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict(map(lambda x: (x,{'count_regitrations': 0, 'count_tracks': 0,}), ids))
+        try:
+            for data in self.browse(cr, uid, ids, context=context):
+                res[data.id] = {'count_regitrations': len(data.registration_ids),
+                'count_tracks': len(data.track_ids),
+               }
+        except:
+            pass
+        return res
 
     _columns = {
         'name': fields.char('Event Name', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}),
@@ -147,6 +158,7 @@ class event_event(osv.osv):
         'seats_unconfirmed': fields.function(_get_seats, oldname='register_prospect', string='Unconfirmed Seat Reservations', type='integer', multi='seats_reserved'),
         'seats_used': fields.function(_get_seats, oldname='register_attended', string='Number of Participations', type='integer', multi='seats_reserved'),
         'registration_ids': fields.one2many('event.registration', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}),
+        'track_ids': fields.one2many('event.track', 'event_id', 'Tracks', readonly=False),
         'date_begin': fields.datetime('Start Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'date_end': fields.datetime('End Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'state': fields.selection([
@@ -169,6 +181,8 @@ class event_event(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
         'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
         'organizer_id': fields.many2one('res.partner', "Organizer"),
+        'count_regitrations': fields.function(_count_all, type="integer", string="Registrations", multi=True),
+        'count_tracks': fields.function(_count_all, type='integer', string='Tracks', multi=True),
     }
     _defaults = {
         'state': 'draft',
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 07a36ea3a6b..cbc8fbaa52b 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -66,7 +66,13 @@
                     </header>
                     <sheet>
                         <div class="oe_right oe_button_box" groups="base.group_user">
-                            <button name="%(event.act_event_list_register_event)d" type="action" string="Registrations" help="Register with this event"/>
+                            <button name="%(event.act_event_list_register_event)d" 
+                                type="action" 
+                                class="oe_stat_button oe_inline" 
+                                icon="fa-github" 
+                                help="Register with this event">
+                                <field name="count_regitrations" widget="statinfo" string="Registrations"/>
+                            </button>
                         </div>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
@@ -363,11 +369,12 @@
                                 <field name="name"/>
                                 <field name="phone"/>
                                 <label for="email"/>
-                                <div>
+                                <div class="oe_button_box">
                                     <field name="email" class="oe_inline"/>
-                                    <button class="oe_inline oe_right" string="Send Email"
+                                    <button class="oe_inline oe_right oe_stat_button" 
+                                        string="Send Email"
                                         name="%(mail.action_email_compose_message_wizard)d"
-                                        icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
+                                        icon="fa-reply-all" context= '{"default_email_to":email}' type="action"/>
                                 </div>
                             </group>
                             <group>

From 45585f734610765ca6804c636e1bd72c365a48e7 Mon Sep 17 00:00:00 2001
From: "Yogesh Parekh (OpenERP)" <ypa@tinyerp.com>
Date: Wed, 26 Mar 2014 17:50:23 +0530
Subject: [PATCH 22/65] [IMP]: Convert buttons into stat buttons in fleet
 module

bzr revid: ypa@tinyerp.com-20140326122023-glwfkl5nwowq5i2e
---
 addons/fleet/fleet.py       | 21 +++++++++++++++++
 addons/fleet/fleet_view.xml | 45 ++++++++++++++++++++++++++++++++-----
 2 files changed, 61 insertions(+), 5 deletions(-)

diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index 8aea73ba405..0e964cafc80 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -313,6 +313,20 @@ class fleet_vehicle(osv.Model):
         except ValueError:
             model_id = False
         return model_id
+    
+    def _count_all(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict(map(lambda x: (x,{'odometer_count': 0, 'fuel_logs_count': 0, 'service_count': 0, 'contract_count': 0, 'cost_count': 0,}), ids))
+        try:
+            for costs in self.browse(cr, uid, ids, context=context):
+                res[costs.id] = {'odometer_count': len(costs.odometer_ids),
+                'fuel_logs_count': len(costs.log_fuel),
+                'service_count': len(costs.log_services),
+                'contract_count': len(costs.log_contracts),
+                'cost_count': len(costs.costs_ids)
+                }
+        except:
+            pass
+        return res
 
     _name = 'fleet.vehicle'
     _description = 'Information on a vehicle'
@@ -327,6 +341,13 @@ class fleet_vehicle(osv.Model):
         'log_fuel': fields.one2many('fleet.vehicle.log.fuel', 'vehicle_id', 'Fuel Logs'),
         'log_services': fields.one2many('fleet.vehicle.log.services', 'vehicle_id', 'Services Logs'),
         'log_contracts': fields.one2many('fleet.vehicle.log.contract', 'vehicle_id', 'Contracts'),
+        'costs_ids': fields.one2many('fleet.vehicle.cost', 'vehicle_id', 'Costs'),
+        'odometer_ids': fields.one2many('fleet.vehicle.odometer', 'vehicle_id', 'Odometer'),
+        'cost_count': fields.function(_count_all, type='integer', string="Costs" , multi=True),
+        'contract_count': fields.function(_count_all, type='integer', string='Contracts', multi=True),
+        'service_count': fields.function(_count_all, type='integer', string='Services', multi=True),
+        'fuel_logs_count': fields.function(_count_all, type='integer', string='Fuel Logs', multi=True),
+        'odometer_count': fields.function(_count_all, type='integer', string='Odometer', multi=True),
         'acquisition_date': fields.date('Acquisition Date', required=False, help='Date when the vehicle has been bought'),
         'color': fields.char('Color', size=32, help='Color of the vehicle'),
         'state_id': fields.many2one('fleet.vehicle.state', 'State', help='Current state of the vehicle', ondelete="set null"),
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index d8c47e43b9d..4cadeebdc19 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -211,11 +211,46 @@
                             <field name="tag_ids" widget="many2many_tags" />
                         </div>
                         <div class="oe_right oe_button_box">
-                            <button name="return_action_to_open" type="object" context="{'xml_id':'fleet_vehicle_log_contract_act'}" string="Contracts" help="show the contract for this vehicle" />
-                            <button name="act_show_log_cost" type="object" string="Costs" help="show all the costs for this vehicle" groups="fleet.group_fleet_manager"/>
-                            <button name="return_action_to_open" type="object" context="{'xml_id':'fleet_vehicle_log_services_act'}" string="Services" help="show the services logs for this vehicle" />
-                            <button name="return_action_to_open" type="object" context="{'xml_id':'fleet_vehicle_log_fuel_act'}" string="Fuel Logs" help="show the fuel logs for this vehicle" />
-                            <button name="return_action_to_open" type="object" context="{'xml_id':'fleet_vehicle_odometer_act'}" string="Odometer Logs" help="show the odometer logs for this vehicle" />
+                            <button name="return_action_to_open" 
+                                type="object"
+                                class="oe_stat_button"
+                                icon="fa-thumbs-o-up" 
+                                context="{'xml_id':'fleet_vehicle_log_contract_act'}" 
+                                help="show the contract for this vehicle">
+                                <field name="contract_count" widget="statinfo" string="Contracts"/>
+                            </button>
+                            <button name="act_show_log_cost" 
+                                type="object"
+                                class="oe_stat_button"
+                                icon="fa-money" 
+                                help="show all the costs for this vehicle" 
+                                groups="fleet.group_fleet_manager">
+                                <field name="cost_count" widget="statinfo" string="Costs"/>
+                            </button>
+                            <button name="return_action_to_open" 
+                                type="object"
+                                class="oe_stat_button"
+                                icon="fa-wrench" 
+                                context="{'xml_id':'fleet_vehicle_log_services_act'}" 
+                                help="show the services logs for this vehicle" >
+                                <field name="service_count" widget="statinfo" string="Services"/>
+                            </button>
+                            <button name="return_action_to_open" 
+                                type="object"
+                                class="oe_stat_button"
+                                icon="fa-flask" 
+                                context="{'xml_id':'fleet_vehicle_log_fuel_act'}" 
+                                help="show the fuel logs for this vehicle" >
+                                <field name="fuel_logs_count" widget="statinfo" string="Fuel Logs"/>
+                            </button>
+                            <button name="return_action_to_open" 
+                                type="object" 
+                                class="oe_stat_button"
+                                icon="fa-tachometer"
+                                context="{'xml_id':'fleet_vehicle_odometer_act'}" 
+                                help="show the odometer logs for this vehicle" >
+                                <field name="odometer_count" widget="statinfo" string="odometer Logs"/>
+                            </button>
                         </div> 
                         <group col="2" string="General Properties">
                             <group >

From 21bb79d47e1e00df0b625453bc6817ad0d5a85f9 Mon Sep 17 00:00:00 2001
From: "Yogesh Parekh (OpenERP)" <ypa@tinyerp.com>
Date: Wed, 26 Mar 2014 17:55:49 +0530
Subject: [PATCH 23/65] [IMP]: Convert buttons into stat button in gamification
 module

bzr revid: ypa@tinyerp.com-20140326122549-imqefk86wbxdxmpm
---
 addons/gamification/models/challenge.py | 11 +++++++++++
 addons/gamification/views/challenge.xml |  8 +++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index 06d0c44baac..11b5f787bdd 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -114,6 +114,15 @@ class gamification_challenge(osv.Model):
             return self.pool.get('ir.model.data').get_object_reference(cr, uid, 'gamification', 'simple_report_template')[1]
         except ValueError:
             return False
+    
+    def _count_goals(self, cr, uid, ids, field_name, arg, context=None):
+        res = {}
+        try:
+            for goals in self.browse(cr, uid, ids, context=context):
+                res[goals.id] = len(goals.goals_ids)
+        except:
+            pass
+        return res
 
     _order = 'end_date, start_date, name, id'
     _columns = {
@@ -191,6 +200,8 @@ class gamification_challenge(osv.Model):
 
         'category': fields.selection(lambda s, *a, **k: s._get_categories(*a, **k),
             string="Appears in", help="Define the visibility of the challenge through menus", required=True),
+        'goals_ids': fields.one2many('gamification.goal', 'challenge_id', 'Related Goals'),
+        'goals_count': fields.function(_count_goals, type='integer', string='Related Goals')
         }
 
     _defaults = {
diff --git a/addons/gamification/views/challenge.xml b/addons/gamification/views/challenge.xml
index 075afcaccfa..ef2151c5a77 100644
--- a/addons/gamification/views/challenge.xml
+++ b/addons/gamification/views/challenge.xml
@@ -53,7 +53,13 @@
 
                         <!-- action buttons -->
                         <div class="oe_right oe_button_box">
-                            <button type="action" name="%(goals_from_challenge_act)d" string="Related Goals" attrs="{'invisible': [('state','=','draft')]}" />
+                            <button type="action" 
+                                name="%(goals_from_challenge_act)d" 
+                                class="oe_stat_button"
+                                icon="fa-globe"
+                                attrs="{'invisible': [('state','=','draft')]}">
+                                <field name="goals_count" widget="statinfo" string="Related Goals"/>
+                            </button>
                         </div>
                         <group>
                             <group>

From e264864ba129caac4d8ce37b1bd1d3f25d56ef81 Mon Sep 17 00:00:00 2001
From: "Yogesh Parekh (OpenERP)" <ypa@tinyerp.com>
Date: Wed, 26 Mar 2014 18:04:57 +0530
Subject: [PATCH 24/65] [IMP]: Convert buttons into stat button in
 marketing_campaign module

bzr revid: ypa@tinyerp.com-20140326123457-h62junadkragtxgx
---
 addons/marketing_campaign/marketing_campaign.py       | 11 +++++++++++
 addons/marketing_campaign/marketing_campaign_view.xml |  9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index e434090ad76..142d059e1f9 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -85,6 +85,15 @@ translate_selections = {
 class marketing_campaign(osv.osv):
     _name = "marketing.campaign"
     _description = "Marketing Campaign"
+    
+    def _count_segments(self, cr, uid, ids, field_name, arg, context=None):
+        res = {}
+        try:
+            for segments in self.browse(cr, uid, ids, context=context):
+                res[segments.id] = len(segments.segment_ids)
+        except: 
+            pass
+        return res
 
     _columns = {
         'name': fields.char('Name', size=64, required=True),
@@ -121,6 +130,8 @@ Normal - the campaign runs normally and automatically sends all emails and repor
         'activity_ids': fields.one2many('marketing.campaign.activity',
                                        'campaign_id', 'Activities'),
         'fixed_cost': fields.float('Fixed Cost', help="Fixed cost for running this campaign. You may also specify variable cost and revenue on each campaign activity. Cost and Revenue statistics are included in Campaign Reporting.", digits_compute=dp.get_precision('Product Price')),
+        'segment_ids': fields.one2many('marketing.campaign.segment', 'campaign_id', 'Segments', readonly=False),
+        'segments_count': fields.function(_count_segments, type='integer', string='Segments')
     }
 
     _defaults = {
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 6503cc482ab..c5789dd68ba 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -64,12 +64,19 @@
                 <div class="oe_right oe_button_box" name="button_box">
                     <button type="action"
                         name="%(act_marketing_campaing_stat)d"
+                        class="oe_stat_button"
+                        icon="fa-keyboard-o"
                         string="Campaign Statistics"/>
                     <button type="action"
                         name="%(act_marketing_campaing_segment_opened)d"
-                        string="Segments"/>  
+                        class="oe_stat_button"
+                        icon="fa-table">
+                        <field name="segments_count" widget="statinfo" string="Segments"/>
+                    </button>  
                     <button type="action"
                         name="%(act_marketing_campaing_followup)d"
+                        class="oe_stat_button"
+                        icon="fa-thumbs-up"
                         string="Follow-Up"/>
                 </div>
                 <div class="oe_title">

From 5e75ce212b3d35a22a1ce9b53e72e58a71c9c89e Mon Sep 17 00:00:00 2001
From: "Yogesh Parekh (OpenERP)" <ypa@tinyerp.com>
Date: Wed, 26 Mar 2014 18:10:02 +0530
Subject: [PATCH 25/65] [IMP]: Convert buttons into stat button in purchase
 module

bzr revid: ypa@tinyerp.com-20140326124002-lj4wd30vd6hy5k9x
---
 addons/purchase/purchase.py    | 13 +++++++++++++
 addons/purchase/stock_view.xml | 12 ++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 9ecbc4bf0fd..a27dfce1985 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -150,6 +150,17 @@ class purchase_order(osv.osv):
                                                 limit=1)
         return res and res[0] or False  
 
+    def _count_all(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict(map(lambda x: (x,{'shipment_count': 0, 'invoice_count': 0,}), ids))
+        try:
+            for data in self.browse(cr, uid, ids, context=context):
+                res[data.id] = {'shipment_count': len(data.picking_ids),
+                'invoice_count': len(data.invoice_ids),
+                }
+        except:
+            pass
+        return res
+
     STATE_SELECTION = [
         ('draft', 'Draft PO'),
         ('sent', 'RFQ Sent'),
@@ -226,6 +237,8 @@ class purchase_order(osv.osv):
         'create_uid':  fields.many2one('res.users', 'Responsible'),
         'company_id': fields.many2one('res.company','Company',required=True,select=1, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}),
         'journal_id': fields.many2one('account.journal', 'Journal'),
+        'shipment_count': fields.function(_count_all, type='integer', string='Incoming Shipments', multi=True),
+        'invoice_count': fields.function(_count_all, type='integer', string='Invoices', multi=True)
     }
     _defaults = {
         'date_order': fields.date.context_today,
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 0ba48a63512..94eaff5f498 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -47,9 +47,17 @@
                     <div class="oe_right oe_button_box" name="buttons">
                         <button type="object"
                             name="view_picking"
-                            string="Incoming Shipments" states="approved"/>
+                            class="oe_stat_button"
+                            icon="fa-truck"
+                            states="approved">
+                            <field name="shipment_count" widget="statinfo" string="Incoming Shipments"/>
+                        </button>
                         <button type="object"  name="invoice_open"
-                            string="Invoices" attrs="{'invisible': [('state', 'in', ['draft','sent'])]}"/> 
+                            class="oe_stat_button"
+                            icon="fa-file-o"
+                            attrs="{'invisible': [('state', 'in', ['draft','sent'])]}">
+                            <field name="invoice_count" widget="statinfo" string="Invoices"/>
+                        </button> 
                     </div>
                 </xpath>
             </field>

From 22fd5a3e9231c878065b694c80cfcc309d919e2e Mon Sep 17 00:00:00 2001
From: "Yogesh Parekh (OpenERP)" <ypa@tinyerp.com>
Date: Wed, 26 Mar 2014 18:26:40 +0530
Subject: [PATCH 26/65] [IMP]: Convert buttons into stat button in stockand
 purchase module

bzr revid: ypa@tinyerp.com-20140326125640-0my7ih6bgk9s9dt1
---
 .../purchase_requisition_view.xml             |  4 ++-
 addons/stock/stock_view.xml                   | 35 +++++++++++++------
 .../views/event_backend.xml                   |  7 +++-
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index da3a6d132ee..1af71d214e9 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -77,7 +77,9 @@
                         </field>
                         <div class="oe_right oe_button_box" style="margin-top: 10px">
                             <button name="%(action_purchase_requisition_partner)d" type="action"
-                                string="Request a Quotation" icon="gtk-execute"
+                                string="Request a Quotation"
+                                class="oe_stat_button" 
+                                icon="fa-quote-left"
                                 attrs="{'invisible': [('line_ids','=',False),('state', 'not in', ('in_progress'))]}"/>
                         </div>
                         <separator string="Quotations"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e96652c11aa..fd87ecb5143 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -240,9 +240,16 @@
                             <field name="active"/>
                         </group>
                         <group groups="stock.group_tracking_lot" string="Traceability">
-                            <button name="action_traceability" string="Upstream Traceability" type="object"
-                                 colspan="2"/>
-                            <button name="action_traceability" string="Downstream Traceability" type="object"
+                            <button name="action_traceability" 
+                                string="Upstream Traceability"
+                                class="oe_stat_button"
+                                icon="fa-arrow-up" 
+                                type="object" colspan="2"/>
+                            <button name="action_traceability" 
+                                string="Downstream Traceability"
+                                class="oe_stat_button"
+                                icon="fa-arrow-down" 
+                                type="object"
                                 context="{'type': 'move_history_ids'}" colspan="2"/>
                         </group>
                     </group>
@@ -344,8 +351,10 @@
             <field name="arch" type="xml">
                 <form string="Serial Number" version="7.0">
                     <div class="oe_button_box oe_right">
-                        <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': 'move_history_ids2', 'field': 'prodlot_id'}"/>
-                        <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}"/>
+                        <button name="action_traceability" string="Upstream Traceability" class="oe_stat_button"
+                            icon="fa-arrow-up" type="object" context="{'type': 'move_history_ids2', 'field': 'prodlot_id'}"/>
+                        <button name="action_traceability" string="Downstream Traceability" class="oe_stat_button"
+                            icon="fa-arrow-down" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}"/
                     </div>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
@@ -1236,14 +1245,16 @@
                         <group name="main_grp" string="Details">
                             <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                             <label for="product_qty"/>
-                            <div>
+                            <div class="oe_button_box">
                                 <field name="product_qty"
                                     on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"
                                     class="oe_inline"/>
                                 <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
                                 <button name="%(stock.move_scrap)d"
                                         string="Scrap" type="action"
-                                        icon="terp-gtk-jump-to-ltr" context="{'scrap': True}"
+                                        class="oe_stat_button"
+                                        icon="fa-trash-o" context="{'scrap': True}"
+                                        context="{'scrap': True}"
                                         states="draft,waiting,confirmed,assigned" colspan="1"/>
                             </div>
                             <label for="product_uos_qty" groups="product.group_uos"/>
@@ -1277,18 +1288,20 @@
                                 <field name="tracking_id" class="oe_inline"/>
                                 <button name="%(split_into)d" string="New Pack" type="action"
                                       groups="product.group_stock_packaging"
-                                      icon="terp-accessories-archiver+"
+                                      class="oe_stat_button "
+                                      icon="fa-gift"
                                       states="draft,assigned,confirmed"/>
                             </div>
                             <label for="prodlot_id" groups="stock.group_production_lot"/>
-                            <div groups="stock.group_production_lot">
+                            <div groups="stock.group_production_lot" class="oe_button_box">
                                 <field name="prodlot_id"
                                     context="{'location_id':location_id, 'product_id':product_id}"
                                     domain="[('product_id','=?',product_id)]" class="oe_inline"
                                     on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"/>
                                 <button name="%(track_line)d"
-                                    states="draft,waiting,confirmed,assigned"
-                                    string="Split" type="action" icon="gtk-justify-fill"/>
+                                    states="draft,waiting,confirmed,assigned" 
+                                    class="oe_stat_button"
+                                    string="Split" type="action" icon="fa-filter"/>
                             </div>
                         </group>
                     </group>
diff --git a/addons/website_event_track/views/event_backend.xml b/addons/website_event_track/views/event_backend.xml
index ad262b6122e..ff863289993 100644
--- a/addons/website_event_track/views/event_backend.xml
+++ b/addons/website_event_track/views/event_backend.xml
@@ -160,7 +160,12 @@
             <field name="model">event.event</field>
             <field name="arch" type="xml">
                 <xpath expr="//div[@class='oe_right oe_button_box']" position="inside">
-                    <button name="%(website_event_track.act_event_list_tracks)d" type="action" string="Tracks"/>
+                    <button name="%(website_event_track.act_event_list_tracks)d" 
+                        type="action" 
+                        class="oe_stat_button oe_inline" 
+                        icon="fa-inbox">
+                        <field name="count_tracks" widget="statinfo"/>
+                    </button>
                 </xpath>
                 <xpath expr="//div[@class='oe_title']" position="inside">
                     <label for="tag_ids" class="oe_edit_only"/>

From cec491f8378e2a5d442b4888136241a7a3fe4223 Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Thu, 27 Mar 2014 10:36:46 +0530
Subject: [PATCH 27/65] [IMP] improve code

bzr revid: rma@tinyerp.com-20140327050646-1ghtvl9pqk1xqg0x
---
 addons/stock/stock_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index fd87ecb5143..a47eac91dde 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -354,7 +354,7 @@
                         <button name="action_traceability" string="Upstream Traceability" class="oe_stat_button"
                             icon="fa-arrow-up" type="object" context="{'type': 'move_history_ids2', 'field': 'prodlot_id'}"/>
                         <button name="action_traceability" string="Downstream Traceability" class="oe_stat_button"
-                            icon="fa-arrow-down" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}"/
+                            icon="fa-arrow-down" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}"/>
                     </div>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
@@ -1254,7 +1254,6 @@
                                         string="Scrap" type="action"
                                         class="oe_stat_button"
                                         icon="fa-trash-o" context="{'scrap': True}"
-                                        context="{'scrap': True}"
                                         states="draft,waiting,confirmed,assigned" colspan="1"/>
                             </div>
                             <label for="product_uos_qty" groups="product.group_uos"/>

From 36e0eb4e2e8191ffad689d565cc2cbe74122c5c6 Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Thu, 27 Mar 2014 11:19:50 +0530
Subject: [PATCH 28/65] [IMP] add required icon

bzr revid: rma@tinyerp.com-20140327054950-d126732mv15imvyi
---
 addons/web/static/lib/fontawesome/css/font-awesome.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/web/static/lib/fontawesome/css/font-awesome.css b/addons/web/static/lib/fontawesome/css/font-awesome.css
index 5d86a180012..35da66e7484 100644
--- a/addons/web/static/lib/fontawesome/css/font-awesome.css
+++ b/addons/web/static/lib/fontawesome/css/font-awesome.css
@@ -243,6 +243,9 @@
 .fa-adn:before {
   content: "\f170";
 }
+. fa-times:before {
+  content: "\f00d";
+}
 .fa-power-off:before {
   content: "\f011";
 }

From 457a62dee605f9a7c8173903d6cd9b038faf13ed Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Thu, 27 Mar 2014 17:07:20 +0530
Subject: [PATCH 29/65] [IMP] add stat button for point of sale, email template

bzr revid: rma@tinyerp.com-20140327113720-1jlqhlk17muqv5nf
---
 addons/account/partner_view.xml               |  2 +-
 addons/email_template/email_template_view.xml |  3 +-
 .../hr_timesheet_sheet/hr_timesheet_sheet.py  |  8 ++--
 .../hr_timesheet_sheet_view.xml               |  8 ++--
 addons/point_of_sale/point_of_sale_view.xml   |  6 ++-
 addons/stock/stock_view.xml                   | 41 +++++++++----------
 6 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 8dbda70ec6b..402337204ae 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -71,7 +71,7 @@
                         context="{'search_default_partner_id': active_id,'default_partner_id': active_id}" groups="account.group_account_invoice">
                         <field string="Invoices" name="invoice_count" widget="statinfo" attrs="{'readonly':1}"/>
                     </button>
-                    <button type="action" class="oe_stat_button" name="%(account.action_account_moves_all_tree)d" groups="account.group_account_user" icon="fa-book">
+                    <button type="action" class="oe_stat_button" name="%(account.action_account_moves_all_tree)d" groups="account.group_account_user" icon="fa-list">
                         <field string="Journal Items" name="journal_item_count" widget="statinfo"/>                        
                     </button>
                     <button class="oe_inline oe_stat_button" type="action" name="%(account.action_open_partner_analytic_accounts)d" 
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index dfa2697b322..26fa93f520a 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -18,8 +18,9 @@
                                     attrs="{'invisible':[('ref_ir_act_window','!=',False)]}" icon="fa-adn"
                                     help="Display an option on related documents to open a composition wizard with this template" widget="statinfo"/>
                             <button name="unlink_action" string="Remove context action" type="object" 
+                                    class="oe_stat_button" icon="fa-minus"
                                     attrs="{'invisible':[('ref_ir_act_window','=',False)]}"
-                                    help="Remove the contextual action to use this template on related documents"/>
+                                    help="Remove the contextual action to use this template on related documents" widget="statinfo"/>
                             <button class="oe_inline oe_stat_button" name="%(wizard_email_template_preview)d" icon="fa-search-plus" string="Preview"
                                     type="action" target="new"
                                     context="{'template_id':active_id}" widget="statinfo"/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 2560590a7f8..d71d083fbcd 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -105,11 +105,10 @@ class hr_timesheet_sheet(osv.osv):
         return hr_employee.attendance_action_change(cr, uid, employee_ids, context=context)
     
     def _count_all(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,{'timesheet_count': 0, 'attendance_count': 0,}), ids))
+        res = dict(map(lambda x: (x,{'timesheet_activity_count': 0, 'attendance_count': 0,}), ids))
         try:
            for datas in self.browse(cr, uid, ids, context=context):
-                res[datas.id] = {'appraisal_count': len(datas.appraisal_ids),
-                'timesheet_count': len(datas.timesheet_ids),
+                res[datas.id] = {'timesheet_activity_count': len(datas.timesheet_activity_ids),
                 'attendance_count': len(datas.attendances_ids),
                 }
         except:
@@ -146,7 +145,8 @@ class hr_timesheet_sheet(osv.osv):
         'account_ids': fields.one2many('hr_timesheet_sheet.sheet.account', 'sheet_id', 'Analytic accounts', readonly=True),
         'company_id': fields.many2one('res.company', 'Company'),
         'department_id':fields.many2one('hr.department','Department'),
-        'timesheet_count': fields.function(_count_all, type='integer', string='Timesheet Activities', multi=True),
+        'timesheet_activity_ids': fields.one2many('hr.analytic.timesheet', 'sheet_id', 'Timesheet Activities'),
+        'timesheet_activity_count': fields.function(_count_all, type='integer', string='Timesheet Activities', multi=True),
         'attendance_count': fields.function(_count_all, type='integer', string="Attendances", multi=True),
     }
 
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index fd7570c17df..d6c987b6a24 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -75,11 +75,13 @@
                             name="%(act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet)d"
                             class="oe_stat_button"
                             icon="fa-times">
-                            <field name="timesheet_count" widget="statinfo" string="Timesheet Activities"/>
+                            <field name="timesheet_activity_count" widget="statinfo" string="Timesheet Activities"/>
                         </button>
                         <button type="action" groups="base.group_hr_attendance"
-                            name="%(act_hr_timesheet_sheet_sheet_2_hr_attendance)d"
-                            string="Attendances" />
+                            class="oe_stat_button" icon="fa-users"
+                            name="%(act_hr_timesheet_sheet_sheet_2_hr_attendance)d">
+                            <field name="attendance_count" widget="statinfo" string="Attendances"/>
+                        </button>
                     </div>
                     <div class="oe_title">
                         <label for="employee_id" class="oe_edit_only"/>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 7740020e37f..c58d2eafd9e 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -843,8 +843,10 @@
                     </header>
                     <sheet>
                         <div class="oe_right oe_button_box">
-                            <button name="%(action_pos_box_in)d" string="Put Money In" type="action" states="opened,closing_control"/>
-                            <button name="%(action_pos_box_out)d" string="Take Money Out" type="action" states="opened,closing_control"/>
+                            <button class="oe_stat_button" name="%(action_pos_box_in)d" string="Put Money In" 
+                                type="action" states="opened,closing_control" icon="fa-money"/>
+                            <button class="oe_stat_button" name="%(action_pos_box_out)d" string="Take Money Out" 
+                                type="action" states="opened,closing_control" icon="fa-money"/>
                         </div>
                         <h1 class="oe_title">
                             Session:
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index a47eac91dde..9e712ce5d97 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -240,18 +240,20 @@
                             <field name="active"/>
                         </group>
                         <group groups="stock.group_tracking_lot" string="Traceability">
-                            <button name="action_traceability" 
-                                string="Upstream Traceability"
-                                class="oe_stat_button"
-                                icon="fa-arrow-up" 
-                                type="object" colspan="2"/>
-                            <button name="action_traceability" 
-                                string="Downstream Traceability"
-                                class="oe_stat_button"
-                                icon="fa-arrow-down" 
-                                type="object"
-                                context="{'type': 'move_history_ids'}" colspan="2"/>
-                        </group>
+                            <div class="oe_button_box">
+                                <button name="action_traceability" 
+                                    string="Upstream Traceability"
+                                    class="oe_stat_button"
+                                    icon="fa-arrow-up" 
+                                    type="object" colspan="2"/>
+                                <button name="action_traceability" 
+                                    string="Downstream Traceability"
+                                    class="oe_stat_button"
+                                    icon="fa-arrow-down" 
+                                    type="object"
+                                    context="{'type': 'move_history_ids'}" colspan="2"/>
+                            </div>
+                        </group>                            
                     </group>
                     <field name="move_ids"/>
                 </form>
@@ -1245,15 +1247,14 @@
                         <group name="main_grp" string="Details">
                             <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                             <label for="product_qty"/>
-                            <div class="oe_button_box">
+                            <div>
                                 <field name="product_qty"
                                     on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"
                                     class="oe_inline"/>
                                 <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
                                 <button name="%(stock.move_scrap)d"
                                         string="Scrap" type="action"
-                                        class="oe_stat_button"
-                                        icon="fa-trash-o" context="{'scrap': True}"
+                                        icon="terp-gtk-jump-to-ltr" context="{'scrap': True}"
                                         states="draft,waiting,confirmed,assigned" colspan="1"/>
                             </div>
                             <label for="product_uos_qty" groups="product.group_uos"/>
@@ -1287,20 +1288,18 @@
                                 <field name="tracking_id" class="oe_inline"/>
                                 <button name="%(split_into)d" string="New Pack" type="action"
                                       groups="product.group_stock_packaging"
-                                      class="oe_stat_button "
-                                      icon="fa-gift"
+                                      icon="terp-accessories-archiver+"
                                       states="draft,assigned,confirmed"/>
                             </div>
                             <label for="prodlot_id" groups="stock.group_production_lot"/>
-                            <div groups="stock.group_production_lot" class="oe_button_box">
+                            <div groups="stock.group_production_lot">
                                 <field name="prodlot_id"
                                     context="{'location_id':location_id, 'product_id':product_id}"
                                     domain="[('product_id','=?',product_id)]" class="oe_inline"
                                     on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"/>
                                 <button name="%(track_line)d"
-                                    states="draft,waiting,confirmed,assigned" 
-                                    class="oe_stat_button"
-                                    string="Split" type="action" icon="fa-filter"/>
+                                    states="draft,waiting,confirmed,assigned"
+                                    string="Split" type="action" icon="gtk-justify-fill"/>
                             </div>
                         </group>
                     </group>

From 77ff3a69b82bd49d19fda5a73f1b33dc4bc81eee Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Fri, 28 Mar 2014 19:00:51 +0530
Subject: [PATCH 30/65] [IMP] improve icons and views

bzr revid: rma@tinyerp.com-20140328133051-2amm63n2vy3bj3xe
---
 addons/account_asset/account_asset_view.xml   |  2 +-
 .../account_followup_customers.xml            | 20 ++++++++--------
 .../account_payment/account_payment_view.xml  | 10 ++++----
 .../account_voucher/account_voucher_view.xml  |  2 +-
 addons/crm/crm_lead_view.xml                  |  6 ++---
 addons/crm/crm_phonecall_view.xml             |  9 +++----
 .../crm_project_issue/project_issue_view.xml  |  2 +-
 addons/email_template/email_template_view.xml |  6 ++---
 addons/fleet/fleet_view.xml                   |  8 +++----
 addons/gamification/views/challenge.xml       |  4 ++--
 addons/hr_contract/hr_contract_view.xml       |  2 +-
 addons/hr_evaluation/hr_evaluation_view.xml   |  2 +-
 addons/hr_payroll/hr_payroll_view.xml         |  4 ++--
 addons/hr_recruitment/hr_recruitment_view.xml | 12 +++++-----
 addons/hr_timesheet/hr_timesheet_view.xml     |  2 +-
 .../hr_timesheet_sheet_view.xml               |  4 ++--
 .../marketing_campaign_view.xml               |  2 +-
 addons/point_of_sale/point_of_sale_view.xml   |  8 +++----
 .../project_long_term_view.xml                |  2 +-
 addons/purchase/partner_view.xml              |  2 +-
 addons/purchase/stock_view.xml                |  4 ++--
 addons/sale/res_partner_view.xml              |  2 +-
 addons/stock/stock_view.xml                   | 24 ++++++++++++-------
 23 files changed, 74 insertions(+), 65 deletions(-)

diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 40d99afd1fe..f9f0e75fba6 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -84,7 +84,7 @@
                 </header>
                 <sheet>
                     <div class="oe_button_box oe_right">
-                        <button class="oe_inline oe_stat_button" name="open_entries"  type="object" icon="fa-pencil-square-o">
+                        <button class="oe_inline oe_stat_button" name="open_entries"  type="object" icon="fa-pencil">
                         <field string="Entries" name="entry_count" widget="statinfo" />
                     </button>
                     </div>
diff --git a/addons/account_followup/account_followup_customers.xml b/addons/account_followup/account_followup_customers.xml
index d503ed4b306..bdd258237c8 100644
--- a/addons/account_followup/account_followup_customers.xml
+++ b/addons/account_followup/account_followup_customers.xml
@@ -78,18 +78,18 @@
             <field name="model">res.partner</field>
             <field name="groups_id" eval="[(4, ref('account.group_account_invoice'))]"/>
             <field name="arch" type="xml" >
+                <xpath expr="//div[@name='buttons']" position="inside" groups="account.group_account_invoice">
+                    <button class="oe_inline oe_stat_button" type="object" name="do_button_print" 
+                        icon="fa-print" string="Print Overdue" widget="statinfo" groups="account.group_account_user" 
+                        help="Print overdue payments report independent of follow-up line" 
+                        attrs="{'invisible':[('payment_amount_due', '&lt;=', 0.0)]}"/>
+                    <button class="oe_inline oe_stat_button" type="object" name="do_partner_mail" 
+                        icon="fa-envelope-o" string="Mail Overdue" widget="statinfo" 
+                        help="If not specified by the latest follow-up level, it will send from the default email template"
+                        attrs="{'invisible':[('payment_amount_due', '&lt;=', 0.0)]}" groups="account.group_account_user"/>
+                </xpath>
                 <page string="Accounting" position="before" version="7.0">
                     <page string="Payment Follow-up" groups="account.group_account_invoice" name="followup_tab">
-                        <div class="oe_right oe_button_box" name="followup_button">
-                            <button class="oe_inline oe_stat_button" type="object" name="do_button_print" 
-                                icon="fa-mail" string="Print Overdue Payments" widget="statinfo" groups="account.group_account_user" 
-                                help="Print overdue payments report independent of follow-up line" 
-                                attrs="{'invisible':[('payment_amount_due', '&lt;=', 0.0)]}"/>
-                            <button class="oe_inline oe_stat_button" type="object" name="do_partner_mail" 
-                                icon="fa-print" string="Send Overdue Email" widget="statinfo" 
-                                help="If not specified by the latest follow-up level, it will send from the default email template"
-                                attrs="{'invisible':[('payment_amount_due', '&lt;=', 0.0)]}" groups="account.group_account_user"/>
-                        </div>
                         <p attrs="{'invisible':[('latest_followup_date','=', False)]}">
                             The <field name="latest_followup_date"  class = "oe_inline"/>, the latest payment follow-up
                             was: <field name="latest_followup_level_id" class="oe_inline"/>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 4de42a53669..d62a7969754 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -69,14 +69,14 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
                 </header>
                 <sheet string="Payment order">
-                    <div class="oe_button_box">
-                        <button class="oe_inline oe_stat_button oe_right" name="%(action_create_payment_order)d" string="Select Invoices to Pay"
-                               type="action" attrs="{'invisible':[('state','=','done')]}" icon="fa-search" widget="statinfo"/>
-                    </div>
                     <div class="oe_title">
                         <label for="reference" class="oe_edit_only"/>
                         <h1><field name="reference"/></h1>
                     </div>
+                    <div class=" oe_right oe_button_box">
+                        <button class="oe_inline oe_stat_button oe_right" name="%(action_create_payment_order)d" string="Invoices" Help="Select Invoices to Pay"
+                               type="action" attrs="{'invisible':[('state','=','done')]}" icon="fa-pencil-square-o" widget="statinfo"/>
+                    </div>
                     <group>
                         <group>
                             <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'account.group_account_invoice']}"/>
@@ -292,7 +292,7 @@
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
 	            <xpath expr="//div[@name='import_buttons']" position="inside">
-	                <button class="oe_inline oe_stat_button" name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import Payment Lines" type="action" icon="fa-cogs" widget="statinfo"/>
+	                <button class="oe_inline oe_stat_button" name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import Lines" help="Import Payment Lines" type="action" icon="fa-cogs" widget="statinfo"/>
 	            </xpath>
             </field>
         </record>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index aae4d5dbed4..bbc17580f94 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -201,7 +201,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='import_buttons']" position="inside">
                     <button class="oe_inline oe_stat_button" name="%(action_view_account_statement_from_invoice_lines)d"
-                            string="Import Invoices" type="action"
+                            string="Import Invoice" type="action"
                             attrs="{'invisible':[('state','=','confirm')]}" widget="statinfo" icon="fa-pencil-square-o"/>
                 </xpath>
             </field>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 17c7f58c4fe..beed7ba5c97 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -104,7 +104,7 @@
                 <sheet>
                     <div class="oe_right oe_button_box" name="buttons">
                         <button class="oe_inline oe_stat_button" type="action" name="%(opportunity2phonecall_act)d" icon="fa-phone"  
-                            widget="statinfo" string="Schedule/Log Call"/>
+                            widget="statinfo" string="Calls"/>
                     </div>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
@@ -389,11 +389,11 @@
                     <sheet>
                         <div class="oe_right oe_button_box">
                             <button class="oe_inline oe_stat_button" type="action" name="%(opportunity2phonecall_act)d" icon="fa-phone"  
-                                widget="statinfo" string="Schedule/Log Call"/>
+                                widget="statinfo" string="Calls"/>
                             <button class="oe_inline oe_stat_button" type="object" 
                                 context="{'search_default_attendee_id': active_id, 'default_attendee_id' : active_id}"
                                 name="action_makeMeeting" icon="fa-calendar">
-                                <field string="Meeting" name="meeting_count" widget="statinfo"/>
+                                <field string="Meetings" name="meeting_count" widget="statinfo"/>
                             </button>
                         </div>
                         <div class="oe_title">
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index e41040905b2..25cddce10b6 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -66,12 +66,13 @@
                 <sheet string="Phone Call">
                     <div class="oe_right oe_button_box">
                         <button class="oe_inline oe_stat_button" type="object" name="action_button_convert2opportunity" 
-                            icon="fa fa-star fa-fw" string="Convert to Opportunity" 
-                            attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state', 'not in', ('open', 'done'))]}" widget="statinfo"/>
+                            icon="fa-star" string="Opportunity" 
+                            attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state', 'not in', ('open', 'done'))]}"
+                            help="Convert to Opportunity" widget="statinfo"/>
                         <button class="oe_inline oe_stat_button" type="action" 
-                            name="%(phonecall_to_phonecall_act)d" icon="fa-phone fa-fw" string="Schedule Other Call" widget="statinfo"/>
+                            name="%(phonecall_to_phonecall_act)d" icon="fa-phone" string="Other Call" widget="statinfo"/>
                         <button class="oe_inline oe_stat_button" name="action_make_meeting" type="object" icon="fa-calendar fa-fw">
-                              <field string="Schedule a Meeting" name="meeting_count" widget="statinfo" />
+                              <field string="Plan Meeting" name="meeting_count" widget="statinfo" />
                         </button>
                     </div>
                     <div class="oe_title">
diff --git a/addons/crm_project_issue/project_issue_view.xml b/addons/crm_project_issue/project_issue_view.xml
index bd147378e28..65ca274f086 100644
--- a/addons/crm_project_issue/project_issue_view.xml
+++ b/addons/crm_project_issue/project_issue_view.xml
@@ -37,7 +37,7 @@
         <field name="arch" type="xml">
             <xpath expr="//div[@name='buttons']/button" position="after">
                     <button class="oe_inline oe_stat_button" type="action" name="%(convert_lead2projectissue_wizard_action)d" icon="fa-bug"  
-                        help="Convert to Issue" widget="statinfo" string="Convert to Issue"/>
+                        help="Convert to Issue" widget="statinfo" string="Move to Issue"/>
             </xpath>
         </field>
     </record>
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 26fa93f520a..52fb270eb12 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -14,10 +14,10 @@
                         </div>
                         <div class="oe_right oe_button_box" name="buttons">
                             <field name="ref_ir_act_window" invisible="1"/>
-                            <button class="oe_inline oe_stat_button" name="create_action" string="Add context action" type="object"
-                                    attrs="{'invisible':[('ref_ir_act_window','!=',False)]}" icon="fa-adn"
+                            <button class="oe_inline oe_stat_button" name="create_action" string="Add action" type="object"
+                                    attrs="{'invisible':[('ref_ir_act_window','!=',False)]}" icon="fa-plus"
                                     help="Display an option on related documents to open a composition wizard with this template" widget="statinfo"/>
-                            <button name="unlink_action" string="Remove context action" type="object" 
+                            <button name="unlink_action" string="Drop action" type="object" 
                                     class="oe_stat_button" icon="fa-minus"
                                     attrs="{'invisible':[('ref_ir_act_window','=',False)]}"
                                     help="Remove the contextual action to use this template on related documents" widget="statinfo"/>
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 4cadeebdc19..e4cdbe886f7 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -214,7 +214,7 @@
                             <button name="return_action_to_open" 
                                 type="object"
                                 class="oe_stat_button"
-                                icon="fa-thumbs-o-up" 
+                                icon="fa-book" 
                                 context="{'xml_id':'fleet_vehicle_log_contract_act'}" 
                                 help="show the contract for this vehicle">
                                 <field name="contract_count" widget="statinfo" string="Contracts"/>
@@ -222,7 +222,7 @@
                             <button name="act_show_log_cost" 
                                 type="object"
                                 class="oe_stat_button"
-                                icon="fa-money" 
+                                icon="fa-usd" 
                                 help="show all the costs for this vehicle" 
                                 groups="fleet.group_fleet_manager">
                                 <field name="cost_count" widget="statinfo" string="Costs"/>
@@ -241,7 +241,7 @@
                                 icon="fa-flask" 
                                 context="{'xml_id':'fleet_vehicle_log_fuel_act'}" 
                                 help="show the fuel logs for this vehicle" >
-                                <field name="fuel_logs_count" widget="statinfo" string="Fuel Logs"/>
+                                <field name="fuel_logs_count" widget="statinfo" string="Fuel"/>
                             </button>
                             <button name="return_action_to_open" 
                                 type="object" 
@@ -249,7 +249,7 @@
                                 icon="fa-tachometer"
                                 context="{'xml_id':'fleet_vehicle_odometer_act'}" 
                                 help="show the odometer logs for this vehicle" >
-                                <field name="odometer_count" widget="statinfo" string="odometer Logs"/>
+                                <field name="odometer_count" widget="statinfo" string="Odometer"/>
                             </button>
                         </div> 
                         <group col="2" string="General Properties">
diff --git a/addons/gamification/views/challenge.xml b/addons/gamification/views/challenge.xml
index ef2151c5a77..9683557a14c 100644
--- a/addons/gamification/views/challenge.xml
+++ b/addons/gamification/views/challenge.xml
@@ -56,9 +56,9 @@
                             <button type="action" 
                                 name="%(goals_from_challenge_act)d" 
                                 class="oe_stat_button"
-                                icon="fa-globe"
+                                icon="fa-gift"
                                 attrs="{'invisible': [('state','=','draft')]}">
-                                <field name="goals_count" widget="statinfo" string="Related Goals"/>
+                                <field name="goals_count" widget="statinfo" string="Goals" help="Related Goals"/>
                             </button>
                         </div>
                         <group>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index eb1adaad9fc..f97aefd70ed 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -23,7 +23,7 @@
                     <xpath expr="//div[@name='button_box']" position="inside">
                         <button name="%(act_hr_employee_2_hr_contract)d" 
                             class="oe_stat_button" 
-                            icon="fa-thumbs-o-up" 
+                            icon="fa-book" 
                             type="action"
                             groups="base.group_hr_manager">
                             <field name="contracts_count" widget="statinfo" string="Contracts"/>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 42e48771701..4d153fa7e31 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -147,7 +147,7 @@
             <xpath expr="//div[@name='button_box']" position="inside">
                 <button name="%(act_hr_employee_2_hr__evaluation_interview)d"  
                     class="oe_stat_button"
-                    icon="fa-briefcase"
+                    icon="fa-sitemap"
                     type="action">
                     <field name="appraisal_count" widget="statinfo" string="Appraisal Interviews"/>
                 </button>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 6232f593b90..4cf7597d87e 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -224,9 +224,9 @@
                     <div class="oe_right oe_button_box">
                         <button name="%(act_payslip_lines)d" 
                             class="oe_stat_button" 
-                            icon="fa-comment" 
+                            icon="fa-money" 
                             type="action">
-                            <field name="payslip_count" widget="statinfo" string="Payslip Computation Details"/>
+                            <field name="payslip_count" widget="statinfo" string="Payslip" help="Payslip Computation Details"/>
                         </button>
                     </div>
                     <div class="oe_title">
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 4bf705d9de2..6221d0d83f1 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -75,23 +75,23 @@
             <sheet>
                 <div class="oe_right oe_button_box">
                     <button name="action_makeMeeting" class="oe_stat_button" icon="fa-calendar" type="object"
-                         string="Schedule Meeting" help="Schedule interview with this applicant"/>
+                         string="Meeting" help="Schedule interview with this applicant"/>
                     <button name="%(survey.action_view_survey_question_message)d" 
                         class="oe_stat_button"
-                        icon="fa-pencil-square-o" 
+                        icon="fa-user" 
                         type="action"
-                        string="Start Interview" help="Answer related job question"
+                        string="Interview" help="Answer related job question"
                         context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant'}"
                         attrs="{'invisible':[('survey','=',False)]}"/>
                     <button name="action_print_survey" 
                         class="oe_stat_button"
-                        icon="fa-pencil-square-o"
+                        icon="fa-print"
                         type="object"
-                        string="Print Interview" help="Print interview report"
+                        string="Print" help="Print interview report"
                         attrs="{'invisible':[('survey','=',False)]}"/>
                     <button name="action_get_attachment_tree_view" 
                         class="oe_stat_button"
-                        icon="fa-pencil-square-o"
+                        icon="fa-book"
                         type="object">
                         <field name="attachment_number" widget="statinfo" string="Documents"/>
                     </button>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 0546099e581..a9de1bb19c9 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -119,7 +119,7 @@
                 </xpath>
                 <xpath expr='//div[@name="buttons"]' position='inside'>
                     <button class="oe_inline oe_stat_button" type="action" name="%(act_analytic_cost_revenue)d" 
-                        icon="fa-suitcase"  string="Costs and Revenues" widget="statinfo"/>
+                        icon="fa-usd"  string="Cost/Revenue" widget="statinfo"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index d6c987b6a24..a60afda8531 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -74,8 +74,8 @@
                         <button type="action"
                             name="%(act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet)d"
                             class="oe_stat_button"
-                            icon="fa-times">
-                            <field name="timesheet_activity_count" widget="statinfo" string="Timesheet Activities"/>
+                            icon="fa-clock-o">
+                            <field name="timesheet_activity_count" widget="statinfo" string="Timesheet" help="Timesheet Activities"/>
                         </button>
                         <button type="action" groups="base.group_hr_attendance"
                             class="oe_stat_button" icon="fa-users"
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index c5789dd68ba..20c3a1bb6e7 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -66,7 +66,7 @@
                         name="%(act_marketing_campaing_stat)d"
                         class="oe_stat_button"
                         icon="fa-keyboard-o"
-                        string="Campaign Statistics"/>
+                        string="Statistics" help="Marketing Campaign Statistics"/>
                     <button type="action"
                         name="%(act_marketing_campaing_segment_opened)d"
                         class="oe_stat_button"
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index c58d2eafd9e..1d1bd73703f 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -843,10 +843,10 @@
                     </header>
                     <sheet>
                         <div class="oe_right oe_button_box">
-                            <button class="oe_stat_button" name="%(action_pos_box_in)d" string="Put Money In" 
-                                type="action" states="opened,closing_control" icon="fa-money"/>
-                            <button class="oe_stat_button" name="%(action_pos_box_out)d" string="Take Money Out" 
-                                type="action" states="opened,closing_control" icon="fa-money"/>
+                            <button class="oe_stat_button" name="%(action_pos_box_in)d" string="Put Money" 
+                                type="action" states="opened,closing_control" icon="fa-level-down"/>
+                            <button class="oe_stat_button" name="%(action_pos_box_out)d" string="Take Money" 
+                                type="action" states="opened,closing_control" icon="fa-level-up"/>
                         </div>
                         <h1 class="oe_title">
                             Session:
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 9e4b11c20a1..4af0a7aed0a 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -154,7 +154,7 @@
                 <sheet>
                     <div class="oe_button_box oe_right">
                     <button class=" oe_inline oe_stat_button " name= "%(project_phase_task_list)d" type="action" icon="fa-tasks">
-                        <field string="Related Tasks" name="tasks_count" widget="statinfo"/>
+                        <field string="Tasks" name="tasks_count" widget="statinfo"/>
                     </button>
                     </div>
                     <div class="oe_title">
diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml
index 77fe49aeef6..9ff2645a51c 100644
--- a/addons/purchase/partner_view.xml
+++ b/addons/purchase/partner_view.xml
@@ -77,7 +77,7 @@
                     <button class="oe_inline oe_stat_button" name="%(purchase.act_res_partner_2_purchase_order)d" type="action"
                         attrs="{'invisible': [('supplier', '=', False)]}"
                         groups="purchase.group_purchase_user" icon="fa-list-alt">
-                        <field string="Purchase Orders" name="purchase_order_count" widget="statinfo"/>
+                        <field string="Purchase Order" name="purchase_order_count" widget="statinfo"/>
                     </button>
                     <button class="oe_inline oe_stat_button" name="%(purchase.act_res_partner_2_supplier_invoices)d" type="action"
                         attrs="{'invisible': [('supplier', '=', False)]}" icon="fa-pencil-square-o">
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 94eaff5f498..33972c90fb6 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -50,11 +50,11 @@
                             class="oe_stat_button"
                             icon="fa-truck"
                             states="approved">
-                            <field name="shipment_count" widget="statinfo" string="Incoming Shipments"/>
+                            <field name="shipment_count" widget="statinfo" string="In Shipments" help="Incoming Shipments"/>
                         </button>
                         <button type="object"  name="invoice_open"
                             class="oe_stat_button"
-                            icon="fa-file-o"
+                            icon="fa-pencil-square-o"
                             attrs="{'invisible': [('state', 'in', ['draft','sent'])]}">
                             <field name="invoice_count" widget="statinfo" string="Invoices"/>
                         </button> 
diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index 049d2e40284..e689cac1476 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -51,7 +51,7 @@
                     <button class="oe_inline oe_stat_button" type="action" name="%(sale.act_res_partner_2_sale_order)d" 
                         attrs="{'invisible': [('customer', '=', False)]}"
                         icon="fa-strikethrough" groups="base.group_sale_salesman">
-                        <field string="Quot. and Sales" name="sale_order_count" widget="statinfo"/>
+                        <field string="Sales" name="sale_order_count" widget="statinfo"/>
                     </button>     
                 </xpath>
             </field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 9e712ce5d97..b9518cc03c3 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -239,15 +239,17 @@
                             <field name="date"/>
                             <field name="active"/>
                         </group>
-                        <group groups="stock.group_tracking_lot" string="Traceability">
-                            <div class="oe_button_box">
+                        <group  class="oe_right" groups="stock.group_tracking_lot" string="Traceability">
+                            <div class="oe_right oe_button_box">
                                 <button name="action_traceability" 
-                                    string="Upstream Traceability"
+                                    string="Upstream"
+                                    help="Upstream Traceability"
                                     class="oe_stat_button"
                                     icon="fa-arrow-up" 
                                     type="object" colspan="2"/>
                                 <button name="action_traceability" 
-                                    string="Downstream Traceability"
+                                    string="Downstream"
+                                    help="Downstream Traceability"
                                     class="oe_stat_button"
                                     icon="fa-arrow-down" 
                                     type="object"
@@ -353,10 +355,16 @@
             <field name="arch" type="xml">
                 <form string="Serial Number" version="7.0">
                     <div class="oe_button_box oe_right">
-                        <button name="action_traceability" string="Upstream Traceability" class="oe_stat_button"
-                            icon="fa-arrow-up" type="object" context="{'type': 'move_history_ids2', 'field': 'prodlot_id'}"/>
-                        <button name="action_traceability" string="Downstream Traceability" class="oe_stat_button"
-                            icon="fa-arrow-down" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}"/>
+                        <button name="action_traceability" 
+                            string="Upstream" class="oe_stat_button" 
+                            help="Upstream Traceability"
+                            icon="fa-arrow-up" type="object" 
+                            context="{'type': 'move_history_ids2', 'field': 'prodlot_id'}"/>
+                        <button name="action_traceability" 
+                            string="Downstream" class="oe_stat_button"
+                            icon="fa-arrow-down" type="object" 
+                            help="Downstream Traceability"
+                            context="{'type': 'move_history_ids', 'field': 'prodlot_id'}"/>
                     </div>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>

From 538d50a51413a46fd5fa525632964aad171fba2d Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Fri, 28 Mar 2014 19:36:51 +0530
Subject: [PATCH 31/65] [IMP]remove oe_stat_button

bzr revid: rma@tinyerp.com-20140328140651-m3qm99zahjqawyk3
---
 addons/account/account_view.xml                           | 4 +---
 addons/account_asset/account_asset_view.xml               | 4 ++--
 addons/event/event_view.xml                               | 7 +++----
 addons/purchase_requisition/purchase_requisition_view.xml | 4 +---
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 562cd624a56..48d6320fbc3 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1532,9 +1532,7 @@
                     <field name="lines_id" widget="one2many_list"/>
                     <separator string="Legend"/>
                     <field name="legend"/>
-                    <div class="oe_button_box">
-                        <button class="oe_inline oe_button_box oe_stat_button" name="%(action_account_use_model_create_entry)d" string="Create entries" type="action" icon="fa-cogs" widget="statinfo"/>
-                    </div>
+                    <button name="%(action_account_use_model_create_entry)d" string="Create entries" type="action" icon="gtk-execute"/>
                 </form>
             </field>
         </record>
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index f9f0e75fba6..b0a5deacfcb 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -119,9 +119,9 @@
                                     <field name="method"/>
                                     <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
                                     <label for="method_time"/>
-                                    <div class="oe_button_box">
+                                    <div>
                                         <field name="method_time" on_change="onchange_method_time(method_time)" class="oe_inline"/>
-                                        <button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="fa-cogs" class="oe_inline oe_stat_button" colspan="1" widget="statinfo"/>
+                                        <button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="terp-stock_effects-object-colorize" class="oe_inline" colspan="1"/>
                                     </div>
                                     <field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/>
                                     <field name="method_number" attrs="{'invisible':[('method_time','=','end')], 'required':[('method_time','=','number')]}"/>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index cbc8fbaa52b..8f02c05e739 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -369,12 +369,11 @@
                                 <field name="name"/>
                                 <field name="phone"/>
                                 <label for="email"/>
-                                <div class="oe_button_box">
+                                <div>
                                     <field name="email" class="oe_inline"/>
-                                    <button class="oe_inline oe_right oe_stat_button" 
-                                        string="Send Email"
+                                    <button class="oe_inline oe_right" string="Send Email"
                                         name="%(mail.action_email_compose_message_wizard)d"
-                                        icon="fa-reply-all" context= '{"default_email_to":email}' type="action"/>
+                                        icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
                                 </div>
                             </group>
                             <group>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 1af71d214e9..da3a6d132ee 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -77,9 +77,7 @@
                         </field>
                         <div class="oe_right oe_button_box" style="margin-top: 10px">
                             <button name="%(action_purchase_requisition_partner)d" type="action"
-                                string="Request a Quotation"
-                                class="oe_stat_button" 
-                                icon="fa-quote-left"
+                                string="Request a Quotation" icon="gtk-execute"
                                 attrs="{'invisible': [('line_ids','=',False),('state', 'not in', ('in_progress'))]}"/>
                         </div>
                         <separator string="Quotations"/>

From fdceb21f0eb9e11b2cfc6c81ab9544b3f05eac6c Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Fri, 28 Mar 2014 20:01:09 +0530
Subject: [PATCH 32/65] [IMP] improve project view

bzr revid: rma@tinyerp.com-20140328143109-7yqsabwrlxh5ms6p
---
 addons/project/project_view.xml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 35d4e1bf64f..8d08f72c789 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -102,16 +102,20 @@
                         </button>
                     </div>
                     <group>
-                        <group>
+                        <group col="4">
                             <field name="user_id" string="Project Manager" 
                                     attrs="{'readonly':[('state','in',['close', 'cancelled'])]}" 
                                     context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'project.group_project_manager']}"/>
+                            <newline/>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                             <span></span>
-                            <p attrs="{'invisible': [('analytic_account_id','=',False)]}">
-                                To invoice or setup invoicing and renewal options, go to the related contract:
-                                <field name="analytic_account_id" readonly="1" required="0" class="oe_inline" nolabel="1"/>.
-                            </p>
+                        </group>
+                        <newline/>
+                        <group>
+                        <p attrs="{'invisible': [('analytic_account_id','=',False)]}">
+                            To invoice or setup invoicing and renewal options, go to the related contract:
+                            <field name="analytic_account_id" readonly="1" required="0" class="oe_inline" nolabel="1"/>.
+                        </p>
                         </group>
                         <group name="group_alias"
                                 attrs="{'invisible': [('alias_domain', '=', False)]}">

From 233b1a6eb8311aaef66c0971cccf145391b2ed36 Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Mon, 31 Mar 2014 12:45:16 +0530
Subject: [PATCH 33/65] [IMP] imrove event view and string for survey

bzr revid: rma@tinyerp.com-20140331071516-oy29mgwrqv3va1dq
---
 addons/event/event_view.xml   | 8 ++++----
 addons/survey/survey_view.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 8f02c05e739..6f41646d156 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -65,6 +65,10 @@
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
                     </header>
                     <sheet>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1><field name="name"/></h1>
+                        </div>
                         <div class="oe_right oe_button_box" groups="base.group_user">
                             <button name="%(event.act_event_list_register_event)d" 
                                 type="action" 
@@ -74,10 +78,6 @@
                                 <field name="count_regitrations" widget="statinfo" string="Registrations"/>
                             </button>
                         </div>
-                        <div class="oe_title">
-                            <label for="name" class="oe_edit_only"/>
-                            <h1><field name="name"/></h1>
-                        </div>
                         <group name="main_field_group">
                             <group>
                                 <field name="address_id" context="{'show_address': 1}" options='{"always_reload": True}'/>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 1e38c181b30..ba906cc4377 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -31,7 +31,7 @@
                         <button class="oe_inline oe_stat_button" name="test_survey" states="open,draft,close,cancel" 
                             string="Test Survey" type="object" icon="fa-file-o" context="{'survey_id': active_id}" 
                             attrs="{'invisible':[('id','=',0)]}"/>
-                        <button class="oe_inline oe_stat_button" name="fill_survey" states="open" string="Answer Survey" 
+                        <button class="oe_inline oe_stat_button" name="fill_survey" states="open" string="Reply Survey" 
                             type="object" icon="fa-star-half-o" context="{'survey_id': active_id}" 
                             attrs="{'invisible':[('state','!=','open')]}"/>
                         <button class="oe_inline oe_stat_button" name="action_print_survey" states="open,draft,close,cancel" 

From e31ef83542a1115516dfe67f502e44eb6fa019a7 Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Thu, 3 Apr 2014 11:18:56 +0530
Subject: [PATCH 34/65] [IMP] revert changes of project view

bzr revid: rma@tinyerp.com-20140403054856-cx0yhhbaq026bl32
---
 addons/project/project_view.xml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 8d08f72c789..d2bf8dfaa24 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -102,20 +102,17 @@
                         </button>
                     </div>
                     <group>
-                        <group col="4">
+                        <group>
                             <field name="user_id" string="Project Manager" 
                                     attrs="{'readonly':[('state','in',['close', 'cancelled'])]}" 
                                     context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'project.group_project_manager']}"/>
                             <newline/>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                             <span></span>
-                        </group>
-                        <newline/>
-                        <group>
-                        <p attrs="{'invisible': [('analytic_account_id','=',False)]}">
-                            To invoice or setup invoicing and renewal options, go to the related contract:
-                            <field name="analytic_account_id" readonly="1" required="0" class="oe_inline" nolabel="1"/>.
-                        </p>
+                            <p attrs="{'invisible': [('analytic_account_id','=',False)]}">
+                                To invoice or setup invoicing and renewal options, go to the related contract:
+                                <field name="analytic_account_id" readonly="1" required="0" class="oe_inline" nolabel="1"/>.
+                            </p>
                         </group>
                         <group name="group_alias"
                                 attrs="{'invisible': [('alias_domain', '=', False)]}">

From 4c0f7b1be8d188734b44856f093fa525f6837489 Mon Sep 17 00:00:00 2001
From: Randhir Mayatra rma-openerp <rma@tinyerp.com>
Date: Fri, 4 Apr 2014 16:59:26 +0530
Subject: [PATCH 35/65] [IMP] improve strings and project view

bzr revid: rma@tinyerp.com-20140404112926-716zimuh3p2ec80k
---
 addons/hr_evaluation/hr_evaluation_view.xml | 2 +-
 addons/mrp/mrp_view.xml                     | 4 ++--
 addons/project/project_view.xml             | 5 ++---
 addons/purchase/partner_view.xml            | 8 ++++----
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 4d153fa7e31..ab8363049c1 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -149,7 +149,7 @@
                     class="oe_stat_button"
                     icon="fa-sitemap"
                     type="action">
-                    <field name="appraisal_count" widget="statinfo" string="Appraisal Interviews"/>
+                    <field name="appraisal_count" widget="statinfo" string="Form"/>
                 </button>
             </xpath>
             </field>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index feba58568d5..eb42b970add 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -1049,8 +1049,8 @@
                         <field string="BoM Structure" name="bom_strct" widget="statinfo" />
                     </button>
                     <button class="oe_inline oe_stat_button" name="%(act_product_mrp_production)d" type="action" 
-                        groups="mrp.group_mrp_user" attrs="{'invisible':[('type', '=', 'service')]}" icon="fa-pencil-square-o">
-                        <field string="Manufacturing Orders" name="mo_count" widget="statinfo" />
+                        groups="mrp.group_mrp_user" attrs="{'invisible':[('type', '=', 'service')]}" icon="fa-list-alt">
+                        <field string="Manufacturing" name="mo_count" widget="statinfo" />
                     </button>
                 </xpath>
             </field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index d2bf8dfaa24..7857ec9449a 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -102,18 +102,17 @@
                         </button>
                     </div>
                     <group>
-                        <group>
+                        <group col="4">
                             <field name="user_id" string="Project Manager" 
                                     attrs="{'readonly':[('state','in',['close', 'cancelled'])]}" 
                                     context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'project.group_project_manager']}"/>
                             <newline/>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                            <span></span>
+                        </group>
                             <p attrs="{'invisible': [('analytic_account_id','=',False)]}">
                                 To invoice or setup invoicing and renewal options, go to the related contract:
                                 <field name="analytic_account_id" readonly="1" required="0" class="oe_inline" nolabel="1"/>.
                             </p>
-                        </group>
                         <group name="group_alias"
                                 attrs="{'invisible': [('alias_domain', '=', False)]}">
                             <label for="alias_name" string="Email Alias"/>
diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml
index 9ff2645a51c..6d1916f9cc3 100644
--- a/addons/purchase/partner_view.xml
+++ b/addons/purchase/partner_view.xml
@@ -76,12 +76,12 @@
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <button class="oe_inline oe_stat_button" name="%(purchase.act_res_partner_2_purchase_order)d" type="action"
                         attrs="{'invisible': [('supplier', '=', False)]}"
-                        groups="purchase.group_purchase_user" icon="fa-list-alt">
-                        <field string="Purchase Order" name="purchase_order_count" widget="statinfo"/>
+                        groups="purchase.group_purchase_user" icon="fa-shopping-cart">
+                        <field string="Purchases" name="purchase_order_count" widget="statinfo"/>
                     </button>
                     <button class="oe_inline oe_stat_button" name="%(purchase.act_res_partner_2_supplier_invoices)d" type="action"
-                        attrs="{'invisible': [('supplier', '=', False)]}" icon="fa-pencil-square-o">
-                        <field string="Supplier Invoices" name="supplier_invoice_count" widget="statinfo"/>
+                        attrs="{'invisible': [('supplier', '=', False)]}" icon="fa-pencil-square-o" help="Supplier Invoices">
+                        <field string="Pay Invoices" name="supplier_invoice_count" widget="statinfo"/>
                     </button>
                 </xpath>
             </field>

From ea23d24e870d221657358e5351b8cce938f39ec9 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Mon, 14 Apr 2014 11:32:21 +0200
Subject: [PATCH 36/65] [FIX] correct some typos in addon account variable name

bzr revid: ged@openerp.com-20140414093221-qbpxrv2kihsvtafg
---
 addons/account/partner.py       | 6 +++---
 addons/account/partner_view.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/partner.py b/addons/account/partner.py
index 6ae83368143..5f5f43ebe52 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -163,14 +163,14 @@ class res_partner(osv.osv):
         return self._asset_difference_search(cr, uid, obj, name, 'payable', args, context=context)
 
     def _invoice_journal_item_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,{'invoice_count': 0, 'journal_item_count': 0, 'cotracts_count': 0 }), ids))
+        res = dict(map(lambda x: (x,{'invoice_count': 0, 'journal_item_count': 0, 'contracts_count': 0 }), ids))
         # the user may not have access rights 
         try:
             for partner in self.browse(cr, uid, ids, context):
                 res[partner.id] = {
                     'invoice_count': len(partner.invoice_ids),
                     'journal_item_count': len(partner.journal_item_ids),
-                    'cotracts_count': len(partner.contract_ids)
+                    'contracts_count': len(partner.contract_ids)
                 }
         except:
             pass
@@ -205,7 +205,7 @@ class res_partner(osv.osv):
         'debit': fields.function(_credit_debit_get, fnct_search=_debit_search, string='Total Payable', multi='dc', help="Total amount you have to pay to this supplier."),
         'debit_limit': fields.float('Payable Limit'),
         'invoice_count': fields.function(_invoice_journal_item_count, string="Invoices", type='integer', multi="invoice_journal"),
-        'cotracts_count': fields.function(_invoice_journal_item_count, string="Contracts", type='integer', multi="invoice_journal"),
+        'contracts_count': fields.function(_invoice_journal_item_count, string="Contracts", type='integer', multi="invoice_journal"),
         'journal_item_ids': fields.one2many('account.move.line', 'partner_id', 'Journal Items'),
         'journal_item_count': fields.function(_invoice_journal_item_count, string="Journal Items", type="integer", multi="invoice_journal"),
         'property_account_payable': fields.property(
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 402337204ae..d66d64ab0da 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -76,7 +76,7 @@
                     </button>
                     <button class="oe_inline oe_stat_button" type="action" name="%(account.action_open_partner_analytic_accounts)d" 
                         icon="fa-book" groups="analytic.group_analytic_accounting">
-                        <field string="Contracts" name="cotracts_count" widget="statinfo"/>
+                        <field string="Contracts" name="contracts_count" widget="statinfo"/>
                     </button>
                 </xpath>
             </field>

From 6630568dbe75f5fe252aabe086306f8e6a702399 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Mon, 14 Apr 2014 11:42:41 +0200
Subject: [PATCH 37/65] [FIX] replace the Print overdue and Mail overdue
 buttons to their correct place in the accounting page of a partner (addon
 account_followup)

bzr revid: ged@openerp.com-20140414094241-e74wi4jasyqtpmsj
---
 .../account_followup_customers.xml               | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/addons/account_followup/account_followup_customers.xml b/addons/account_followup/account_followup_customers.xml
index bdd258237c8..fba0bce460b 100644
--- a/addons/account_followup/account_followup_customers.xml
+++ b/addons/account_followup/account_followup_customers.xml
@@ -78,18 +78,14 @@
             <field name="model">res.partner</field>
             <field name="groups_id" eval="[(4, ref('account.group_account_invoice'))]"/>
             <field name="arch" type="xml" >
-                <xpath expr="//div[@name='buttons']" position="inside" groups="account.group_account_invoice">
-                    <button class="oe_inline oe_stat_button" type="object" name="do_button_print" 
-                        icon="fa-print" string="Print Overdue" widget="statinfo" groups="account.group_account_user" 
-                        help="Print overdue payments report independent of follow-up line" 
-                        attrs="{'invisible':[('payment_amount_due', '&lt;=', 0.0)]}"/>
-                    <button class="oe_inline oe_stat_button" type="object" name="do_partner_mail" 
-                        icon="fa-envelope-o" string="Mail Overdue" widget="statinfo" 
-                        help="If not specified by the latest follow-up level, it will send from the default email template"
-                        attrs="{'invisible':[('payment_amount_due', '&lt;=', 0.0)]}" groups="account.group_account_user"/>
-                </xpath>
                 <page string="Accounting" position="before" version="7.0">
                     <page string="Payment Follow-up" groups="account.group_account_invoice" name="followup_tab">
+                        <div class="oe_right oe_button_box" name="followup_button">
+                            <button name="do_button_print" type="object" string="Print Overdue Payments" groups="account.group_account_user" 
+                                help="Print overdue payments report independent of follow-up line" attrs="{'invisible':[('payment_amount_due', '&lt;=', 0.0)]}" />
+                            <button name="do_partner_mail" type="object" string="Send Overdue Email" groups="account.group_account_user"
+                                help="If not specified by the latest follow-up level, it will send from the default email template" attrs="{'invisible':[('payment_amount_due', '&lt;=', 0.0)]}"/>
+                        </div>
                         <p attrs="{'invisible':[('latest_followup_date','=', False)]}">
                             The <field name="latest_followup_date"  class = "oe_inline"/>, the latest payment follow-up
                             was: <field name="latest_followup_level_id" class="oe_inline"/>

From d8b2eab2d0de3a467cb264b768466c0ec01d0ada Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Mon, 14 Apr 2014 12:06:52 +0200
Subject: [PATCH 38/65] [FIX] correctly names a variable 'meeting_ids' instead
 of 'opportunity_ids' (addon crm)

bzr revid: ged@openerp.com-20140414100652-gwv5cwht6wl12ah9
---
 addons/crm/crm_lead.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index f3ce3ace549..8a8b17df0cb 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -218,7 +218,7 @@ class crm_lead(format_address, osv.osv):
         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)
+                res[meeting.id] = len(meeting.meeting_ids)
         except:
             pass
         return res
@@ -296,7 +296,7 @@ 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_ids': fields.one2many('calendar.event', 'opportunity_id', 'Opportunities'),
         'meeting_count': fields.function(_meeting_count, string='# Meetings', type='integer'),
     }
 

From c9c2ed506a221bcf90753f353030d521b71ff7f6 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Mon, 14 Apr 2014 12:48:19 +0200
Subject: [PATCH 39/65] [IMP] change the information displayed on the 'schedule
 calls' stat buttons in lead/opportunities form views (addon crm)

bzr revid: ged@openerp.com-20140414104819-7te5ilmmsvykdypy
---
 addons/crm/crm_lead_view.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index beed7ba5c97..6ae2bc32b62 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -103,8 +103,9 @@
                 </header>
                 <sheet>
                     <div class="oe_right oe_button_box" name="buttons">
-                        <button class="oe_inline oe_stat_button" type="action" name="%(opportunity2phonecall_act)d" icon="fa-phone"  
-                            widget="statinfo" string="Calls"/>
+                        <button class="oe_inline oe_stat_button" type="action" name="%(opportunity2phonecall_act)d" icon="fa-phone">
+                            <div>Schedule/Log<br/>Calls</div>
+                        </button>
                     </div>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
@@ -388,8 +389,9 @@
                     </header>
                     <sheet>
                         <div class="oe_right oe_button_box">
-                            <button class="oe_inline oe_stat_button" type="action" name="%(opportunity2phonecall_act)d" icon="fa-phone"  
-                                widget="statinfo" string="Calls"/>
+                            <button class="oe_inline oe_stat_button" type="action" name="%(opportunity2phonecall_act)d" icon="fa-phone">
+                                <div>Schedule/Log<br/>Calls</div>
+                            </button>
                             <button class="oe_inline oe_stat_button" type="object" 
                                 context="{'search_default_attendee_id': active_id, 'default_attendee_id' : active_id}"
                                 name="action_makeMeeting" icon="fa-calendar">

From 69af9ca3dcdbf880cec4127bab0bff07195a2f5e Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Mon, 14 Apr 2014 14:49:26 +0200
Subject: [PATCH 40/65] [IMP] improves the layout of the three stat buttons
 (schedule call/meeting/convert to opp) in logged calls form view (addon crm)

bzr revid: ged@openerp.com-20140414124926-lggdqus1agzzr7dh
---
 addons/crm/crm_phonecall_view.xml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 25cddce10b6..a39747e4bc5 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -66,13 +66,17 @@
                 <sheet string="Phone Call">
                     <div class="oe_right oe_button_box">
                         <button class="oe_inline oe_stat_button" type="object" name="action_button_convert2opportunity" 
-                            icon="fa-star" string="Opportunity" 
-                            attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state', 'not in', ('open', 'done'))]}"
-                            help="Convert to Opportunity" widget="statinfo"/>
+                            icon="fa-star" attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state', 'not in', ('open', 'done'))]}"
+                            help="Convert To Opportunity">
+                            <div>Convert To<br/>Opportunity</div>
+                        </button>
+
                         <button class="oe_inline oe_stat_button" type="action" 
-                            name="%(phonecall_to_phonecall_act)d" icon="fa-phone" string="Other Call" widget="statinfo"/>
+                            name="%(phonecall_to_phonecall_act)d" icon="fa-phone">
+                            <div>Schedule<br/>Other Call</div>
+                        </button>
                         <button class="oe_inline oe_stat_button" name="action_make_meeting" type="object" icon="fa-calendar fa-fw">
-                              <field string="Plan Meeting" name="meeting_count" widget="statinfo" />
+                            <div>Schedule<br/>A Meeting</div>
                         </button>
                     </div>
                     <div class="oe_title">

From 1af4ca6cac2bf86cb41d775a6f97b8c4dddad308 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Mon, 14 Apr 2014 14:52:31 +0200
Subject: [PATCH 41/65] [IMP] improves the layout and xpath expr of the
 'convert to issue' button in addon crm_project_issue

bzr revid: ged@openerp.com-20140414125231-w7kapgt2mpmhhn2m
---
 addons/crm_project_issue/project_issue_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/crm_project_issue/project_issue_view.xml b/addons/crm_project_issue/project_issue_view.xml
index 65ca274f086..4bb07a8e0f7 100644
--- a/addons/crm_project_issue/project_issue_view.xml
+++ b/addons/crm_project_issue/project_issue_view.xml
@@ -35,9 +35,11 @@
         <field name="model">crm.lead</field>
         <field name="inherit_id" ref="crm.crm_case_form_view_leads" />
         <field name="arch" type="xml">
-            <xpath expr="//div[@name='buttons']/button" position="after">
+            <xpath expr="//div[@name='buttons']" position="inside">
                     <button class="oe_inline oe_stat_button" type="action" name="%(convert_lead2projectissue_wizard_action)d" icon="fa-bug"  
-                        help="Convert to Issue" widget="statinfo" string="Move to Issue"/>
+                        help="Convert to Issue">
+                        <div>Convert To<br/>Issue</div>
+                    </button>
             </xpath>
         </field>
     </record>

From ecd2b4fd30b17f6e189cfe4d8f7fa6985031d5b3 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Mon, 14 Apr 2014 15:09:10 +0200
Subject: [PATCH 42/65] [IMP] improves the add/remove actions and preview
 buttons in email template form view (addon email_template)

bzr revid: ged@openerp.com-20140414130910-hrx1wqy71ahdsmy4
---
 addons/email_template/email_template_view.xml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 52fb270eb12..0f54504cbf6 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -14,16 +14,20 @@
                         </div>
                         <div class="oe_right oe_button_box" name="buttons">
                             <field name="ref_ir_act_window" invisible="1"/>
-                            <button class="oe_inline oe_stat_button" name="create_action" string="Add action" type="object"
+                            <button class="oe_inline oe_stat_button" name="create_action" type="object"
                                     attrs="{'invisible':[('ref_ir_act_window','!=',False)]}" icon="fa-plus"
-                                    help="Display an option on related documents to open a composition wizard with this template" widget="statinfo"/>
-                            <button name="unlink_action" string="Drop action" type="object" 
+                                    help="Display an option on related documents to open a composition wizard with this template">
+                                <div>Add<br/>Context Action</div>
+                            </button>
+                            <button name="unlink_action" type="object" 
                                     class="oe_stat_button" icon="fa-minus"
                                     attrs="{'invisible':[('ref_ir_act_window','=',False)]}"
-                                    help="Remove the contextual action to use this template on related documents" widget="statinfo"/>
+                                    help="Remove the contextual action to use this template on related documents" widget="statinfo">
+                                <div>Remove<br/>Context Action</div>
+                            </button>
                             <button class="oe_inline oe_stat_button" name="%(wizard_email_template_preview)d" icon="fa-search-plus" string="Preview"
                                     type="action" target="new"
-                                    context="{'template_id':active_id}" widget="statinfo"/>
+                                    context="{'template_id':active_id}"/>
                         </div>
                         <notebook>
                             <page string="Mailing Template">

From 0a3987b6c91960f572a2a5b0a848146c06a8d1f2 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Mon, 14 Apr 2014 15:27:06 +0200
Subject: [PATCH 43/65] [FIX] correct the spelling 'registration' to
 'registration' in addon event

bzr revid: ged@openerp.com-20140414132706-qn2q82d33jdq59q6
---
 addons/event/event.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 497d75f9be0..9aae6f3af8f 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -151,10 +151,10 @@ class event_event(osv.osv):
         return res
     
     def _count_all(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,{'count_regitrations': 0, 'count_tracks': 0,}), ids))
+        res = dict(map(lambda x: (x,{'count_registrations': 0, 'count_tracks': 0,}), ids))
         try:
             for data in self.browse(cr, uid, ids, context=context):
-                res[data.id] = {'count_regitrations': len(data.registration_ids),
+                res[data.id] = {'count_registrations': len(data.registration_ids),
                 'count_tracks': len(data.track_ids),
                }
         except:
@@ -203,7 +203,7 @@ class event_event(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
         'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
         'organizer_id': fields.many2one('res.partner', "Organizer"),
-        'count_regitrations': fields.function(_count_all, type="integer", string="Registrations", multi=True),
+        'count_registrations': fields.function(_count_all, type="integer", string="Registrations", multi=True),
         'count_tracks': fields.function(_count_all, type='integer', string='Tracks', multi=True),
     }
     _defaults = {

From 9950bb8f74ecc5f6af4eb9a79df94c73c0fea69a Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Mon, 14 Apr 2014 15:43:32 +0200
Subject: [PATCH 44/65] [FIX] remove an useless computation in gamification.py
 and improves the text of the stat button displayed in challenges form view
 (addon gamification)

bzr revid: ged@openerp.com-20140414134332-h4gn61fu1ly9tbye
---
 addons/gamification/models/challenge.py | 11 -----------
 addons/gamification/views/challenge.xml |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index 11b5f787bdd..06d0c44baac 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -114,15 +114,6 @@ class gamification_challenge(osv.Model):
             return self.pool.get('ir.model.data').get_object_reference(cr, uid, 'gamification', 'simple_report_template')[1]
         except ValueError:
             return False
-    
-    def _count_goals(self, cr, uid, ids, field_name, arg, context=None):
-        res = {}
-        try:
-            for goals in self.browse(cr, uid, ids, context=context):
-                res[goals.id] = len(goals.goals_ids)
-        except:
-            pass
-        return res
 
     _order = 'end_date, start_date, name, id'
     _columns = {
@@ -200,8 +191,6 @@ class gamification_challenge(osv.Model):
 
         'category': fields.selection(lambda s, *a, **k: s._get_categories(*a, **k),
             string="Appears in", help="Define the visibility of the challenge through menus", required=True),
-        'goals_ids': fields.one2many('gamification.goal', 'challenge_id', 'Related Goals'),
-        'goals_count': fields.function(_count_goals, type='integer', string='Related Goals')
         }
 
     _defaults = {
diff --git a/addons/gamification/views/challenge.xml b/addons/gamification/views/challenge.xml
index 9683557a14c..e427780677b 100644
--- a/addons/gamification/views/challenge.xml
+++ b/addons/gamification/views/challenge.xml
@@ -58,7 +58,7 @@
                                 class="oe_stat_button"
                                 icon="fa-gift"
                                 attrs="{'invisible': [('state','=','draft')]}">
-                                <field name="goals_count" widget="statinfo" string="Goals" help="Related Goals"/>
+                                <div>Related<br/>Goals</div>
                             </button>
                         </div>
                         <group>

From 8135812d34ceeaebde9ef33b96502910debf4c43 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Tue, 15 Apr 2014 12:54:19 +0200
Subject: [PATCH 45/65] [FIX] moves the field definitions of models hr.job and
 hr.employee that should have been in submodules to their correct place (in
 hr_something) to avoid dependencies problems (addons hr, hr_*)

bzr revid: ged@openerp.com-20140415105419-wy026n5k10wo80wb
---
 addons/hr/hr.py                               | 39 -------------------
 addons/hr_contract/hr_contract.py             | 10 +++++
 addons/hr_evaluation/hr_evaluation.py         | 11 ++++++
 addons/hr_evaluation/hr_evaluation_view.xml   |  2 +-
 addons/hr_holidays/hr_holidays.py             | 12 ++++++
 addons/hr_payroll/hr_payroll.py               | 11 ++++++
 addons/hr_recruitment/hr_recruitment.py       | 13 +++++++
 addons/hr_recruitment/hr_recruitment_view.xml | 16 +++++---
 .../hr_timesheet_sheet/hr_timesheet_sheet.py  | 20 ++++++++++
 9 files changed, 89 insertions(+), 45 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 4efa72e8f5e..a13a1866493 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -92,17 +92,6 @@ class hr_job(osv.Model):
                 res.append(employee.job_id.id)
         return res
 
-    def _count_all(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,{'documents_count': 0, 'application_count': 0,}), ids))
-        try:
-            for data in self.browse(cr, uid, ids, context=context):
-                res[data.id] = {'documents_count': len(data.document_ids),
-                'application_count': len(data.applicant_ids),
-                }
-        except:
-            pass
-        return res
-
     _name = "hr.job"
     _description = "Job Position"
     _inherit = ['mail.thread', 'ir.needaction_mixin']
@@ -133,10 +122,6 @@ class hr_job(osv.Model):
                                   track_visibility='always',
                                   help="By default 'Closed', set it to 'In Recruitment' if recruitment process is going on for this job position."),
         'write_date': fields.datetime('Update Date', readonly=True),
-        'applicant_ids':fields.one2many('hr.applicant', 'job_id', 'Applications'),
-        'application_count': fields.function(_count_all, type='integer', string='Applications', multi=True),
-        'document_ids': fields.one2many('ir.attachment', 'company_id', 'Documents'),
-        'documents_count': fields.function(_count_all, type='integer', string='Documents', multi=True),
     }
 
     _defaults = {
@@ -201,20 +186,6 @@ class hr_employee(osv.osv):
 
     def _set_image(self, cr, uid, id, name, value, args, context=None):
         return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
-    
-    def _count_all(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,{'appraisal_count': 0, 'leaves_count': 0, 'contracts_count': 0, 'timesheet_count': 0, 'payslip_count': 0,}), ids))
-        try:
-            for datas in self.browse(cr, uid, ids, context=context):
-                res[datas.id] = {'appraisal_count': len(datas.appraisal_ids),
-                'leaves_count': len(datas.leave_ids),
-                'contracts_count': len(datas.contract_ids),
-                'timesheet_count': len(datas.timsheet_ids),
-                'payslip_count': len(datas.payslip_ids)
-                }
-        except:
-            pass
-        return res
 
     _columns = {
         #we need a related field in order to be able to sort the employee by name
@@ -266,16 +237,6 @@ class hr_employee(osv.osv):
         'city': fields.related('address_id', 'city', type='char', string='City'),
         'login': fields.related('user_id', 'login', type='char', string='Login', readonly=1),
         'last_login': fields.related('user_id', 'date', type='datetime', string='Latest Connection', readonly=1),
-        'appraisal_ids': fields.one2many('hr.evaluation.interview', 'user_to_review_id', 'Appraisal Interviews'),
-        'leave_ids': fields.one2many('hr.holidays', 'employee_id', 'Leaves'),
-        'contracts_ids': fields.one2many('hr.contract', 'employee_id', 'Contracts'),
-        'timsheet_ids': fields.one2many('hr_timesheet_sheet.sheet', 'employee_id', 'Timesheets'),
-        'payslip_ids': fields.one2many('hr.payslip', 'employee_id', 'Payslips'),
-        'appraisal_count': fields.function(_count_all, type='integer', string='Appraisal Interviews', multi=True),
-        'leaves_count': fields.function(_count_all, type='integer', string='Leaves', multi=True),
-        'contracts_count': fields.function(_count_all, type='integer', string='Contracts', multi=True),
-        'timesheet_count': fields.function(_count_all, type='integer', string='Timsheets', multi=True),
-        'payslip_count': fields.function(_count_all, type='integer', string='Payslips', multi=True),
     }
 
     def _get_default_image(self, cr, uid, context=None):
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index d74253b5d53..d641c490ec2 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -38,6 +38,15 @@ class hr_employee(osv.osv):
                 res[emp.id] = False
         return res
 
+    def _contracts_count(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict(map(lambda x: (x,0), ids))
+        try:
+            for employee in self.browse(cr, uid, ids, context=context):
+                res[employee.id] = len(employee.contract_ids)
+        except:
+            pass
+        return res
+
     _columns = {
         'manager': fields.boolean('Is a Manager'),
         'medic_exam': fields.date('Medical Examination Date'),
@@ -47,6 +56,7 @@ class hr_employee(osv.osv):
         'vehicle_distance': fields.integer('Home-Work Dist.', help="In kilometers"),
         'contract_ids': fields.one2many('hr.contract', 'employee_id', 'Contracts'),
         'contract_id':fields.function(_get_latest_contract, string='Contract', type='many2one', relation="hr.contract", help='Latest contract of the employee'),
+        'contracts_count': fields.function(_contracts_count, type='integer', string='Contracts'),
     }
 
 
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 462154e9e4a..bfcbf6a3369 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -102,11 +102,22 @@ class hr_employee(osv.osv):
     _name = "hr.employee"
     _inherit="hr.employee"
     
+    def _appraisal_count(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict(map(lambda x: (x,0), ids))
+        try:
+            for employee in self.browse(cr, uid, ids, context=context):
+                res[employee.id] = len(employee.appraisal_ids)
+        except:
+            pass
+        return res
 
     _columns = {
         'evaluation_plan_id': fields.many2one('hr_evaluation.plan', 'Appraisal Plan'),
         'evaluation_date': fields.date('Next Appraisal Date', help="The date of the next appraisal is computed by the appraisal plan's dates (first appraisal + periodicity)."),
+        'appraisal_ids': fields.one2many('hr.evaluation.interview', 'user_to_review_id', 'Appraisal Interviews'),
+        'appraisal_count': fields.function(_appraisal_count, type='integer', string='Appraisal Interviews'),
     }
+
     def run_employee_evaluation(self, cr, uid, automatic=False, use_new_cursor=False, context=None):
         now = parser.parse(datetime.now().strftime('%Y-%m-%d'))
         obj_evaluation = self.pool.get('hr_evaluation.evaluation')
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index ab8363049c1..e2b6a6274ab 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -149,7 +149,7 @@
                     class="oe_stat_button"
                     icon="fa-sitemap"
                     type="action">
-                    <field name="appraisal_count" widget="statinfo" string="Form"/>
+                    <field name="appraisal_count" widget="statinfo" string="Appraisals"/>
                 </button>
             </xpath>
             </field>
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 932a290b4a1..356287dde7c 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -549,6 +549,15 @@ class hr_employee(osv.osv):
             result[holiday.employee_id.id]['current_leave_id'] = holiday.holiday_status_id.id
         return result
 
+    def _leaves_count(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict(map(lambda x: (x,0), ids))
+        try:
+            for employee in self.browse(cr, uid, ids, context=context):
+                res[employee.id] = len(employee.leave_ids)
+        except:
+            pass
+        return res
+
     _columns = {
         'remaining_leaves': fields.function(_get_remaining_days, string='Remaining Legal Leaves', fnct_inv=_set_remaining_days, type="float", help='Total number of legal leaves allocated to this employee, change this value to create allocation/leave request. Total based on all the leave types without overriding limit.'),
         'current_leave_state': fields.function(_get_leave_status, multi="leave_status", string="Current Leave Status", type="selection",
@@ -557,6 +566,9 @@ class hr_employee(osv.osv):
         'current_leave_id': fields.function(_get_leave_status, multi="leave_status", string="Current Leave Type",type='many2one', relation='hr.holidays.status'),
         'leave_date_from': fields.function(_get_leave_status, multi='leave_status', type='date', string='From Date'),
         'leave_date_to': fields.function(_get_leave_status, multi='leave_status', type='date', string='To Date'),
+        'leave_ids': fields.one2many('hr.holidays', 'employee_id', 'Leaves'),
+        'leaves_count': fields.function(_leaves_count, type='integer', string='Leaves'),
+
     }
 
 
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 8a8353ad5a0..e2cb1b3ad3f 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -982,9 +982,20 @@ class hr_employee(osv.osv):
             res[employee.id] = {'basic': result['sum']}
         return res
 
+    def _payslip_count(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict(map(lambda x: (x,0), ids))
+        try:
+            for employee in self.browse(cr, uid, ids, context=context):
+                res[employee.id] = len(employee.payslip_ids)
+        except:
+            pass
+        return res
+
     _columns = {
         'slip_ids':fields.one2many('hr.payslip', 'employee_id', 'Payslips', required=False, readonly=True),
         'total_wage': fields.function(_calculate_total_wage, method=True, type='float', string='Total Basic Salary', digits_compute=dp.get_precision('Payroll'), help="Sum of all current contract's wage of employee."),
+        'payslip_count': fields.function(_payslip_count, type='integer', string='Payslips'),
+        'payslip_ids': fields.one2many('hr.payslip', 'employee_id', 'Payslips'),
     }
 
 
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 20e9e0930cc..d82463b2c47 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -517,6 +517,17 @@ class hr_job(osv.osv):
                 ], context=context)
         return res
 
+    def _count_all(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict(map(lambda x: (x,{'documents_count': 0, 'application_count': 0,}), ids))
+        try:
+            for job in self.browse(cr, uid, ids, context=context):
+                res[job.id] = {'documents_count': len(job.document_ids),
+                'application_count': len(job.applicant_ids),
+                }
+        except:
+            pass
+        return res
+
     _columns = {
         'survey_id': fields.many2one('survey', 'Interview Form', help="Choose an interview form for this job position and you will be able to print/answer this interview from all applicants who apply for this job"),
         'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True,
@@ -524,8 +535,10 @@ class hr_job(osv.osv):
                                          "create new applicants for this job position."),
         'address_id': fields.many2one('res.partner', 'Job Location', help="Address where employees are working"),
         'application_ids': fields.one2many('hr.applicant', 'job_id', 'Applications'),
+        'application_count': fields.function(_count_all, type='integer', string='Applications', multi=True),
         'manager_id': fields.related('department_id', 'manager_id', type='many2one', string='Department Manager', relation='hr.employee', readonly=True, store=True),
         'document_ids': fields.function(_get_attached_docs, type='one2many', relation='ir.attachment', string='Applications'),
+        'documents_count': fields.function(_count_all, type='integer', string='Documents', multi=True),
         'user_id': fields.many2one('res.users', 'Recruitment Responsible', track_visibility='onchange'),
         'color': fields.integer('Color Index'),
     }
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 6221d0d83f1..22735af30a9 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -75,20 +75,26 @@
             <sheet>
                 <div class="oe_right oe_button_box">
                     <button name="action_makeMeeting" class="oe_stat_button" icon="fa-calendar" type="object"
-                         string="Meeting" help="Schedule interview with this applicant"/>
+                         help="Schedule interview with this applicant">
+                         <div>Schedule<br/>Meeting</div>
+                    </button>
                     <button name="%(survey.action_view_survey_question_message)d" 
                         class="oe_stat_button"
                         icon="fa-user" 
                         type="action"
-                        string="Interview" help="Answer related job question"
+                        help="Answer related job question"
                         context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant'}"
-                        attrs="{'invisible':[('survey','=',False)]}"/>
+                        attrs="{'invisible':[('survey','=',False)]}">
+                        <div>Start<br/>Interview</div>
+                    </button>
                     <button name="action_print_survey" 
                         class="oe_stat_button"
                         icon="fa-print"
                         type="object"
-                        string="Print" help="Print interview report"
-                        attrs="{'invisible':[('survey','=',False)]}"/>
+                        help="Print interview report"
+                        attrs="{'invisible':[('survey','=',False)]}">
+                        <div>Print<br/>Interview</div>
+                    </button>
                     <button name="action_get_attachment_tree_view" 
                         class="oe_stat_button"
                         icon="fa-book"
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index d71d083fbcd..bd574dc152f 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -558,6 +558,26 @@ class res_company(osv.osv):
         'timesheet_max_difference': lambda *args: 0.0
     }
 
+class hr_employee(osv.osv):
+    '''
+    Employee
+    '''
 
+    _inherit = 'hr.employee'
+    _description = 'Employee'
+
+    def _timesheet_count(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict(map(lambda x: (x,0), ids))
+        try:
+            for employee in self.browse(cr, uid, ids, context=context):
+                res[employee.id] = len(employee.timesheet_ids)
+        except:
+            pass
+        return res
+
+    _columns = {
+        'timesheet_ids': fields.one2many('hr_timesheet_sheet.sheet', 'employee_id', 'Timesheets'),
+        'timesheet_count': fields.function(_timesheet_count, type='integer', string='Timsheets'),
+    }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From a869dac9486a80b8f434892db57864cb8296802a Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Tue, 15 Apr 2014 13:16:33 +0200
Subject: [PATCH 46/65] [IMP] improves slightly the marketing campaign stat
 button in addon marketing_campaign

bzr revid: ged@openerp.com-20140415111633-bg0tc21aidpzc8yx
---
 addons/marketing_campaign/marketing_campaign_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 20c3a1bb6e7..dc4d989ee5b 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -66,7 +66,9 @@
                         name="%(act_marketing_campaing_stat)d"
                         class="oe_stat_button"
                         icon="fa-keyboard-o"
-                        string="Statistics" help="Marketing Campaign Statistics"/>
+                        help="Marketing Campaign Statistics">
+                        <div>Campaign<br/>Statistics</div>
+                    </button>
                     <button type="action"
                         name="%(act_marketing_campaing_segment_opened)d"
                         class="oe_stat_button"

From c0aed69bdc90c73d3b391d4129a040c67726415d Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Tue, 15 Apr 2014 13:45:42 +0200
Subject: [PATCH 47/65] [FIX] fix the spelling of count_regitrations to avoid
 crash (addon event)

bzr revid: ged@openerp.com-20140415114542-algev359v37qsq12
---
 addons/event/event_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 6f41646d156..7bbaa68d9fa 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -75,7 +75,7 @@
                                 class="oe_stat_button oe_inline" 
                                 icon="fa-github" 
                                 help="Register with this event">
-                                <field name="count_regitrations" widget="statinfo" string="Registrations"/>
+                                <field name="count_registrations" widget="statinfo" string="Registrations"/>
                             </button>
                         </div>
                         <group name="main_field_group">

From e0d45c418a780fd634d25edb3a04387604bf67eb Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Tue, 15 Apr 2014 13:53:49 +0200
Subject: [PATCH 48/65] [IMP] improves the put money in/take money out stat
 button in point of sale form views

bzr revid: ged@openerp.com-20140415115349-360ydoz85069bgyb
---
 addons/point_of_sale/point_of_sale_view.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 1d1bd73703f..cf939ed970b 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -843,10 +843,14 @@
                     </header>
                     <sheet>
                         <div class="oe_right oe_button_box">
-                            <button class="oe_stat_button" name="%(action_pos_box_in)d" string="Put Money" 
-                                type="action" states="opened,closing_control" icon="fa-level-down"/>
-                            <button class="oe_stat_button" name="%(action_pos_box_out)d" string="Take Money" 
-                                type="action" states="opened,closing_control" icon="fa-level-up"/>
+                            <button class="oe_stat_button" name="%(action_pos_box_in)d"
+                                type="action" states="opened,closing_control" icon="fa-level-down">
+                                <div>Put<br/>Money In</div>
+                            </button>
+                            <button class="oe_stat_button" name="%(action_pos_box_out)d"
+                                type="action" states="opened,closing_control" icon="fa-level-up">
+                                <div>Take<br/>Money Out</div>
+                            </button>
                         </div>
                         <h1 class="oe_title">
                             Session:

From c68163c16069e4ef38dc2a6b073a8f7bd2f5bb10 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Tue, 15 Apr 2014 14:14:04 +0200
Subject: [PATCH 49/65] [FIX] correct the spelling of 'task' in stat button in
 project form view (addon project)

bzr revid: ged@openerp.com-20140415121404-gasss4hjx0vx9su5
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f362a9266ed..5bd669cb14f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -95,7 +95,7 @@
                     <div class="oe_right oe_button_box" name="buttons" groups="base.group_user">
                          <button class="oe_inline oe_stat_button" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}" 
                             name="%(act_project_project_2_project_task_all)d" icon="fa-tasks">
-                            <field string="Task" name="task_count" widget="statinfo"/>
+                            <field string="Tasks" name="task_count" widget="statinfo"/>
                         </button>
                         <button  class="oe_inline oe_stat_button" name="attachment_tree_view"  type="object" icon="fa-files-o">
                             <field string="Documents" name="doc_count" widget="statinfo"/>

From d6a3d9d0897d066a63357b5fd6433a90ff578542 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Tue, 15 Apr 2014 14:57:15 +0200
Subject: [PATCH 50/65] [FIX] change the timesheet stat button in project form
 view to not display the number of hours (addon project_timesheet)

bzr revid: ged@openerp.com-20140415125715-slkpgg4mpqhw1mh0
---
 addons/project_timesheet/project_timesheet_view.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index a51c7976602..086986e7462 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -31,9 +31,7 @@
                 </xpath>
                 <xpath expr='//div[@name="buttons"]' position="inside">
                     <button class="oe_inline oe_stat_button" name="open_timesheets" type="object" attrs="{'invisible':[('use_timesheets','=', 0)]}"
-                        icon="fa-calendar" widget="statinfo">
-                        <field name="hours_quantity" string="Timesheets" widget="statinfo"/>
-                    </button>
+                        icon="fa-calendar" string="Timesheets"/>
                 </xpath>
             </field>
         </record>

From 032a453f676117b22674faf449788be819f1adc4 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Tue, 15 Apr 2014 15:02:44 +0200
Subject: [PATCH 51/65] [FIX] spelling fix: Orderpoints -> Order Points in
 addon procurement

bzr revid: ged@openerp.com-20140415130244-o2hkdo3qbpro7hrr
---
 addons/procurement/procurement_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 596ce2f0ba0..c483dcec851 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -359,7 +359,7 @@
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <button class="oe_inline oe_stat_button" name="%(product_open_orderpoint)d" type="action" 
                         attrs="{'invisible':[('type', '=', 'service')]}" icon="fa-pinterest">
-                       <field string="Orderpoints" name="orderpoint_count" widget="statinfo" />
+                       <field string="Order Points" name="orderpoint_count" widget="statinfo" />
                    </button>
                 </xpath>
                 <xpath expr="//field[@name='cost_method']" position="before">

From d1eb2547bbb9ea8f80651dfd1766fcdc924fb659 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Tue, 15 Apr 2014 15:18:18 +0200
Subject: [PATCH 52/65] [FIX] change the string 'pay invoices' to 'supplier
 inv.' to avoid misleading the user (there is another 'invoices' button)
 (addon purchases)

bzr revid: ged@openerp.com-20140415131818-geev2ewszvkjxj19
---
 addons/purchase/partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml
index 6d1916f9cc3..eb8f01e047d 100644
--- a/addons/purchase/partner_view.xml
+++ b/addons/purchase/partner_view.xml
@@ -81,7 +81,7 @@
                     </button>
                     <button class="oe_inline oe_stat_button" name="%(purchase.act_res_partner_2_supplier_invoices)d" type="action"
                         attrs="{'invisible': [('supplier', '=', False)]}" icon="fa-pencil-square-o" help="Supplier Invoices">
-                        <field string="Pay Invoices" name="supplier_invoice_count" widget="statinfo"/>
+                        <field string="Supplier Inv." name="supplier_invoice_count" widget="statinfo"/>
                     </button>
                 </xpath>
             </field>

From 569d9dc75af78ee9840e5c224a1dfacfc61710d6 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Tue, 15 Apr 2014 15:54:11 +0200
Subject: [PATCH 53/65] [FIX] move the purchase_ids, purchase_count fields
 defined in purchase.py from the model product.template to product.product to
 make them work correctly (addon purchase)

bzr revid: ged@openerp.com-20140415135411-428kxcysuy73soeu
---
 addons/purchase/purchase.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index a27dfce1985..25bf5217461 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -1271,6 +1271,17 @@ class product_template(osv.Model):
     _name = 'product.template'
     _inherit = 'product.template'
     
+    _columns = {
+        'purchase_ok': fields.boolean('Can be Purchased', help="Specify if the product can be selected in a purchase order line."),
+    }
+    _defaults = {
+        'purchase_ok': 1,
+    }
+
+class product_product(osv.Model):
+    _name = 'product.product'
+    _inherit = 'product.product'
+    
     def _purchase_count(self, cr, uid, ids, field_name, arg, context=None):
         res = dict(map(lambda x: (x,0), ids))
         try:
@@ -1280,13 +1291,10 @@ class product_template(osv.Model):
             pass
         return res
     _columns = {
-        'purchase_ok': fields.boolean('Can be Purchased', help="Specify if the product can be selected in a purchase order line."),
         'purchase_ids': fields.one2many('purchase.order', 'product_id', 'Purchases'),
         'purchase_count': fields.function(_purchase_count, string='# Purchases', type='integer'),
     }
-    _defaults = {
-        'purchase_ok': 1,
-    }
+
 
 
 class mail_compose_message(osv.Model):

From 9d358bad71e85c2a49654d0b0529ebca919498a4 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Tue, 15 Apr 2014 16:16:28 +0200
Subject: [PATCH 54/65] [FIX] change the string 'Reply survey' into 'Answer
 Survey' in survey form view (stat button work) (addon survey)

bzr revid: ged@openerp.com-20140415141628-iyw063tkertas2e1
---
 addons/survey/survey_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index ba906cc4377..1e38c181b30 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -31,7 +31,7 @@
                         <button class="oe_inline oe_stat_button" name="test_survey" states="open,draft,close,cancel" 
                             string="Test Survey" type="object" icon="fa-file-o" context="{'survey_id': active_id}" 
                             attrs="{'invisible':[('id','=',0)]}"/>
-                        <button class="oe_inline oe_stat_button" name="fill_survey" states="open" string="Reply Survey" 
+                        <button class="oe_inline oe_stat_button" name="fill_survey" states="open" string="Answer Survey" 
                             type="object" icon="fa-star-half-o" context="{'survey_id': active_id}" 
                             attrs="{'invisible':[('state','!=','open')]}"/>
                         <button class="oe_inline oe_stat_button" name="action_print_survey" states="open,draft,close,cancel" 

From ffc7bccef96a1fea2a5007c617c89e964607bf37 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Thu, 17 Apr 2014 11:45:43 +0200
Subject: [PATCH 55/65] [IMP] removes an useless button_box in addon mass
 mailing to allow the stat button contained inside to be aligned properly
 (addon mass mailing)

bzr revid: ged@openerp.com-20140417094543-03q0sxu0jqpdva0k
---
 addons/mass_mailing/views/mass_mailing.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml
index 7892feacacc..2ad9633ceef 100644
--- a/addons/mass_mailing/views/mass_mailing.xml
+++ b/addons/mass_mailing/views/mass_mailing.xml
@@ -215,12 +215,11 @@
                                 <field name="replied_dayly" string="Replied Daily" widget="barchart"/>
                             </button>
                         </div>
-                        <div class="oe_button_box" attrs="{'invisible': [('total', '=', 0)]}" style="margin-bottom: 32px">
-                            <button name="%(action_view_mass_mailing_contacts)d" type="action"
-                                icon="fa-envelope-o" class="oe_stat_button">
-                                <field name="total" string="Emails" widget="statinfo"/>
-                            </button>
-                        </div>
+                        <button name="%(action_view_mass_mailing_contacts)d" type="action"
+                            icon="fa-envelope-o" class="oe_stat_button"
+                            attrs="{'invisible': [('total', '=', 0)]}" >
+                            <field name="total" string="Emails" widget="statinfo"/>
+                        </button>
 
                         <group>
                             <field name="email_from"/>

From 3e99ca7285a3eb7b9aa2a8179ba408beca021f40 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Thu, 17 Apr 2014 15:34:57 +0200
Subject: [PATCH 56/65] [IMP] small css tweaks to stat buttons (addon web)

bzr revid: ged@openerp.com-20140417133457-m04g3560jnwjudnr
---
 addons/web/static/src/css/base.css  | 4 ++--
 addons/web/static/src/css/base.sass | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 570bb367a70..a4653fad853 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -79,7 +79,7 @@
   vertical-align: top;
 }
 .openerp .oe_title {
-  width: 50%;
+  width: 38%;
   float: left;
 }
 .openerp .oe_title:after {
@@ -316,7 +316,7 @@
 }
 .openerp .oe_button_box {
   width: 400px;
-  text-align: left;
+  text-align: right;
 }
 .openerp .oe_button_box .oe_stat_button:hover {
   background: #7c7bad;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 0a2bee832e4..d2bc762853d 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -190,7 +190,7 @@ $sheet-padding: 16px
     td
         vertical-align: top
     .oe_title
-        width: 50%
+        width: 38%
         float: left    
     .oe_title:after
         content: "."
@@ -332,7 +332,7 @@ $sheet-padding: 16px
                 background: #ED6F6A
     .oe_button_box
         width: 400px
-        text-align: left
+        text-align: right
         .oe_stat_button:hover
             background: #7c7bad
             color: white

From 8ae48fae7d1338c2ade0870ed51842af4ca7b1bc Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Thu, 17 Apr 2014 15:36:30 +0200
Subject: [PATCH 57/65] [IMP] simplify the stat button html structure (one less
 span) (addon web)

bzr revid: ged@openerp.com-20140417133630-q001n7sjrt9xw0to
---
 addons/web/static/src/js/view_form.js | 2 +-
 addons/web/static/src/xml/base.xml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 0ecd164a5e1..8cd7042ada8 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1922,7 +1922,7 @@ instance.web.form.WidgetButton = instance.web.form.FormWidget.extend({
     init: function(field_manager, node) {
         node.attrs.type = node.attrs['data-button-type'];
         this.is_stat_button = /\boe_stat_button\b/.test(node.attrs['class']);
-        this.icon = node.attrs.icon && "<span class=\"fa " + node.attrs.icon + " fa-fw\"></span>";
+        this.icon_class = node.attrs.icon && "stat_button_icon fa " + node.attrs.icon + " fa-fw";
         this._super(field_manager, node);
         this.force_disabled = false;
         this.string = (this.node.attrs.string || '').replace(/_/g, '');
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index a08de0bc4bd..24985ec0520 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1410,7 +1410,7 @@
         t-att-autofocus="widget.node.attrs.autofocus"
         t-att-accesskey="widget.node.attrs.accesskey">
         <img t-if="!widget.is_stat_button and widget.node.attrs.icon " t-att-src="_s + widget.node.attrs.icon" width="16" height="16"/>
-        <div t-if="widget.is_stat_button and widget.icon" class="stat_button_icon"><t t-raw="widget.icon"/></div>
+        <div t-if="widget.is_stat_button and widget.icon_class" t-att-class="widget.icon_class"></div>
         <span t-if="widget.string and !widget.is_stat_button"><t t-esc="widget.string"/></span>
         <div t-if="widget.string and widget.is_stat_button"><t t-esc="widget.string"/></div>
     </button>

From fcacd5452c34304e9bb781f5d2fa2f740138e1ce Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Thu, 17 Apr 2014 15:37:06 +0200
Subject: [PATCH 58/65] [IMP] improves the css for the stat buttons: moves the
 css independent of oe_button_box to a oe_stat_button section to allow a
 better look when used out of the button box (addon web)

bzr revid: ged@openerp.com-20140417133706-c60zdovc3k4ll9ga
---
 addons/web/static/src/css/base.css  | 56 +++++++++++++-----------
 addons/web/static/src/css/base.sass | 67 +++++++++++++++--------------
 2 files changed, 64 insertions(+), 59 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index a4653fad853..813f75345a3 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "utf-8";
+@charset "UTF-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -314,56 +314,58 @@
 .openerp .oe_form_dirty button.oe_highlight_on_dirty:hover {
   background: #ed6f6a;
 }
-.openerp .oe_button_box {
-  width: 400px;
-  text-align: right;
-}
-.openerp .oe_button_box .oe_stat_button:hover {
-  background: #7c7bad;
-  color: white;
-}
-.openerp .oe_button_box .oe_stat_button:hover .fa {
-  color: white;
-}
-.openerp .oe_button_box .oe_stat_button {
+.openerp .oe_stat_button {
   font-weight: normal;
-  display: inline-table;
-  width: 33% !important;
   height: 42px;
-  margin: 0px -1px -1px 0px;
-  padding: 0;
   color: #666666;
   border: 1px solid #dddddd;
   border-radius: 0;
   box-shadow: none;
   background: white;
 }
-.openerp .oe_button_box .oe_stat_button > div {
+.openerp .oe_stat_button > div {
   display: table-cell;
   vertical-align: middle;
   text-align: left;
   padding: 0;
   line-height: 120%;
 }
-.openerp .oe_button_box .oe_stat_button .stat_button_icon {
+.openerp .oe_stat_button .stat_button_icon {
   color: #7c7bad;
   font-size: 24px;
   padding: 0px 3px;
   width: 37px;
   text-align: center;
 }
-.openerp .oe_button_box .oe_stat_button .oe_form_field_percent_pie {
+.openerp .oe_stat_button .oe_form_field_percent_pie {
   width: 42px;
 }
-.openerp .oe_button_box .oe_stat_button .oe_form_field_bar_chart {
+.openerp .oe_stat_button .oe_form_field_bar_chart {
   width: 42px;
 }
-.openerp .oe_button_box .oe_stat_button svg {
+.openerp .oe_stat_button svg {
   width: 38px;
   height: 38px;
   display: inline;
   vertical-align: middle;
 }
+.openerp .oe_stat_button:hover {
+  background: #7c7bad;
+  color: white;
+}
+.openerp .oe_stat_button:hover .fa {
+  color: white;
+}
+.openerp .oe_button_box {
+  width: 400px;
+  text-align: right;
+}
+.openerp .oe_button_box .oe_stat_button {
+  display: inline-table;
+  width: 33% !important;
+  margin: 0px -1px -1px 0px;
+  padding: 0;
+}
 .openerp .oe_avatar > img {
   max-height: 90px;
   max-width: 90px;
@@ -3331,6 +3333,7 @@ body.oe_single_form .oe_single_form_container {
   width: 18px;
   height: 18px;
 }
+
 .modal .modal-header button.close {
   border: none;
   background: none;
@@ -3341,12 +3344,13 @@ body.oe_single_form .oe_single_form_container {
 .modal .modal-footer {
   text-align: left;
 }
-.modal .oe_act_window.modal-body{
-  padding: 0;
-}
-.modal .oe_button{
+.modal .oe_button {
   margin: 0 4px 0 0;
 }
+.modal .oe_act_window.modal-body {
+  padding: 0;
+}
+
 input[type="radio"], input[type="checkbox"] {
   margin-right: 4px;
   margin-left: 4px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index d2bc762853d..23a0095cb08 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -330,47 +330,48 @@ $sheet-padding: 16px
             @include box-shadow(none)
             &:hover
                 background: #ED6F6A
+    .oe_stat_button
+        font-weight: normal
+        height: 42px
+        color: #666
+        border: 1px solid #dddddd
+        border-radius: 0
+        box-shadow: none
+        background: white
+        > div
+            display: table-cell
+            vertical-align: middle
+            text-align: left
+            padding: 0
+            line-height: 120%
+        .stat_button_icon
+            color: #7C7BAD
+            font-size: 24px
+            padding: 0px 3px
+            width: 37px
+            text-align: center
+        .oe_form_field_percent_pie
+            width: 42px
+        .oe_form_field_bar_chart
+            width: 42px
+        svg
+            width: 38px
+            height: 38px
+            display: inline
+            vertical-align: middle
+    .oe_stat_button:hover
+        background: #7c7bad
+        color: white
+        .fa
+            color: white
     .oe_button_box
         width: 400px
         text-align: right
-        .oe_stat_button:hover
-            background: #7c7bad
-            color: white
-            .fa
-                color: white
         .oe_stat_button
-            font-weight: normal
             display: inline-table
             width: 33% !important
-            height: 42px
             margin: 0px -1px -1px 0px
             padding: 0
-            color: #666
-            border: 1px solid #dddddd
-            border-radius: 0
-            box-shadow: none
-            background: white
-            > div
-                display: table-cell
-                vertical-align: middle
-                text-align: left
-                padding: 0
-                line-height: 120%
-            .stat_button_icon
-                color: #7C7BAD
-                font-size: 24px
-                padding: 0px 3px
-                width: 37px
-                text-align: center
-            .oe_form_field_percent_pie
-                width: 42px
-            .oe_form_field_bar_chart
-                width: 42px
-            svg
-                width: 38px
-                height: 38px
-                display: inline
-                vertical-align: middle
     .oe_avatar
         > img
             max-height: 90px

From 98b45f97ebebdb70a21347508fca327b4975f6d5 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Thu, 17 Apr 2014 15:37:35 +0200
Subject: [PATCH 59/65] [IMP] small css tweaks to stat buttons (addon web)

bzr revid: ged@openerp.com-20140417133735-ijp8il7e1igs7z95
---
 addons/web/static/src/css/base.css  | 6 +++---
 addons/web/static/src/css/base.sass | 6 +++---
 addons/web/static/src/xml/base.xml  | 3 +--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 813f75345a3..b9f681281bb 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -316,8 +316,11 @@
 }
 .openerp .oe_stat_button {
   font-weight: normal;
+  width: 132px !important;
   height: 42px;
   color: #666666;
+  margin: 0px -1px -1px 0px;
+  padding: 0;
   border: 1px solid #dddddd;
   border-radius: 0;
   box-shadow: none;
@@ -362,9 +365,6 @@
 }
 .openerp .oe_button_box .oe_stat_button {
   display: inline-table;
-  width: 33% !important;
-  margin: 0px -1px -1px 0px;
-  padding: 0;
 }
 .openerp .oe_avatar > img {
   max-height: 90px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 23a0095cb08..3934f0f9acb 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -332,8 +332,11 @@ $sheet-padding: 16px
                 background: #ED6F6A
     .oe_stat_button
         font-weight: normal
+        width: 132px !important
         height: 42px
         color: #666
+        margin: 0px -1px -1px 0px
+        padding: 0
         border: 1px solid #dddddd
         border-radius: 0
         box-shadow: none
@@ -369,9 +372,6 @@ $sheet-padding: 16px
         text-align: right
         .oe_stat_button
             display: inline-table
-            width: 33% !important
-            margin: 0px -1px -1px 0px
-            padding: 0
     .oe_avatar
         > img
             max-height: 90px
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 24985ec0520..7b502bc4e8a 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1986,6 +1986,5 @@
     <a href="javascript:void(0)"><t t-esc="text"/></a>
 </t>
 <t t-name="StatInfo">
-    <strong><t t-esc="value"/></strong>
-    <t t-esc="text"/></t>
+    <strong><t t-esc="value"/></strong><br/><t t-esc="text"/></t>
 </templates>

From 5910f9375f2181da8f847738eb2118073986bc61 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Fri, 18 Apr 2014 11:34:53 +0200
Subject: [PATCH 60/65] [IMP] removes 2px to the stat button height, to save on
 vertical space (addon web)

bzr revid: ged@openerp.com-20140418093453-4u0vcqbtj2pdqi69
---
 addons/web/static/src/css/base.css  | 2 +-
 addons/web/static/src/css/base.sass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index b9f681281bb..b0bfcda8b38 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -317,7 +317,7 @@
 .openerp .oe_stat_button {
   font-weight: normal;
   width: 132px !important;
-  height: 42px;
+  height: 40px;
   color: #666666;
   margin: 0px -1px -1px 0px;
   padding: 0;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 3934f0f9acb..7b863cb1527 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -333,7 +333,7 @@ $sheet-padding: 16px
     .oe_stat_button
         font-weight: normal
         width: 132px !important
-        height: 42px
+        height: 40px
         color: #666
         margin: 0px -1px -1px 0px
         padding: 0

From a81ba2b1eaba206db3d0f932c7af80a5dfabc0a1 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Fri, 18 Apr 2014 11:37:56 +0200
Subject: [PATCH 61/65] [IMP] compute the total invoiced and display it on the
 stat button for invoices in res_partner form view (addon account)

bzr revid: ged@openerp.com-20140418093756-nxy2rkbyousbsjaf
---
 addons/account/partner.py       | 23 ++++++++++++++++-------
 addons/account/partner_view.xml |  2 +-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/addons/account/partner.py b/addons/account/partner.py
index 5f5f43ebe52..df4c1ec4888 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -162,13 +162,22 @@ class res_partner(osv.osv):
     def _debit_search(self, cr, uid, obj, name, args, context=None):
         return self._asset_difference_search(cr, uid, obj, name, 'payable', args, context=context)
 
-    def _invoice_journal_item_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,{'invoice_count': 0, 'journal_item_count': 0, 'contracts_count': 0 }), ids))
+    def _invoice_total(self, cr, uid, ids, field_name, arg, context=None):
+        result = {}
+        account_invoice_report = self.pool.get('account.invoice.report')
+        for partner in self.browse(cr, uid, ids, context=context):
+            invoice_ids = account_invoice_report.search(cr, uid, [('partner_id','child_of',partner.id)], context=context)
+            invoices = account_invoice_report.browse(cr, uid, invoice_ids, context=context)
+            result[partner.id] = sum(inv.user_currency_price_total for inv in invoices)
+        return result
+
+    def _journal_item_count(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict(map(lambda x: (x,{'journal_item_count': 0, 'contracts_count': 0 }), ids))
+
         # the user may not have access rights 
         try:
-            for partner in self.browse(cr, uid, ids, context):
+            for partner in self.browse(cr, uid, ids, context=context):
                 res[partner.id] = {
-                    'invoice_count': len(partner.invoice_ids),
                     'journal_item_count': len(partner.journal_item_ids),
                     'contracts_count': len(partner.contract_ids)
                 }
@@ -204,10 +213,10 @@ class res_partner(osv.osv):
             fnct_search=_credit_search, string='Total Receivable', multi='dc', help="Total amount this customer owes you."),
         'debit': fields.function(_credit_debit_get, fnct_search=_debit_search, string='Total Payable', multi='dc', help="Total amount you have to pay to this supplier."),
         'debit_limit': fields.float('Payable Limit'),
-        'invoice_count': fields.function(_invoice_journal_item_count, string="Invoices", type='integer', multi="invoice_journal"),
-        'contracts_count': fields.function(_invoice_journal_item_count, string="Contracts", type='integer', multi="invoice_journal"),
+        'total_invoiced': fields.function(_invoice_total, string="Total Invoiced", type='float'),
+        'contracts_count': fields.function(_journal_item_count, string="Contracts", type='integer', multi="invoice_journal"),
         'journal_item_ids': fields.one2many('account.move.line', 'partner_id', 'Journal Items'),
-        'journal_item_count': fields.function(_invoice_journal_item_count, string="Journal Items", type="integer", multi="invoice_journal"),
+        'journal_item_count': fields.function(_journal_item_count, string="Journal Items", type="integer", multi="invoice_journal"),
         '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 d66d64ab0da..e1b81082b5f 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -69,7 +69,7 @@
                         icon="fa-pencil-square-o"
                         name="%(account.action_invoice_tree)d" 
                         context="{'search_default_partner_id': active_id,'default_partner_id': active_id}" groups="account.group_account_invoice">
-                        <field string="Invoices" name="invoice_count" widget="statinfo" attrs="{'readonly':1}"/>
+                        <div><strong><field name="total_invoiced" widget="monetary"/></strong><br/>Invoiced</div>
                     </button>
                     <button type="action" class="oe_stat_button" name="%(account.action_account_moves_all_tree)d" groups="account.group_account_user" icon="fa-list">
                         <field string="Journal Items" name="journal_item_count" widget="statinfo"/>                        

From 6c950dc970fef9c0565be34fd483c47171c959c4 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 1 May 2014 23:20:23 +0200
Subject: [PATCH 62/65] [FIX] ir_qweb revert async script attribute

bzr revid: al@openerp.com-20140501212023-x9r57i05nrr0g29f
---
 openerp/addons/base/ir/ir_qweb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py
index bff10917374..acfac2dd892 100644
--- a/openerp/addons/base/ir/ir_qweb.py
+++ b/openerp/addons/base/ir/ir_qweb.py
@@ -1021,7 +1021,7 @@ class AssetsBundle(object):
         if self.stylesheets:
             response.append('<link href="/web/css/%s" rel="stylesheet"/>' % self.xmlid)
         if self.javascripts:
-            response.append('<script async type="text/javascript" src="/web/js/%s"></script>' % self.xmlid)
+            response.append('<script type="text/javascript" src="/web/js/%s"></script>' % self.xmlid)
         response.extend(self.remains)
 
         return sep.join(response)

From a8e1fbcbd352f1239f8db437bda0521ed56dc866 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Fri, 2 May 2014 15:22:58 +0200
Subject: [PATCH 63/65] [FIX] correct a small typo in previous merge (addon
 crm)

bzr revid: ged@openerp.com-20140502132258-88x9mam35o3k5ndm
---
 addons/crm/crm_lead_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 04855989089..dc297492020 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -393,7 +393,7 @@
                         <div class="oe_right oe_button_box">
                             <button class="oe_inline oe_stat_button" type="action" 
                                 name="%(crm.crm_case_categ_phone_incoming0)d" icon="fa-phone"
-                                context="{'default_opportunity_id': active_id, 'search_default_opportunity_id': active_id, 'default_partner_id': partner_id, 'default_duration': 1.0}"/>
+                                context="{'default_opportunity_id': active_id, 'search_default_opportunity_id': active_id, 'default_partner_id': partner_id, 'default_duration': 1.0}">
                                 <div>Schedule/Log<br/>Calls</div>
                             </button>
                             <button class="oe_inline oe_stat_button" type="object" 

From f55dfdc40ea9f5e247dc1557e5f0356ae67159ac Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 4 May 2014 13:38:47 +0200
Subject: [PATCH 64/65] [IMP] Certification Template

bzr revid: fp@tinyerp.com-20140504113847-4xmjg30m5leaqz2c
---
 .../views/website_certification_templates.xml | 77 +++++++++++++------
 1 file changed, 53 insertions(+), 24 deletions(-)

diff --git a/addons/website_certification/views/website_certification_templates.xml b/addons/website_certification/views/website_certification_templates.xml
index 13fe86a810c..210bb6d46d0 100644
--- a/addons/website_certification/views/website_certification_templates.xml
+++ b/addons/website_certification/views/website_certification_templates.xml
@@ -6,31 +6,60 @@
         <div id="wrap">
             <div class="oe_structure"/>
             <div class="container">
+                <h1>Odoo Certified Experts</h1>
                 <div class="row">
-                    <h1>Certified People</h1>
-                    <div class="well">Filter by certification type:
-                        <a href="/certifications"><span class="badge">all</span></a>
-                        <t t-foreach="types" t-as="t">
-                            <a t-att-href="'/certifications/%s' % slug(t)"><span class="badge" t-field="t.name" /></a>
-                        </t>
-                    </div>
-                    <div class="table-responsive">
-                        <table class="table table-striped">
-                            <thead><tr>
-                                <th>Name</th>
-                                <th>Date</th>
-                                <th>Type</th>
-                                <th>Score</th>
-                            </tr></thead>
-                            <tbody>
-                                <tr t-foreach="certifications" t-as="c">
-                                    <td><span t-field="c.partner_id"/></td>
-                                    <td><span t-field="c.certification_date"/></td>
-                                    <td><span t-field="c.type_id.name"/></td>
-                                    <td><t t-if="c.certification_hidden_score == False"><span t-field="c.certification_score"/></t></td>
-                                </tr>
-                            </tbody>
-                        </table>
+                    <div class="col-md-8">
+                        <div class="well well-sm">Filter by Certification:
+                            <a href="/certifications"><span class="badge">All</span></a>
+                            <t t-foreach="types" t-as="t">
+                                <a t-att-href="'/certifications/%s' % slug(t)"><span class="badge" t-field="t.name" /></a>
+                            </t>
+                        </div>
+                        <div class="table-responsive">
+                            <table class="table table-striped">
+                                <thead><tr>
+                                    <th>Name</th>
+                                    <th>Date</th>
+                                    <th>Type</th>
+                                    <th>Score</th>
+                                </tr></thead>
+                                <tbody>
+                                    <tr t-foreach="certifications" t-as="c">
+                                        <td><span t-field="c.partner_id"/></td>
+                                        <td><span t-field="c.certification_date"/></td>
+                                        <td><span t-field="c.type_id.name"/></td>
+                                        <td><t t-if="c.certification_hidden_score == False"><span t-field="c.certification_score"/></t></td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div><div class="col-md-3 col-md-offset-1">
+                        <div class="panel panel-default">
+                            <div class="panel-heading">
+                                <h3 class="panel-title">Odoo Certifications</h3>
+                            </div>
+                            <div class="panel-body">
+                                <p>
+                                    The Odoo certification program allows companies
+                                    to identify certified professionals and get
+                                    the guarantee that their contractors are
+                                    qualified to offer Odoo services.
+                                </p>
+                                <a href="/page/contactus" class="btn btn-primary">Get Certified</a>
+                            </div>
+                        </div>
+                        <div class="panel panel-default mt16">
+                            <div class="panel-heading">
+                                <h3 class="panel-title">Sample Examination</h3>
+                            </div>
+                            <div class="panel-body">
+                                <p>
+                                    Before trying the certification, you can
+                                    assess your skills with the sample test.
+                                </p>
+                                <a href="/page/contactus" class="btn btn-primary">Try The Test</a>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>

From 1d0a6e20a4abc36a28142b94b983e141d9c1537b Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 5 May 2014 10:57:39 +0200
Subject: [PATCH 65/65] [FIX] event: move definition of fields track_ids and
 count_tracks to the right module

bzr revid: rco@openerp.com-20140505085739-z2asr1vrx6yyjtlh
---
 addons/event/event.py                      | 19 ++++++-------------
 addons/website_event_track/models/event.py | 10 ++++++++++
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 1f2410a834c..5e5d1204a17 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -150,16 +150,11 @@ class event_event(osv.osv):
                         continue
         return res
     
-    def _count_all(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,{'count_registrations': 0, 'count_tracks': 0,}), ids))
-        try:
-            for data in self.browse(cr, uid, ids, context=context):
-                res[data.id] = {'count_registrations': len(data.registration_ids),
-                'count_tracks': len(data.track_ids),
-               }
-        except:
-            pass
-        return res
+    def _count_registrations(self, cr, uid, ids, field_name, arg, context=None):
+        return {
+            event.id: len(event.registration_ids)
+            for event in self.browse(cr, uid, ids, context=context)
+        }
 
     _columns = {
         'name': fields.char('Event Name', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}),
@@ -180,7 +175,6 @@ class event_event(osv.osv):
             store={'event.registration': (_get_events_from_registrations, ['state'], 10),
                    'event.event': (lambda  self, cr, uid, ids, c = {}: ids, ['seats_max', 'registration_ids'], 20)}),
         'registration_ids': fields.one2many('event.registration', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}),
-        'track_ids': fields.one2many('event.track', 'event_id', 'Tracks', readonly=False),
         'date_begin': fields.datetime('Start Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'date_end': fields.datetime('End Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'state': fields.selection([
@@ -203,8 +197,7 @@ class event_event(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
         'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
         'organizer_id': fields.many2one('res.partner', "Organizer"),
-        'count_registrations': fields.function(_count_all, type="integer", string="Registrations", multi=True),
-        'count_tracks': fields.function(_count_all, type='integer', string='Tracks', multi=True),
+        'count_registrations': fields.function(_count_registrations, type="integer", string="Registrations"),
     }
     _defaults = {
         'state': 'draft',
diff --git a/addons/website_event_track/models/event.py b/addons/website_event_track/models/event.py
index c9d590d7068..954598f0bd2 100644
--- a/addons/website_event_track/models/event.py
+++ b/addons/website_event_track/models/event.py
@@ -124,6 +124,12 @@ class event_event(osv.osv):
         # put POSIX 'Etc/*' entries at the end to avoid confusing users - see bug 1086728
         return [(tz,tz) for tz in sorted(pytz.all_timezones, key=lambda tz: tz if not tz.startswith('Etc/') else '_')]
 
+    def _count_tracks(self, cr, uid, ids, field_name, arg, context=None):
+        return {
+            event.id: len(event.track_ids)
+            for event in self.browse(cr, uid, ids, context=context)
+        }
+
     def _get_tracks_tag_ids(self, cr, uid, ids, field_names, arg=None, context=None):
         res = dict.fromkeys(ids, [])
         for event in self.browse(cr, uid, ids, context=context):
@@ -131,6 +137,7 @@ class event_event(osv.osv):
                 res[event.id] += [tag.id for tag in track.tag_ids]
             res[event.id] = list(set(res[event.id]))
         return res
+
     _columns = {
         'tag_ids': fields.many2many('event.tag', string='Tags'),
         'track_ids': fields.one2many('event.track', 'event_id', 'Tracks'),
@@ -139,16 +146,19 @@ class event_event(osv.osv):
         'show_track_proposal': fields.boolean('Talks Proposals'),
         'show_tracks': fields.boolean('Multiple Tracks'),
         'show_blog': fields.boolean('News'),
+        'count_tracks': fields.function(_count_tracks, type='integer', string='Tracks'),
         'tracks_tag_ids': fields.function(_get_tracks_tag_ids, type='one2many', relation='event.track.tag', string='Tags of Tracks'),
         'allowed_track_tag_ids': fields.many2many('event.track.tag', string='Accepted Tags', help="List of available tags for track proposals."),
         'timezone_of_event': fields.selection(_tz_get, 'Event Timezone', size=64),
     }
+
     _defaults = {
         'show_track_proposal': False,
         'show_tracks': False,
         'show_blog': False,
         'timezone_of_event':lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).tz,
     }
+
     def _get_new_menu_pages(self, cr, uid, event, context=None):
         context = context or {}
         result = super(event_event, self)._get_new_menu_pages(cr, uid, event, context=context)