From 9edecec48f938acc0f766c09521eccb99096ca82 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Tue, 24 Dec 2013 11:26:31 +0100 Subject: [PATCH 01/51] [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon account) bzr revid: ged@openerp.com-20131224102631-gca1kk3xfh48d4bp --- addons/account/report/account_invoice_report_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index 47ce75b4d61..c7a9d097a68 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -40,8 +40,8 @@ account.invoice.report - - + + From 6474a028d2e9950ca1c2fd45e864cb568c2dcf15 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Tue, 24 Dec 2013 11:26:50 +0100 Subject: [PATCH 02/51] [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon crm) bzr revid: ged@openerp.com-20131224102650-rbekdotddbgfylcp --- addons/crm/crm_lead_view.xml | 4 ++-- addons/crm/report/crm_lead_report_view.xml | 16 ++++++++-------- addons/crm/report/crm_phonecall_report_view.xml | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 1107234b928..c110464b740 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_view.xml b/addons/crm/report/crm_lead_report_view.xml index c7220fe66f2..59cfd5f8fc6 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -39,10 +39,10 @@ crm.lead.report.graph crm.lead.report - - - - + + + + @@ -51,10 +51,10 @@ crm.opportunity.report.graph crm.lead.report - - - - + + + + diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml index 52ecd2d13b3..08428858e98 100644 --- a/addons/crm/report/crm_phonecall_report_view.xml +++ b/addons/crm/report/crm_phonecall_report_view.xml @@ -34,10 +34,10 @@ crm.phonecall.report.graph crm.phonecall.report - - - - + + + + From 323226ff3a74ffee88b43719964ec72a7c18326e Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Tue, 24 Dec 2013 11:27:06 +0100 Subject: [PATCH 03/51] [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon crm_claim) bzr revid: ged@openerp.com-20131224102706-wgwmx711355g2xmj --- addons/crm_claim/report/crm_claim_report_view.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml index 965c4b5bffc..63a3f7ea3d9 100644 --- a/addons/crm_claim/report/crm_claim_report_view.xml +++ b/addons/crm_claim/report/crm_claim_report_view.xml @@ -35,9 +35,10 @@ crm.claim.report.graph crm.claim.report - - - + + + + From 6e651f2b0590c6a84ce0aae77e417927ba39ede1 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Tue, 24 Dec 2013 11:27:19 +0100 Subject: [PATCH 04/51] [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon event) bzr revid: ged@openerp.com-20131224102719-69fmb4wc1zccjtfx --- addons/event/board_association_view.xml | 6 ++---- addons/event/event_view.xml | 6 +++--- addons/event/report/report_event_registration_view.xml | 8 +++----- 3 files changed, 8 insertions(+), 12 deletions(-) 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_view.xml b/addons/event/report/report_event_registration_view.xml index 249757efbd3..750e359292e 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -32,11 +32,9 @@ report.event.registration.graph report.event.registration - - - - - + + + From 7e6a3a7b79590dac7ae1e37f7827adc6afc4d330 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Tue, 24 Dec 2013 11:27:35 +0100 Subject: [PATCH 05/51] [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon fleet) bzr revid: ged@openerp.com-20131224102735-hvwlr0kcnb5tp9lx --- addons/fleet/fleet_view.xml | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index a0ced74a509..9b3df6f673f 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 - - - - + + + + @@ -921,9 +916,8 @@ fleet.vehicle.cost - - - + + From 48196bcad5589ec1b6856e0e45f4b9d321db37d1 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Tue, 24 Dec 2013 11:27:58 +0100 Subject: [PATCH 06/51] [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon hr_evaluation) bzr revid: ged@openerp.com-20131224102758-nrt1i8kv6y1bpl21 --- addons/hr_evaluation/report/hr_evaluation_report_view.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml index d4907c90f11..ce106b9b12a 100644 --- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml +++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml @@ -29,10 +29,10 @@ hr.evaluation.report.graph hr.evaluation.report - - - - + + + + From bb5a2662c8798bb08a56f2edb2fb591f12e5daa4 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Tue, 24 Dec 2013 11:28:13 +0100 Subject: [PATCH 07/51] [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon hr_holidays) bzr revid: ged@openerp.com-20131224102813-l818l4lp6ml5164i --- addons/hr_holidays/report/hr_holidays_report_view.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 - - - - + + + + From 2793a41cd4fdc80397510682ee7c0aed1ad304ae Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Tue, 24 Dec 2013 11:28:27 +0100 Subject: [PATCH 08/51] [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon hr_recruitment) bzr revid: ged@openerp.com-20131224102827-of7l5cds4t25g17z --- addons/hr_recruitment/hr_recruitment_view.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index abb90e8f46b..e1f00c0a854 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -160,10 +160,10 @@ Jobs - Recruitment Graph hr.applicant - - - - + + + + From b569c6de23ccb984bd827c9bf8781965e77dec63 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Tue, 24 Dec 2013 11:28:46 +0100 Subject: [PATCH 09/51] [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon membership) bzr revid: ged@openerp.com-20131224102846-ul5tyji72ai5sesb --- addons/membership/report/report_membership_view.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml index 99dcc73ceba..c825c452149 100644 --- a/addons/membership/report/report_membership_view.xml +++ b/addons/membership/report/report_membership_view.xml @@ -64,10 +64,8 @@ report.membership - - - - + + From def9e99aa44b48ddef8dd3ed3c0e2bfb7d718f73 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Tue, 24 Dec 2013 11:29:09 +0100 Subject: [PATCH 10/51] [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon mrp_operations) bzr revid: ged@openerp.com-20131224102909-cxweo8yyo67bt7su --- addons/mrp_operations/mrp_operations_view.xml | 5 ++--- .../mrp_operations/report/mrp_workorder_analysis_view.xml | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) 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..a360e2ee0d1 100644 --- a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml +++ b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml @@ -31,9 +31,9 @@ mrp.workorder.graph mrp.workorder - - - + + + From e6c2dd738b9c6eedab3073b53d52284279940bb8 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Tue, 24 Dec 2013 11:29:22 +0100 Subject: [PATCH 11/51] [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon project) bzr revid: ged@openerp.com-20131224102922-g7nbwftaktd4g2v4 --- addons/project/project_view.xml | 5 ++--- addons/project/report/project_cumulative.xml | 9 ++++----- addons/project/report/project_report_view.xml | 5 ++--- 3 files changed, 8 insertions(+), 11 deletions(-) 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..9df2eb2706e 100644 --- a/addons/project/report/project_cumulative.xml +++ b/addons/project/report/project_cumulative.xml @@ -22,11 +22,10 @@ project.task.history.cumulative.graph project.task.history.cumulative - - - - - + + + + diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index d5638e332a4..4edd710f79c 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -44,9 +44,8 @@ report.project.task.user - - - + + From ae13bea0d83538c73f1777cbab2775b696164f41 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Tue, 24 Dec 2013 11:29:42 +0100 Subject: [PATCH 12/51] [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon sale) bzr revid: ged@openerp.com-20131224102942-5g4gchmgyloo2s06 --- addons/sale/board_sale_view.xml | 4 ++-- addons/sale/report/sale_report_view.xml | 8 ++++---- addons/sale/sale_view.xml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) 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_view.xml b/addons/sale/report/sale_report_view.xml index 28a6f83936a..61a6c9e2e24 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -32,10 +32,10 @@ sale.report.graph sale.report - - - - + + + + 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 - - + + From 50f183d4ed4fe20799c85313c1795204ce6b66be Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Tue, 24 Dec 2013 11:29:50 +0100 Subject: [PATCH 13/51] [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon stock) bzr revid: ged@openerp.com-20131224102950-kz77cndltvqinzmr --- addons/stock/report/report_stock_move_view.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml index c0e301b6af0..3498f94cd0d 100644 --- a/addons/stock/report/report_stock_move_view.xml +++ b/addons/stock/report/report_stock_move_view.xml @@ -43,8 +43,8 @@ report.stock.move - - + + @@ -128,8 +128,8 @@ report.stock.inventory - - + + From 11aa391100bbacb33ea01f9277f6c6559f290de7 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Thu, 26 Dec 2013 17:16:09 +0100 Subject: [PATCH 14/51] [IMP] convert the graphs defined in the reporting dashboard of crm to the new style (addon crm) bzr revid: ged@openerp.com-20131226161609-er28iu6gs14gp7dg --- addons/crm/board_crm_view.xml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) 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 - - - - + + + + From 313519beb1b4f97a078c016b01544d61a941ea08 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Fri, 27 Dec 2013 12:26:04 +0100 Subject: [PATCH 15/51] [IMP] convert dashboard graph 'Moves analysis' to new style in graph view (addon stock) bzr revid: ged@openerp.com-20131227112604-shl0n4bbpjeal232 --- addons/stock/board_warehouse_view.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 - - - - + + + + From 939602481a802983b49d712c4ddb657da3270c47 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Fri, 27 Dec 2013 14:17:59 +0100 Subject: [PATCH 16/51] [IMP] convert fleet dashboard graph to new graph style (addon fleet) bzr revid: ged@openerp.com-20131227131759-p0wnxp01jngz15jn --- addons/fleet/fleet_view.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 9b3df6f673f..db38821b56e 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -915,8 +915,9 @@ fleet.vehicle.cost.graph fleet.vehicle.cost - - + + + From e21539cb88bb8603b111def1f33b0bb30f1498a3 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Tue, 31 Dec 2013 11:53:48 +0100 Subject: [PATCH 17/51] [IMP] removes old tree view in reporting/crm and replaces them by the new graph view in pivot mode by default (addon crm) bzr revid: ged@openerp.com-20131231105348-dzcv1rriy3dwqk54 --- addons/crm/report/crm_lead_report_view.xml | 94 ++----------------- .../crm/report/crm_phonecall_report_view.xml | 41 +------- 2 files changed, 12 insertions(+), 123 deletions(-) diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index 59cfd5f8fc6..8115e74e71b 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -2,46 +2,15 @@ - - - - crm.lead.report.tree - crm.lead.report - - - - - - - - - - - - - - - - - - - - - - - - - crm.lead.report.graph crm.lead.report - - - + + + @@ -51,9 +20,9 @@ crm.opportunity.report.graph crm.lead.report - - - + + + @@ -125,40 +94,6 @@ - - - - crm.lead.report.tree - crm.lead.report - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -166,16 +101,10 @@ 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 @@ -188,18 +117,11 @@ 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 08428858e98..9de9adeade3 100644 --- a/addons/crm/report/crm_phonecall_report_view.xml +++ b/addons/crm/report/crm_phonecall_report_view.xml @@ -2,41 +2,15 @@ - - - - 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 From 9477cacd5fd3c88862912af9143fa4fbc2755cab Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Tue, 31 Dec 2013 12:18:24 +0100 Subject: [PATCH 18/51] [IMP] removes old tree view in reporting (sales, sales_crm, sales_stock) and replaces them by the new graph view in pivot mode by default (addon sale, sale_crm, sale_stock) bzr revid: ged@openerp.com-20131231111824-1altk73m9l4iszkq --- addons/sale/report/sale_report_view.xml | 33 ++----------------- addons/sale_crm/report/sale_report_view.xml | 11 ------- addons/sale_stock/report/sale_report_view.xml | 11 ------- 3 files changed, 3 insertions(+), 52 deletions(-) diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 61a6c9e2e24..0ee7999c2e3 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -2,40 +2,13 @@ - - - sale.report.tree - sale.report - - - - - - - - - - - - - - - - - - - - - - sale.report.graph sale.report - + - @@ -79,9 +52,9 @@ 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':[]} 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_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 From 4ac8a1e0d616567d16fd3a9c2fa935402e56ea4f Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Tue, 31 Dec 2013 14:07:52 +0100 Subject: [PATCH 19/51] [IMP] removes old tree view in reporting and replaces it by the new graph view in pivot mode by default (addon crm_partner_assign) bzr revid: ged@openerp.com-20131231130752-vfoknapwtb644ldb --- .../report/crm_lead_report_view.xml | 46 ++----------------- 1 file changed, 4 insertions(+), 42 deletions(-) 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 From 5ff5cb1ababd195db3303aae85ab4248c8e5df30 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Tue, 31 Dec 2013 14:27:40 +0100 Subject: [PATCH 20/51] [IMP] removes old tree view in reporting and replaces it by the new graph view in pivot mode by default (addon purchase) bzr revid: ged@openerp.com-20131231132740-q6n82cs2tfe9pvyj --- .../purchase/report/purchase_report_view.xml | 49 +++---------------- 1 file changed, 8 insertions(+), 41 deletions(-) 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. From 9b2acc68a6eb3624c3de438fb00b057af11c7eb9 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Tue, 31 Dec 2013 14:41:35 +0100 Subject: [PATCH 21/51] [IMP] removes old tree view in reporting and replaces it by the new graph view in pivot mode by default (addon stock) bzr revid: ged@openerp.com-20131231134135-7dhme4bk792k05p1 --- .../stock/report/report_stock_move_view.xml | 60 ++----------------- 1 file changed, 4 insertions(+), 56 deletions(-) diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml index 3498f94cd0d..fa578a82309 100644 --- a/addons/stock/report/report_stock_move_view.xml +++ b/addons/stock/report/report_stock_move_view.xml @@ -9,40 +9,11 @@ parent="base.menu_reporting" groups="group_stock_manager"/> - - report.stock.move.tree - report.stock.move - - - - - - - - - - - - - - - - - - - - - - - - - - report.stock.move.graph report.stock.move - + @@ -93,41 +64,18 @@ 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} From d44df5eba852993f9f036e6b3d057d6a784dd594 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Tue, 31 Dec 2013 14:53:05 +0100 Subject: [PATCH 22/51] [IMP] removes old tree view in reporting and replaces it by the new graph view in pivot mode by default (addon mrp_operations) bzr revid: ged@openerp.com-20131231135305-4cq5vsbwlc4ecia5 --- .../report/mrp_workorder_analysis_view.xml | 36 ++----------------- 1 file changed, 3 insertions(+), 33 deletions(-) diff --git a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml index a360e2ee0d1..144bfb95c63 100644 --- a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml +++ b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml @@ -4,34 +4,11 @@ - - - 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 From 7adfd70d7e4101cbcbde9dc8f7d07d9fc9e347f7 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Tue, 31 Dec 2013 15:28:07 +0100 Subject: [PATCH 23/51] [IMP] removes old tree view in reporting and replaces it by the new graph view in pivot mode by default (addon membership) bzr revid: ged@openerp.com-20131231142807-llb4bvv9njt03ub2 --- .../report/report_membership_view.xml | 36 +------------------ 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml index c825c452149..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,7 +37,7 @@ report.membership.graph1 report.membership - + @@ -78,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 From 2505af2bc6a00992f78ac50ad59b418b151a76b1 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Tue, 31 Dec 2013 15:34:14 +0100 Subject: [PATCH 24/51] [IMP] removes old tree view in reporting and replaces it by the new graph view in pivot mode by default (addon event) bzr revid: ged@openerp.com-20131231143414-qugq5hxyw8v5yq1i --- .../report/report_event_registration_view.xml | 37 +------------------ 1 file changed, 2 insertions(+), 35 deletions(-) diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml index 750e359292e..378fc667362 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -2,37 +2,11 @@ - - - report.event.registration.tree - report.event.registration - - - - - - - - - - - - - - - - - - - - - - report.event.registration.graph report.event.registration - + @@ -82,18 +56,11 @@ 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 - - - - graph From 892e54111b4a5bbd0f262c06ec37ed00dea18fbd Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Tue, 31 Dec 2013 15:53:25 +0100 Subject: [PATCH 25/51] [IMP] removes old tree view in reporting and replaces it by the new graph view in pivot mode by default (addon project) bzr revid: ged@openerp.com-20131231145325-9rb3td76i454ptlx --- addons/project/report/project_cumulative.xml | 20 +--------- addons/project/report/project_report_view.xml | 37 +------------------ 2 files changed, 4 insertions(+), 53 deletions(-) diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml index 9df2eb2706e..8886ae17505 100644 --- a/addons/project/report/project_cumulative.xml +++ b/addons/project/report/project_cumulative.xml @@ -2,27 +2,11 @@ - - project.task.history.cumulative.tree - project.task.history.cumulative - - - - - - - - - - - - - project.task.history.cumulative.graph project.task.history.cumulative - + @@ -55,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 4edd710f79c..6fb4e24e7ad 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -6,44 +6,11 @@ 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 - + @@ -90,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. From b201e0d1110eb0204818afa0a239a9873482c22f Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Tue, 31 Dec 2013 15:59:53 +0100 Subject: [PATCH 26/51] [IMP] removes old tree view in reporting and replaces it by the new graph view in pivot mode by default (addon project_issue) bzr revid: ged@openerp.com-20131231145953-8jo2yrf64xa3hdnb --- .../report/project_issue_report_view.xml | 49 +++---------------- 1 file changed, 6 insertions(+), 43 deletions(-) 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 From 9d85be9d982761ef5ff9f0391c5bf91d7f6ef8f6 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Thu, 2 Jan 2014 09:42:27 +0100 Subject: [PATCH 27/51] [IMP] removes old tree view in reporting and replaces it by the new graph view in pivot mode by default (addon crm_claim) bzr revid: ged@openerp.com-20140102084227-3emol7pamysippq0 --- .../report/crm_claim_report_view.xml | 40 ++----------------- 1 file changed, 3 insertions(+), 37 deletions(-) diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml index 63a3f7ea3d9..710603af10a 100644 --- a/addons/crm_claim/report/crm_claim_report_view.xml +++ b/addons/crm_claim/report/crm_claim_report_view.xml @@ -2,40 +2,13 @@ - - - - crm.claim.report.tree - crm.claim.report - - - - - - - - - - - - - - - - - - - - - crm.claim.report.graph crm.claim.report - + @@ -94,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 From 041a9795bbb1aabcda1847be36c3728003d5f65b Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Thu, 2 Jan 2014 09:47:39 +0100 Subject: [PATCH 28/51] [IMP] removes old tree view in reporting and replaces it by the new graph view in pivot mode by default (addon crm_helpdesk) bzr revid: ged@openerp.com-20140102084739-l4lqem7hzgnll8lo --- .../report/crm_helpdesk_report_view.xml | 46 +++---------------- 1 file changed, 6 insertions(+), 40 deletions(-) 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 From 8135ef70f34d9a9887f0227d349ba940e25532d5 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Thu, 2 Jan 2014 10:00:22 +0100 Subject: [PATCH 29/51] [IMP] removes old tree view in reporting (invoice) and replaces it by the new graph view in pivot mode by default (addon account) bzr revid: ged@openerp.com-20140102090022-mzjiiiwg6he3ggz5 --- .../report/account_invoice_report_view.xml | 36 +------------------ 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index c7a9d097a68..329291406ce 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -1,40 +1,6 @@ - - account.invoice.report.tree - account.invoice.report - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - account.invoice.report.graph account.invoice.report @@ -92,7 +58,7 @@ Invoices Analysis account.invoice.report form - tree,graph + 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,} 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. From ea2dcd79b123afa9fdede83c3478a76822d0112d Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Thu, 2 Jan 2014 11:04:27 +0100 Subject: [PATCH 30/51] [IMP] removes old tree view in reporting (invoice) and replaces it by the new graph view in pivot mode by default (addon account) bzr revid: ged@openerp.com-20140102100427-kk048mulsrhgnnbw --- .../report/account_entries_report_view.xml | 41 ++----------------- .../report/account_invoice_report_view.xml | 2 +- 2 files changed, 5 insertions(+), 38 deletions(-) diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml index 66959051ea4..df56b5927e6 100644 --- a/addons/account/report/account_entries_report_view.xml +++ b/addons/account/report/account_entries_report_view.xml @@ -1,45 +1,12 @@ - - account.entries.report.tree - account.entries.report - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - account.entries.report.graph account.entries.report - - + + @@ -103,9 +70,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 329291406ce..5bdef88392d 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -5,7 +5,7 @@ account.invoice.report.graph account.invoice.report - + From dddd0fec574ce644ec03437671cfd5bf5f2b12b1 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Thu, 2 Jan 2014 11:16:05 +0100 Subject: [PATCH 31/51] [IMP] removes old tree views in reporting and replaces them by the new graph views in pivot mode by default (addon account) bzr revid: ged@openerp.com-20140102101605-6hlsx1d2jse7uggf --- .../report/account_entries_report_view.xml | 33 +++++++++++++++++++ .../report/account_treasury_report_view.xml | 10 +++--- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml index df56b5927e6..2d1af681062 100644 --- a/addons/account/report/account_entries_report_view.xml +++ b/addons/account/report/account_entries_report_view.xml @@ -1,6 +1,39 @@ + + account.entries.report.tree + account.entries.report + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + account.entries.report.graph account.entries.report 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. From 7bcfa45b29e90ef50147e7637073b28606e6f4ae Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Thu, 2 Jan 2014 11:18:44 +0100 Subject: [PATCH 32/51] [IMP] removes old tree views in reporting and replaces them by the new graph views in pivot mode by default (addon account_voucher) bzr revid: ged@openerp.com-20140102101844-zbsaemd01kmuszkb --- .../report/account_voucher_sales_receipt_view.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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,} From 48b67ddf540789c0cbbaea4377818aafe9b59438 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Thu, 2 Jan 2014 11:23:41 +0100 Subject: [PATCH 33/51] [IMP] removes old tree views in reporting and replaces them by the new graph views in pivot mode by default (addon account) bzr revid: ged@openerp.com-20140102102341-bvdpp0ltlibkefei --- .../account_analytic_entries_report_view.xml | 32 ++----------------- 1 file changed, 3 insertions(+), 29 deletions(-) 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. From d0c503ce0255e8579d4ad4dfc616378fef25d012 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Thu, 2 Jan 2014 11:28:35 +0100 Subject: [PATCH 34/51] [IMP] removes old tree views in reporting and replaces them by the new graph views in pivot mode by default (addon account_asset) bzr revid: ged@openerp.com-20140102102835-2d4v4o3ck8r3atgl --- .../report/account_asset_report_view.xml | 26 ++----------------- 1 file changed, 2 insertions(+), 24 deletions(-) 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} From f8fd65b492303549ead63f0c91c1e95ed3b2ae08 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Thu, 2 Jan 2014 11:47:34 +0100 Subject: [PATCH 35/51] [IMP] removes old tree views in reporting and replaces them by the new graph views in pivot mode by default (addon account_followup) bzr revid: ged@openerp.com-20140102104734-swgjgt33a1xg7kj0 --- .../report/account_followup_report.xml | 28 +++---------------- 1 file changed, 4 insertions(+), 24 deletions(-) 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} From 524697751c7fb439b7102205d6c1ee0e3b051449 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Thu, 2 Jan 2014 11:47:54 +0100 Subject: [PATCH 36/51] [IMP] removes old tree views in reporting and replaces them by the new graph views in pivot mode by default (addon hr_recruitment) bzr revid: ged@openerp.com-20140102104754-pfyq7zdprsfzky60 --- .../report/hr_recruitment_report_view.xml | 38 ++----------------- 1 file changed, 4 insertions(+), 34 deletions(-) diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml index d24e406bc0c..56d0e61a1f6 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml +++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml @@ -1,43 +1,13 @@ - - hr.recruitment.report.tree - hr.recruitment.report - - - - - - - - - - - - - - - - - - - - - - - - - - - hr.recruitment.report.graph hr.recruitment.report - - - + + + @@ -84,7 +54,7 @@ Recruitment Analysis hr.recruitment.report form - tree,graph + graph {'search_default_year':1,'search_default_month':1,'search_default_department':1,'group_by_no_leaf':1,'group_by':[]} From 5ff1074593d2e13bad9d596e1a10220f700e9afe Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Thu, 2 Jan 2014 11:51:41 +0100 Subject: [PATCH 37/51] [IMP] removes old tree views in reporting and replaces them by the new graph views in pivot mode by default (addon hr_expense) bzr revid: ged@openerp.com-20140102105141-whih1fsc97domxso --- .../report/hr_expense_report_view.xml | 37 +++---------------- 1 file changed, 5 insertions(+), 32 deletions(-) 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':[]} From 52615b9d127c2e8e826d30f23e39ccee9b615e7b Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Thu, 2 Jan 2014 11:54:55 +0100 Subject: [PATCH 38/51] [IMP] removes old tree views in reporting and replaces them by the new graph views in pivot mode by default (addon hr_evaluation) bzr revid: ged@openerp.com-20140102105455-1v3ututqhersh0hp --- .../report/hr_evaluation_report_view.xml | 29 ++----------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml index ce106b9b12a..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':[]} From 0b1f968fc3784cbb0388abc0537dcd8da4ee0ba5 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Thu, 2 Jan 2014 12:02:59 +0100 Subject: [PATCH 39/51] [IMP] removes old tree views in reporting and replaces them by the new graph views in pivot mode by default (addon hr_timesheet_sheet) bzr revid: ged@openerp.com-20140102110259-eyxw0qff1w4dwdzu --- .../report/hr_timesheet_report_view.xml | 28 ++------------ .../report/timesheet_report_view.xml | 38 +++---------------- 2 files changed, 9 insertions(+), 57 deletions(-) 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..5c0da80b528 100644 --- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml @@ -5,32 +5,12 @@ hr.timesheet.report.graph hr.timesheet.report - - - + + + - - hr.timesheet.report.tree - hr.timesheet.report - - - - - - - - - - - - - - - - - hr.timesheet.report.search hr.timesheet.report @@ -63,7 +43,7 @@ Timesheet Analysis hr.timesheet.report form - tree,graph + graph {'search_default_year':1,'search_default_month':1,'search_default_group_user_id':1,'group_by_no_leaf':1,'group_by':[]}

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':[]} From 1b7e21a38b082ae59c005521fd4424860f0da215 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Fri, 3 Jan 2014 14:53:42 +0100 Subject: [PATCH 40/51] [FIX] removes reference to invoice report tree view in sale_crm because it was already removed in a previous commit to replace it with a graph view (addon web_graph) bzr revid: ged@openerp.com-20140103135342-ba1r15d2r3mrt0k9 --- .../report/sale_crm_account_invoice_report_view.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 @@ - + From 4845221231c03decfc48b1b623add388732123ce Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Wed, 22 Jan 2014 13:22:51 +0100 Subject: [PATCH 41/51] [FIX] fixes the call to read_group to make it use the new way to group dates by interval, instead of using the context (addon mass mailing) bzr revid: ged@openerp.com-20140122122251-t0yrrjfa6ob5eoj0 --- addons/mass_mailing/mass_mailing.py | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) 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): From 3d6a575d03c1f0f8c8344d82ac5a6d6ab178e824 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Fri, 24 Jan 2014 13:24:39 +0100 Subject: [PATCH 42/51] [IMP] changes the crm_lead graph view in reporting, to use the new groupby interval features of graph view (addon crm) bzr revid: ged@openerp.com-20140124122439-t8vvgy9zebbhhy2a --- addons/crm/report/crm_lead_report.py | 22 +++------------ addons/crm/report/crm_lead_report_view.xml | 32 +++++++++++----------- 2 files changed, 20 insertions(+), 34 deletions(-) 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 8115e74e71b..f25cfa1f4b1 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -10,8 +10,7 @@ - - + @@ -21,9 +20,10 @@ crm.lead.report - - - + + + + @@ -67,27 +67,29 @@ - + - + - - - + + + + + domain="[]" context="{'group_by':'date_deadline'}"/> @@ -100,7 +102,6 @@ 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':[]} 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. @@ -116,7 +117,6 @@ 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':[]} 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. From 939ae651b4553cc39e1019b13b581525d285b16c Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Mon, 27 Jan 2014 09:20:38 +0100 Subject: [PATCH 43/51] [IMP] improves the account invoice reporting view, in graph view mode : puts the period in column, product category in rows (addon account) bzr revid: ged@openerp.com-20140127082038-sek8wnkzwundrxe6 --- addons/account/report/account_invoice_report_view.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index 5bdef88392d..67d568801b7 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -6,7 +6,8 @@ account.invoice.report - + + @@ -38,7 +39,7 @@ - + @@ -59,7 +60,7 @@ account.invoice.report form 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,} + {'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. From 737bb32e588eb9c64c11d7a7ff89791bd00ef675 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Mon, 27 Jan 2014 10:23:08 +0100 Subject: [PATCH 44/51] [IMP] improves the HR recruitment analysis view (reporting) by using the new graph view in pivot mode (addon hr_recruitment) bzr revid: ged@openerp.com-20140127092308-g893knucca1ez4cq --- .../report/hr_recruitment_report.py | 19 ++++--------------- .../report/hr_recruitment_report_view.xml | 14 ++++++++------ 2 files changed, 12 insertions(+), 21 deletions(-) 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 56d0e61a1f6..c214b2efa75 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml +++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml @@ -6,8 +6,9 @@ hr.recruitment.report - - + + + @@ -42,9 +43,10 @@ - - - + + + + @@ -55,7 +57,7 @@ hr.recruitment.report form graph - {'search_default_year':1,'search_default_month':1,'search_default_department':1,'group_by_no_leaf':1,'group_by':[]} + {'group_by_no_leaf':1,'group_by':[]} From f6fec727974c1cf4094f044fbf88184d93603ae5 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Mon, 27 Jan 2014 10:49:18 +0100 Subject: [PATCH 45/51] [IMP] improves the Event reporting view by using the new graph view in pivot mode (addon event) bzr revid: ged@openerp.com-20140127094918-52w9xt1nj1ae93fn --- addons/event/report/report_event_registration.py | 13 ++----------- .../report/report_event_registration_view.xml | 14 ++++++++------ 2 files changed, 10 insertions(+), 17 deletions(-) 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 378fc667362..c6c2191c9c0 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -7,8 +7,10 @@ report.event.registration - - + + + + @@ -40,9 +42,9 @@ - - - + + + form 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":[]} + {"group_by_no_leaf":1, "group_by":[]} From 9cd84a583457d1052e2cbba9f5b178dc3c68a32f Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Mon, 27 Jan 2014 11:34:08 +0100 Subject: [PATCH 46/51] [IMP] replace the Leaves analysis views in reporting by the new pivot graph view (addon hr_holidays) bzr revid: ged@openerp.com-20140127103408-8a1fi88gdhl2sud5 --- .../report/available_holidays_view.xml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) 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')] From fcb9f7a76ef1678bffb75ef534a1d687590a1d83 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Mon, 27 Jan 2014 12:01:02 +0100 Subject: [PATCH 47/51] [IMP] improves the Sales Analysis reporting views (add filters and changes the row/col definitions) in pivot table mode (addon sale) bzr revid: ged@openerp.com-20140127110102-so4cma7679uvdwtk --- addons/sale/report/sale_report.py | 8 -------- addons/sale/report/sale_report_view.xml | 13 +++++++------ 2 files changed, 7 insertions(+), 14 deletions(-) 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 0ee7999c2e3..40af5281012 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -7,7 +7,8 @@ sale.report - + + @@ -21,7 +22,7 @@ - + @@ -40,9 +41,9 @@ - - - + + + @@ -55,7 +56,7 @@ 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. From 68a466e8a876238e4cb3422ccfd10fddfe050585 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Mon, 27 Jan 2014 14:03:51 +0100 Subject: [PATCH 48/51] [IMP] improves the Timesheet Analysis reporting view : changes the axis, adds a 'this month' filter using the new pivot graph view (addon hr_timesheet_sheet) bzr revid: ged@openerp.com-20140127130351-iu422fkjnu8059wd --- .../hr_timesheet_sheet/report/hr_timesheet_report.py | 8 -------- .../report/hr_timesheet_report_view.xml | 10 ++++++---- 2 files changed, 6 insertions(+), 12 deletions(-) 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 5c0da80b528..5e2ca249d7d 100644 --- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml @@ -7,6 +7,7 @@ + @@ -16,6 +17,7 @@ hr.timesheet.report + @@ -31,9 +33,9 @@ - - - + + + @@ -44,7 +46,7 @@ hr.timesheet.report form graph - {'search_default_year':1,'search_default_month':1,'search_default_group_user_id':1,'group_by_no_leaf':1,'group_by':[]} + {'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 From a584ba9ed2e2d921d16b4a5c69f62bbc5e43d219 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Mon, 27 Jan 2014 14:20:20 +0100 Subject: [PATCH 49/51] [IMP] removes 'Employee Timesheet' and 'Employees Timesheet' reports in HR reporting (addon hr_timesheet) bzr revid: ged@openerp.com-20140127132020-qhxgkygxx38vecab --- addons/hr_timesheet/__openerp__.py | 2 - addons/hr_timesheet/wizard/__init__.py | 2 - .../wizard/hr_timesheet_print_employee.py | 66 ------------------- .../hr_timesheet_print_employee_view.xml | 40 ----------- .../wizard/hr_timesheet_print_users.py | 56 ---------------- .../wizard/hr_timesheet_print_users_view.xml | 46 ------------- 6 files changed, 212 deletions(-) delete mode 100644 addons/hr_timesheet/wizard/hr_timesheet_print_employee.py delete mode 100644 addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml delete mode 100644 addons/hr_timesheet/wizard/hr_timesheet_print_users.py delete mode 100644 addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py index f2e589d969e..17a40f64189 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' 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 - - - - - - From cdde84f821a78ad4948e4a87ba760c359a908caa Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Mon, 27 Jan 2014 15:04:30 +0100 Subject: [PATCH 50/51] [FIX] remove the yml tests hr_timesheet_report (it should have been removed when I removed the Employee(s) timesheet reports from the reporting menu) (addon hr_timesheet) bzr revid: ged@openerp.com-20140127140430-49i2dqyq67qc19qm --- addons/hr_timesheet/__openerp__.py | 1 - .../hr_timesheet/test/hr_timesheet_report.yml | 23 ------------------- 2 files changed, 24 deletions(-) delete mode 100644 addons/hr_timesheet/test/hr_timesheet_report.yml diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py index 17a40f64189..6105271be77 100644 --- a/addons/hr_timesheet/__openerp__.py +++ b/addons/hr_timesheet/__openerp__.py @@ -57,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') From e4cb7e5aa14b8d5d5e759ff1997f2164852cd76c Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Mon, 27 Jan 2014 15:32:19 +0100 Subject: [PATCH 51/51] [FIX] change the name of the sales filter to Sales -> this is the name required in some other places that inherits it (addon sale) bzr revid: ged@openerp.com-20140127143219-2ljcrieylv3pdz8c --- addons/sale/report/sale_report_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 40af5281012..14b719ebd7a 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -22,7 +22,7 @@ - + @@ -56,7 +56,7 @@ graph - {'search_default_sales':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.