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

FIX Columns truncated and translation missing

Browse Source
This commit is contained in:
Laurent Destailleur 2016-09-06 13:07:24 +02:00
parent 898bbd6031
commit cc9230c07f
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,7 @@ class pdf_standard extends ModeleExpenseReport
$langs->load("main"); $langs->load("main");
$langs->load("trips"); $langs->load("trips");
$langs->load("project"); $langs->load("projects");
$this->db = $db; $this->db = $db;
$this->name = ""; $this->name = "";
@ -107,11 +107,11 @@ class pdf_standard extends ModeleExpenseReport
$this->posxcomment=$this->marge_gauche+10; $this->posxcomment=$this->marge_gauche+10;
$this->posxdate=88; $this->posxdate=88;
$this->posxtype=107; $this->posxtype=107;
$this->posxprojet=126; $this->posxprojet=120;
$this->posxtva=146; $this->posxtva=136;
$this->posxup=158; $this->posxup=152;
$this->posxqty=176; $this->posxqty=168;
$this->postotalttc=188; $this->postotalttc=178;
if (empty($conf->projet->enabled)) { if (empty($conf->projet->enabled)) {
$this->posxtva-=20; $this->posxtva-=20;
$this->posxup-=20; $this->posxup-=20;
@ -158,7 +158,7 @@ class pdf_standard extends ModeleExpenseReport
$outputlangs->load("main"); $outputlangs->load("main");
$outputlangs->load("dict"); $outputlangs->load("dict");
$outputlangs->load("trips"); $outputlangs->load("trips");
$outputlangs->load("project"); $outputlangs->load("projects");
$nblignes = count($object->lines); $nblignes = count($object->lines);
@ -435,6 +435,7 @@ class pdf_standard extends ModeleExpenseReport
if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
{ {
// TODO Show vat amout per tax level
$posy+=5; $posy+=5;
$pdf->SetXY(100, $posy); $pdf->SetXY(100, $posy);
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);