[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r5541 - phpcompta/tags/rel670/include
From: |
phpcompta-dev |
Subject: |
[Phpcompta-dev] r5541 - phpcompta/tags/rel670/include |
Date: |
Fri, 22 Nov 2013 20:06:16 +0100 (CET) |
Author: danydb
Date: 2013-11-22 20:06:16 +0100 (Fri, 22 Nov 2013)
New Revision: 5541
Modified:
phpcompta/tags/rel670/include/class_acc_account_ledger.php
phpcompta/tags/rel670/include/export_gl_pdf.php
phpcompta/tags/rel670/include/impress_gl_comptes.inc.php
Log:
Task #0000916: PRINTGL et PRINTPOSTE
Modified: phpcompta/tags/rel670/include/class_acc_account_ledger.php
===================================================================
--- phpcompta/tags/rel670/include/class_acc_account_ledger.php 2013-11-22
19:03:43 UTC (rev 5540)
+++ phpcompta/tags/rel670/include/class_acc_account_ledger.php 2013-11-22
19:06:16 UTC (rev 5541)
@@ -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/tags/rel670/include/export_gl_pdf.php
===================================================================
--- phpcompta/tags/rel670/include/export_gl_pdf.php 2013-11-22 19:03:43 UTC
(rev 5540)
+++ phpcompta/tags/rel670/include/export_gl_pdf.php 2013-11-22 19:06:16 UTC
(rev 5541)
@@ -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/tags/rel670/include/impress_gl_comptes.inc.php
===================================================================
--- phpcompta/tags/rel670/include/impress_gl_comptes.inc.php 2013-11-22
19:03:43 UTC (rev 5540)
+++ phpcompta/tags/rel670/include/impress_gl_comptes.inc.php 2013-11-22
19:06:16 UTC (rev 5541)
@@ -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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpcompta-dev] r5541 - phpcompta/tags/rel670/include,
phpcompta-dev <=