diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 3eed4eb5e01..969d73913f2 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -5375,7 +5375,7 @@ abstract class CommonObject
 			if (isset($this->expeditions[$line->id])) {
 				$qty_shipped = $this->expeditions[$line->id];
 			}
-			$disableedit = $qty_shipped >= $line->qty;
+			$disableedit = ($qty_shipped > 0) && ($qty_shipped >= $line->qty);
 
 			$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
 			foreach ($dirtpls as $module => $reldir) {
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 8560d1af9e3..65dfd9a94f8 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1947,13 +1947,13 @@ class ExtraFields
 	/**
 	 * Return HTML string to put an output field into a page
 	 *
-	 * @param   string		$key            		Key of attribute
-	 * @param   string		$value          		Value to show
-	 * @param	string		$moreparam				To add more parameters on html input tag (only checkbox use html input for output rendering)
-	 * @param	string		$extrafieldsobjectkey	Required (for example $object->table_element).
-	 * @param 	Translate 	$outputlangs 			Output
-	 * @param	object		$object					The parent object of field to show
-	 * @return	string								Formatted value
+	 * @param   string			$key            		Key of attribute
+	 * @param   string			$value          		Value to show
+	 * @param	string			$moreparam				To add more parameters on html input tag (only checkbox use html input for output rendering)
+	 * @param	string			$extrafieldsobjectkey	Required (for example $object->table_element).
+	 * @param 	Translate|null 	$outputlangs 			Output
+	 * @param	object			$object					The parent object of field to show
+	 * @return	string									Formatted value
 	 */
 	public function showOutputField($key, $value, $moreparam = '', $extrafieldsobjectkey = '', $outputlangs = null, $object = null)
 	{
diff --git a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
index b5208a8a0bb..e5a11e84114 100644
--- a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
@@ -51,7 +51,7 @@ if (!empty($extrafieldsobjectkey) && !empty($extrafields->attributes[$extrafield
 					}
 				}
 
-				$valuetoshow = $extrafields->showOutputField($key, $value, '', $extrafieldsobjectkey);
+				$valuetoshow = $extrafields->showOutputField($key, $value, '', $extrafieldsobjectkey, null, $object);
 				$title = dol_string_nohtmltag($valuetoshow);
 
 				print '<td'.($cssclass ? ' class="'.$cssclass.'"' : '');	// TODO Add 'css' and 'cssview' and 'csslist' for extrafields and use here 'csslist'
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index e93596d2726..65ecea214f7 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -256,7 +256,7 @@ if (empty($reshook) && !empty($object->table_element) && isset($extrafields->att
 				print '</form>';
 			} else {
 				//var_dump($tmpkeyextra.'-'.$value.'-'.$object->table_element);
-				print $extrafields->showOutputField($tmpkeyextra, $value, '', $object->table_element);
+				print $extrafields->showOutputField($tmpkeyextra, $value, '', $object->table_element, null, $object);
 			}
 
 			print '</td>';