From 687d6265111e5dc2002db9d2531d561cb0c682a8 Mon Sep 17 00:00:00 2001 From: Jay Vora Date: Mon, 10 Nov 2008 12:43:05 +0530 Subject: [PATCH] Indicators:Minor modifs and corrected demo data. bzr revid: jvo@tinyerp.com-20081110071305-2qa2tos59i5o1ywl --- addons/account_report/account.py | 4 ---- addons/l10n_lu/account.report.report.csv | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/addons/account_report/account.py b/addons/account_report/account.py index 1ec926d07c5..0682a1100be 100644 --- a/addons/account_report/account.py +++ b/addons/account_report/account.py @@ -69,7 +69,6 @@ class account_report(osv.osv): return key_ids[key] def _calc_credit(code,year=0): - context['fiscalyear']=False context['fiscalyear']=_calc_context(year,obj_fy) if not context['fiscalyear']: del context['fiscalyear'] @@ -78,7 +77,6 @@ class account_report(osv.osv): return reduce(lambda y,x=0: x.credit+y, acc.browse(cr, uid, acc_id, context),0) def _calc_debit(code,year=0): - context['fiscalyear']=False context['fiscalyear']=_calc_context(year,obj_fy) if not context['fiscalyear']: del context['fiscalyear'] @@ -87,7 +85,6 @@ class account_report(osv.osv): return reduce(lambda y,x=0: x.debit+y, acc.browse(cr, uid, acc_id, context),0) def _calc_balance(code,year=0): - context['fiscalyear']=False context['fiscalyear']=_calc_context(year,obj_fy) if not context['fiscalyear']: del context['fiscalyear'] @@ -101,7 +98,6 @@ class account_report(osv.osv): return reduce(lambda y,x=0: x.amount+y, acc.browse(cr, uid, acc_id, context),0) def _calc_tax_code(code,period=0): - context['period_id']=False context['period_id']=_calc_context(period,obj_period) if not context['period_id']: return 0.00 diff --git a/addons/l10n_lu/account.report.report.csv b/addons/l10n_lu/account.report.report.csv index 8bf965c741c..0e4095972fc 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,1,"indicator","BILAN","Bilan" "report('BIMMO','BSTOCK','BREAL','BDISPO')",,"BILAN",,0,1,"fiscal","Actif","Actif" -"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" +"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" +"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" +"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)" +"-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" +"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" +"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"