Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

New add payments table to pdf expense report

Browse Source
This commit is contained in:
fappels
2018-12-04 23:16:41 +01:00
parent 6d093b03f6
commit d1d41f4dd4
2 changed files with 164 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
View File

@@ -3,6 +3,7 @@
* Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2016-2018 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2018 Francis Appels <francis.appels@z-application.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -213,7 +214,7 @@ class pdf_standard extends ModeleExpenseReport
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
// Load traductions files requiredby by page
$outputlangs->loadLangs(array("main", "trips", "projects", "dict"));
$outputlangs->loadLangs(array("main", "trips", "projects", "dict", "bills", "banks"));
$nblignes = count($object->lines);
@@ -462,30 +463,37 @@ class pdf_standard extends ModeleExpenseReport
// Show total area box
$posy=$bottomlasttab+5;
$pdf->SetXY(100, $posy);
$pdf->MultiCell(60, 5, $outputlangs->transnoentities("TotalHT"), 1, 'L');
$pdf->SetXY(160, $posy);
$pdf->MultiCell($this->page_largeur - $this->marge_gauche - 160, 5, price($object->total_ht), 1, 'R');
$posy_start_of_totals = $posy;
$pdf->SetXY(130, $posy);
$pdf->MultiCell(70, 5, $outputlangs->transnoentities("TotalHT"), 1, 'L');
$pdf->SetXY(180, $posy);
$pdf->MultiCell($this->page_largeur - $this->marge_gauche - 180, 5, price($object->total_ht), 1, 'R');
$pdf->SetFillColor(248,248,248);
if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
{
// TODO Show vat amout per tax level
$posy+=5;
$pdf->SetXY(100, $posy);
$pdf->SetXY(130, $posy);
$pdf->SetTextColor(0,0,60);
$pdf->MultiCell(60, 5, $outputlangs->transnoentities("TotalVAT"), 1,'L');
$pdf->SetXY(160, $posy);
$pdf->MultiCell($this->page_largeur - $this->marge_gauche - 160, 5, price($object->total_tva),1, 'R');
$pdf->MultiCell(70, 5, $outputlangs->transnoentities("TotalVAT"), 1,'L');
$pdf->SetXY(180, $posy);
$pdf->MultiCell($this->page_largeur - $this->marge_gauche - 180, 5, price($object->total_tva),1, 'R');
}
$posy+=5;
$pdf->SetXY(100, $posy);
$pdf->SetXY(130, $posy);
$pdf->SetFont('','B', 10);
$pdf->SetTextColor(0,0,60);
$pdf->MultiCell(60, 5, $outputlangs->transnoentities("TotalTTC"), 1,'L');
$pdf->SetXY(160, $posy);
$pdf->MultiCell($this->page_largeur - $this->marge_gauche - 160, 5, price($object->total_ttc),1, 'R');
$pdf->MultiCell(70, 5, $outputlangs->transnoentities("TotalTTC"), 1,'L');
$pdf->SetXY(180, $posy);
$pdf->MultiCell($this->page_largeur - $this->marge_gauche - 180, 5, price($object->total_ttc),1, 'R');
// show payments zone
$sumPayments = $object->getSumPayments();
if ($sumPayments > 0 && empty($conf->global->PDF_EXPENSEREPORT_NO_PAYMENT_DETAILS)) {
$posy=$this->tablePayments($pdf, $object, $posy_start_of_totals, $outputlangs);
}
// Pied de page
$this->_pagefoot($pdf,$object,$outputlangs);
@@ -531,7 +539,7 @@ class pdf_standard extends ModeleExpenseReport
* @param int $hidedetails Hide details (0=no, 1=yes, 2=just special lines)
* @return void
*/
private function printLine(&$pdf, $object, $linenumber, $curY, $default_font_size, $outputlangs, $hidedetails=0)
private function printLine(&$pdf, $object, $linenumber, $curY, $default_font_size, $outputlangs, $hidedetails=0)
{
global $conf;
$pdf->SetFont('','', $default_font_size - 1);
@@ -926,6 +934,118 @@ class pdf_standard extends ModeleExpenseReport
$pdf->SetTextColor(0,0,0);
}
/**
* Show payments table
*
* @param PDF $pdf Object PDF
* @param Object $object Object invoice
* @param int $posy Position y in PDF
* @param Translate $outputlangs Object langs for output
* @return int <0 if KO, >0 if OK
*/
private function tablePayments(&$pdf, $object, $posy, $outputlangs)
{
global $conf;
$sign=1;
$tab3_posx = $this->marge_gauche;
$tab3_top = $posy;
$tab3_width = 88;
$tab3_height = 5;
$default_font_size = pdf_getPDFFontSize($outputlangs);
$title=$outputlangs->transnoentities("PaymentsAlreadyDone");
$pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY($tab3_posx, $tab3_top - 4);
$pdf->SetTextColor(0,0,0);
$pdf->MultiCell(60, 3, $title, 0, 'L', 0);
$pdf->line($tab3_posx, $tab3_top, $tab3_posx+$tab3_width+2, $tab3_top); // Top border line of table title
$pdf->SetXY($tab3_posx, $tab3_top+1);
$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Date"), 0, 'L', 0);
$pdf->SetXY($tab3_posx+19, $tab3_top+1); // Old value 17
$pdf->MultiCell(15, 3, $outputlangs->transnoentities("Amount"), 0, 'C', 0);
$pdf->SetXY($tab3_posx+35, $tab3_top+1);
$pdf->MultiCell(30, 3, $outputlangs->transnoentities("Type"), 0, 'L', 0);
if (! empty($conf->banque->enabled)) {
$pdf->SetXY($tab3_posx+65, $tab3_top+1);
$pdf->MultiCell(25, 3, $outputlangs->transnoentities("BankAccount"), 0, 'L', 0);
}
$pdf->line($tab3_posx, $tab3_top+$tab3_height, $tab3_posx+$tab3_width+2, $tab3_top+$tab3_height); // Bottom border line of table title
$y=0;
// Loop on each payment
// TODO create method on expensereport class to get payments
// Payments already done (from payment on this expensereport)
$sql = "SELECT p.rowid, p.num_payment, p.datep as dp, p.amount, p.fk_bank,";
$sql.= "c.code as p_code, c.libelle as payment_type,";
$sql.= "ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal";
$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as e, ".MAIN_DB_PREFIX."payment_expensereport as p";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_typepayment = c.id";
$sql.= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank as b ON p.fk_bank = b.rowid';
$sql.= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank_account as ba ON b.fk_account = ba.rowid';
$sql.= " WHERE e.rowid = '".$object->id."'";
$sql.= " AND p.fk_expensereport = e.rowid";
$sql.= ' AND e.entity IN ('.getEntity('expensereport').')';
$sql.= " ORDER BY dp";
$resql=$this->db->query($sql);
if ($resql)
{
$num = $this->db->num_rows($resql);
$i=0;
while ($i < $num) {
$y+=$tab3_height;
$row = $this->db->fetch_object($resql);
$pdf->SetXY($tab3_posx, $tab3_top+$y+1);
$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->dp),'day',false,$outputlangs,true), 0, 'L', 0);
$pdf->SetXY($tab3_posx+17, $tab3_top+$y+1);
$pdf->MultiCell(15, 3, price($sign * $row->amount, 0, $outputlangs), 0, 'R', 0);
$pdf->SetXY($tab3_posx+35, $tab3_top+$y+1);
$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort" . $row->p_code);
$pdf->MultiCell(40, 3, $oper, 0, 'L', 0);
if (! empty($conf->banque->enabled)) {
$pdf->SetXY($tab3_posx+65, $tab3_top+$y+1);
$pdf->MultiCell(30, 3, $row->baref, 0, 'L', 0);
}
$pdf->line($tab3_posx, $tab3_top+$y+$tab3_height, $tab3_posx+$tab3_width+2, $tab3_top+$y+$tab3_height); // Bottom line border of table
$totalpaid += $row->amount;
$i++;
}
if ($num > 0 && $object->paid == 0)
{
$y+=$tab3_height;
$pdf->SetXY($tab3_posx+17, $tab3_top+$y);
$pdf->MultiCell(15, 3, price($totalpaid), 0, 'R', 0);
$pdf->SetXY($tab3_posx+35, $tab3_top+$y);
$pdf->MultiCell(30, 4, $outputlangs->trans("AlreadyPaid"), 0, 'L', 0);
$y+=$tab3_height-2;
$pdf->SetXY($tab3_posx+17, $tab3_top+$y);
$pdf->MultiCell(15, 3, price($object->total_ttc), 0, 'R', 0);
$pdf->SetXY($tab3_posx+35, $tab3_top+$y);
$pdf->MultiCell(30, 4, $outputlangs->trans("AmountExpected"), 0, 'L', 0);
$y+=$tab3_height-2;
$remaintopay = $object->total_ttc - $totalpaid;
$pdf->SetXY($tab3_posx+17, $tab3_top+$y);
$pdf->MultiCell(15, 3, price($remaintopay), 0, 'R', 0);
$pdf->SetXY($tab3_posx+35, $tab3_top+$y);
$pdf->MultiCell(30, 4, $outputlangs->trans("RemainderToPay"), 0, 'L', 0);
}
}
else
{
$this->error=$this->db->lasterror();
return -1;
}
}
/**
* Show footer of page. Need this->emetteur object
*

30
htdocs/expensereport/class/expensereport.class.php
View File

@@ -2402,6 +2402,36 @@ class ExpenseReport extends CommonObject
}
return 0;
}
/**
* Return amount of payments already done
*
* @return int Amount of payment already done, <0 if KO
*/
public function getSumPayments()
{
//TODO move to expensereport class
$table='payment_expensereport';
$field='fk_expensereport';
$sql = 'SELECT sum(amount) as amount';
$sql.= ' FROM '.MAIN_DB_PREFIX.$table;
$sql.= ' WHERE '.$field.' = '.$this->id;
dol_syslog(get_class($this)."::getSumPayments", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
$obj = $this->db->fetch_object($resql);
$this->db->free($resql);
return $obj->amount;
}
else
{
$this->error=$this->db->lasterror();
return -1;
}
}
}