From b9507e503f29a66ecde6ae2d9430b740e3df5d0c Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 7 Mar 2013 10:54:53 +0100 Subject: [PATCH] [IMP] gamification: add unit and description in kanban bzr revid: mat@openerp.com-20130307095453-ttfyk3rfkm763ut9 --- addons/gamification/goal.py | 8 +++++++- addons/gamification/goal_view.xml | 4 ++++ addons/gamification_sale_crm/sale_crm_goals.xml | 11 +++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py index ccf14dce35f..beceb3470f8 100644 --- a/addons/gamification/goal.py +++ b/addons/gamification/goal.py @@ -152,7 +152,13 @@ class gamification_goal(osv.Model): 'remind_update_delay' : fields.integer('Remind delay', help="The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value is specified."), 'last_update' : fields.date('Last Update', - help="In case of manual goal, reminders are sent if the goal as not been updated for a while (defined in goal plan). Ignored in case of non-manual goal or goal not linked to a plan."), # + help="In case of manual goal, reminders are sent if the goal as not been updated for a while (defined in goal plan). Ignored in case of non-manual goal or goal not linked to a plan."), + 'type_description': fields.related('type_id','description', + type='char', + string='Type Description'), + 'type_unit': fields.related('type_id','unit', + type='char', + string='Type Description'), } _defaults = { diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml index ec075b5ffeb..c47a2abac2e 100644 --- a/addons/gamification/goal_view.xml +++ b/addons/gamification/goal_view.xml @@ -141,9 +141,13 @@

+ + +

/ + ⟨%%⟩
End: diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml index 3308b860e8d..0c5683f4fca 100644 --- a/addons/gamification_sale_crm/sale_crm_goals.xml +++ b/addons/gamification_sale_crm/sale_crm_goals.xml @@ -7,6 +7,7 @@ Total Invoiced sum + € @@ -18,6 +19,7 @@ The average number of days to open the case (lower than) sum lower + days @@ -29,6 +31,7 @@ The average number of days to close the case (lower than) sum lower + days @@ -40,6 +43,7 @@ # Logged Calls Log a certain number of calls to reach this goal count + calls [('user_id','=',user_id),('type','='),('state','=','done')] @@ -49,6 +53,7 @@ # New Leads Based on the creation date count + leads [('user_id','=',user_id)] @@ -58,6 +63,7 @@ # New Opportunities Based on the opening date count + opportunities [('user_id','=',user_id),('type','=','opportunity')] @@ -67,6 +73,7 @@ # New Sales Orders Based on the creation date count + orders [('user_id','=',user_id),('state','not in',('draft', 'sent', 'cancel'))] @@ -76,6 +83,7 @@ # Paid Sales Orders Based on the invoice date count + orders [('state','=','paid'),('user_id','=',user_id),('type','=','out_invoice')] @@ -84,6 +92,7 @@ Total Paid Sales Orders Based on the invoice date count + € @@ -96,6 +105,7 @@ Refund the least customers (lower than) count lower + invoices [('state','!=','cancel'),('user_id','=',user_id),('type','=','out_refund')] @@ -105,6 +115,7 @@ The total refunded value is a negative value. Validated when higher (min refunded). sum higher + €