Bläddra i källkod

Fix persist display extrafields in card when updated & auto hide in fourn/commande

Mathieu Moulin 1 år sedan
förälder
incheckning
f481aaf479

+ 1 - 1
htdocs/comm/propal/card.php

@@ -2610,7 +2610,7 @@ if ($action == 'create') {
 	
 	// Added by MMI Mathieu Moulin iProspective
 	// Other attributes / extrafields show/hide
-	$extrafields_showhide = $conf->global->DOCUMENT_EXTRAFIELDS_SHOWHIDE && (empty($action) || $action != 'edit_extras');
+	$extrafields_showhide = $conf->global->DOCUMENT_EXTRAFIELDS_SHOWHIDE && (empty($action) || !in_array($action, ['edit_extras', 'update_extras']));
 	if ($extrafields_showhide) {
 		echo '<tr> <td colspan="2"><a href="javascript:;" onclick="$(\'#extrafields_form\').toggle();">'.$langs->trans('ToggleExtrafields').'</a></td> </tr>';
 		echo '<tbody id="extrafields_form" class="extrafields" style="display: none;">';

+ 1 - 1
htdocs/commande/card.php

@@ -2562,7 +2562,7 @@ if ($action == 'create' && $usercancreate) {
 
 		// Added by MMI Mathieu Moulin iProspective
 		// Other attributes/extrafields show/hide
-		$extrafields_showhide = $conf->global->DOCUMENT_EXTRAFIELDS_SHOWHIDE && (empty($action) || $action != 'edit_extras');
+		$extrafields_showhide = $conf->global->DOCUMENT_EXTRAFIELDS_SHOWHIDE && (empty($action) || !in_array($action, ['edit_extras', 'update_extras']));
 		if ($extrafields_showhide) {
 			echo '<tr> <td colspan="2"><a href="javascript:;" onclick="$(\'#extrafields_form\').toggle();">'.$langs->trans('ToggleExtrafields').'</a></td> </tr>';
 			echo '<tbody id="extrafields_form" class="extrafields" style="display: none;">';

+ 1 - 1
htdocs/compta/facture/card.php

@@ -4725,7 +4725,7 @@ if ($action == 'create') {
 	$cols = 2;
 	// Added by MMI Mathieu Moulin iProspective
 	// Hack extrafields show/hide
-	$extrafields_showhide = $conf->global->DOCUMENT_EXTRAFIELDS_SHOWHIDE && (empty($action) || $action != 'edit_extras');
+	$extrafields_showhide = $conf->global->DOCUMENT_EXTRAFIELDS_SHOWHIDE && (empty($action) || !in_array($action, ['edit_extras', 'update_extras']));
 	if ($extrafields_showhide) {
 		echo '<tr> <td colspan="2"><a href="javascript:;" onclick="$(\'#extrafields_form\').toggle();">'.$langs->trans('ToggleExtrafields').'</a></td> </tr>';
 		echo '<tbody id="extrafields_form" class="extrafields" style="display: none;">';

+ 3 - 2
htdocs/expedition/card.php

@@ -1953,12 +1953,13 @@ if ($action == 'create') {
 		$cols = 2;
 		// Added by MMI Mathieu Moulin iProspective
 		// Extrafields show/hide
-		if ($conf->global->DOCUMENT_EXTRAFIELDS_SHOWHIDE) {
+		$extrafields_showhide = $conf->global->DOCUMENT_EXTRAFIELDS_SHOWHIDE && (empty($action) || !in_array($action, ['edit_extras', 'update_extras']));
+		if ($extrafields_showhide) {
 			echo '<tr> <td colspan="2"><a href="javascript:;" onclick="$(\'#extrafields_form\').toggle();">'.$langs->trans('ToggleExtrafields').'</a></td> </tr>';
 			echo '<tbody id="extrafields_form" class="extrafields" style="display: none;">';
 		}
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
-		if ($conf->global->DOCUMENT_EXTRAFIELDS_SHOWHIDE) {
+		if ($extrafields_showhide) {
 			echo '</tbody>';
 		}
 

+ 10 - 1
htdocs/fourn/commande/card.php

@@ -2290,8 +2290,17 @@ if ($action == 'create') {
 		print '</td></tr>';
 	}
 
-	// Other attributes
+	// Added by MMI Mathieu Moulin iProspective
+	// Other attributes / extrafields show/hide
+	$extrafields_showhide = $conf->global->DOCUMENT_EXTRAFIELDS_SHOWHIDE && (empty($action) || !in_array($action, ['edit_extras', 'update_extras']));
+	if ($extrafields_showhide) {
+		echo '<tr> <td colspan="2"><a href="javascript:;" onclick="$(\'#extrafields_form\').toggle();">'.$langs->trans('ToggleExtrafields').'</a></td> </tr>';
+		echo '<tbody id="extrafields_form" class="extrafields" style="display: none;">';
+	}
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+	if ($extrafields_showhide) {
+		echo '</tbody>';
+	}
 
 	print '</table>';
 

+ 5 - 4
htdocs/reception/card.php

@@ -1600,14 +1600,15 @@ if ($action == 'create') {
 
 		// Other attributes
 		$cols = 2;
-		// Addes by MMI Mathieu Moulin iProspective
-		// Hack extrafields show/hide
-		if ($conf->global->DOCUMENT_EXTRAFIELDS_SHOWHIDE) {
+		// Added by MMI Mathieu Moulin iProspective
+		// Other attributes / extrafields show/hide
+		$extrafields_showhide = $conf->global->DOCUMENT_EXTRAFIELDS_SHOWHIDE && (empty($action) || !in_array($action, ['edit_extras', 'update_extras']));
+		if ($extrafields_showhide) {
 			echo '<tr> <td colspan="2"><a href="javascript:;" onclick="$(\'#extrafields_form\').toggle();">'.$langs->trans('ToggleExtrafields').'</a></td> </tr>';
 			echo '<tbody id="extrafields_form" class="extrafields" style="display: none;">';
 		}
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
-		if ($conf->global->DOCUMENT_EXTRAFIELDS_SHOWHIDE) {
+		if ($extrafields_showhide) {
 			echo '</tbody>';
 		}