From 885b767a1f8617f2508d3b79cc9d92052cb7df4e Mon Sep 17 00:00:00 2001
From: Gilles Lengy <gilles.lengy@artaban.fr>
Date: Wed, 22 Mar 2023 20:26:19 +0100
Subject: [PATCH 1/2] FIX|Fix #24298 No error or 0.00 instead of NULL in
 database anymore when emptying an extrafield of type price on a propal card

---
 htdocs/comm/propal/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index b36415f5b15..7c5ab1d210e 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1393,7 +1393,7 @@ if (empty($reshook)) {
 			$error++;
 		}
 		if (!$error) {
-			$result = $object->updateExtraField(GETPOST('attribute', 'restricthtml'), 'PROPAL_MODIFY', $user);
+			$result = $object->insertExtraFields('PROPAL_MODIFY');
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;

From 3fdec7cecf647a21af9997eb6c72a199872131a9 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Fri, 31 Mar 2023 15:36:16 +0200
Subject: [PATCH 2/2] FIX - PDF Espadon => display extrafields

---
 .../modules/expedition/doc/pdf_espadon.modules.php   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index 12f20d74d7e..9a1cac5fecc 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -394,20 +394,20 @@ class pdf_espadon extends ModelePdfExpedition
 									$label .= $object->tracking_url;
 								}
 
-								$height_trackingnumber += 6;
+								$height_trackingnumber += 4;
 								$pdf->SetFont('', 'B', $default_font_size - 2);
 								$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
 					$pagenb = $pdf->getPage();
 					if (!empty($notetoshow) || !empty($object->tracking_number)) {
-						$tab_top -= 2;
+						$tab_top -= 1;
 
 						$tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
 						$pageposbeforenote = $pagenb;
@@ -476,7 +476,7 @@ class pdf_espadon extends ModelePdfExpedition
 										$height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter) + $height_trackingnumber + 1;
 										$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 {
 									if (empty($height_trackingnumber)) {
 										$height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
@@ -484,7 +484,7 @@ class pdf_espadon extends ModelePdfExpedition
 										$height_note = $this->page_hauteur - ($tab_top + $heightforfooter)+ $height_trackingnumber + 1;
 										$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
@@ -510,7 +510,7 @@ class pdf_espadon extends ModelePdfExpedition
 								$height_note = $posyafter - $tab_top + $height_trackingnumber + 1;
 								$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))) {