vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Debug v20

Browse source
This commit is contained in:
Laurent Destailleur 2024-05-22 20:40:11 +02:00
parent 5945fd8c7f
commit 01f584a43b
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
htdocs/core/modules/reception/doc/pdf_squille.modules.php
View file

@ -154,7 +154,7 @@ class pdf_squille extends ModelePdfReception
$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "propal", "deliveries", "receptions", "productbatch", "sendings"));
// Show Draft Watermark
if ($object->statut == $object::STATUS_DRAFT && (getDolGlobalString('RECEPTION_DRAFT_WATERMARK'))) {
if ($object->status == $object::STATUS_DRAFT && (getDolGlobalString('RECEPTION_DRAFT_WATERMARK'))) {
$this->watermark = getDolGlobalString('RECEPTION_DRAFT_WATERMARK');
}
@ -316,8 +316,11 @@ class pdf_squille extends ModelePdfReception
}
}
// Barcode
$height_barcode = (isModEnabled("barcode") && getDolGlobalInt("BARCODE_ON_RECEPTION_PDF") ? 20 : 0);
if (!empty($object->note_public) || !empty($object->tracking_number)) {
$tab_top = 88 + $height_incoterms + (isModEnabled("barcode") && getDolGlobalInt("BARCODE_ON_RECEPTION_PDF") ? 20 : 0);
$tab_top = 88 + $height_incoterms + $height_barcode;
$tab_top_alt = $tab_top;
$pdf->SetFont('', 'B', $default_font_size - 2);
@ -370,9 +373,9 @@ class pdf_squille extends ModelePdfReception
$height_note = 0;
}
$iniY = $tab_top + (isModEnabled("barcode") && getDolGlobalInt("BARCODE_ON_SHIPPING_PDF") ? 9 : 7);
$curY = $tab_top + (isModEnabled("barcode") && getDolGlobalInt("BARCODE_ON_SHIPPING_PDF") ? 9 : 7);
$nexY = $tab_top + (isModEnabled("barcode") && getDolGlobalInt("BARCODE_ON_SHIPPING_PDF") ? 9 : 7);
$iniY = $tab_top + 7;
$curY = $tab_top + 7;
$nexY = $tab_top + 7;
$fk_commandefourndet = 0;
$totalOrdered = 0;
$totalAmount = 0;
@ -922,7 +925,7 @@ class pdf_squille extends ModelePdfReception
}
if ($result > 0) {
$pdf->Image($barcode_path, $this->marge_gauche, $this->marge_haute +80 -5, 20, 20);
$pdf->Image($barcode_path, $this->marge_gauche, $this->marge_haute + 80 -5, 20, 20);
} else {
$this->error = 'Failed to generate barcode';
}

5
htdocs/reception/class/reception.class.php
View file

@ -1438,6 +1438,7 @@ class Reception extends CommonObject
$this->ref = 'SPECIMEN';
$this->specimen = 1;
$this->statut = 1;
$this->status = 1;
$this->date = $now;
$this->date_creation = $now;
$this->date_valid = $now;
@ -1454,6 +1455,10 @@ class Reception extends CommonObject
$this->note_private = 'Private note';
$this->note_public = 'Public note';
if (isModEnabled('incoterms')) {
$this->fk_incoterms = 1;
}
$nbp = 5;
$xnbp = 0;
while ($xnbp < $nbp) {