From f4ae960d7954c0a98cf05817823d3daf9749ebee Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Thu, 22 Jul 2010 13:39:17 +0000 Subject: [PATCH] FS#139 : hide the analytic accountancy in the detail of an operation if we are not in a popup --- include/template/ledger_detail_ach.php | 6 +++--- include/template/ledger_detail_misc.php | 4 ++-- include/template/ledger_detail_ven.php | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/template/ledger_detail_ach.php b/include/template/ledger_detail_ach.php index 2edc27f2a..189b89c2d 100644 --- a/include/template/ledger_detail_ach.php +++ b/include/template/ledger_detail_ach.php @@ -65,7 +65,7 @@ if ( $owner->MY_TVA_USE == 'Y') { }else echo th(_('Total'), 'style="text-align:right"'); - if ($owner->MY_ANALYTIC != 'nu'){ + if ($owner->MY_ANALYTIC != 'nu' && $div=='popup'){ $anc=new Anc_Plan($cn); $a_anc=$anc->get_list(); $x=count($a_anc); @@ -103,7 +103,7 @@ echo ''; $total_tvac+=$tvac; $total_htva+=$htva; /* Analytic accountancy */ - if ( $owner->MY_ANALYTIC != "nu"){ + if ( $owner->MY_ANALYTIC != "nu" && $div == 'popup'){ $poste=$fiche->strAttribut(ATTR_DEF_ACCOUNT); if ( preg_match('/^(6|7)/',$poste)) { $anc_op=new Anc_Operation($cn); @@ -201,4 +201,4 @@ echo ''; - \ No newline at end of file + diff --git a/include/template/ledger_detail_misc.php b/include/template/ledger_detail_misc.php index d32607c1a..d008d517a 100644 --- a/include/template/ledger_detail_misc.php +++ b/include/template/ledger_detail_misc.php @@ -58,7 +58,7 @@ echo td(_('Pièce')).td($itext->input()); echo th(_('Libellé')); echo th(_('Débit'), 'style="text-align:right"'); echo th(_('Crédit'), 'style="text-align:right"'); - if ($owner->MY_ANALYTIC != 'nu'){ + if ($owner->MY_ANALYTIC != 'nu' && $div == 'popup'){ $anc=new Anc_Plan($cn); $a_anc=$anc->get_list(); $x=count($a_anc); @@ -99,7 +99,7 @@ echo ''; $row.=($q[$e]['j_debit']=='t')?$montant:td(''); $row.=($q[$e]['j_debit']=='f')?$montant:td(''); /* Analytic accountancy */ - if ( $owner->MY_ANALYTIC != "nu"){ + if ( $owner->MY_ANALYTIC != "nu" && $div=='popup'){ if ( preg_match('/^(6|7)/',$q[$e]['j_poste'])) { diff --git a/include/template/ledger_detail_ven.php b/include/template/ledger_detail_ven.php index 05afe7732..ef51180ac 100644 --- a/include/template/ledger_detail_ven.php +++ b/include/template/ledger_detail_ven.php @@ -64,7 +64,7 @@ if ( $owner->MY_TVA_USE == 'Y') { } else echo th(_('Total'), 'style="text-align:right"'); - if ($owner->MY_ANALYTIC != 'nu'){ + if ($owner->MY_ANALYTIC != 'nu' && $div == 'popup'){ $anc=new Anc_Plan($cn); $a_anc=$anc->get_list(); $x=count($a_anc); @@ -104,7 +104,7 @@ echo ''; $total_tvac+=$tvac; $total_htva+=$htva; /* Analytic accountancy */ - if ( $owner->MY_ANALYTIC != "nu"){ + if ( $owner->MY_ANALYTIC != "nu" && $div == 'popup'){ $poste=$fiche->strAttribut(ATTR_DEF_ACCOUNT); if ( preg_match('/^(6|7)/',$poste)) { $anc_op=new Anc_Operation($cn); @@ -201,4 +201,4 @@ echo ''; - \ No newline at end of file +