[Phpcompta-dev] r5462 - phpcompta/trunk/include

[phpcompta-dev]

Author: danydb
Date: 2013-10-03 12:56:13 +0200 (Thu, 03 Oct 2013)
New Revision: 5462

Modified:
   phpcompta/trunk/include/class_acc_account_ledger.php
   phpcompta/trunk/include/class_acc_operation.php
   phpcompta/trunk/include/impress_poste.inc.php
Log:
Highlight in PRINTPOSTE

Modified: phpcompta/trunk/include/class_acc_account_ledger.php
===================================================================
--- phpcompta/trunk/include/class_acc_account_ledger.php        2013-10-03 
10:43:02 UTC (rev 5461)
+++ phpcompta/trunk/include/class_acc_account_ledger.php        2013-10-03 
10:56:13 UTC (rev 5462)
@@ -150,7 +150,7 @@
                                  "j_debit, jr_internal,jr_pj_number,
                                                                 
coalesce(comptaproc.get_letter_jnt(j_id),-1) as letter ".
                                  ",pcm_lib ".
-                                ",jr_tech_per,p_exercice ".
+                                ",jr_tech_per,p_exercice,jrn_def_name".
                                  " from jrnx left join jrn_def on 
(jrn_def_id=j_jrn_def )".
                                  " left join jrn on (jr_grpt_id=j_grpt)".
                                  " left join tmp_pcmn on (j_poste=pcm_val)".
@@ -467,7 +467,7 @@
        }
         $hid=new IHidden();
 
-        echo "<table >";
+        echo "<table  >";
         echo '<TR>';
         
$str_ople=(isset($_REQUEST['ople']))?HtmlInput::hidden('ople',$_REQUEST['ople']):'';
        if ($actiontarget=='poste')

Modified: phpcompta/trunk/include/class_acc_operation.php
===================================================================
--- phpcompta/trunk/include/class_acc_operation.php     2013-10-03 10:43:02 UTC 
(rev 5461)
+++ phpcompta/trunk/include/class_acc_operation.php     2013-10-03 10:56:13 UTC 
(rev 5462)
@@ -252,7 +252,7 @@
         $filter_sql=str_replace('jrn_def_id','jr_def_id',$filter_sql);
         if ( $this->jr_id==0 ) return;
         $sql=" select  jr_date,j_qcode,j_poste,j_montant,jr_internal,case when 
j_debit = 'f' then 'C' else 'D' end as debit,jr_comment as description,
-             
vw_name,pcm_lib,j_debit,coalesce(comptaproc.get_letter_jnt(j_id),-1) as letter 
".
+             
vw_name,pcm_lib,j_debit,coalesce(comptaproc.get_letter_jnt(j_id),-1) as 
letter,jr_def_id ".
              " from jrnx join jrn on (jr_grpt_id=j_grpt)
              join tmp_pcmn on (j_poste=pcm_val)
              left join vw_fiche_attr on (j_qcode=quick_code)

Modified: phpcompta/trunk/include/impress_poste.inc.php
===================================================================
--- phpcompta/trunk/include/impress_poste.inc.php       2013-10-03 10:43:02 UTC 
(rev 5461)
+++ phpcompta/trunk/include/impress_poste.inc.php       2013-10-03 10:56:13 UTC 
(rev 5462)
@@ -276,14 +276,14 @@
             // Detail
             
//----------------------------------------------------------------------
             echo Acc_Account_Ledger::HtmlTableHeader();
-            echo '<table class="result" style="width:80%;margin-left:10%">';
+            echo '<table  style="width:100%;margin-left:0%">';
             foreach ($a_poste as $poste_id )
             {
                 $Poste=new Acc_Account_Ledger ($cn,$poste_id['pcm_val']);
                 $Poste->load();
                 $Poste->get_row_date( $_GET['from_periode'], 
$_GET['to_periode'],$_GET['ople']);
                 if ( empty($Poste->row)) continue;
-                echo '<tr><td  class="mtitle" style="width:auto" 
colspan="6"><h2 class="info">'. $poste_id['pcm_val'].' 
'.h($Poste->label).'</h2></td></tr>';
+                echo '<tr><td  class="mtitle" style="width:auto" 
colspan="6"><h2 class="title">'. $poste_id['pcm_val'].' 
'.h($Poste->label).'</h2></td></tr>';
 
                 $detail=$Poste->row[0];
 
@@ -294,6 +294,7 @@
                     /* avoid duplicates */
                     if ( in_array($detail['jr_id'],$old) == TRUE ) continue;
                     $old[]=$detail['jr_id'];
+                    echo tr(td("Journal 
:".$detail['jrn_def_name'],''),'style="width:auto" colspan="6"');
                     echo '<tr><td class="mtitle" style="width:auto" 
colspan="6">'. $detail['j_date'].' '.$detail['jr_internal'].' 
'.hb($detail['description']).' '.hi($detail['jr_pj_number']).'</td></tr>';
 
                     $op=new Acc_Operation($cn);



---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu