diff --git a/addons/board_crm_configuration/__terp__.py b/addons/board_crm_configuration/__terp__.py index 3c303ee2d1c..2d67fdc0174 100644 --- a/addons/board_crm_configuration/__terp__.py +++ b/addons/board_crm_configuration/__terp__.py @@ -37,7 +37,7 @@ This module implements a dashboard for CRM that includes: 'depends': ['board', 'crm', 'report_crm'], 'update_xml': ['board_crm_statistical_view.xml', 'board_crm_view.xml'], 'demo_xml': ['board_crm_demo.xml'], - 'installable': True, + 'installable': False, 'active': False, 'certificate': '0071599098909', } diff --git a/addons/caldav/common.py b/addons/caldav/common.py index f81f7f8c417..0f68e29e660 100644 --- a/addons/caldav/common.py +++ b/addons/caldav/common.py @@ -506,10 +506,12 @@ class calendar_event(osv.osv): res = {} for event in self.browse(cr, uid, ids, context=context): start = datetime.strptime(event.date, "%Y-%m-%d %H:%M:%S") - end = datetime.strptime(event.date_deadline[:19], "%Y-%m-%d %H:%M:%S") - diff = end - start - duration = float(diff.days)* 24 + (float(diff.seconds) / 3600) - res[event.id] = round(duration, 2) + res[event.id] = 0 + if event.date_deadline: + end = datetime.strptime(event.date_deadline[:19], "%Y-%m-%d %H:%M:%S") + diff = end - start + duration = float(diff.days)* 24 + (float(diff.seconds) / 3600) + res[event.id] = round(duration, 2) return res def _set_duration(self, cr, uid, id, name, value, arg, context): diff --git a/addons/crm/wizard/crm_opportunity_wizard.py b/addons/crm/wizard/crm_opportunity_wizard.py index b33da1cd258..3a01fde870c 100644 --- a/addons/crm/wizard/crm_opportunity_wizard.py +++ b/addons/crm/wizard/crm_opportunity_wizard.py @@ -46,7 +46,7 @@ class opportunity2phonecall(wizard.interface): case_fields = { 'user_id' : {'string' : 'Assign To', 'type' : 'many2one', 'relation' : 'res.users'}, - 'deadline' : {'string' : 'Planned Date', 'type' : 'datetime'}, + 'deadline' : {'string' : 'Planned Date', 'type' : 'datetime' ,'required' :True}, 'note' : {'string' : 'Goals', 'type' : 'text'}, 'category_id' : {'string' : 'Category', 'type' : 'many2one', 'relation' : 'crm.case.categ', 'required' :True}, 'section_id' : {'string' : 'Section', 'type' : 'many2one', 'relation' : 'crm.case.section'}, @@ -133,6 +133,19 @@ class opportunity2meeting(wizard.interface): def _makeMeeting(self, cr, uid, data, context): pool = pooler.get_pool(cr.dbname) + opportunity_case_obj = pool.get('crm.opportunity') + meeting_case_obj = pool.get('crm.meeting') + for opportunity in opportunity_case_obj.browse(cr, uid, data['ids']): + new_meeting_id = meeting_case_obj.create(cr, uid, { + 'name': opportunity.name, + 'date': opportunity.date, + 'date_deadline': opportunity.date_deadline, + }) + new_meeting = meeting_case_obj.browse(cr, uid, new_meeting_id) + vals = {} + opportunity_case_obj.write(cr, uid, [opportunity.id], vals) + opportunity_case_obj.case_cancel(cr, uid, [opportunity.id]) + meeting_case_obj.case_open(cr, uid, [new_meeting_id]) data_obj = pool.get('ir.model.data') result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter') id = data_obj.read(cr, uid, result, ['res_id']) diff --git a/addons/crm/wizard/crm_phonecall_wizard.py b/addons/crm/wizard/crm_phonecall_wizard.py index 35b79392b6e..3393662e420 100644 --- a/addons/crm/wizard/crm_phonecall_wizard.py +++ b/addons/crm/wizard/crm_phonecall_wizard.py @@ -194,6 +194,19 @@ class phonecall2meeting(wizard.interface): def _makeMeeting(self, cr, uid, data, context): pool = pooler.get_pool(cr.dbname) + phonecall_case_obj = pool.get('crm.phonecall') + meeting_case_obj = pool.get('crm.meeting') + for phonecall in phonecall_case_obj.browse(cr, uid, data['ids']): + new_meeting_id = meeting_case_obj.create(cr, uid, { + 'name': phonecall.name, + 'date': phonecall.date, + 'duration': phonecall.duration, + }) + new_meeting = meeting_case_obj.browse(cr, uid, new_meeting_id) + vals = {} + phonecall_case_obj.write(cr, uid, [phonecall.id], vals) + phonecall_case_obj.case_cancel(cr, uid, [phonecall.id]) + meeting_case_obj.case_open(cr, uid, [new_meeting_id]) data_obj = pool.get('ir.model.data') result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter') id = data_obj.read(cr, uid, result, ['res_id']) diff --git a/addons/crm_hr/wizard/crm_hr_wizard.py b/addons/crm_hr/wizard/crm_hr_wizard.py index d682a72b044..66736c5ce47 100644 --- a/addons/crm_hr/wizard/crm_hr_wizard.py +++ b/addons/crm_hr/wizard/crm_hr_wizard.py @@ -91,6 +91,12 @@ class job2phonecall(wizard.interface): 'date' : form['deadline'], 'section_id' : form['section_id'], 'description':job.description, + 'partner_id':job.partner_id.id, + 'partner_address_id':job.partner_address_id.id, + 'partner_phone':job.partner_phone, + 'partner_mobile':job.partner_mobile, + 'description':job.description, + 'date':job.date, }, context=context) new_phonecall = phonecall_case_obj.browse(cr, uid, new_phonecall_id) vals = {} @@ -129,6 +135,20 @@ class job2meeting(wizard.interface): def _makeMeeting(self, cr, uid, data, context): pool = pooler.get_pool(cr.dbname) + job_case_obj = pool.get('crm.job') + meeting_case_obj = pool.get('crm.meeting') + for job in job_case_obj.browse(cr, uid, data['ids']): + new_meeting_id = meeting_case_obj.create(cr, uid, { + 'name': job.name, + 'date': job.date, + 'duration': job.duration, + }) + new_meeting = meeting_case_obj.browse(cr, uid, new_meeting_id) + vals = {} + job_case_obj.write(cr, uid, [job.id], vals) + job_case_obj.case_cancel(cr, uid, [job.id]) + meeting_case_obj.case_open(cr, uid, [new_meeting_id]) + data_obj = pool.get('ir.model.data') result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter') id = data_obj.read(cr, uid, result, ['res_id']) diff --git a/addons/report_crm/__terp__.py b/addons/report_crm/__terp__.py index be8ed55bf4d..dabe76d37db 100644 --- a/addons/report_crm/__terp__.py +++ b/addons/report_crm/__terp__.py @@ -32,7 +32,7 @@ 'init_xml': [], 'update_xml': ['security/ir.model.access.csv', 'report_crm_view.xml'], 'demo_xml': [], - 'installable': False, #TODO : After fixed problems , set True + 'installable': True, #TODO : After fixed problems , set True 'active': False, 'certificate': '0030422968285', } diff --git a/addons/report_crm/report_crm.py b/addons/report_crm/report_crm.py index 6ae41dc7417..c5646e255c5 100644 --- a/addons/report_crm/report_crm.py +++ b/addons/report_crm/report_crm.py @@ -37,18 +37,13 @@ class report_crm_case_user(osv.osv): _columns = { 'name': fields.char('Year',size=64,required=False, readonly=True), 'user_id':fields.many2one('res.users', 'User', readonly=True), - 'section_id':fields.many2one('crm.case.section', 'Section', readonly=True), - 'amount_revenue': fields.float('Est.Revenue', readonly=True), - 'amount_costs': fields.float('Est.Cost', readonly=True), - 'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True), 'nbr': fields.integer('# of Cases', readonly=True), 'probability': fields.float('Avg. Probability', readonly=True), 'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True), - 'delay_close': fields.char('Delay to close', size=20, readonly=True), 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True), } - _order = 'name desc, user_id, section_id' + _order = 'name desc, user_id' def init(self, cr): tools.drop_view_if_exists(cr, 'report_crm_case_user') cr.execute(""" @@ -59,16 +54,10 @@ class report_crm_case_user(osv.osv): to_char(c.create_date, 'MM') as month, c.state, c.user_id, - c.section_id, - count(*) as nbr, - sum(planned_revenue) as amount_revenue, - sum(planned_cost) as amount_costs, - sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob, - avg(probability)::decimal(16,2) as probability, - to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close + count(*) as nbr from crm_case c - group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id, c.section_id + group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id )""") report_crm_case_user() @@ -78,19 +67,12 @@ class report_crm_case_categ(osv.osv): _auto = False _columns = { 'name': fields.char('Year',size=64,required=False, readonly=True), - 'categ_id':fields.many2one('crm.case.categ', 'Category', readonly=True), - 'section_id':fields.many2one('crm.case.section', 'Section', readonly=True), - 'amount_revenue': fields.float('Est.Revenue', readonly=True), - 'amount_costs': fields.float('Est.Cost', readonly=True), - 'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True), 'nbr': fields.integer('# of Cases', readonly=True), - 'probability': fields.float('Avg. Probability', readonly=True), 'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True), - 'delay_close': fields.char('Delay Close', size=20, readonly=True), 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True), } - _order = 'name desc, categ_id, section_id' + _order = 'name desc' def init(self, cr): tools.drop_view_if_exists(cr, 'report_crm_case_categ') cr.execute(""" @@ -100,17 +82,10 @@ class report_crm_case_categ(osv.osv): to_char(c.create_date, 'YYYY') as name, to_char(c.create_date, 'MM') as month, c.state, - c.categ_id, - c.section_id, - count(*) as nbr, - sum(planned_revenue) as amount_revenue, - sum(planned_cost) as amount_costs, - sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob, - avg(probability)::decimal(16,2) as probability, - to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close + count(*) as nbr from crm_case c - group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.categ_id, c.section_id + group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state )""") report_crm_case_categ() @@ -145,12 +120,10 @@ class report_crm_case_section(osv.osv): _columns = { 'name': fields.char('Year',size=64,required=False, readonly=True), # 'user_id':fields.many2one('res.users', 'User', readonly=True), - 'section_id':fields.many2one('crm.case.section', 'Section', readonly=True), 'nbr_cases': fields.integer('# of Cases', readonly=True), 'avg_answers': fields.function(_get_data,string='Avg. Answers', method=True,type="integer"), - 'perc_done': fields.function(_get_data,string='%Done', method=True,type="float"), - 'perc_cancel': fields.function(_get_data,string='%Cancel', method=True,type="float"), - 'delay_close': fields.char('Delay to close', size=20, readonly=True), + # 'perc_done': fields.function(_get_data,string='%Done', method=True,type="float"), +# 'perc_cancel': fields.function(_get_data,string='%Cancel', method=True,type="float"), 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True), } @@ -163,12 +136,10 @@ class report_crm_case_section(osv.osv): min(c.id) as id, to_char(c.create_date, 'YYYY') as name, to_char(c.create_date, 'MM') as month, - c.section_id as section_id, count(*) as nbr_cases, 0 as avg_answers, 0.0 as perc_done, - 0.0 as perc_cancel, - to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close + 0.0 as perc_cancel from crm_case c group by to_char(c.create_date, 'YYYY'),to_char(c.create_date, 'MM'),c.section_id @@ -183,13 +154,8 @@ class report_crm_case_service_dashboard(osv.osv): 'date': fields.datetime('Date', readonly=True), 'date_deadline': fields.datetime('Deadline', readonly=True), 'name': fields.char('Description', size=64, readonly=True), - 'partner_id': fields.many2one('res.partner', 'Partner', readonly=True), 'user_id': fields.many2one('res.users', 'Responsible', readonly=True), - 'priority': fields.char('Priority', size=64, readonly=True), - 'planned_revenue': fields.float('Planned Revenue', readonly=True), - 'planned_cost': fields.float('Planned Costs', readonly=True), 'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True), - 'date_closed' : fields.datetime('Date Closed', readonly=True), 'create_date' : fields.datetime('Create Date', readonly=True) } _order = 'date_closed, create_date' @@ -198,19 +164,13 @@ class report_crm_case_service_dashboard(osv.osv): cr.execute("""create or replace view report_crm_case_service_dashboard as ( select cse.id as id, cse.date as date, cse.date_deadline as date_deadline, - cse.name as name, cse.partner_id as partner_id, cse.user_id as user_id, - cse.priority as priority, cse.planned_revenue as planned_revenue, - cse.planned_cost as planned_cost, cse.state as state, - cse.date_closed as date_closed, cse.create_date as create_date + cse.name as name, cse.user_id as user_id, + cse.state as state, + cse.create_date as create_date from crm_case cse where - ((to_date(to_char(cse.date_closed, 'YYYY-MM-dd'),'YYYY-MM-dd') <= CURRENT_DATE) - AND - (to_date(to_char(cse.date_closed, 'YYYY-MM-dd'),'YYYY-MM-dd') > (CURRENT_DATE-15)) - AND - cse.state='done') - + (cse.state='done') OR ((to_date(to_char(cse.create_date, 'YYYY-MM-dd'),'YYYY-MM-dd') <= CURRENT_DATE) diff --git a/addons/report_crm/report_crm_view.xml b/addons/report_crm/report_crm_view.xml index 42850dad86e..d39d1eb068f 100644 --- a/addons/report_crm/report_crm_view.xml +++ b/addons/report_crm/report_crm_view.xml @@ -15,13 +15,7 @@ - - - - - - @@ -35,7 +29,6 @@ - @@ -70,7 +63,6 @@ - @@ -78,8 +70,8 @@ - - + + Cases by User and Section @@ -88,7 +80,7 @@ tree,graph - + @@ -100,14 +92,7 @@ - - - - - - - @@ -120,8 +105,6 @@
- - @@ -139,9 +122,6 @@ - - - @@ -156,7 +136,7 @@ tree,graph - + @@ -177,12 +157,8 @@ - - - - @@ -211,7 +187,6 @@ - @@ -239,11 +214,7 @@ - - - - @@ -257,13 +228,8 @@ - - - - -