diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py index 18a6daa0c3c..59938f1a11d 100644 --- a/addons/crm/crm_phonecall.py +++ b/addons/crm/crm_phonecall.py @@ -50,11 +50,11 @@ class crm_phonecall(crm_case, osv.osv): 'company_id': fields.many2one('res.company', 'Company'), 'description': fields.text('Description'), 'state': fields.selection([ - ('draft', 'Draft'), + ('draft', 'Todo'), ('open', 'Todo'), ('cancel', 'Cancelled'), - ('done', 'Done'), - ('pending', 'Pending'), + ('done', 'Held'), + ('pending', 'Not Held'), ], 'State', size=16, readonly=True, help='The state is set to \'Draft\', when a case is created.\ \nIf the case is in progress the state is set to \'Open\'.\ diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py index 00d13c7216c..a82dc15525f 100644 --- a/addons/crm/report/crm_phonecall_report.py +++ b/addons/crm/report/crm_phonecall_report.py @@ -24,11 +24,11 @@ import tools from crm import crm AVAILABLE_STATES = [ - ('draft','Draft'), - ('open','Open'), + ('draft','Todo'), + ('open','Todo'), ('cancel', 'Cancelled'), - ('done', 'Closed'), - ('pending','Pending') + ('done', 'Held'), + ('pending','Not Held') ] @@ -119,9 +119,9 @@ class crm_phonecall_report(osv.osv): create or replace view crm_phonecall_report as ( select id, - to_char(c.create_date, 'YYYY') as name, - to_char(c.create_date, 'MM') as month, - to_char(c.create_date, 'YYYY-MM-DD') as day, + to_char(c.date, 'YYYY') as name, + to_char(c.date, 'MM') as month, + to_char(c.date, 'YYYY-MM-DD') as day, to_char(c.create_date, 'YYYY-MM-DD') as creation_date, to_char(c.date_open, 'YYYY-MM-DD') as opening_date, to_char(c.date_closed, 'YYYY-mm-dd') as date_closed, diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml index 69402603d17..f717cc0ca6d 100644 --- a/addons/crm/report/crm_phonecall_report_view.xml +++ b/addons/crm/report/crm_phonecall_report_view.xml @@ -9,7 +9,7 @@ crm.phonecall.report tree - + @@ -75,55 +75,53 @@ - + - + - + - + - - - - - - - - + + + + - - - + - + @@ -133,11 +131,11 @@ context="{'group_by':'company_id'}" /> + domain="[]" context="{'group_by':'day'}" help="Date of call"/> + domain="[]" context="{'group_by':'month'}" help="Month of call"/> + domain="[]" context="{'group_by':'name'}" help="Year of call"/> @@ -145,7 +143,7 @@ - + @@ -160,7 +158,7 @@ - Phone Calls + Phone Calls Analysis crm.phonecall.report form tree,graph