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

Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0

Browse Source
This commit is contained in:
Laurent Destailleur 2023-04-01 15:02:19 +02:00
commit 2ccbc1c2ce
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/propal/card.php
View File

@ -1393,7 +1393,7 @@ if (empty($reshook)) {
$error++; $error++;
} }
if (!$error) { if (!$error) {
$result = $object->updateExtraField(GETPOST('attribute', 'restricthtml'), 'PROPAL_MODIFY', $user); $result = $object->insertExtraFields('PROPAL_MODIFY');
if ($result < 0) { if ($result < 0) {
setEventMessages($object->error, $object->errors, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
$error++; $error++;

13
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
View File

@ -394,20 +394,19 @@ class pdf_espadon extends ModelePdfExpedition
$label .= $object->tracking_url; $label .= $object->tracking_url;
} }
$height_trackingnumber += 6; $height_trackingnumber += 4;
$pdf->SetFont('', 'B', $default_font_size - 2); $pdf->SetFont('', 'B', $default_font_size - 2);
$pdf->writeHTMLCell(60, $height_trackingnumber, $this->posxdesc - 1, $tab_top_alt, $label, 0, 1, false, true, 'L'); $pdf->writeHTMLCell(60, $height_trackingnumber, $this->posxdesc - 1, $tab_top_alt, $label, 0, 1, false, true, 'L');
$tab_top = $pdf->GetY();
} }
} }
$tab_top = $pdf->GetY();
} }
// Notes // Notes
$pagenb = $pdf->getPage(); $pagenb = $pdf->getPage();
if (!empty($notetoshow) || !empty($object->tracking_number)) { if (!empty($notetoshow) || !empty($object->tracking_number)) {
$tab_top -= 2; $tab_top -= 1;
$tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite; $tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
$pageposbeforenote = $pagenb; $pageposbeforenote = $pagenb;
@ -476,7 +475,7 @@ class pdf_espadon extends ModelePdfExpedition
$height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter) + $height_trackingnumber + 1; $height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter) + $height_trackingnumber + 1;
$tab_top_newpage = $tab_topbeforetrackingnumber; $tab_top_newpage = $tab_topbeforetrackingnumber;
} }
$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1); $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 2);
} else { } else {
if (empty($height_trackingnumber)) { if (empty($height_trackingnumber)) {
$height_note = $this->page_hauteur - ($tab_top + $heightforfooter); $height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
@ -484,7 +483,7 @@ class pdf_espadon extends ModelePdfExpedition
$height_note = $this->page_hauteur - ($tab_top + $heightforfooter)+ $height_trackingnumber + 1; $height_note = $this->page_hauteur - ($tab_top + $heightforfooter)+ $height_trackingnumber + 1;
$tab_top = $tab_topbeforetrackingnumber; $tab_top = $tab_topbeforetrackingnumber;
} }
$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1); $pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 2);
} }
// Add footer // Add footer
@ -510,7 +509,7 @@ class pdf_espadon extends ModelePdfExpedition
$height_note = $posyafter - $tab_top + $height_trackingnumber + 1; $height_note = $posyafter - $tab_top + $height_trackingnumber + 1;
$tab_top = $tab_topbeforetrackingnumber; $tab_top = $tab_topbeforetrackingnumber;
} }
$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1); $pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 2);
if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20))) { if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20))) {