[Noalyss-commit] [noalyss] 01/10: Cosmetique remove title detail

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 33a30ab4a9bd1de9bfbbf11065a63e47df8b012b
Author: Dany De Bontridder <address@hidden>
Date:   Sun Dec 21 17:30:07 2014 +0100

    Cosmetique remove title detail
---
 include/template/ledger_detail_ach.php  |    1 -
 include/template/ledger_detail_fin.php  |   57 ++++---------------------------
 include/template/ledger_detail_misc.php |    1 -
 include/template/ledger_detail_ven.php  |    3 --
 4 files changed, 7 insertions(+), 55 deletions(-)

diff --git a/include/template/ledger_detail_ach.php 
b/include/template/ledger_detail_ach.php
index d513aa2..9741a7b 100644
--- a/include/template/ledger_detail_ach.php
+++ b/include/template/ledger_detail_ach.php
@@ -110,7 +110,6 @@ $str_anc="";
 
         </table>
         <div class="myfieldset">
-            <h1 class="legend"><?php echo _('Détail') ?></h1>
             <table class="result">
                 <?php
                 bcscale(2);
diff --git a/include/template/ledger_detail_fin.php 
b/include/template/ledger_detail_fin.php
index b57ed01..03e42aa 100644
--- a/include/template/ledger_detail_fin.php
+++ b/include/template/ledger_detail_fin.php
@@ -94,21 +94,11 @@ echo td(_('Pièce')).td($itext->input());
 
 </td>
 <div class="myfieldset">
-       <h1 class="legend">
-<?php echo _('Détail')?>
 <?php 
   $detail=new Acc_Misc($cn,$obj->jr_id);
-$detail->get();
+  $detail->get();
 ?>
-</h1>
-<table class="result">
-<tr>
 <?php 
- echo th(_('Poste Comptable'));
-    echo th(_('Quick Code'));
-    echo th(_('Libellé'));
-echo th(_('Débit'),' style="text-align:right"');
-echo th(_('Crédit'),' style="text-align:right"');
  if ($owner->MY_ANALYTIC != 'nu' /*&& $div == 'popup'*/){
       $anc=new Anc_Plan($cn);
       $a_anc=$anc->get_list(' order by pa_id ');
@@ -119,40 +109,11 @@ echo th(_('Crédit'),' style="text-align:right"');
       /* add hidden variables pa[] to hold the value of pa_id */
       $str_anc .= Anc_Plan::hidden($a_anc);
     }
-echo '</tr>';
+    bcscale(2);
   for ($e=0;$e<count($detail->det->array);$e++) {
     $row=''; $q=$detail->det->array;
-   $view_history= sprintf('<A class="detail" style="text-decoration:underline" 
HREF="javascript:view_history_account(\'%s\',\'%s\')" >%s</A>',
-                          $q[$e]['j_poste'], $gDossier, $q[$e]['j_poste']);
-
-    $row.=td($view_history);
-
-    if ( $q[$e]['j_qcode'] !=''){
-      $fiche=new Fiche($cn);
-      $fiche->get_by_qcode($q[$e]['j_qcode']);
-      $view_history= sprintf('<A class="detail" 
style="text-decoration:underline" 
HREF="javascript:view_history_card(\'%s\',\'%s\')" >%s</A>',
-                            $fiche->id,$gDossier, $q[$e]['j_qcode']);
-    }
-    else
-      $view_history='';
-    $row.=td($view_history);
-       if ( $q[$e]['j_text']!='')
-       {
-        $row.=td(h(strip_tags($q[$e]['j_text'])));
-       }else
-    if ( $q[$e]['j_qcode'] !='') {
-      // nom de la fiche
-      $ff=new Fiche($cn);
-      $ff->get_by_qcode( $q[$e]['j_qcode']);
-      $row.=td($ff->strAttribut(h(ATTR_DEF_NAME)));
-    } else {
-      // libellé du compte
-      $name=$cn->get_value('select pcm_lib from tmp_pcmn where 
pcm_val=$1',array($q[$e]['j_poste']));
-      $row.=td(h($name));
-    }
-    $montant=td(nbm($q[$e]['j_montant']),'class="num"');
-    $row.=($q[$e]['j_debit']=='t')?$montant:td('');
-    $row.=($q[$e]['j_debit']=='f')?$montant:td('');
+    $fiche=new Fiche($cn);
+    $fiche->get_by_qcode($q[$e]['j_qcode']);
    /* Analytic accountancy */
     if ( $owner->MY_ANALYTIC != "nu" /*&& $div == 'popup'*/)
       {
@@ -169,19 +130,15 @@ echo '</tr>';
             $str_anc.=td(nbm($q[$e]['j_montant']));
             $str_anc.='<td>';
            $str_anc.= HtmlInput::hidden('op[]',$anc_op->j_id);
-           $str_anc.=$anc_op->display_table(1,$q[$e]['j_montant'],$div);
+            $montant=($q[$e]['j_debit'] == 
"t")?$q[$e]['j_montant']:bcmul($q[$e]['j_montant'], -1);
+           $str_anc.=$anc_op->display_table(1,$montant,$div);
             $str_anc.='</td>';
             $str_anc.='</tr>';
 
-      }  else {
-       $row.=td('');
-      }
+          } 
       }
-    echo tr($row);
-
   }
 ?>
-</table>
 </div>
 <?php 
 require_once('ledger_detail_bottom.php');
diff --git a/include/template/ledger_detail_misc.php 
b/include/template/ledger_detail_misc.php
index 630b4c5..685ca1b 100644
--- a/include/template/ledger_detail_misc.php
+++ b/include/template/ledger_detail_misc.php
@@ -77,7 +77,6 @@ require_once ('class_anc_plan.php');
 </table>
 
 <div class="myfieldset">
-       <h1 class="legend"><?php echo _('Détail')?></h1>
 <?php 
   require_once('class_own.php');
   $owner=new Own($cn);
diff --git a/include/template/ledger_detail_ven.php 
b/include/template/ledger_detail_ven.php
index 33c5021..f7e4d57 100644
--- a/include/template/ledger_detail_ven.php
+++ b/include/template/ledger_detail_ven.php
@@ -118,9 +118,6 @@ echo $ipaid->input();
             </tr>
         </table>
         <div class="myfieldset">
-            <h1 class="legend">
-<?php echo _('Détail') ?>
-            </h1>
             <table class="result">
                 <?php
                 bcscale(2);