Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Debug v18 - Length of amount in number too large

Browse Source
This commit is contained in:
Laurent Destailleur
2023-07-05 14:07:15 +02:00
parent 61d71fdaa6
commit 07bca51a75
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
View File

@@ -125,7 +125,6 @@ class pdf_standard extends ModelePDFSuppliersPayments
$this->posxtva = 90;
$this->posxtotalttc = 180;
//if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) $this->posxtva=$this->posxup;
if ($this->page_largeur < 210) { // To work with US executive format
$this->posxreffacturefourn -= 20;
$this->posxreffacture -= 20;
@@ -208,12 +207,12 @@ class pdf_standard extends ModelePDFSuppliersPayments
$file = $dir."/SPECIMEN.pdf";
} else {
$objectref = dol_sanitizeFileName($object->ref);
$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
//$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
$dir = $conf->fournisseur->payment->dir_output.'/'.$objectref;
$file = $dir."/".$objectref.".pdf";
if (!empty($conf->global->SUPPLIER_REF_IN_NAME)) {
$file = $dir."/".$objectref.($objectrefsupplier ? "_".$objectrefsupplier : "").".pdf";
}
//if (!empty($conf->global->SUPPLIER_REF_IN_NAME)) {
// $file = $dir."/".$objectref.($objectrefsupplier ? "_".$objectrefsupplier : "").".pdf";
//}
}
if (!file_exists($dir)) {
@@ -365,23 +364,23 @@ class pdf_standard extends ModelePDFSuppliersPayments
// ref fourn
$pdf->SetXY($this->posxreffacturefourn, $curY);
$pdf->MultiCell($this->posxreffacturefourn - $this->posxup - 0.8, 3, $object->lines[$i]->ref_supplier, 0, 'L', 0);
$pdf->MultiCell($this->posxreffacturefourn - 0.8, 3, $object->lines[$i]->ref_supplier, 0, 'L', 0);
// ref facture fourn
$pdf->SetXY($this->posxreffacture, $curY);
$pdf->MultiCell($this->posxreffacture - $this->posxup - 0.8, 3, $object->lines[$i]->ref, 0, 'L', 0);
$pdf->MultiCell($this->posxreffacture - 0.8, 3, $object->lines[$i]->ref, 0, 'L', 0);
// type
$pdf->SetXY($this->posxtype, $curY);
$pdf->MultiCell($this->posxtype - $this->posxup - 0.8, 3, $object->lines[$i]->type, 0, 'L', 0);
$pdf->MultiCell($this->posxtype - 0.8, 3, $object->lines[$i]->type, 0, 'L', 0);
// Total ht
$pdf->SetXY($this->posxtotalht, $curY);
$pdf->MultiCell($this->posxtotalht - $this->posxup - 0.8, 3, price($object->lines[$i]->total_ht), 0, 'R', 0);
$pdf->MultiCell($this->posxtotalht - 0.8, 3, price($object->lines[$i]->total_ht), 0, 'R', 0);
// Total tva
$pdf->SetXY($this->posxtva, $curY);
$pdf->MultiCell($this->posxtva - $this->posxup - 0.8, 3, price($object->lines[$i]->total_tva), 0, 'R', 0);
$pdf->MultiCell($this->posxtva - 0.8, 3, price($object->lines[$i]->total_tva), 0, 'R', 0);
// Total TTC line
$pdf->SetXY($this->posxtotalttc, $curY);
@@ -787,6 +786,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
// Show default IBAN account
$iban = '';
$sql = "SELECT iban_prefix as iban";
$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib as rib";
$sql .= " WHERE fk_soc = ".($object->thirdparty->id);
@@ -796,7 +796,9 @@ class pdf_standard extends ModelePDFSuppliersPayments
$resql = $this->db->query($sql);
if ($resql) {
$obj = $this->db->fetch_object($resql);
$iban = $obj->iban;
if ($obj) {
$iban = $obj->iban;
}
}
if (!empty($iban)) {