phpcompta-dev
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpcompta-dev] r4614 - phpcompta/branches/rel560/include/template


From: phpcompta-dev
Subject: [Phpcompta-dev] r4614 - phpcompta/branches/rel560/include/template
Date: Fri, 16 Dec 2011 02:56:03 +0100 (CET)

Author: danydb
Date: 2011-12-16 02:56:02 +0100 (Fri, 16 Dec 2011)
New Revision: 4614

Modified:
   phpcompta/branches/rel560/include/template/ledger_detail_fin.php
   phpcompta/branches/rel560/include/template/ledger_detail_misc.php
Log:

Show j_text in detailled operation


Modified: phpcompta/branches/rel560/include/template/ledger_detail_fin.php
===================================================================
--- phpcompta/branches/rel560/include/template/ledger_detail_fin.php    
2011-12-15 20:21:23 UTC (rev 4613)
+++ phpcompta/branches/rel560/include/template/ledger_detail_fin.php    
2011-12-16 01:56:02 UTC (rev 4614)
@@ -19,7 +19,7 @@
 $date=new IDate('p_date');
 $date->value=format_date($obj->det->jr_date);
  echo td('Date').td($date->input());
- 
+
  ?>
 
 </tr>
@@ -35,7 +35,7 @@
 </tr>
 <tr>
 <?
- 
+
 $bk=new Fiche($cn,$obj->det->array[0]['qf_other']);
 $view_history= sprintf('<A class="detail" 
HREF="javascript:view_history_card(\'%s\',\'%s\')" >%s</A>',
                                $bk->id, $gDossier, $bk->get_quick_code());
@@ -45,7 +45,7 @@
 </tr>
 
 <tr>
-<? 
+<?
   $itext=new IText('lib');
   $itext->value=$obj->det->jr_comment;
   $itext->size=40;
@@ -58,7 +58,7 @@
 <? echo td('montant').td($obj->det->array[0]['qf_amount'],' class="inum"');?>
 </tr>
 <tr>
-<? 
+<?
 $itext=new IText('npj');
 $itext->value=$obj->det->jr_pj_number;
 echo td(_('Pièce')).td($itext->input());
@@ -93,7 +93,7 @@
 <fieldset>
 <legend>
 <?=_('Détail')?>
-<? 
+<?
   $detail=new Acc_Misc($cn,$obj->jr_id);
 $detail->get();
 ?>
@@ -132,8 +132,11 @@
     else
       $view_history='';
     $row.=td($view_history);
-    if ( $q[$e]['j_qcode'] !='') {
-      // nom de la fiche 
+       if ( $q[$e]['j_text']!='')
+       {
+               $row.=td(h($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)));
@@ -149,13 +152,13 @@
     if ( $owner->MY_ANALYTIC != "nu" && $div == 'popup')
       {
        $poste=$fiche->strAttribut(ATTR_DEF_ACCOUNT);
-       if ( preg_match('/^(6|7)/',$q[$e]['j_poste'])) 
+       if ( preg_match('/^(6|7)/',$q[$e]['j_poste']))
          {
            $anc_op=new Anc_Operation($cn);
            $anc_op->j_id=$q[$e]['j_id'];
            $row.= HtmlInput::hidden('op[]',$anc_op->j_id);
            $row.=$anc_op->display_table(1,$q[$e]['j_montant'],$div);
-       
+
       }  else {
        $row.=td('');
       }

Modified: phpcompta/branches/rel560/include/template/ledger_detail_misc.php
===================================================================
--- phpcompta/branches/rel560/include/template/ledger_detail_misc.php   
2011-12-15 20:21:23 UTC (rev 4613)
+++ phpcompta/branches/rel560/include/template/ledger_detail_misc.php   
2011-12-16 01:56:02 UTC (rev 4614)
@@ -1,11 +1,11 @@
-<? 
-require_once('template/ledger_detail_top.php'); 
+<?
+require_once('template/ledger_detail_top.php');
 require_once('class_anc_operation.php');
 require_once('class_anc_plan.php');
 
 ?>
-<? 
-require_once('class_own.php'); 
+<?
+require_once('class_own.php');
 require_once ('class_anc_plan.php');
 ?>
 <div class="content" style="padding:0">
@@ -22,31 +22,31 @@
                                                                $date=new 
IDate('p_date');
                                                                
$date->value=format_date($obj->det->jr_date);
                                                                 echo 
td('Date').td($date->input());
-                                                                
+
                                                                 ?>
                                                                </td>
                                                                </tr>
-                                                               
+
                                                                <tr><td>
-                                                               <? 
+                                                               <?
                                                                  $itext=new 
IText('lib');
                                                                  
$itext->value=$obj->det->jr_comment;
                                                                  
$itext->size=40;
                                                                  echo 
td(_('Libellé')).td($itext->input());
-                                                               
-                                                               
+
+
                                                                ?>
                                                                </td></tr>
                                                                <tr><td>
                                                                <? echo 
td('montant').td(nbm($obj->det->jr_montant),' class="inum"');?>
                                                                </td></tr>
                                                                <tr><td>
-                                                               <? 
+                                                               <?
                                                                $itext=new 
IText('npj');
                                                                
$itext->value=$obj->det->jr_pj_number;
                                                                echo 
td(_('Pièce')).td($itext->input());
                                                                ?>
-                                                               
+
                                                                </td></tr>
                        </table>
                        </td><td>
@@ -64,7 +64,7 @@
                                                $inote->value=$obj->det->note;
                                                echo $inote->input();
                                                ?>
-                                               
+
                                                </td>
                                                </tr>
                                                </table>
@@ -98,7 +98,7 @@
       /* add hidden variables pa[] to hold the value of pa_id */
       echo Anc_Plan::hidden($a_anc);
     }
-echo '</tr>';  
+echo '</tr>';
   for ($e=0;$e<count($obj->det->array);$e++) {
     $row=''; $q=$obj->det->array;
     $view_history= sprintf('<A class="detail" 
style="text-decoration:underline" 
HREF="javascript:view_history_account(\'%s\',\'%s\')" >%s</A>',
@@ -114,9 +114,12 @@
     else
       $view_history='';
     $row.=td($view_history);
-
+       if ( $q[$e]['j_text']!='')
+       {
+               $row.=td(h($q[$e]['j_text']));
+       }else
     if ( $q[$e]['j_qcode'] !='') {
-      // nom de la fiche 
+      // nom de la fiche
       $ff=new Fiche($cn);
       $ff->get_by_qcode( $q[$e]['j_qcode']);
       $row.=td(h($ff->strAttribut(ATTR_DEF_NAME)));
@@ -131,13 +134,13 @@
     /* Analytic accountancy */
     if ( $owner->MY_ANALYTIC != "nu" && $div=='popup'){
       if ( preg_match('/^(6|7)/',$q[$e]['j_poste'])) {
-       
 
+
        $anc_op=new Anc_Operation($cn);
        $anc_op->j_id=$q[$e]['j_id'];
        echo HtmlInput::hidden('op[]',$anc_op->j_id);
        $row.=$anc_op->display_table(1,$q[$e]['j_montant'],$div);
-       
+
       }  else {
        $row.=td('');
       }




reply via email to

[Prev in Thread] Current Thread [Next in Thread]