diff --git a/mis_builder_demo/__openerp__.py b/mis_builder_demo/__openerp__.py index 131a7acd..452d8fbf 100644 --- a/mis_builder_demo/__openerp__.py +++ b/mis_builder_demo/__openerp__.py @@ -31,16 +31,15 @@ 'website': 'http://acsone.eu', 'depends': ['mis_builder', 'crm'], 'data': [ - 'mis.report.kpi.csv', + ], + 'test': [ + ], + 'demo': ['mis.report.kpi.csv', 'mis.report.query.csv', 'mis.report.csv', 'mis.report.instance.period.csv', 'mis.report.instance.csv', ], - 'test': [ - ], - 'demo': [ - ], 'installable': True, 'application': True, 'auto_install': False, diff --git a/mis_builder_demo/mis.report.csv b/mis_builder_demo/mis.report.csv index 99c43286..6dc932f6 100644 --- a/mis_builder_demo/mis.report.csv +++ b/mis_builder_demo/mis.report.csv @@ -1,3 +1,3 @@ "id","description","kpi_ids/id","name","query_ids/id" -"mis_report","","mis_report_kpi_1,mis_report_kpi_2,mis_report_kpi_3,mis_report_kpi_4,mis_report_kpi_5,mis_report_kpi_6","Test","mis_report_query" +"mis_report","","mis_report_kpi_1,mis_report_kpi_2,mis_report_kpi_3,mis_report_kpi_4,mis_report_kpi_5","Margin report","mis_report_query" "mis_report_phonecall","","mis_report_phonecall_kpi_1,mis_report_phonecall_kpi_2,mis_report_phonecall_kpi_3,mis_report_phonecall_kpi_4","Phonecall report","mis_report_phonecall_query" diff --git a/mis_builder_demo/mis.report.instance.csv b/mis_builder_demo/mis.report.instance.csv index 8827b50d..cba420b7 100644 --- a/mis_builder_demo/mis.report.instance.csv +++ b/mis_builder_demo/mis.report.instance.csv @@ -1,3 +1,3 @@ "id","date","description","name","period_ids/id","report_id/id" -"mis_report_instance","","","Test-report-instance","mis_report_instance_period_1,mis_report_instance_period_2,mis_report_instance_period_3,mis_report_instance_period_4,mis_report_instance_period_5","mis_report" +"mis_report_instance","","","Test-margin-report-instance","mis_report_instance_period_1,mis_report_instance_period_2,mis_report_instance_period_3,mis_report_instance_period_4","mis_report" "mis_report_phonecall_instance","","","Test phonecall report instance","mis_report_phonecall_instance_period_1,mis_report_phonecall_instance_period_2,mis_report_phonecall_instance_period_3","mis_report_phonecall" diff --git a/mis_builder_demo/mis.report.instance.period.csv b/mis_builder_demo/mis.report.instance.period.csv index f8560640..e82528ce 100644 --- a/mis_builder_demo/mis.report.instance.period.csv +++ b/mis_builder_demo/mis.report.instance.period.csv @@ -1,9 +1,8 @@ "id","duration","name","offset","type","sequence","company_id/id" -"mis_report_instance_period_1","1","today","","Day","","base.main_company" -"mis_report_instance_period_2","1","yesterday","-1","Day","","base.main_company" -"mis_report_instance_period_3","1","last week","-1","Week","2","base.main_company" -"mis_report_instance_period_4","2","last 2 period","-2","Fiscal Period","3","base.main_company" -"mis_report_instance_period_5","2","last 2 week","-2","Week","4","base.main_company" +"mis_report_instance_period_1","1","today","0","Day","1","base.main_company" +"mis_report_instance_period_2","1","yesterday","-1","Day","2","base.main_company" +"mis_report_instance_period_3","1","last week","-1","Week","3","base.main_company" +"mis_report_instance_period_4","1","last period","-1","Fiscal Period","4","base.main_company" "mis_report_phonecall_instance_period_1","1","today","0","Day","1","base.main_company" "mis_report_phonecall_instance_period_2","1","this period","0","Fiscal Period","2","base.main_company" "mis_report_phonecall_instance_period_3","1","previous period","-1","Fiscal Period","3","base.main_company" diff --git a/mis_builder_demo/mis.report.kpi.csv b/mis_builder_demo/mis.report.kpi.csv index 891e6da0..0bb84647 100644 --- a/mis_builder_demo/mis.report.kpi.csv +++ b/mis_builder_demo/mis.report.kpi.csv @@ -1,10 +1,9 @@ id,compare_method,description,expression,divider,name,dp,sequence,type,suffix -mis_report_kpi_1,Percentage,chiffre d'affaire,-bal_70,,ca,,1,Numeric,€ -mis_report_kpi_2,Percentage,cost,-bal_60 - bal_61,,cost,,2,Numeric,€ -mis_report_kpi_3,Percentage,profit,ca - cost,,profit,,3,Numeric,€ -mis_report_kpi_4,Difference,margin,profit/ca,,margin,,4,Percentage,% -mis_report_kpi_5,None,couleur,'vert' if profit > 0 else 'rouge',,couleur,,5,String, -mis_report_kpi_6,Percentage,total invoice,len(inv),,total_invoice,,6,Numeric,€ +mis_report_kpi_1,Percentage,CA,-balx2001,,ca,,1,Numeric,€ +mis_report_kpi_2,Percentage,CAHT invoice,sum([s.amount_untaxed for s in inv]),,total_invoice,,2,Numeric,€ +mis_report_kpi_3,Percentage,Cost,balx2110,,cost,,3,Numeric,€ +mis_report_kpi_4,Percentage,Profit,ca - cost,,profit,,4,Numeric,€ +mis_report_kpi_5,Difference,Margin,profit/ca,,margin,,5,Percentage,% mis_report_phonecall_kpi_1,Percentage,Total phone call,len(phone),,total_phone_call,,1,Numeric, mis_report_phonecall_kpi_2,Percentage,Average duration phone call,sum([p.duration for p in phone])/total_phone_call,,average_duration_phone_call,2,2,Numeric, mis_report_phonecall_kpi_3,Percentage,Total converted phone call,sum([p.opportunity_id and 1 or 0 for p in phone]),,phone_call_convert,,3,Numeric,