[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r4797 - phpcompta/tags/rel600/include
|
From: |
phpcompta-dev |
|
Subject: |
[Phpcompta-dev] r4797 - phpcompta/tags/rel600/include |
|
Date: |
Tue, 27 Mar 2012 20:24:28 +0200 (CEST) |
Author: danydb
Date: 2012-03-27 20:24:27 +0200 (Tue, 27 Mar 2012)
New Revision: 4797
Modified:
phpcompta/tags/rel600/include/class_anc_balance_double.php
phpcompta/tags/rel600/include/class_anc_balance_simple.php
phpcompta/tags/rel600/include/export_balance_pdf.php
phpcompta/tags/rel600/include/export_fiche_balance_pdf.php
phpcompta/tags/rel600/include/export_fiche_detail_pdf.php
phpcompta/tags/rel600/include/export_fiche_pdf.php
phpcompta/tags/rel600/include/export_form_pdf.php
phpcompta/tags/rel600/include/export_gl_pdf.php
phpcompta/tags/rel600/include/export_ledger_pdf.php
phpcompta/tags/rel600/include/export_poste_detail_pdf.php
phpcompta/tags/rel600/include/export_security_pdf.php
Log:
Force the download, problem with adobe plugin.
Limit size of description in export_poste_detail_pdf.php
Modified: phpcompta/tags/rel600/include/class_anc_balance_double.php
===================================================================
--- phpcompta/tags/rel600/include/class_anc_balance_double.php 2012-03-23
20:12:57 UTC (rev 4796)
+++ phpcompta/tags/rel600/include/class_anc_balance_double.php 2012-03-27
18:24:27 UTC (rev 4797)
@@ -150,7 +150,7 @@
$tot_deb=bcadd($tot_deb,$row['debit']);
$r.=td(nbm($diff),' class="num" ');
-
+
$r.='<td>'.$row['dc'].'</td>';
$r.='</tr>';
}
@@ -263,7 +263,7 @@
$pdf->Ln();
}
$fDate=date('dmy-Hi');
- $pdf->output('crossbalance-'.$fDate.'.pdf','I');
+ $pdf->output('crossbalance-'.$fDate.'.pdf','D');
}
@@ -440,14 +440,14 @@
pb.po_name as b_po_name,
sum(a_oa_amount_c) as a_c,
sum(a_oa_amount_d) as a_d
- from (select
+ from (select
a.j_id,
a.po_id as a_po_id,
b.po_id as b_po_id,
case when a.oa_debit='t' then a.oa_amount else 0 end as
a_oa_amount_d,
case when a.oa_debit='f' then a.oa_amount else 0 end as
a_oa_amount_c
from
- operation_analytique as a join operation_analytique as b on
(a.j_id=b.j_id and a.oa_row=b.oa_row)
+ operation_analytique as a join operation_analytique as b on
(a.j_id=b.j_id and a.oa_row=b.oa_row)
join poste_analytique as poa on (a.po_id=poa.po_id)
join poste_analytique as pob on (b.po_id=pob.po_id)
where poa.pa_id=".
@@ -514,7 +514,7 @@
$array[]=array('poste'=>$old,'desc'=>$old_desc
,'debit'=>$tot_deb,'credit'=>$tot_cred,
'solde'=>$s,'dc'=>$d);
-
+
$tot_deb=0;
$tot_cred=0;
@@ -538,10 +538,10 @@
$d=($tot_deb>$tot_cred)?'debit':'credit';
$array[]=array('poste'=>$old,'desc'=>$old_desc
,'debit'=>$tot_deb,'credit'=>$tot_cred,
-
+
'solde'=>$s,'dc'=>$d);
-
+
return $array;
}
Modified: phpcompta/tags/rel600/include/class_anc_balance_simple.php
===================================================================
--- phpcompta/tags/rel600/include/class_anc_balance_simple.php 2012-03-23
20:12:57 UTC (rev 4796)
+++ phpcompta/tags/rel600/include/class_anc_balance_simple.php 2012-03-27
18:24:27 UTC (rev 4797)
@@ -199,7 +199,7 @@
$pdf->Ln();
}
$fDate=date('dmy-Hi');
- $pdf->output('simple-balance-'.$fDate.'.pdf','I');
+ $pdf->output('simple-balance-'.$fDate.'.pdf','D');
}
/*!
Modified: phpcompta/tags/rel600/include/export_balance_pdf.php
===================================================================
--- phpcompta/tags/rel600/include/export_balance_pdf.php 2012-03-23
20:12:57 UTC (rev 4796)
+++ phpcompta/tags/rel600/include/export_balance_pdf.php 2012-03-27
18:24:27 UTC (rev 4797)
@@ -219,7 +219,7 @@
} // if ! empty
$fDate=date('dmy-Hi');
-$pdf->Output('balance-'.$fDate.'.pdf','I');
+$pdf->Output('balance-'.$fDate.'.pdf','D');
Modified: phpcompta/tags/rel600/include/export_fiche_balance_pdf.php
===================================================================
--- phpcompta/tags/rel600/include/export_fiche_balance_pdf.php 2012-03-23
20:12:57 UTC (rev 4796)
+++ phpcompta/tags/rel600/include/export_fiche_balance_pdf.php 2012-03-27
18:24:27 UTC (rev 4797)
@@ -59,7 +59,7 @@
$pdf->Cell(0,10, "Cette catégorie n'ayant pas de poste comptable n'a
pas de balance");
//Save PDF to file
$fDate=date('dmy-Hi');
- $pdf->Output("category-$fDate.pdf", 'I');
+ $pdf->Output("category-$fDate.pdf", 'D');
exit;
}
// all card
@@ -76,7 +76,7 @@
{
$pdf->Cell(0,10, "Aucune fiche trouvée");//Save PDF to file
$fDate=date('dmy-Hi');
- $pdf->Output("category-$fDate.pdf", 'I');
+ $pdf->Output("category-$fDate.pdf", 'D');
exit;
}
$pdf->SetFont('DejaVuCond','',7);
@@ -270,5 +270,5 @@
}
//Save PDF to file
$fDate=date('dmy-Hi');
-$pdf->Output("category-$fDate.pdf", 'I');
+$pdf->Output("category-$fDate.pdf", 'D');
exit;
Modified: phpcompta/tags/rel600/include/export_fiche_detail_pdf.php
===================================================================
--- phpcompta/tags/rel600/include/export_fiche_detail_pdf.php 2012-03-23
20:12:57 UTC (rev 4796)
+++ phpcompta/tags/rel600/include/export_fiche_detail_pdf.php 2012-03-27
18:24:27 UTC (rev 4797)
@@ -187,7 +187,7 @@
$pdf->Ln();
$fDate=date('dmy-Hi');
-$pdf->Output('fiche-'.$fDate.'.pdf','I');
+$pdf->Output('fiche-'.$fDate.'.pdf','D');
?>
Modified: phpcompta/tags/rel600/include/export_fiche_pdf.php
===================================================================
--- phpcompta/tags/rel600/include/export_fiche_pdf.php 2012-03-23 20:12:57 UTC
(rev 4796)
+++ phpcompta/tags/rel600/include/export_fiche_pdf.php 2012-03-27 18:24:27 UTC
(rev 4797)
@@ -58,7 +58,7 @@
$pdf->Cell(0,10, "Cette catégorie n'ayant pas de poste comptable n'a
pas de balance");
//Save PDF to file
$fDate=date('dmy-Hi');
- $pdf->Output("category-$fDate.pdf", 'I');
+ $pdf->Output("category-$fDate.pdf", 'D');
exit;
}
$aCard=$cn->get_array("select f_id,ad_value from fiche join fiche_Detail
using (f_id) where ad_id=1 and fd_id=$1 order by 2 ",array($_REQUEST['cat']));
@@ -67,7 +67,7 @@
{
$pdf->Cell(0,10, "Aucune fiche trouvée");//Save PDF to file
$fDate=date('dmy-Hi');
- $pdf->Output("category-$fDate.pdf", 'I');
+ $pdf->Output("category-$fDate.pdf", 'D');
exit;
}
$pdf->SetFont('DejaVuCond','',7);
@@ -230,5 +230,5 @@
}
//Save PDF to file
$fDate=date('dmy-Hi');
-$pdf->Output("category-$fDate.pdf", 'I');
+$pdf->Output("category-$fDate.pdf", 'D');
exit;
Modified: phpcompta/tags/rel600/include/export_form_pdf.php
===================================================================
--- phpcompta/tags/rel600/include/export_form_pdf.php 2012-03-23 20:12:57 UTC
(rev 4796)
+++ phpcompta/tags/rel600/include/export_form_pdf.php 2012-03-27 18:24:27 UTC
(rev 4797)
@@ -124,6 +124,6 @@
}
$fDate=date('dmy-Hi');
-$pdf->Output('rapport-'.$fDate.'.pdf','I');
+$pdf->Output('rapport-'.$fDate.'.pdf','D');
?>
Modified: phpcompta/tags/rel600/include/export_gl_pdf.php
===================================================================
--- phpcompta/tags/rel600/include/export_gl_pdf.php 2012-03-23 20:12:57 UTC
(rev 4796)
+++ phpcompta/tags/rel600/include/export_gl_pdf.php 2012-03-27 18:24:27 UTC
(rev 4797)
@@ -198,6 +198,6 @@
}
//Save PDF to file
-$pdf->Output("gl_comptes.pdf", 'I');
+$pdf->Output("gl_comptes.pdf", 'D');
exit;
?>
Modified: phpcompta/tags/rel600/include/export_ledger_pdf.php
===================================================================
--- phpcompta/tags/rel600/include/export_ledger_pdf.php 2012-03-23 20:12:57 UTC
(rev 4796)
+++ phpcompta/tags/rel600/include/export_ledger_pdf.php 2012-03-27 18:24:27 UTC
(rev 4797)
@@ -80,11 +80,11 @@
$pdf->AddPage();
$pdf->SetAuthor('Phpcompta');
$pdf->setTitle("Journal",true);
-
+
$pdf->export($Jrn);
$fDate=date('dmy-Hi');
- $pdf->Output('journal-'.$fDate.'.pdf','I');
+ $pdf->Output('journal-'.$fDate.'.pdf','D');
exit(0);
} // impression detaillé
@@ -105,7 +105,7 @@
$pdf->setTitle("Journal",true);
$pdf->Cell(0,6,'Ce journal ne peut être imprimé en mode simple');
- $pdf->output('erreur.pdf','I');
+ $pdf->output('erreur.pdf','D');
exit();
}
if ( $jrn_type=='VEN' && $cn->get_value('select count(qs_id) from
quant_sold') == 0 )
@@ -115,7 +115,7 @@
$pdf->AliasNbPages();
$pdf->AddPage();
$pdf->Cell(0,6,'Ce journal ne peut être imprimé en mode simple');
- $pdf->output('erreur.pdf','I');
+ $pdf->output('erreur.pdf','D');
exit();
}
@@ -130,7 +130,7 @@
$pdf->export();
$fDate=date('dmy-Hi');
- $pdf->Output('journal-'.$fDate.'.pdf','I');
+ $pdf->Output('journal-'.$fDate.'.pdf','D');
exit(0);
}
if ( $own->MY_TVA_USE=='N')
@@ -144,7 +144,7 @@
$pdf->export($Jrn);
$fDate=date('dmy-Hi');
- $pdf->Output('journal-'.$fDate.'.pdf','I');
+ $pdf->Output('journal-'.$fDate.'.pdf','D');
exit(0);
}
@@ -158,10 +158,10 @@
$pdf->AddPage();
$pdf->SetAuthor('Phpcompta');
$pdf->setTitle("Journal",true);
-
+
$pdf->export();
$fDate=date('dmy-Hi');
- $pdf->Output('journal-'.$fDate.'.pdf','I');
+ $pdf->Output('journal-'.$fDate.'.pdf','D');
exit(0);
}
if ( $jrn_type=='ODS' || $Jrn->id==0)
@@ -171,11 +171,11 @@
$pdf->AliasNbPages();
$pdf->SetAuthor('Phpcompta');
$pdf->setTitle("Journal",true);
-
+
$pdf->AddPage();
$pdf->export();
$fDate=date('dmy-Hi');
- $pdf->Output('journal-'.$fDate.'.pdf','I');
+ $pdf->Output('journal-'.$fDate.'.pdf','D');
exit(0);
}
}
Modified: phpcompta/tags/rel600/include/export_poste_detail_pdf.php
===================================================================
--- phpcompta/tags/rel600/include/export_poste_detail_pdf.php 2012-03-23
20:12:57 UTC (rev 4796)
+++ phpcompta/tags/rel600/include/export_poste_detail_pdf.php 2012-03-27
18:24:27 UTC (rev 4797)
@@ -58,7 +58,7 @@
if ( count($a_poste) == 0 )
{
- $pdf->Output('poste.pdf','I');
+ $pdf->Output('poste.pdf','D');
exit;
}
$size=array(13,25,20,60,12,20,20,20);
@@ -112,11 +112,11 @@
if ( $row['jr_pj_number'] == '')
$pdf->Cell($size[$l],6,$row['jr_internal'],0,0,$align[$l]);
else
- $pdf->Cell($size[$l],6,$row['jr_pj_number'],0,0,$align[$l]);
+ $pdf->Cell($size[$l],6,$row['jr_pj_number'],0,0,$align[$l]);
$l++;
$pdf->Cell($size[$l],6,substr($row['jrn_name'],0,14),0,0,$align[$l]);
$l++;
- $pdf->Cell($size[$l],6,$row['description'],0,0,$align[$l]);
+ $pdf->Cell($size[$l],6,
substr($row['description'],0,55),0,0,$align[$l]);
$l++;
$pdf->Cell($size[$l],6,(($row['letter']!=-1)?$row['letter']:''),0,0,$align[$l]);
$l++;
@@ -198,5 +198,5 @@
}
$fDate=date('dmy-Hi');
-$pdf->Output('poste-'.$fDate.'.pdf','I');
+$pdf->Output('poste-'.$fDate.'.pdf','D');
?>
Modified: phpcompta/tags/rel600/include/export_security_pdf.php
===================================================================
--- phpcompta/tags/rel600/include/export_security_pdf.php 2012-03-23
20:12:57 UTC (rev 4796)
+++ phpcompta/tags/rel600/include/export_security_pdf.php 2012-03-27
18:24:27 UTC (rev 4797)
@@ -175,5 +175,5 @@
$pdf->Ln();
}
$fDate=date('dmy-HI');
-$pdf->Output('security-'.$fDate.'pdf','I');
+$pdf->Output('security-'.$fDate.'pdf','D');
?>
---
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] r4797 - phpcompta/tags/rel600/include,
phpcompta-dev <=