diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml index 8a421e3cb36..047d563cc58 100644 --- a/addons/account/report/account_analytic_entries_report_view.xml +++ b/addons/account/report/account_analytic_entries_report_view.xml @@ -1,32 +1,6 @@ - - analytic.entries.report.tree - analytic.entries.report - - - - - - - - - - - - - - - - - - - - - - - analytic.entries.report.search analytic.entries.report @@ -58,8 +32,8 @@ account.analytic.entries.graph analytic.entries.report - - + + @@ -69,7 +43,7 @@ Analytic Entries Analysis analytic.entries.report form - tree,graph + graph {'search_default_year':1,'search_default_month':1, 'group_by_no_leaf':1, 'search_default_Account':1, 'search_default_Month':1, 'group_by':[]} From this view, have an analysis of your different analytic entries following the analytic account you defined matching your business need. Use the tool search to analyse information about analytic entries generated in the system. diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml index 66959051ea4..2d1af681062 100644 --- a/addons/account/report/account_entries_report_view.xml +++ b/addons/account/report/account_entries_report_view.xml @@ -38,8 +38,8 @@ account.entries.report.graph account.entries.report - - + + @@ -103,9 +103,9 @@ Entries Analysis account.entries.report form - tree,graph + graph - + {'group_by':[], 'search_default_usertype':1, 'search_default_thisyear':1, 'group_by_no_leaf':1} From this view, have an analysis of your different financial accounts. The document shows your debit and credit taking in consideration some criteria you can choose by using the search tool. diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index 47ce75b4d61..67d568801b7 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -1,47 +1,14 @@ - - account.invoice.report.tree - account.invoice.report - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - account.invoice.report.graph account.invoice.report - - - + + + + @@ -72,7 +39,7 @@ - + @@ -92,8 +59,8 @@ Invoices Analysis account.invoice.report form - tree,graph - {'search_default_period':1,'search_default_current':1, 'search_default_year': 1, 'search_default_category_product':1, 'search_default_customer':1, 'group_by':[], 'group_by_no_leaf':1,} + graph + {'search_default_current':1, 'search_default_year': 1, 'search_default_customer':1, 'group_by':[], 'group_by_no_leaf':1,} From this report, you can have an overview of the amount invoiced to your customer. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs. diff --git a/addons/account/report/account_treasury_report_view.xml b/addons/account/report/account_treasury_report_view.xml index be6ae0dfdc9..fe898cd81ce 100644 --- a/addons/account/report/account_treasury_report_view.xml +++ b/addons/account/report/account_treasury_report_view.xml @@ -22,9 +22,9 @@ account.treasury.report.graph account.treasury.report - - - + + + @@ -43,9 +43,9 @@ Treasury Analysis account.treasury.report form - tree,graph + graph - + {'group_by':[], 'group_by_no_leaf':0} From this view, have an analysis of your treasury. It sums the balance of every accounting entries made on liquidity accounts per period. diff --git a/addons/account_asset/report/account_asset_report_view.xml b/addons/account_asset/report/account_asset_report_view.xml index c0055773bea..4655172572c 100644 --- a/addons/account_asset/report/account_asset_report_view.xml +++ b/addons/account_asset/report/account_asset_report_view.xml @@ -2,33 +2,11 @@ - - asset.asset.report.tree - asset.asset.report - - - - - - - - - - - - - - - - - - - asset.asset.report.graph asset.asset.report - + @@ -69,7 +47,7 @@ Assets Analysis asset.asset.report form - tree,graph + graph {'search_default_year':1,'search_default_this_month':1,'search_default_asset_category':1, 'search_default_posted':1, 'group_by':[], 'group_by_no_leaf':1} diff --git a/addons/account_followup/report/account_followup_report.xml b/addons/account_followup/report/account_followup_report.xml index 7f9ea48010b..e435e58da7b 100644 --- a/addons/account_followup/report/account_followup_report.xml +++ b/addons/account_followup/report/account_followup_report.xml @@ -2,33 +2,13 @@ - - account_followup.stat.tree - account_followup.stat - - - - - - - - - - - - - - - - - account_followup.stat.graph account_followup.stat - - - + + + @@ -60,7 +40,7 @@ Follow-ups Sent account_followup.stat form - tree,graph + graph {'search_default_followup_level':1} diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml index d0f696c2f7e..38b5423a7d6 100644 --- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml +++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml @@ -2,7 +2,7 @@ - + sale.receipt.report.graph sale.receipt.report - + - + @@ -77,7 +77,7 @@ Sales Receipts Analysis sale.receipt.report form - tree,graph + graph {'search_default_year':1,'search_default_month':1,'search_default_current':1, 'search_default_partner':1, 'search_default_customer':1, 'group_by':[], 'group_by_no_leaf':1,} diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml index 8bbbece18cb..27e835f1594 100644 --- a/addons/crm/board_crm_view.xml +++ b/addons/crm/board_crm_view.xml @@ -6,9 +6,8 @@ Opportunities By Stage - Graph crm.lead.report - - - + + @@ -29,10 +28,10 @@ Opportunities By Stage Per User - Graph crm.lead.report - - - - + + + + diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 66f1e33c3a9..c728404d9ce 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -207,8 +207,8 @@ crm.lead - - + + diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py index ac1e10a84c6..871bef2099d 100644 --- a/addons/crm/report/crm_lead_report.py +++ b/addons/crm/report/crm_lead_report.py @@ -43,21 +43,11 @@ class crm_lead_report(osv.osv): _name = "crm.lead.report" _auto = False _description = "CRM Lead Analysis" - _rec_name = 'deadline_day' + _rec_name = 'date_deadline' _columns = { - # grouping fields based on Deadline Date - 'deadline_year': fields.char('Ex. Closing Year', size=10, readonly=True, help="Expected closing year"), - 'deadline_month':fields.selection(MONTHS, 'Exp. Closing Month', readonly=True, help="Expected closing month"), - 'deadline_day': fields.char('Exp. Closing Day', size=10, readonly=True, help="Expected closing day"), - - # grouping fields based on Create Date - 'creation_year': fields.char('Creation Year', size=10, readonly=True, help="Creation year"), - 'creation_month': fields.selection(MONTHS, 'Creation Month', readonly=True, help="Creation month"), - 'creation_day': fields.char('Creation Day', size=10, readonly=True, help="Creation day"), - - # other date fields - 'create_date': fields.datetime('Create Date', readonly=True), + 'date_deadline': fields.date('Exp. Closing', size=10, readonly=True, help="Expected Closing"), + 'create_date': fields.datetime('Creation Date', readonly=True), 'opening_date': fields.date('Assignation Date', readonly=True), 'date_closed': fields.date('Close Date', readonly=True), 'date_last_stage_update': fields.datetime('Last Stage Update', readonly=True), @@ -78,7 +68,6 @@ class crm_lead_report(osv.osv): 'probable_revenue': fields.float('Probable Revenue', digits=(16,2),readonly=True), 'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True, domain="[('section_ids', '=', section_id)]"), 'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True), - 'nbr': fields.integer('# of Cases', readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True), 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 'type':fields.selection([ @@ -98,9 +87,7 @@ class crm_lead_report(osv.osv): CREATE OR REPLACE VIEW crm_lead_report AS ( SELECT id, - to_char(c.date_deadline, 'YYYY') as deadline_year, - to_char(c.date_deadline, 'MM') as deadline_month, - to_char(c.date_deadline, 'YYYY-MM-DD') as deadline_day, + c.date_deadline, to_char(c.create_date, 'YYYY') as creation_year, to_char(c.create_date, 'MM') as creation_month, @@ -124,7 +111,6 @@ class crm_lead_report(osv.osv): c.country_id, c.planned_revenue, c.planned_revenue*(c.probability/100) as probable_revenue, - 1 as nbr, date_trunc('day',c.create_date) as create_date, extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as delay_close, abs(extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24)) as delay_expected, diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index c7220fe66f2..f25cfa1f4b1 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -2,47 +2,15 @@ - - - - crm.lead.report.tree - crm.lead.report - - - - - - - - - - - - - - - - - - - - - - - - - crm.lead.report.graph crm.lead.report - - - - + + + @@ -51,10 +19,11 @@ crm.opportunity.report.graph crm.lead.report - - - - + + + + + @@ -98,84 +67,45 @@ - + - + - - - + + + + + domain="[]" context="{'group_by':'date_deadline'}"/> - - - - crm.lead.report.tree - crm.lead.report - - - - - - - - - - - - - - - - - - - - - - - - - - - - Leads Analysis crm.lead.report form - {'search_default_year': 1, "search_default_user":1, "search_default_month":1, 'group_by_no_leaf':1, 'group_by':[]} - tree,graph + graph [('type','=', 'lead')] Leads Analysis allows you to check different CRM related information like the treatment delays or number of leads per state. You can sort out your leads analysis by different groups to get accurate grained analysis. - - - tree - - - graph @@ -187,19 +117,11 @@ Opportunities Analysis crm.lead.report form - {"search_default_year":1, "search_default_user":1,"search_default_month":1,'group_by_no_leaf':1,'group_by':[]} - tree,graph + graph [('type','=', 'opportunity')] Opportunities Analysis gives you an instant access to your opportunities with information such as the expected revenue, planned cost, missed deadlines or the number of interactions per opportunity. This report is mainly used by the sales manager in order to do the periodic review with the teams of the sales pipeline. - - - tree - - - - graph diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml index 52ecd2d13b3..9de9adeade3 100644 --- a/addons/crm/report/crm_phonecall_report_view.xml +++ b/addons/crm/report/crm_phonecall_report_view.xml @@ -2,42 +2,16 @@ - - - - crm.phonecall.report.tree - crm.phonecall.report - - - - - - - - - - - - - - - - - - - - crm.phonecall.report.graph crm.phonecall.report - - - - + + + + @@ -92,20 +66,13 @@ Phone Calls Analysis crm.phonecall.report form - tree,graph + graph {"search_default_year":1,"search_default_Salesperson":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]} - + From this report, you can analyse the performance of your sales team, based on their phone calls. You can group or filter the information according to several criteria and drill down the information, by adding more groups in the report. - - - tree - - - - graph diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml index 965c4b5bffc..710603af10a 100644 --- a/addons/crm_claim/report/crm_claim_report_view.xml +++ b/addons/crm_claim/report/crm_claim_report_view.xml @@ -2,42 +2,16 @@ - - - - crm.claim.report.tree - crm.claim.report - - - - - - - - - - - - - - - - - - - - - crm.claim.report.graph crm.claim.report - - - + + + + @@ -93,20 +67,13 @@ Claims Analysis crm.claim.report form - tree,graph + graph {"search_default_year":1,"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]} - + Have a general overview of all claims processed in the system by sorting them with specific criteria. - - - tree - - - - graph diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml index c1ffc00303d..4a3ee4e92e3 100644 --- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml +++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml @@ -2,43 +2,16 @@ - - - - crm.helpdesk.report.tree - crm.helpdesk.report - - - - - - - - - - - - - - - - - - - - - - crm.helpdesk.report.graph crm.helpdesk.report - - - - + + + + @@ -90,20 +63,13 @@ Helpdesk Analysis crm.helpdesk.report form - tree,graph + graph {"search_default_year":1,"search_default_User":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]} - + Have a general overview of all support requests by sorting them with specific criteria such as the processing time, number of requests answered, emails sent and costs. - - - tree - - - - graph diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml index 3811832020d..a7ff8d80f0f 100644 --- a/addons/crm_partner_assign/report/crm_lead_report_view.xml +++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml @@ -50,44 +50,13 @@ crm.lead.assign.graph crm.lead.report.assign - - - + + + - - crm.lead.assign.report.tree - crm.lead.report.assign - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -95,17 +64,10 @@ crm.lead.report.assign form {'default_type': 'opportunity', "search_default_group_partner_date": 1, "search_default_group_grade":1,'group_by_no_leaf':1,'group_by':[]} - tree + graph [('type', '=', 'opportunity')] - - - tree - - - - graph diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml index 4f4fbd05109..f48722bfea6 100644 --- a/addons/event/board_association_view.xml +++ b/addons/event/board_association_view.xml @@ -7,10 +7,8 @@ report.event.registration - - - - + + diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 4042efbe48c..4b4570fd27a 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -424,9 +424,9 @@ Registration Graph event.registration - - - + + + diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py index 0e33e892432..23ab2f26305 100644 --- a/addons/event/report/report_event_registration.py +++ b/addons/event/report/report_event_registration.py @@ -27,12 +27,7 @@ class report_event_registration(osv.osv): _description = "Events Analysis" _auto = False _columns = { - 'event_date': fields.char('Event Start Date', size=64, 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'), ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), + 'event_date': fields.datetime('Event Date', readonly=True), 'event_id': fields.many2one('event.event', 'Event', required=True), 'draft_state': fields.integer(' # No of Draft Registrations', size=20), 'confirm_state': fields.integer(' # No of Confirmed Registrations', size=20), @@ -65,9 +60,7 @@ class report_event_registration(osv.osv): r.name AS name_registration, e.company_id AS company_id, e.main_speaker_id AS speaker_id, - to_char(e.date_begin, 'YYYY-MM-DD') AS event_date, - to_char(e.date_begin, 'YYYY') AS year, - to_char(e.date_begin, 'MM') AS month, + e.date_begin AS event_date, count(e.id) AS nbevent, CASE WHEN r.state IN ('draft') THEN r.nb_register ELSE 0 END AS draft_state, CASE WHEN r.state IN ('open','done') THEN r.nb_register ELSE 0 END AS confirm_state, @@ -92,8 +85,6 @@ class report_event_registration(osv.osv): event_state, e.company_id, e.main_speaker_id, - year, - month, e.register_max, name_registration ) diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml index 249757efbd3..c6c2191c9c0 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -2,41 +2,15 @@ - - - report.event.registration.tree - report.event.registration - - - - - - - - - - - - - - - - - - - - - - report.event.registration.graph report.event.registration - - - - - + + + + + @@ -68,9 +42,9 @@ - - - + + + Events Analysis report.event.registration form - tree,graph + graph - {"search_default_year":1,"search_default_this_month":1,"search_default_365day":1, "search_default_invoiced":1, "search_default_event":1, "group_by_no_leaf":1, "group_by":[]} - - - - - tree - - + {"group_by_no_leaf":1, "group_by":[]} diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index a0ced74a509..db38821b56e 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -504,12 +504,11 @@ fleet.vehicle.log.contract.graph fleet.vehicle.log.contract - - - - - + + + + @@ -586,12 +585,10 @@ fleet.vehicle.odometer.graph fleet.vehicle.odometer - - - - - + + + @@ -694,12 +691,10 @@ fleet.vehicle.log.fuel.graph fleet.vehicle.log.fuel - - - - + + @@ -789,10 +784,10 @@ fleet.vehicle.log.services.graph fleet.vehicle.log.services - - - - + + + + @@ -920,10 +915,10 @@ fleet.vehicle.cost.graph fleet.vehicle.cost - - - - + + + + diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml index d4907c90f11..456b5ab72f9 100644 --- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml +++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml @@ -2,37 +2,14 @@ - - hr.evaluation.report.tree - hr.evaluation.report - - - - - - - - - - - - - - - - - - - hr.evaluation.report.graph hr.evaluation.report - - - - + + + + @@ -70,7 +47,7 @@ Appraisal Analysis hr.evaluation.report form - tree,graph + graph {'search_default_year':1,'search_default_month':1,'search_default_employee':1,'group_by_no_leaf':1,'group_by':[]} diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml index be1588f3c3b..45a72fa0630 100644 --- a/addons/hr_expense/report/hr_expense_report_view.xml +++ b/addons/hr_expense/report/hr_expense_report_view.xml @@ -2,41 +2,14 @@ - - hr.expense.report.tree - hr.expense.report - - - - - - - - - - - - - - - - - - - - - - - - hr.expense.report.graph hr.expense.report - - - - + + + + @@ -79,7 +52,7 @@ Expenses Analysis hr.expense.report form - tree,graph + graph {'search_default_year':1,'search_default_month':1,'search_default_employee':1,'group_by_no_leaf':1,'group_by':[]} diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml index e7441060204..b288db30572 100644 --- a/addons/hr_holidays/report/available_holidays_view.xml +++ b/addons/hr_holidays/report/available_holidays_view.xml @@ -2,13 +2,26 @@ + + hr.holidays.report_graph + hr.holidays + 20 + + + + + + + + + + Leaves Analysis hr.holidays form - tree,form + graph - {'search_default_year':1, 'search_default_This Month':1, 'search_default_group_employee': 1, 'search_default_group_type': 1} [('holiday_type','=','employee')] diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml index 8af7075f109..88438d52869 100644 --- a/addons/hr_holidays/report/hr_holidays_report_view.xml +++ b/addons/hr_holidays/report/hr_holidays_report_view.xml @@ -18,10 +18,10 @@ hr.holidays.remaining.leaves.user.graph hr.holidays.remaining.leaves.user - - - - + + + + diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 244ee6dabd2..18b9caa23ac 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -162,10 +162,10 @@ Jobs - Recruitment Graph hr.applicant - - - - + + + + diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py index 908b701d928..e83b0d2cc3e 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report.py +++ b/addons/hr_recruitment/report/hr_recruitment_report.py @@ -34,18 +34,8 @@ class hr_recruitment_report(osv.Model): _columns = { 'user_id': fields.many2one('res.users', 'User', readonly=True), - 'nbr': fields.integer('# of Applications', readonly=True), - # TDE TODO: use MONTHS - '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), 'company_id': fields.many2one('res.company', 'Company', readonly=True), - 'day': fields.char('Day', size=128, readonly=True), - 'year': fields.char('Year', size=4, readonly=True), - 'date_create': fields.date('Create Date', readonly=True), + 'date_create': fields.datetime('Create Date', readonly=True), 'date_last_stage_update': fields.datetime('Last Stage Update', readonly=True), 'date_closed': fields.date('Closed', readonly=True), 'job_id': fields.many2one('hr.job', 'Applied Job',readonly=True), @@ -70,7 +60,7 @@ class hr_recruitment_report(osv.Model): create or replace view hr_recruitment_report as ( select min(s.id) as id, - date_trunc('day',s.create_date) as date_create, + s.create_date as date_create, date_trunc('day',s.date_closed) as date_closed, date_trunc('day',s.date_last_stage_update) as date_last_stage_update, to_char(s.create_date, 'YYYY') as year, @@ -94,9 +84,6 @@ class hr_recruitment_report(osv.Model): count(*) as nbr from hr_applicant s group by - to_char(s.create_date, 'YYYY'), - to_char(s.create_date, 'MM'), - to_char(s.create_date, 'YYYY-MM-DD') , date_trunc('day',s.create_date), date_trunc('day',s.date_closed), s.date_open, @@ -117,3 +104,5 @@ class hr_recruitment_report(osv.Model): """) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + + diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml index d24e406bc0c..c214b2efa75 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml +++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml @@ -1,43 +1,14 @@ - - hr.recruitment.report.tree - hr.recruitment.report - - - - - - - - - - - - - - - - - - - - - - - - - - - hr.recruitment.report.graph hr.recruitment.report - - - + + + + @@ -72,9 +43,10 @@ - - - + + + + @@ -84,8 +56,8 @@ Recruitment Analysis hr.recruitment.report form - tree,graph - {'search_default_year':1,'search_default_month':1,'search_default_department':1,'group_by_no_leaf':1,'group_by':[]} + graph + {'group_by_no_leaf':1,'group_by':[]} diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py index f2e589d969e..6105271be77 100644 --- a/addons/hr_timesheet/__openerp__.py +++ b/addons/hr_timesheet/__openerp__.py @@ -49,8 +49,6 @@ up a management by affair. 'hr_timesheet_report.xml', 'hr_timesheet_wizard.xml', 'process/hr_timesheet_process.xml', - 'wizard/hr_timesheet_print_employee_view.xml', - 'wizard/hr_timesheet_print_users_view.xml', 'wizard/hr_timesheet_sign_in_out_view.xml', 'hr_timesheet_installer.xml', 'hr_timesheet_data.xml' @@ -59,7 +57,6 @@ up a management by affair. 'test': [ 'test/hr_timesheet_users.yml', 'test/test_hr_timesheet.yml', - 'test/hr_timesheet_report.yml', 'test/hr_timesheet_demo.yml', ], 'installable': True, diff --git a/addons/hr_timesheet/test/hr_timesheet_report.yml b/addons/hr_timesheet/test/hr_timesheet_report.yml deleted file mode 100644 index ec8a8954cca..00000000000 --- a/addons/hr_timesheet/test/hr_timesheet_report.yml +++ /dev/null @@ -1,23 +0,0 @@ -- - Print the HR Timesheet By Employee report through the wizard -- - !python {model: hr.employee}: | - import os, time - from openerp import netsvc, tools - ctx={} - ctx.update({'model': 'hr.employee','active_ids': []}) - data_dict = {'month': time.gmtime()[1], 'year': time.gmtime()[0], 'employee_id' : ref('hr.employee_fp')} - from openerp.tools import test_reports - test_reports.try_report_action(cr, uid, 'action_hr_timesheet_employee',wiz_data=data_dict, context=ctx, our_module='hr_timesheet') - -- - Print the HR Timesheet By Employee report through the wizard -- - !python {model: hr.employee}: | - import os, time - from openerp import netsvc, tools - ctx={} - ctx.update({'model': 'hr.employee','active_ids': []}) - data_dict = {'month': time.gmtime()[1], 'year': time.gmtime()[0], 'employee_ids' : [(6,0,[ref('hr.employee_fp'),ref('hr.employee_qdp'),ref('hr.employee_al')])]} - from openerp.tools import test_reports - test_reports.try_report_action(cr, uid, 'action_hr_timesheet_users',wiz_data=data_dict, context=ctx, our_module='hr_timesheet') diff --git a/addons/hr_timesheet/wizard/__init__.py b/addons/hr_timesheet/wizard/__init__.py index 5f2bc1443e3..8b73cf62f43 100644 --- a/addons/hr_timesheet/wizard/__init__.py +++ b/addons/hr_timesheet/wizard/__init__.py @@ -20,8 +20,6 @@ ############################################################################## import hr_timesheet_sign_in_out -import hr_timesheet_print_employee -import hr_timesheet_print_users # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py deleted file mode 100644 index efffa6acd5f..00000000000 --- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py +++ /dev/null @@ -1,66 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## -import datetime - -from openerp.osv import fields, osv -from openerp.tools.translate import _ - -class analytical_timesheet_employee(osv.osv_memory): - _name = 'hr.analytical.timesheet.employee' - _description = 'Print Employee Timesheet & Print My Timesheet' - _columns = { - 'month': fields.selection([(1,'January'), (2,'February'), (3,'March'), (4,'April'), - (5,'May'), (6,'June'), (7,'July'), (8,'August'), (9,'September'), - (10,'October'), (11,'November'), (12,'December')], 'Month', required=True), - 'year': fields.integer('Year', required=True), - 'employee_id': fields.many2one('hr.employee', 'Employee', required=True) - - } - - def _get_user(self, cr, uid, context=None): - - emp_obj = self.pool.get('hr.employee') - emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)], context=context) - if not emp_id: - raise osv.except_osv(_("Warning!"), _("Please define employee for this user!")) - return emp_id and emp_id[0] or False - - _defaults = { - 'month': lambda *a: datetime.date.today().month, - 'year': lambda *a: datetime.date.today().year, - 'employee_id': _get_user - } - - def print_report(self, cr, uid, ids, context=None): - data = self.read(cr, uid, ids, context=context)[0] - data['employee_id'] = data['employee_id'][0] - datas = { - 'ids': [], - 'model': 'hr.employee', - 'form': data - } - return { - 'type': 'ir.actions.report.xml', - 'report_name': 'hr.analytical.timesheet', - 'datas': datas, - } - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml deleted file mode 100644 index 3603809990b..00000000000 --- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - hr.analytical.timesheet.employee.form - hr.analytical.timesheet.employee - -
- - - - - -
-
-
- - - - - Employee Timesheet - hr.analytical.timesheet.employee - form - tree,form - - new - - - - - - diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users.py b/addons/hr_timesheet/wizard/hr_timesheet_print_users.py deleted file mode 100644 index d7dda927111..00000000000 --- a/addons/hr_timesheet/wizard/hr_timesheet_print_users.py +++ /dev/null @@ -1,56 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -import datetime - -from openerp.osv import fields, osv - -class analytical_timesheet_employees(osv.osv_memory): - _name = 'hr.analytical.timesheet.users' - _description = 'Print Employees Timesheet' - _columns = { - 'month': fields.selection([(1,'January'), (2,'February'), (3,'March'), (4,'April'), - (5,'May'), (6,'June'), (7,'July'), (8,'August'), (9,'September'), - (10,'October'), (11,'November'), (12,'December')], 'Month', required=True), - 'year': fields.integer('Year', required=True), - 'employee_ids': fields.many2many('hr.employee', 'timesheet_employee_rel', 'timesheet_id', 'employee_id', 'employees', required=True) - } - - _defaults = { - 'month': lambda *a: datetime.date.today().month, - 'year': lambda *a: datetime.date.today().year, - } - - def print_report(self, cr, uid, ids, context=None): - data = self.read(cr, uid, ids, context=context)[0] - datas = { - 'ids': [], - 'model': 'hr.employee', - 'form': data - } - return { - 'type': 'ir.actions.report.xml', - 'report_name': 'hr.analytical.timesheet_users', - 'datas': datas, - } - - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml deleted file mode 100644 index 93015a76503..00000000000 --- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - hr.analytical.timesheet.users.form - hr.analytical.timesheet.users - -
- - - - - - - -
-
-
- - - - - Employees Timesheet - hr.analytical.timesheet.users - form - tree,form - - new - - - - - - diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py index 61c2b9e53da..e15ae99ab5a 100644 --- a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py +++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py @@ -29,11 +29,6 @@ class hr_timesheet_report(osv.osv): _description = "Timesheet" _auto = False _columns = { - 'year': fields.char('Year',size=64,required=False, readonly=True), - 'day': fields.char('Day', size=128, 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), 'date': fields.date('Date', readonly=True), 'name': fields.char('Description', size=64,readonly=True), 'product_id' : fields.many2one('product.product', 'Product',readonly=True), @@ -53,9 +48,6 @@ class hr_timesheet_report(osv.osv): select min(t.id) as id, l.date as date, - to_char(l.date, 'YYYY-MM-DD') as day, - to_char(l.date,'YYYY') as year, - to_char(l.date,'MM') as month, sum(l.amount) as cost, sum(l.unit_amount) as quantity, l.account_id as account_id, diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml index 9ee55f9c9f5..5e2ca249d7d 100644 --- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml @@ -5,37 +5,19 @@ hr.timesheet.report.graph hr.timesheet.report - - - + + + + - - hr.timesheet.report.tree - hr.timesheet.report - - - - - - - - - - - - - - - - - hr.timesheet.report.search hr.timesheet.report + @@ -51,9 +33,9 @@ - - - + + + @@ -63,8 +45,8 @@ Timesheet Analysis hr.timesheet.report form - tree,graph - {'search_default_year':1,'search_default_month':1,'search_default_group_user_id':1,'group_by_no_leaf':1,'group_by':[]} + graph + {'search_default_month':1,'search_default_group_user_id':1,'group_by_no_leaf':1,'group_by':[]}

This report performs analysis on timesheets created by your diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml index ddc66260cf0..47854b1f2fd 100644 --- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml @@ -5,41 +5,13 @@ timesheet.report.graph timesheet.report - - - - + + + + - - timesheet.report.tree - timesheet.report - - - - - - - - - - - - - - - - - - - - - - - - - timesheet.report.search timesheet.report @@ -80,7 +52,7 @@ Timesheet Sheet Analysis timesheet.report form - tree,graph + graph {'search_default_year':1,'search_default_month':1,'search_default_User_id':1,'group_by_no_leaf':1,'group_by':[]} diff --git a/addons/mass_mailing/mass_mailing.py b/addons/mass_mailing/mass_mailing.py index 4f59994d4a6..516e68db3d9 100644 --- a/addons/mass_mailing/mass_mailing.py +++ b/addons/mass_mailing/mass_mailing.py @@ -180,18 +180,6 @@ class MassMailing(osv.Model): results for the next 6 days following the mass mailing date. """ obj = self.pool['mail.mail.statistics'] res = {} - context['datetime_format'] = { - 'opened': { - 'interval': 'day', - 'groupby_format': 'yyyy-mm-dd', - 'display_format': 'dd MMMM YYYY' - }, - 'replied': { - 'interval': 'day', - 'groupby_format': 'yyyy-mm-dd', - 'display_format': 'dd MMMM YYYY' - }, - } for id in ids: res[id] = {} date_begin = datetime.strptime(self.browse(cr, uid, id, context=context).date, tools.DEFAULT_SERVER_DATETIME_FORMAT) @@ -199,9 +187,9 @@ class MassMailing(osv.Model): date_begin_str = date_begin.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT) date_end_str = date_end.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT) domain = [('mass_mailing_id', '=', id), ('opened', '>=', date_begin_str), ('opened', '<=', date_end_str)] - res[id]['opened_monthly'] = self.__get_bar_values(cr, uid, id, obj, domain, ['opened'], 'opened_count', 'opened', context=context) + res[id]['opened_monthly'] = self.__get_bar_values(cr, uid, id, obj, domain, ['opened'], 'opened_count', 'opened:day', context=context) domain = [('mass_mailing_id', '=', id), ('replied', '>=', date_begin_str), ('replied', '<=', date_end_str)] - res[id]['replied_monthly'] = self.__get_bar_values(cr, uid, id, obj, domain, ['replied'], 'replied_count', 'replied', context=context) + res[id]['replied_monthly'] = self.__get_bar_values(cr, uid, id, obj, domain, ['replied'], 'replied_count', 'replied:day', context=context) return res def _get_statistics(self, cr, uid, ids, name, arg, context=None): diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml index 99dcc73ceba..bfbdcefca5d 100644 --- a/addons/membership/report/report_membership_view.xml +++ b/addons/membership/report/report_membership_view.xml @@ -2,32 +2,6 @@ - - - - report.membership.tree - report.membership - - - - - - - - - - - - - - - - - - - - - report.membership.search report.membership @@ -63,11 +37,9 @@ report.membership.graph1 report.membership - - - - - + + + @@ -80,14 +52,6 @@ {"search_default_year":1,"search_default_member":1, 'search_default_Revenue':1, 'search_default_this_month':1, 'search_default_salesman':1,'group_by_no_leaf':1} - - - tree - - - - - graph diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml index 9b8587349bc..4fb6bb18a3f 100644 --- a/addons/mrp_operations/mrp_operations_view.xml +++ b/addons/mrp_operations/mrp_operations_view.xml @@ -328,9 +328,8 @@ mrp.production.workcenter.line - - - + + diff --git a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml index de486face78..144bfb95c63 100644 --- a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml +++ b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml @@ -4,36 +4,13 @@ - - - mrp.workorder.tree - mrp.workorder - - - - - - - - - - - - - - - - - - - mrp.workorder.graph mrp.workorder - - - + + + @@ -65,19 +42,12 @@ Work Order mrp.workorder form - graph,tree - + graph + {'search_default_Workcenter': 1,'search_default_year':1,'search_default_month':1,'group_by_no_leaf':1,'group_by':[]} - - - tree - - - - graph diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 38e8fc9fdef..08738227f5a 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -591,9 +591,8 @@ project.task - - - + + diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml index 9b9490f0b28..8886ae17505 100644 --- a/addons/project/report/project_cumulative.xml +++ b/addons/project/report/project_cumulative.xml @@ -2,31 +2,14 @@ - - project.task.history.cumulative.tree - project.task.history.cumulative - - - - - - - - - - - - - project.task.history.cumulative.graph project.task.history.cumulative - - - - - + + + + @@ -56,7 +39,7 @@ Cumulative Flow project.task.history.cumulative form - graph,tree + graph {"search_default_open":1, "search_default_this_month": 1} diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index d5638e332a4..6fb4e24e7ad 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -6,47 +6,13 @@ groups="project.group_project_manager" parent="base.menu_reporting" sequence="25"/> - - report.project.task.user.tree - report.project.task.user - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - report.project.task.user.graph report.project.task.user - - - - + + + @@ -91,7 +57,7 @@ Tasks Analysis report.project.task.user form - tree,graph + graph {'search_default_year':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]} This report allows you to analyse the performance of your projects and users. You can analyse the quantities of tasks, the hours spent compared to the planned hours, the average number of days to open or close a task, etc. diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml index f9ca7168841..ad6d6688d1e 100644 --- a/addons/project_issue/report/project_issue_report_view.xml +++ b/addons/project_issue/report/project_issue_report_view.xml @@ -1,44 +1,14 @@ - - - project.issue.report.tree - project.issue.report - - - - - - - - - - - - - - - - - - - - - - - - - - project.issue.report.graph project.issue.report - - - - + + + + @@ -81,20 +51,13 @@ Issues Analysis project.issue.report form - graph,tree + graph {'search_default_year':1,'search_default_This Month':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]} - + This report on the project issues allows you to analyse the quality of your support or after-sales services. You can track the issues per age. You can analyse the time required to open or close an issue, the number of email to exchange and the time spent on average by issues. - - - - tree - - - graph diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml index 58270f0ccd1..baaf2f8312c 100644 --- a/addons/purchase/report/purchase_report_view.xml +++ b/addons/purchase/report/purchase_report_view.xml @@ -5,46 +5,13 @@ product.month.graph purchase.report - - - + + + - - purchase.order.tree - purchase.report - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - report.purchase.order.search purchase.report @@ -113,8 +80,8 @@ Purchase Analysis purchase.report form - tree,graph - + graph + {'search_default_year':1,'search_default_month':1,'search_default_group_partner_id':1,'search_default_group_product_id': 1, 'search_default_orders': 1, 'group_by_no_leaf':1,'group_by':[]} Purchase Analysis allows you to easily check and analyse your company purchase history and performance. From this menu you can track your negotiation performance, the delivery performance of your suppliers, etc. @@ -123,7 +90,7 @@ Total Qty and Amount by month purchase.report form - graph,tree + graph @@ -131,7 +98,7 @@ Total Orders by User per month purchase.report form - graph,tree + graph @@ -144,7 +111,7 @@ Receptions Analysis report.stock.move form - tree,graph + graph {'full':'1','contact_display': 'partner','search_default_done':1, 'search_default_month':1, 'search_default_group_type':1, 'group_by': [], 'group_by_no_leaf':1,'search_default_year':1,} Reception Analysis allows you to easily check and analyse your company order receptions and the performance of your supplier's deliveries. diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml index 4839744c6d2..021e0c140af 100644 --- a/addons/sale/board_sale_view.xml +++ b/addons/sale/board_sale_view.xml @@ -28,8 +28,8 @@ - - + + diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index 88b4b14a36a..5d6a1cd759c 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -31,11 +31,6 @@ class sale_report(osv.osv): _columns = { 'date': fields.date('Date Order', readonly=True), 'date_confirm': fields.date('Date Confirm', 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'), - ('10', 'October'), ('11', 'November'), ('12', 'December')], 'Month', readonly=True), - 'day': fields.char('Day', size=128, readonly=True), 'product_id': fields.many2one('product.product', 'Product', readonly=True), 'product_uom': fields.many2one('product.uom', 'Unit of Measure', readonly=True), 'product_uom_qty': fields.float('# of Qty', readonly=True), @@ -71,9 +66,6 @@ class sale_report(osv.osv): count(*) as nbr, s.date_order as date, s.date_confirm as date_confirm, - to_char(s.date_order, 'YYYY') as year, - to_char(s.date_order, 'MM') as month, - to_char(s.date_order, 'YYYY-MM-DD') as day, s.partner_id as partner_id, s.user_id as user_id, s.company_id as company_id, diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 28a6f83936a..14b719ebd7a 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -2,40 +2,14 @@ - - - sale.report.tree - sale.report - - - - - - - - - - - - - - - - - - - - - - sale.report.graph sale.report - - - - + + + + @@ -48,7 +22,7 @@ - + @@ -67,9 +41,9 @@ - - - + + + @@ -79,10 +53,10 @@ Sales Analysis sale.report form - tree,graph + graph - - {'search_default_year':1,'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]} + + {'search_default_Sales':1, 'group_by_no_leaf':1,'group_by':[]} This report performs analysis on your quotations and sales orders. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application. diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 60e5c83ecf0..da1ec498e62 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -28,8 +28,8 @@ sale.order - - + + diff --git a/addons/sale_crm/report/sale_crm_account_invoice_report_view.xml b/addons/sale_crm/report/sale_crm_account_invoice_report_view.xml index 983701d9690..be2629c0c55 100644 --- a/addons/sale_crm/report/sale_crm_account_invoice_report_view.xml +++ b/addons/sale_crm/report/sale_crm_account_invoice_report_view.xml @@ -3,7 +3,9 @@ - + diff --git a/addons/sale_crm/report/sale_report_view.xml b/addons/sale_crm/report/sale_report_view.xml index 0d8243c1275..fb62468ec91 100644 --- a/addons/sale_crm/report/sale_report_view.xml +++ b/addons/sale_crm/report/sale_report_view.xml @@ -1,17 +1,6 @@ - - sale.report.tree.sale.crm - sale.report - - - - - - - - sale.report.search.sale.crm sale.report diff --git a/addons/sale_stock/report/sale_report_view.xml b/addons/sale_stock/report/sale_report_view.xml index 486cf3a7b11..5e5ab042e9a 100644 --- a/addons/sale_stock/report/sale_report_view.xml +++ b/addons/sale_stock/report/sale_report_view.xml @@ -1,17 +1,6 @@ - - sale.report.tree.sale.stock - sale.report - - - - - - - - sale.report.search.sale.stock sale.report diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml index 59e17c420b9..a1f327eab5d 100644 --- a/addons/stock/board_warehouse_view.xml +++ b/addons/stock/board_warehouse_view.xml @@ -6,10 +6,10 @@ report.stock.move.graph report.stock.move - - - - + + + + diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml index c0e301b6af0..fa578a82309 100644 --- a/addons/stock/report/report_stock_move_view.xml +++ b/addons/stock/report/report_stock_move_view.xml @@ -9,42 +9,13 @@ parent="base.menu_reporting" groups="group_stock_manager"/> - - report.stock.move.tree - report.stock.move - - - - - - - - - - - - - - - - - - - - - - - - - - report.stock.move.graph report.stock.move - - - + + + @@ -93,43 +64,20 @@ Moves Analysis report.stock.move form - tree,graph + graph {'contact_display': 'partner','search_default_done':1,'search_default_year':1, 'search_default_month':1, 'search_default_group_type':1, 'group_by': [], 'group_by_no_leaf':1,} Moves Analysis allows you to easily check and analyse your company stock moves. Use this report when you want to analyse the different routes taken by your products and inventory management performance. - - - report.stock.inventory.tree - report.stock.inventory - - - - - - - - - - - - - - - - - - - report.stock.inventory.graph report.stock.inventory - - - + + + @@ -177,7 +125,7 @@ Inventory Analysis report.stock.inventory form - tree,graph + graph {'contact_display': 'partner', 'search_default_real':1, 'search_default_year':1,'search_default_month':1, 'search_default_location_type_internal':1,'search_default_group_product':1,'group_by':[], 'group_by_no_leaf':1}