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 16.0

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

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))) {

18
htdocs/expedition/card.php
View File

@ -595,6 +595,7 @@ if (empty($reshook)) {
$num_prod = count($lines); $num_prod = count($lines);
for ($i = 0; $i < $num_prod; $i++) { for ($i = 0; $i < $num_prod; $i++) {
if ($lines[$i]->id == $line_id) { // we have found line to update if ($lines[$i]->id == $line_id) { // we have found line to update
$update_done = false;
$line = new ExpeditionLigne($db); $line = new ExpeditionLigne($db);
$line->fk_expedition = $object->id; $line->fk_expedition = $object->id;
@ -635,6 +636,8 @@ if (empty($reshook)) {
if ($line->update($user) < 0) { if ($line->update($user) < 0) {
setEventMessages($line->error, $line->errors, 'errors'); setEventMessages($line->error, $line->errors, 'errors');
$error++; $error++;
} else {
$update_done=true;
} }
} else { } else {
setEventMessages($lotStock->error, $lotStock->errors, 'errors'); setEventMessages($lotStock->error, $lotStock->errors, 'errors');
@ -677,6 +680,8 @@ if (empty($reshook)) {
if ($line->update($user) < 0) { if ($line->update($user) < 0) {
setEventMessages($line->error, $line->errors, 'errors'); setEventMessages($line->error, $line->errors, 'errors');
$error++; $error++;
} else {
$update_done=true;
} }
} else { } else {
setEventMessages($line->error, $line->errors, 'errors'); setEventMessages($line->error, $line->errors, 'errors');
@ -694,6 +699,8 @@ if (empty($reshook)) {
if ($object->create_line_batch($line, $line->array_options) < 0) { if ($object->create_line_batch($line, $line->array_options) < 0) {
setEventMessages($object->error, $object->errors, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
$error++; $error++;
} else {
$update_done=true;
} }
} }
} else { } else {
@ -731,6 +738,8 @@ if (empty($reshook)) {
if ($line->update($user) < 0) { if ($line->update($user) < 0) {
setEventMessages($line->error, $line->errors, 'errors'); setEventMessages($line->error, $line->errors, 'errors');
$error++; $error++;
} else {
$update_done=true;
} }
} }
unset($_POST[$stockLocation]); unset($_POST[$stockLocation]);
@ -745,6 +754,8 @@ if (empty($reshook)) {
if ($line->update($user) < 0) { if ($line->update($user) < 0) {
setEventMessages($line->error, $line->errors, 'errors'); setEventMessages($line->error, $line->errors, 'errors');
$error++; $error++;
} else {
$update_done=true;
} }
unset($_POST[$qty]); unset($_POST[$qty]);
} }
@ -757,10 +768,17 @@ if (empty($reshook)) {
if ($line->update($user) < 0) { if ($line->update($user) < 0) {
setEventMessages($line->error, $line->errors, 'errors'); setEventMessages($line->error, $line->errors, 'errors');
$error++; $error++;
} else {
$update_done=true;
} }
unset($_POST[$qty]); unset($_POST[$qty]);
} }
} }
if (empty($update_done)) {
$line->id = $lines[$i]->id;
$line->insertExtraFields();
}
} }
} }