diff --git a/html/category_pdf.php b/html/category_pdf.php
index 3c4be1399..8faa295eb 100644
--- a/html/category_pdf.php
+++ b/html/category_pdf.php
@@ -1,29 +1,29 @@
category, export in PDF the history of a category
- * of card
- */
+ /*!\file
+ * \brief Called by impress->category, export in PDF the history of a category
+ * of card
+ */
// Security we check if user does exist and his privilege
require_once('class_user.php');
@@ -45,113 +45,159 @@ $pdf=new PDF($cn);
$pdf->setDossierInfo(" Periode : ".$_GET['start']." - ".$_GET['end']);
$pdf->AliasNbPages();
$pdf->AddPage();
-$array=Fiche::get_fiche_def($cn,$_GET['cat']);
$name=$cn->get_value('select fd_label from fiche_def where fd_id=$1',array($_GET['cat']));
$pdf->SetFont('DejaVu','BI',14);
$pdf->Cell(0,8,$name,0,1,'C');
$pdf->SetTitle($name,1);
$pdf->SetAuthor('Phpcompta');
-/*
- * You show now the result
- */
-if ($array == null ) {
- /**
- * @todo if no data send an empty PDF
- */
- // echo ' Aucune fiche trouvée
';
- exit();
-}
-$tab=array(13,25,55,20,20,12,20);
-$align=array('L','L','L','R','R','R','R');
+/* balance */
+if ( $_GET['histo'] == 4 ) {
+ $fd=new Fiche_Def($cn,$_REQUEST['cat']);
+ if ( $fd->hasAttribute(ATTR_DEF_ACCOUNT) == false ) {
+ $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');exit;
+ }
-foreach($array as $row) {
- $letter=new Lettering_Card($cn);
- $letter->set_parameter('quick_code',$row->strAttribut(ATTR_DEF_QUICKCODE));
- $letter->set_parameter('start',$_GET['start']);
- $letter->set_parameter('end',$_GET['end']);
- // all
- if ( $_GET['histo'] == 0 ) {
- $letter->get_all();
- }
-
- // lettered
- if ( $_GET['histo'] == 1 ) {
- $letter->get_letter();
- }
- // unlettered
- if ( $_GET['histo'] == 2 ) {
- $letter->get_unletter();
- }
- /* skip if nothing to display */
- if (count($letter->content) == 0 ) continue;
- $pdf->SetFont('DejaVuCond','',10);
-
- $pdf->Cell(0,7,$row->strAttribut(ATTR_DEF_NAME),1,1,'C');
-
+ $aCard=$fd->GetByType();
+ if ( empty($aCard)) {
+ $pdf->Cell(0,10, "Aucune fiche trouvée");//Save PDF to file
+ $fDate=date('dmy-Hi');
+ $pdf->Output("category-$fDate.pdf", 'I');
+ exit;}
$pdf->SetFont('DejaVuCond','',7);
+ $pdf->Cell(30,7,'Quick Code',0,0,'L',0);
+ $pdf->Cell(80,7,'Libellé',0,0,'L',0);
+ $pdf->Cell(20,8,'Débit',0,0,'R',0);
+ $pdf->Cell(20,8,'Crédit',0,0,'R',0);
+ $pdf->Cell(20,8,'Solde',0,0,'R',0);
+ $pdf->Cell(20,8,'D/C',0,0,'C',0);
+ $pdf->Ln();
+ $idx=0;
+ for ($i=0;$i < count($aCard);$i++) {
+ if ( isDate($_REQUEST['start']) == null || isDate ($_REQUEST['end']) == null ) exit;
+ $filter= " (j_date >= to_date('".$_REQUEST['start']."','DD.MM.YYYY') ".
+ " and j_date <= to_date('".$_REQUEST['end']."','DD.MM.YYYY')) ";
+ $solde=$aCard[$i]->get_solde_detail($filter);
+ if ( $solde['debit'] == 0 && $solde['credit']==0) continue;
- $pdf->Cell($tab[0],7,'Date');
- $pdf->Cell($tab[1],7,'ref');
- $pdf->Cell($tab[1],7,'Int.');
- $pdf->Cell($tab[2],7,'Comm');
- $pdf->Cell(40,7,'Montant',0,0,'C');
- $pdf->Cell($tab[5],7,'Let.',0,0,'R');
- $pdf->Cell($tab[6],7,'Som. Let.',0,0,'R');
- $pdf->ln();
-
- $amount_deb=0;$amount_cred=0;
- for ($i=0;$icontent);$i++){
- if ( $i % 2 == 0 ) {
- $pdf->SetFillColor(220,221,255);
- $fill=1;
- } else {
- $pdf->SetFillColor(0,0,0);
- $fill=0;
+ if ( $idx % 2 == 0 ) {
+ $pdf->SetFillColor(220,221,255);
+ $fill=1;
+ } else {
+ $pdf->SetFillColor(0,0,0);
+ $fill=0;
+ }
+ $idx++;
+
+ $pdf->Cell(30,7,$aCard[$i]->strAttribut(ATTR_DEF_QUICKCODE),0,0,'L',$fill);
+ $pdf->Cell(80,7,$aCard[$i]->strAttribut(ATTR_DEF_NAME),0,0,'L',$fill);
+ $pdf->Cell(20,7,sprintf('%.02f',$solde['debit']),0,0,'R',$fill);
+ $pdf->Cell(20,7,sprintf('%.02f',$solde['credit']),0,0,'R',$fill);
+ $pdf->Cell(20,7,sprintf('%.02f',abs($solde['solde'])),0,0,'R',$fill);
+ $pdf->Cell(20,7,(($solde['solde']<0)?'CRED':'DEB'),0,0,'C',$fill);
+ $pdf->Ln();
+ }
+} else {
+ $array=Fiche::get_fiche_def($cn,$_GET['cat']);
+ /*
+ * You show now the result
+ */
+ if ($array == null ) {
+ exit();
+ }
+ $tab=array(13,25,55,20,20,12,20);
+ $align=array('L','L','L','R','R','R','R');
+
+ foreach($array as $row) {
+ $letter=new Lettering_Card($cn);
+ $letter->set_parameter('quick_code',$row->strAttribut(ATTR_DEF_QUICKCODE));
+ $letter->set_parameter('start',$_GET['start']);
+ $letter->set_parameter('end',$_GET['end']);
+ // all
+ if ( $_GET['histo'] == 0 ) {
+ $letter->get_all();
}
+
+ // lettered
+ if ( $_GET['histo'] == 1 ) {
+ $letter->get_letter();
+ }
+ // unlettered
+ if ( $_GET['histo'] == 2 ) {
+ $letter->get_unletter();
+ }
+ /* skip if nothing to display */
+ if (count($letter->content) == 0 ) continue;
+ $pdf->SetFont('DejaVuCond','',10);
+
+ $pdf->Cell(0,7,$row->strAttribut(ATTR_DEF_NAME),1,1,'C');
+
$pdf->SetFont('DejaVuCond','',7);
- $row=$letter->content[$i];
- $str_date=shrink_date($row['j_date_fmt']);
- $pdf->Cell($tab[0],4,$str_date,0,0,$align[0],$fill);
- $pdf->Cell($tab[1],4,$row['jr_pj_number'],0,0,$align[1],$fill);
- $pdf->Cell($tab[1],4,$row['jr_internal'],0,0,$align[1],$fill);
- $pdf->Cell($tab[2],4,$row['jr_comment'],0,0,$align[2],$fill);
- if ( $row['j_debit'] == 't') {
- $pdf->Cell($tab[3],4,sprintf('%10.2f',$row['j_montant']),0,0,$align[4],$fill);
- $amount_deb+=$row['j_montant'];
- $pdf->Cell($tab[4],4,"",0,0,'C',$fill);
- } else {
- $pdf->Cell($tab[3],4,"",0,0,'C',$fill);
- $pdf->Cell($tab[4],4,sprintf('%10.2f',$row['j_montant']),0,0,$align[4],$fill);
- $amount_cred+=$row['j_montant'];
+ $pdf->Cell($tab[0],7,'Date');
+ $pdf->Cell($tab[1],7,'ref');
+ $pdf->Cell($tab[1],7,'Int.');
+ $pdf->Cell($tab[2],7,'Comm');
+ $pdf->Cell(40,7,'Montant',0,0,'C');
+ $pdf->Cell($tab[5],7,'Let.',0,0,'R');
+ $pdf->Cell($tab[6],7,'Som. Let.',0,0,'R');
+ $pdf->ln();
+
+ $amount_deb=0;$amount_cred=0;
+ for ($i=0;$icontent);$i++){
+ if ( $i % 2 == 0 ) {
+ $pdf->SetFillColor(220,221,255);
+ $fill=1;
+ } else {
+ $pdf->SetFillColor(0,0,0);
+ $fill=0;
+ }
+ $pdf->SetFont('DejaVuCond','',7);
+ $row=$letter->content[$i];
+ $str_date=shrink_date($row['j_date_fmt']);
+
+ $pdf->Cell($tab[0],4,$str_date,0,0,$align[0],$fill);
+ $pdf->Cell($tab[1],4,$row['jr_pj_number'],0,0,$align[1],$fill);
+ $pdf->Cell($tab[1],4,$row['jr_internal'],0,0,$align[1],$fill);
+ $pdf->Cell($tab[2],4,$row['jr_comment'],0,0,$align[2],$fill);
+ if ( $row['j_debit'] == 't') {
+ $pdf->Cell($tab[3],4,sprintf('%10.2f',$row['j_montant']),0,0,$align[4],$fill);
+ $amount_deb+=$row['j_montant'];
+ $pdf->Cell($tab[4],4,"",0,0,'C',$fill);
+ } else {
+ $pdf->Cell($tab[3],4,"",0,0,'C',$fill);
+ $pdf->Cell($tab[4],4,sprintf('%10.2f',$row['j_montant']),0,0,$align[4],$fill);
+ $amount_cred+=$row['j_montant'];
+ }
+ if ($row['letter'] != -1 ) {
+ $pdf->Cell($tab[5],4,$row['letter'],0,0,$align[5],$fill);
+ // get sum for this lettering
+ $sql="select sum(j_montant) from jrnx where j_debit=$1 and j_id in ".
+ " (select j_id from jnt_letter join letter_deb using (jl_id) where jl_id=$2 union ".
+ " select j_id from jnt_letter join letter_cred using (jl_id) where jl_id=$3)";
+ $sum=$cn->get_value($sql,array($row['j_debit'],$row['letter'],$row['letter']));
+ $pdf->Cell($tab[6],4,sprintf('%.2f',$sum),'0','0','R',$fill);
+ }
+ else
+ $pdf->Cell($tab[5],4,"",0,0,'R',$fill);
+ $pdf->Ln();
}
- if ($row['letter'] != -1 ) {
- $pdf->Cell($tab[5],4,$row['letter'],0,0,$align[5],$fill);
- // get sum for this lettering
- $sql="select sum(j_montant) from jrnx where j_debit=$1 and j_id in ".
- " (select j_id from jnt_letter join letter_deb using (jl_id) where jl_id=$2 union ".
- " select j_id from jnt_letter join letter_cred using (jl_id) where jl_id=$3)";
- $sum=$cn->get_value($sql,array($row['j_debit'],$row['letter'],$row['letter']));
- $pdf->Cell($tab[6],4,sprintf('%.2f',$sum),'0','0','R',$fill);
- }
- else
- $pdf->Cell($tab[5],4,"",0,0,'R',$fill);
+ $pdf->SetFillColor(0,0,0);
+ $pdf->SetFont('DejaVuCond','B',8);
+ $debit =sprintf('Debit : % 12.2f',$amount_deb);
+ $credit=sprintf('Credit : % 12.2f',$amount_cred);
+ if ( $amount_deb>$amount_cred) $s='solde débiteur'; else $s='solde crediteur';
+ $solde =sprintf('%s : % 12.2f',$s,(abs(round($amount_cred-$amount_deb,2))));
+
+ $pdf->Cell(0,6,$debit,0,0,'R');$pdf->ln(4);
+ $pdf->Cell(0,6,$credit,0,0,'R');$pdf->ln(4);
+ $pdf->Cell(0,6,$solde,0,0,'R');$pdf->ln(4);
+
$pdf->Ln();
}
- $pdf->SetFillColor(0,0,0);
- $pdf->SetFont('DejaVuCond','B',8);
- $debit =sprintf('Debit : % 12.2f',$amount_deb);
- $credit=sprintf('Credit : % 12.2f',$amount_cred);
- if ( $amount_deb>$amount_cred) $s='solde débiteur'; else $s='solde crediteur';
- $solde =sprintf('%s : % 12.2f',$s,(abs(round($amount_cred-$amount_deb,2))));
-
- $pdf->Cell(0,6,$debit,0,0,'R');$pdf->ln(4);
- $pdf->Cell(0,6,$credit,0,0,'R');$pdf->ln(4);
- $pdf->Cell(0,6,$solde,0,0,'R');$pdf->ln(4);
-
- $pdf->Ln();
}
-
//Save PDF to file
$fDate=date('dmy-Hi');
$pdf->Output("category-$fDate.pdf", 'I');exit;
\ No newline at end of file
diff --git a/include/class_fiche_def.php b/include/class_fiche_def.php
index 9c841f7de..1083b6dc1 100644
--- a/include/class_fiche_def.php
+++ b/include/class_fiche_def.php
@@ -266,7 +266,8 @@ function input ()
* \param $step = 0 we don't use the offset, page_size,...
* $step = 1 we use the jnr_bar_nav
*
- * \return double array (f_id,fd_id)
+ * \return array of object fiche
+ *\see fiche
*/
function GetByType($step=0) {
$sql="select *
diff --git a/include/impress_fiche.inc.php b/include/impress_fiche.inc.php
index 5fd75e890..bc7300608 100644
--- a/include/impress_fiche.inc.php
+++ b/include/impress_fiche.inc.php
@@ -120,12 +120,50 @@ $export_pdf.=HtmlInput::hidden('histo',$_GET['histo']);
$export_pdf.=dossier::hidden();
$export_pdf.=HtmlInput::submit('pdf','Export en PDF');
$export_pdf.='';
- echo $export_pdf;
+echo $export_pdf;
// Balance
if ( $_GET['histo'] == 4 ) {
- var_dump('to be implemented');
- exit();
- }
+ $fd=new Fiche_Def($cn,$_REQUEST['cat']);
+ if ( $fd->hasAttribute(ATTR_DEF_ACCOUNT) == false ) {
+ echo "Cette catégorie n'ayant pas de poste comptable n'a pas de balance";
+ exit;}
+ $aCard=$fd->GetByType();
+ if ( empty($aCard)) { echo "Aucune fiche trouvée";exit;}
+ echo '';
+ echo tr(
+ th('Quick Code').
+ th('Libellé').
+ th('Débit','style="text-align:right"').
+ th('Crédit','style="text-align:right"').
+ th('Solde','style="text-align:right"').
+ th('D/C','style="text-align:right"')
+ );
+ $idx=0;
+ for ($i=0;$i < count($aCard);$i++) {
+ if ( isDate($_REQUEST['start']) == null || isDate ($_REQUEST['end']) == null ) {
+ alert('Date invalide !'); exit;}
+ $filter= " (j_date >= to_date('".$_REQUEST['start']."','DD.MM.YYYY') ".
+ " and j_date <= to_date('".$_REQUEST['end']."','DD.MM.YYYY')) ";
+ $solde=$aCard[$i]->get_solde_detail($filter);
+ if ( $solde['debit'] == 0 && $solde['credit']==0) continue;
+ $class='';
+ if ( $idx%2 == 0) $class='class="odd"';
+ $idx++;
+ echo tr(
+ td($aCard[$i]->strAttribut(ATTR_DEF_QUICKCODE)).
+ td($aCard[$i]->strAttribut(ATTR_DEF_NAME)).
+ td(sprintf('%.02f',$solde['debit']),'style="text-align:right"').
+ td(sprintf('%.02f',$solde['credit']),'style="text-align:right"').
+ td(sprintf('%.02f',abs($solde['solde'])),'style="text-align:right"').
+ td((($solde['solde']<0)?'CRED':'DEB'),'style="text-align:right"'),
+ $class
+ );
+
+ }
+ echo '
';
+ echo $export_pdf;
+ exit();
+ }
// for the lettering
foreach($array as $row) {