Author: danydb Date: 2013-11-22 20:13:12 +0100 (Fri, 22 Nov 2013) New Revision: 5544
Modified: phpcompta/trunk/ phpcompta/trunk/include/class_acc_account_ledger.php phpcompta/trunk/include/export_gl_pdf.php phpcompta/trunk/include/fiche.inc.php phpcompta/trunk/include/impress_gl_comptes.inc.php Log: Merged revisions 5541-5542 via svnmerge from svn+ssh://[email protected]/svn/phpcompta/tags/rel670 ........ r5541 | danydb | 2013-11-22 20:06:16 +0100 (ven., 22 nov. 2013) | 1 line Task #0000916: PRINTGL et PRINTPOSTE ........ r5542 | danydb | 2013-11-22 20:10:57 +0100 (ven., 22 nov. 2013) | 1 line Task #0000917: CARD : balance ........ Property changes on: phpcompta/trunk ___________________________________________________________________ Name: svnmerge-integrated - /phpcompta/tags/rel670:1-5535 + /phpcompta/tags/rel670:1-5539,5541-5543 Modified: phpcompta/trunk/include/class_acc_account_ledger.php =================================================================== --- phpcompta/trunk/include/class_acc_account_ledger.php 2013-11-22 19:12:28 UTC (rev 5543) +++ phpcompta/trunk/include/class_acc_account_ledger.php 2013-11-22 19:13:12 UTC (rev 5544) @@ -146,7 +146,9 @@ $Res=$this->db->exec_sql("select jr_id,to_char(j_date,'DD.MM.YYYY') as j_date_fmt,j_date,". "case when j_debit='t' then j_montant else 0 end as deb_montant,". "case when j_debit='f' then j_montant else 0 end as cred_montant,". - " jr_comment as description,jrn_def_name as jrn_name,". + " case when j_text is null or j_text = '' then jr_comment + else jr_comment||' '||j_text end + as description,jrn_def_name as jrn_name,". "j_debit, jr_internal,jr_pj_number, coalesce(comptaproc.get_letter_jnt(j_id),-1) as letter ". ",pcm_lib ". Modified: phpcompta/trunk/include/export_gl_pdf.php =================================================================== --- phpcompta/trunk/include/export_gl_pdf.php 2013-11-22 19:12:28 UTC (rev 5543) +++ phpcompta/trunk/include/export_gl_pdf.php 2013-11-22 19:13:12 UTC (rev 5544) @@ -149,12 +149,12 @@ $i = 0; $side=" ".$Poste->get_amount_side($solde); - $pdf->Cell($width[$i], 6, shrink_date($detail['j_date_fmt']), 0, 0, $lor[$i]); + $pdf->LongLine($width[$i], 6, shrink_date($detail['j_date_fmt']), 0, $lor[$i]); $i++; - $pdf->Cell($width[$i], 6, $detail['jr_internal'], 0, 0, $lor[$i]); + $pdf->LongLine($width[$i], 6, $detail['jr_internal'], 0, $lor[$i] ); $i++; /* limit set to 20 for the substring */ - $pdf->Cell($width[$i], 6, mb_substr($detail['description'],0,42), 0, 0, $lor[$i]); + $pdf->LongLine($width[$i], 6, mb_substr($detail['description'],0,120), 0,$lor[$i]); $i++; $pdf->Cell($width[$i], 6, $detail['jr_pj_number'], 0, 0, $lor[$i]); $i++; Modified: phpcompta/trunk/include/fiche.inc.php =================================================================== --- phpcompta/trunk/include/fiche.inc.php 2013-11-22 19:12:28 UTC (rev 5543) +++ phpcompta/trunk/include/fiche.inc.php 2013-11-22 19:13:12 UTC (rev 5544) @@ -332,9 +332,7 @@ /* only not purged card */ if ($_GET['histo'] == 5 && $solde['debit'] == $solde['credit']) continue; - $class = ''; - if ($idx % 2 == 0) - $class = 'class="odd"'; + $class =($idx % 2 == 0) ? 'class="odd"':'class="even"'; $idx++; $sum_cred=bcadd($sum_cred,$solde['credit']); $sum_deb=bcadd($sum_deb,$solde['debit']); Modified: phpcompta/trunk/include/impress_gl_comptes.inc.php =================================================================== --- phpcompta/trunk/include/impress_gl_comptes.inc.php 2013-11-22 19:12:28 UTC (rev 5543) +++ phpcompta/trunk/include/impress_gl_comptes.inc.php 2013-11-22 19:13:12 UTC (rev 5544) @@ -194,19 +194,6 @@ $i=0; foreach ($Poste->row as $detail) { - if ($a==0) {var_dump($detail);$a=1;} - /* - [0] => 1 [jr_id] => 1 - [1] => 01.02.2009 [j_date_fmt] => 01.02.2009 - [2] => 2009-02-01 [j_date] => 2009-02-01 - [3] => 0 [deb_montant] => 0 - [4] => 12211.9100 [cred_montant] => 12211.9100 - [5] => Ecriture douverture [description] => Ecriture douverture - [6] => Opération Diverses [jrn_name] => Opération Diverses - [7] => f [j_debit] => f - [8] => 17OD-01-1 [jr_internal] => 17OD-01-1 - [9] => ODS1 [jr_pj_number] => ODS1 ) 1 - */ if ($detail['cred_montant'] > 0) { --- PhpCompta est un logiciel de comptabilité libre en ligne (full web) Projet opensource http://www.phpcompta.eu _______________________________________________ Phpcompta est un logiciel libre de comptabilité en ligne (http://www.phpcompta.eu) Phpcompta-dev mailing list [email protected] https://lists.nongnu.org/mailman/listinfo/phpcompta-dev
