diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py index f9c39c92403..0fe718f97ac 100644 --- a/addons/crm/report/crm_lead_report.py +++ b/addons/crm/report/crm_lead_report.py @@ -51,7 +51,7 @@ class crm_lead_report(osv.osv): for case in self.browse(cr, uid, ids, context): if field_name != 'avg_answers': state = field_name[5:] - cr.execute("select count(*) from crm_opportunity where \ + cr.execute("select count(*) from crm_lead where \ section_id =%s and state='%s'"%(case.section_id.id, state)) state_cases = cr.fetchone()[0] perc_state = (state_cases / float(case.nbr)) * 100 diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py index c0e666e4eaa..9c72ed44889 100644 --- a/addons/crm/report/crm_phonecall_report.py +++ b/addons/crm/report/crm_phonecall_report.py @@ -38,7 +38,7 @@ class crm_phonecall_report(osv.osv): _name = "crm.phonecall.report" _description = "Phone calls by user and section" _auto = False - + def _get_data(self, cr, uid, ids, field_name, arg, context={}): """ @param cr: the current row, from the database cursor, @@ -53,8 +53,7 @@ class crm_phonecall_report(osv.osv): for case in self.browse(cr, uid, ids, context): if field_name != 'avg_answers': state = field_name[5:] - cr.execute("select count(*) from crm_opportunity where \ - section_id =%s and state='%s'"%(case.section_id.id, state)) + cr.execute("select count(*) from crm_lead where section_id =%s and state='%s'"%(case.section_id.id, state)) state_cases = cr.fetchone()[0] perc_state = (state_cases / float(case.nbr)) * 100 @@ -92,7 +91,7 @@ class crm_phonecall_report(osv.osv): ('09', 'September'), ('10', 'October'),\ ('11', 'November'), ('12', 'December')], 'Month', readonly=True), 'create_date': fields.datetime('Create Date', readonly=True), - 'day': fields.char('Day', size=128, readonly=True), + 'day': fields.char('Day', size=128, readonly=True), 'delay_close': fields.float('Delay to close', digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"), 'duration': fields.float('Duration', digits=(16,2),readonly=True, group_operator="avg"), 'delay_open': fields.float('Delay to open',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to open the case"), @@ -142,11 +141,11 @@ class crm_phonecall_report(osv.osv): date_trunc('day',c.create_date) as create_date, avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as delay_close, avg(extract('epoch' from (c.date_open-c.create_date)))/(3600*24) as delay_open - + from crm_phonecall c where c.categ_id in (select res_id from ir_model_data where (name = 'categ_phone1' or name ='categ_phone2')) - group by + group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'),\ c.state, diff --git a/addons/crm_claim/report/crm_claim_report.py b/addons/crm_claim/report/crm_claim_report.py index 5be9d3c163b..fc99c0e91a3 100644 --- a/addons/crm_claim/report/crm_claim_report.py +++ b/addons/crm_claim/report/crm_claim_report.py @@ -45,7 +45,7 @@ class crm_claim_report(osv.osv): _name = "crm.claim.report" _auto = False _description = "CRM Claim Report" - + def _get_data(self, cr, uid, ids, field_name, arg, context={}): """ @param cr: the current row, from the database cursor, @@ -60,7 +60,7 @@ class crm_claim_report(osv.osv): for case in self.browse(cr, uid, ids, context): if field_name != 'avg_answers': state = field_name[5:] - cr.execute("select count(*) from crm_opportunity where \ + cr.execute("select count(*) from crm_lead where \ section_id =%s and state='%s'"%(case.section_id.id, state)) state_cases = cr.fetchone()[0] perc_state = (state_cases / float(case.nbr)) * 100 @@ -99,7 +99,7 @@ class crm_claim_report(osv.osv): ('11', 'November'), ('12', 'December')], 'Month', readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True), 'create_date': fields.datetime('Create Date', readonly=True), - 'day': fields.char('Day', size=128, readonly=True), + 'day': fields.char('Day', size=128, readonly=True), 'delay_close': fields.float('Delay to close', digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"), 'stage_id': fields.many2one ('crm.case.stage', 'Stage', \ domain="[('section_id','=',section_id),\ diff --git a/addons/crm_fundraising/report/crm_fundraising_report.py b/addons/crm_fundraising/report/crm_fundraising_report.py index 5c19689257c..e6bd42456e5 100644 --- a/addons/crm_fundraising/report/crm_fundraising_report.py +++ b/addons/crm_fundraising/report/crm_fundraising_report.py @@ -36,7 +36,7 @@ class crm_fundraising_report(osv.osv): _name = "crm.fundraising.report" _auto = False _description = "CRM Fundraising Report" - + def _get_data(self, cr, uid, ids, field_name, arg, context={}): """ @param cr: the current row, from the database cursor, @@ -51,7 +51,7 @@ class crm_fundraising_report(osv.osv): for case in self.browse(cr, uid, ids, context): if field_name != 'avg_answers': state = field_name[5:] - cr.execute("select count(*) from crm_opportunity where \ + cr.execute("select count(*) from crm_lead where \ section_id =%s and state='%s'"%(case.section_id.id, state)) state_cases = cr.fetchone()[0] perc_state = (state_cases / float(case.nbr)) * 100 @@ -90,7 +90,7 @@ class crm_fundraising_report(osv.osv): ('11', 'November'), ('12', 'December')], 'Month', readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True), 'create_date': fields.datetime('Create Date', readonly=True), - 'day': fields.char('Day', size=128, readonly=True), + 'day': fields.char('Day', size=128, readonly=True), 'categ_id': fields.many2one('crm.case.categ', 'Category', \ domain="[('section_id','=',section_id),\ ('object_id.model', '=', 'crm.fundraising')]"), diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report.py b/addons/crm_helpdesk/report/crm_helpdesk_report.py index cf2578ddfaf..70e7318ff6e 100644 --- a/addons/crm_helpdesk/report/crm_helpdesk_report.py +++ b/addons/crm_helpdesk/report/crm_helpdesk_report.py @@ -52,7 +52,7 @@ class crm_helpdesk_report(osv.osv): for case in self.browse(cr, uid, ids, context): if field_name != 'avg_answers': state = field_name[5:] - cr.execute("select count(*) from crm_opportunity where \ + cr.execute("select count(*) from crm_lead where \ section_id =%s and state='%s'"%(case.section_id.id, state)) state_cases = cr.fetchone()[0] perc_state = (state_cases / float(case.nbr)) * 100 @@ -91,7 +91,7 @@ class crm_helpdesk_report(osv.osv): ('11', 'November'), ('12', 'December')], 'Month', readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True), 'create_date': fields.datetime('Create Date', readonly=True), - 'day': fields.char('Day', size=128, readonly=True), + 'day': fields.char('Day', size=128, readonly=True), 'delay_close': fields.char('Delay to close', size=20, readonly=True), 'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True), diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py index 7c867247cd0..62011b21a04 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report.py +++ b/addons/hr_recruitment/report/hr_recruitment_report.py @@ -50,7 +50,7 @@ class hr_recruitment_report(osv.osv): for case in self.browse(cr, uid, ids, context): if field_name != 'avg_answers': state = field_name[5:] - cr.execute("select count(*) from crm_opportunity where \ + cr.execute("select count(*) from crm_lead where \ section_id =%s and state='%s'"%(case.section_id.id, state)) state_cases = cr.fetchone()[0] perc_state = (state_cases / float(case.nbr)) * 100 diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py index b115b576859..1d7a7609112 100644 --- a/addons/project/report/project_report.py +++ b/addons/project/report/project_report.py @@ -33,7 +33,7 @@ class report_project_task_user(osv.osv): 'user_id':fields.many2one('res.users', 'Assigned To', readonly=True), 'date_start': fields.date('Starting Date',readonly=True), 'no_of_days': fields.integer('# of Days', size=128, readonly=True), - 'description': fields.text('Description',readonly=True), + # 'description': fields.text('Description',readonly=True), 'date_end': fields.date('Ending Date',readonly=True), 'date_deadline': fields.date('Deadline',readonly=True), 'project_id':fields.many2one('project.project', 'Project', readonly=True), @@ -104,7 +104,7 @@ class report_project_task_user(osv.osv): (extract('epoch' from (t.date_deadline-t.date_end)))/(3600*24) as delay_endings_days from project_task t - group by + group by t.id, remaining_hours, t.effective_hours, diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py index 92f170eb556..bd94627919f 100644 --- a/addons/project_issue/report/project_issue_report.py +++ b/addons/project_issue/report/project_issue_report.py @@ -26,7 +26,7 @@ class project_issue_report(osv.osv): for case in self.browse(cr, uid, ids, context): if field_name != 'avg_answers': state = field_name[5:] - cr.execute("select count(*) from crm_opportunity where \ + cr.execute("select count(*) from crm_lead where \ section_id =%s and state='%s'"%(case.section_id.id, state)) state_cases = cr.fetchone()[0] perc_state = (state_cases / float(case.nbr)) * 100 @@ -51,7 +51,7 @@ class project_issue_report(osv.osv): _columns = { 'name': fields.char('Year', size=64, required=False, readonly=True), 'user_id':fields.many2one('res.users', 'Responsible', readonly=True), - 'user_id2':fields.many2one('res.users', 'Assigned To', readonly=True), + # 'user_id2':fields.many2one('res.users', 'Assigned To', readonly=True), 'section_id':fields.many2one('crm.case.section', 'Section', readonly=True), 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True), 'avg_answers': fields.function(_get_data, string='Avg. Answers', method=True, type="integer"), @@ -81,7 +81,7 @@ class project_issue_report(osv.osv): 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 'project_id':fields.many2one('project.project', 'Project',readonly=True), 'type_id': fields.many2one('crm.case.resource.type', 'Version', domain="[('object_id.model', '=', 'project.issue')]"), - 'user_id2losed': fields.date('Close Date', readonly=True), + # 'user_id2losed': fields.date('Close Date', readonly=True), 'assigned_to' : fields.many2one('res.users', 'Assigned to',readonly=True), 'partner_id': fields.many2one('res.partner','Partner',domain="[('object_id.model', '=', 'project.issue')]"), 'canal_id': fields.many2one('res.partner.canal', 'Channel',readonly=True), @@ -147,7 +147,7 @@ class project_issue_report(osv.osv): c.partner_id, c.canal_id, c.task_id - )""") + )""") project_issue_report() diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index 8c24b5000ee..98f3a2058e0 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -32,9 +32,9 @@ class sale_report(osv.osv): 'date': fields.date('Date Order', readonly=True), 'date_confirm': fields.date('Date Confirm', readonly=True), 'shipped':fields.boolean('Shipped', readonly=True), - 'paid':fields.float('Picked', readonly=True), + # 'paid':fields.float('Picked', readonly=True), 'shipped_qty_1':fields.integer('Shipped Qty', readonly=True), - 'paid_qty':fields.float('Paid Qty', readonly=True), + # 'paid_qty':fields.float('Paid Qty', readonly=True), 'year': fields.char('Year', size=4, readonly=True), 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), @@ -42,8 +42,8 @@ class sale_report(osv.osv): 'day': fields.char('Day', size=128, readonly=True), 'product_id':fields.many2one('product.product', 'Product', readonly=True), - 'uom_id': fields.many2one('product.uom', 'Default Unit Of Measure', readonly=True), - 'product_qty':fields.float('# of Qty', readonly=True), + # 'uom_id': fields.many2one('product.uom', 'Default Unit Of Measure', readonly=True), + # 'product_qty':fields.float('# of Qty', readonly=True), 'uom_name': fields.char('Default UoM', size=128, readonly=True), 'product_uom_qty':fields.float('# of Qty', readonly=True),