diff --git a/addons/account_report/report/print_indicator.py b/addons/account_report/report/print_indicator.py index 83ac5eb22cc..8496dd3e834 100644 --- a/addons/account_report/report/print_indicator.py +++ b/addons/account_report/report/print_indicator.py @@ -137,9 +137,11 @@ class accounting_report_indicator(report_sxw.rml_parse): 'expression':obj_ind.expression, 'disp_graph':obj_ind.disp_graph, 'note':obj_ind.note, - 'type':obj_ind.type + 'type':obj_ind.type, + 'last':False, } result.append(res) + result[-1]['last']=True return result def getarray(self,data,object): diff --git a/addons/account_report/report/print_indicator.rml b/addons/account_report/report/print_indicator.rml index 305548844b5..1834c8f128b 100644 --- a/addons/account_report/report/print_indicator.rml +++ b/addons/account_report/report/print_indicator.rml @@ -36,12 +36,7 @@ - - - - - - + @@ -56,7 +51,7 @@ - + @@ -78,7 +73,7 @@ -Accounting Test +Indicators @@ -120,7 +115,6 @@
[[ repeatIn(lines(data['form']),'o')]] -[['-'* 155]] @@ -131,6 +125,9 @@ + + + [[ o['disp_graph'] and setTag('para','image',{'file':test(data['form'],o)}) or removeParentNode('para') ]]
[[ repeatIn(getarray(data['form'],o),'array',td=len(data['form']['base_selection'][0][2])) ]] @@ -150,11 +147,37 @@ + + + Expression : [[ o['expression'] ]] -Notes : [[ o['note'] ]] + + + + + + +Notes : [[ o['note'] ]] + + + +[[ o['last'] and removeParentNode('pageBreak')]] + + + + + + +Name[[ o['last'] and removeParentNode('blockTable')]] + + +Code + + +
diff --git a/addons/l10n_be/account.report.report.csv b/addons/l10n_be/account.report.report.csv index 069de01714f..8bf965c741c 100644 --- a/addons/l10n_be/account.report.report.csv +++ b/addons/l10n_be/account.report.report.csv @@ -1,21 +1,21 @@ "expression","note","parent_id","sequence","badness_limit","goodness_limit","type","code","name" -0,,,,0,2,"indicator","BILAN","Bilan" +0,,,,0,1,"indicator","BILAN","Bilan" "report('BIMMO','BSTOCK','BREAL','BDISPO')",,"BILAN",,0,1,"fiscal","Actif","Actif" -"balance('2')",,"Actif",,5,45,"indicator","BIMMO","Valeurs immobilisées" -"balance('3')",,"Actif",2,3,12,"indicator","BSTOCK","Stocks" -"balance('4')",,"Actif",3,0,78,"indicator","BREAL","Réalisable" -"balance('5')",,"Actif",4,4,12,"fiscal","BDISPO","Disponible" -"report('BCAP') + report('BRESNET')",,"BILAN",1,0,2,"fiscal","PASSIF","Passif" -"balance('1')",,"PASSIF",1,0,3,"indicator","BCAP","Capitaux propores" -"-balance('7')+balance('6')",,"PASSIF",,0,5,"fiscal","BRESNET","Résultat net" -0,,,,1,9,"fiscal","CRES","Compte des résultats" -"report('CCHAR','CBENEF')",,"CRES",,1,8,"fiscal","CRESACTIF","Résultat Actif" -"balance('6')",,"CRESACTIF",,0,0,"fiscal","CCHAR","Total des charges" -"report('CRESPROD')",,"CRES",,3,12,"fiscal","CRESPASSIF","Résultat Passif" -"-balance('7')",,"CRESPASSIF",,2,4,"fiscal","CRESPROD","Total des produits" -"-balance('7')+balance('6')",,"CRESACTIF",,"2",8,"fiscal","CBENEF","Résultat (Bénéfice)" -0,,,,0,7,"indicator","IIMMO","Immobilisations" -"balance('1')/balance(map(str(range(21,29))))","Dans une entreprise normalement équilibrée, les valeurs immobilisées sont couvertes en premier lieu par les capitaux propres et, en second lieu, par tout ou partie du passif à long terme. Idéalement, ce ratio (rapport entre capitaux permanents et les valeurs immobilisées) doit être suppérieur à l'unité.","IIMMO",,0,9,"indicator","CIMMO","Couverture des immobilisations" -0,,,,0,0,"indicator","ITRE","Trésorerie" -"balance('3','4','5') / balance('101','13','15','16','17','18')","Détermine si l'entreprise a la possibilité de s'acquitter de ses dettes à court terme dans des conditions normales. Calculé comme suit: (Stocks + Réalisable + Disponible ) / Passif exigible à court terme","ITRE",,0,0,"indicator","IFR","Indice du fond de roulement" -"balance('4','5') / balance('101','13','15','16','17','18')",,"ITRE",,0,6,"indicator","RTRE","Ratio de trésorerie" +"balance('2')",,"Actif",,0,1,"indicator","BIMMO","Valeurs immobilisées" +"balance('3')",,"Actif",2,0,1,"indicator","BSTOCK","Stocks" +"balance('4')",,"Actif",3,0,1,"indicator","BREAL","Réalisable" +"balance('5')",,"Actif",4,0,1,"fiscal","BDISPO","Disponible" +"report('BCAP') + report('BRESNET')",,"BILAN",1,0,1,"fiscal","PASSIF","Passif" +"balance('1')",,"PASSIF",1,0,1,"indicator","BCAP","Capitaux propores" +"-balance('7')+balance('6')",,"PASSIF",,0,1,"fiscal","BRESNET","Résultat net" +0,,,,0,1,"fiscal","CRES","Compte des résultats" +"report('CCHAR','CBENEF')",,"CRES",,0,1,"fiscal","CRESACTIF","Résultat Actif" +"balance('6')",,"CRESACTIF",,0,1,"fiscal","CCHAR","Total des charges" +"report('CRESPROD')",,"CRES",,0,1,"fiscal","CRESPASSIF","Résultat Passif" +"-balance('7')",,"CRESPASSIF",,0,1,"fiscal","CRESPROD","Total des produits" +"-balance('7')+balance('6')",,"CRESACTIF",,0,1,"fiscal","CBENEF","Résultat (Bénéfice)" +0,,,,0,1,"indicator","IIMMO","Immobilisations" +"balance('1')/balance(map(str(range(21,29))))","Dans une entreprise normalement équilibrée, les valeurs immobilisées sont couvertes en premier lieu par les capitaux propres et, en second lieu, par tout ou partie du passif à long terme. Idéalement, ce ratio (rapport entre capitaux permanents et les valeurs immobilisées) doit être suppérieur à l'unité.","IIMMO",,0,1,"indicator","CIMMO","Couverture des immobilisations" +0,,,,0,1,"indicator","ITRE","Trésorerie" +"balance('3','4','5') / balance('101','13','15','16','17','18')","Détermine si l'entreprise a la possibilité de s'acquitter de ses dettes à court terme dans des conditions normales. Calculé comme suit: (Stocks + Réalisable + Disponible ) / Passif exigible à court terme","ITRE",,0,1,"indicator","IFR","Indice du fond de roulement" +"balance('4','5') / balance('101','13','15','16','17','18')",,"ITRE",,0,1,"indicator","RTRE","Ratio de trésorerie" diff --git a/addons/l10n_lu/__terp__.py b/addons/l10n_lu/__terp__.py index 61d131cd5c4..372787fe5a0 100644 --- a/addons/l10n_lu/__terp__.py +++ b/addons/l10n_lu/__terp__.py @@ -3,7 +3,7 @@ "version" : "1.0", "author" : "Tiny", "website" : "http://openerp.com", - "category" : "Vertical Modules/Parametrization", + "category" : "Localisation/Account Charts", "description": """ This module install: diff --git a/addons/l10n_lu/account.report.report.csv b/addons/l10n_lu/account.report.report.csv index 069de01714f..8bf965c741c 100644 --- a/addons/l10n_lu/account.report.report.csv +++ b/addons/l10n_lu/account.report.report.csv @@ -1,21 +1,21 @@ "expression","note","parent_id","sequence","badness_limit","goodness_limit","type","code","name" -0,,,,0,2,"indicator","BILAN","Bilan" +0,,,,0,1,"indicator","BILAN","Bilan" "report('BIMMO','BSTOCK','BREAL','BDISPO')",,"BILAN",,0,1,"fiscal","Actif","Actif" -"balance('2')",,"Actif",,5,45,"indicator","BIMMO","Valeurs immobilisées" -"balance('3')",,"Actif",2,3,12,"indicator","BSTOCK","Stocks" -"balance('4')",,"Actif",3,0,78,"indicator","BREAL","Réalisable" -"balance('5')",,"Actif",4,4,12,"fiscal","BDISPO","Disponible" -"report('BCAP') + report('BRESNET')",,"BILAN",1,0,2,"fiscal","PASSIF","Passif" -"balance('1')",,"PASSIF",1,0,3,"indicator","BCAP","Capitaux propores" -"-balance('7')+balance('6')",,"PASSIF",,0,5,"fiscal","BRESNET","Résultat net" -0,,,,1,9,"fiscal","CRES","Compte des résultats" -"report('CCHAR','CBENEF')",,"CRES",,1,8,"fiscal","CRESACTIF","Résultat Actif" -"balance('6')",,"CRESACTIF",,0,0,"fiscal","CCHAR","Total des charges" -"report('CRESPROD')",,"CRES",,3,12,"fiscal","CRESPASSIF","Résultat Passif" -"-balance('7')",,"CRESPASSIF",,2,4,"fiscal","CRESPROD","Total des produits" -"-balance('7')+balance('6')",,"CRESACTIF",,"2",8,"fiscal","CBENEF","Résultat (Bénéfice)" -0,,,,0,7,"indicator","IIMMO","Immobilisations" -"balance('1')/balance(map(str(range(21,29))))","Dans une entreprise normalement équilibrée, les valeurs immobilisées sont couvertes en premier lieu par les capitaux propres et, en second lieu, par tout ou partie du passif à long terme. Idéalement, ce ratio (rapport entre capitaux permanents et les valeurs immobilisées) doit être suppérieur à l'unité.","IIMMO",,0,9,"indicator","CIMMO","Couverture des immobilisations" -0,,,,0,0,"indicator","ITRE","Trésorerie" -"balance('3','4','5') / balance('101','13','15','16','17','18')","Détermine si l'entreprise a la possibilité de s'acquitter de ses dettes à court terme dans des conditions normales. Calculé comme suit: (Stocks + Réalisable + Disponible ) / Passif exigible à court terme","ITRE",,0,0,"indicator","IFR","Indice du fond de roulement" -"balance('4','5') / balance('101','13','15','16','17','18')",,"ITRE",,0,6,"indicator","RTRE","Ratio de trésorerie" +"balance('2')",,"Actif",,0,1,"indicator","BIMMO","Valeurs immobilisées" +"balance('3')",,"Actif",2,0,1,"indicator","BSTOCK","Stocks" +"balance('4')",,"Actif",3,0,1,"indicator","BREAL","Réalisable" +"balance('5')",,"Actif",4,0,1,"fiscal","BDISPO","Disponible" +"report('BCAP') + report('BRESNET')",,"BILAN",1,0,1,"fiscal","PASSIF","Passif" +"balance('1')",,"PASSIF",1,0,1,"indicator","BCAP","Capitaux propores" +"-balance('7')+balance('6')",,"PASSIF",,0,1,"fiscal","BRESNET","Résultat net" +0,,,,0,1,"fiscal","CRES","Compte des résultats" +"report('CCHAR','CBENEF')",,"CRES",,0,1,"fiscal","CRESACTIF","Résultat Actif" +"balance('6')",,"CRESACTIF",,0,1,"fiscal","CCHAR","Total des charges" +"report('CRESPROD')",,"CRES",,0,1,"fiscal","CRESPASSIF","Résultat Passif" +"-balance('7')",,"CRESPASSIF",,0,1,"fiscal","CRESPROD","Total des produits" +"-balance('7')+balance('6')",,"CRESACTIF",,0,1,"fiscal","CBENEF","Résultat (Bénéfice)" +0,,,,0,1,"indicator","IIMMO","Immobilisations" +"balance('1')/balance(map(str(range(21,29))))","Dans une entreprise normalement équilibrée, les valeurs immobilisées sont couvertes en premier lieu par les capitaux propres et, en second lieu, par tout ou partie du passif à long terme. Idéalement, ce ratio (rapport entre capitaux permanents et les valeurs immobilisées) doit être suppérieur à l'unité.","IIMMO",,0,1,"indicator","CIMMO","Couverture des immobilisations" +0,,,,0,1,"indicator","ITRE","Trésorerie" +"balance('3','4','5') / balance('101','13','15','16','17','18')","Détermine si l'entreprise a la possibilité de s'acquitter de ses dettes à court terme dans des conditions normales. Calculé comme suit: (Stocks + Réalisable + Disponible ) / Passif exigible à court terme","ITRE",,0,1,"indicator","IFR","Indice du fond de roulement" +"balance('4','5') / balance('101','13','15','16','17','18')",,"ITRE",,0,1,"indicator","RTRE","Ratio de trésorerie"