From 96ea9392aab835bb2ea21321b163c105a334bbd1 Mon Sep 17 00:00:00 2001 From: Randhir Mayatra rma-openerp Date: Mon, 24 Mar 2014 19:26:21 +0530 Subject: [PATCH] [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 @@ - 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 @@
-

The , 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 @@ -

-
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 @@