Merge pull request #6447 from aternatik/fix_6446

Fix #6446 : Event status lost after assign or remouve user
Dolibarr · Feb 22, 2017 · b32c552 · b32c552
2 parents daf1dbb + 0a9ffa5
commit b32c552
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
@@ -853,6 +853,9 @@ function setdatefields()
 	$result3=$object->fetch_contact();
 	$result4=$object->fetch_userassigned();
 	$result5=$object->fetch_optionals($id,$extralabels);
+
+	$percentage=in_array(GETPOST('status'),array(-1,100))?GETPOST('status'):(in_array(GETPOST('complete'),array(-1,100))?GETPOST('complete'):GETPOST("percentage"));	// If status is -1 or 100, percentage is not defined and we must use status
+
 
 	if($listUserAssignedUpdated || $donotclearsession) {
 
@@ -1030,7 +1033,7 @@ function init_repeat()
 
 		// Status
 		print '<tr><td class="nowrap">'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td colspan="3">';
-		$percent=GETPOST("percentage")?GETPOST("percentage"):$object->percentage;
+		$percent = GETPOST("percentage") ? GETPOST("percentage"): $object->percentage;
 		$formactions->form_select_status_action('formaction',$percent,1);
 		print '</td></tr>';