lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correction du bug #18267

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2006-12-07 10:36:00 +00:00
parent 6e592b2e37
commit 199b01afef
1 changed files with 70 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/includes/modules/rapport/pdf_paiement.class.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2006 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2006 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -30,15 +30,15 @@
require_once(FPDF_PATH.'fpdf.php'); require_once(FPDF_PATH.'fpdf.php');
/**
/** \class pdf_paiement \class pdf_paiement
\brief Classe permettant de générer les rapports de paiement \brief Classe permettant de générer les rapports de paiement
*/ */
class pdf_paiement class pdf_paiement
{ {
/**
/** \brief Constructeur \brief Constructeur
\param db handler accès base de donnée \param db handler accès base de donnée
*/ */
function pdf_paiement($db=0) function pdf_paiement($db=0)
@ -56,8 +56,12 @@ class pdf_paiement
$this->tab_height = 230; //$this->line_height * $this->line_per_page; $this->tab_height = 230; //$this->line_height * $this->line_per_page;
} }
/**
\brief Generate Header
\param pdf pdf object
\param page current page number
\param pages number of pages
*/
function Header(&$pdf, $page, $pages) function Header(&$pdf, $page, $pages)
{ {
global $langs; global $langs;
@ -154,8 +158,6 @@ class pdf_paiement
} }
} }
/** /**
\brief Fonction générant le rapport sur le disque \brief Fonction générant le rapport sur le disque
\param _dir repertoire \param _dir repertoire
@ -189,7 +191,8 @@ class pdf_paiement
$pdf->Open(); $pdf->Open();
$sql = "SELECT ".$this->db->pdate("p.datep")." as dp, f.facnumber"; $sql = "SELECT ".$this->db->pdate("p.datep")." as dp, f.facnumber";
$sql .= ", c.libelle as paiement_type, p.num_paiement"; //$sql .= ", c.libelle as paiement_type, p.num_paiement";
$sql .= ", c.code as paiement_code, p.num_paiement";
$sql .= ", p.amount as paiement_amount, f.total_ttc as facture_amount "; $sql .= ", p.amount as paiement_amount, f.total_ttc as facture_amount ";
$sql .= ", pf.amount as pf_amount "; $sql .= ", pf.amount as pf_amount ";
$sql .= ", p.rowid as prowid"; $sql .= ", p.rowid as prowid";
@ -217,7 +220,8 @@ class pdf_paiement
$lines[$i][0] = $objp->facnumber; $lines[$i][0] = $objp->facnumber;
$lines[$i][1] = dolibarr_print_date($objp->dp,"%d %B %Y"); $lines[$i][1] = dolibarr_print_date($objp->dp,"%d %B %Y");
$lines[$i][2] = $objp->paiement_type ; //$lines[$i][2] = $objp->paiement_type ;
$lines[$i][2] = $langs->trans("PaymentTypeShort".$objp->paiement_code);
$lines[$i][3] = $objp->num_paiement; $lines[$i][3] = $objp->num_paiement;
$lines[$i][4] = price($objp->paiement_amount); $lines[$i][4] = price($objp->paiement_amount);
$lines[$i][5] = price($objp->facture_amount); $lines[$i][5] = price($objp->facture_amount);