diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index ca551c51e50..d35fcf44221 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -16,9 +16,10 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
- use Luracast\Restler\RestException;
+use Luracast\Restler\RestException;
+
+require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
- require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
 /**
  * API class for Agenda Events
@@ -51,33 +52,32 @@ class AgendaEvents extends DolibarrApi
 		$this->actioncomm = new ActionComm($this->db);
 	}
 
-	/**
-	 * Get properties of a Agenda Events object
-	 *
-	 * Return an array with Agenda Events informations
-	 *
-	 * @param       int         $id         ID of Agenda Events
-	 * @return 	    array|mixed             Data without useless information
-	 *
-	 * @throws 	RestException
-	 */
-	public function get($id)
-	{
-		if (!DolibarrApiAccess::$user->rights->agenda->myactions->read) {
-			throw new RestException(401, "Insufficient rights to read an event");
-		}
-		if ($id == 0) {
-			$result = $this->actioncomm->initAsSpecimen();
-		} else {
-			$result = $this->actioncomm->fetch($id);
-			if ($result) {
-				$this->actioncomm->fetch_optionals();
-				$this->actioncomm->fetchObjectLinked();
-			}
-		}
-		if (!$result) {
-			throw new RestException(404, 'Agenda Events not found');
-		}
+    /**
+     * Get properties of a Agenda Events object
+     * Return an array with Agenda Events informations
+     *
+     * @param       int         $id         ID of Agenda Events
+     * @return 	    array|mixed             Data without useless information
+     *
+     * @throws 	RestException
+     */
+    public function get($id)
+    {
+        if (!DolibarrApiAccess::$user->rights->agenda->myactions->read) {
+            throw new RestException(401, "Insufficient rights to read an event");
+        }
+        if ($id === 0) {
+            $result = $this->actioncomm->initAsSpecimen();
+        } else {
+            $result = $this->actioncomm->fetch($id);
+            if ($result) {
+                $this->actioncomm->fetch_optionals();
+                $this->actioncomm->fetchObjectLinked();
+            }
+        }
+        if (!$result) {
+            throw new RestException(404, 'Agenda Events not found');
+        }
 
 		if (!DolibarrApiAccess::$user->rights->agenda->allactions->read && $this->actioncomm->userownerid != DolibarrApiAccess::$user->id) {
 			throw new RestException(401, "Insufficient rights to read event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index ccb413ecf6f..b44968e21bf 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -320,7 +320,7 @@ if ($action == 'create')
 	print $langs->trans("Date");
 	print '</td>';
 	print '<td>';
-	print $form->selectDate(!empty($dateech) ? $dateech : '-1', 'ech', 0, 0, 0, 'charge', 1);
+	print $form->selectDate(!empty($dateech) ? $dateech : '-1', 'ech', 0, 0, 0, 'charge', 1, 1);
 	print '</td>';
 	print "</tr>\n";
 
@@ -521,10 +521,10 @@ if ($id > 0)
 		if ($action == 'edit')
 		{
 			print '<tr><td>'.$langs->trans("AmountTTC")."</td><td>";
-			print '<input type="text" name="amount" size="12" class="flat" value="'.$object->amount.'">';
+			print '<input type="text" name="amount" size="12" class="flat" value="'.price($object->amount).'">';
 			print "</td></tr>";
 		} else {
-			print '<tr><td>'.$langs->trans("AmountTTC").'</td><td>'.price($object->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
+			print '<tr><td>'.$langs->trans("AmountTTC").'</td><td>'.price($object->amount, 0, $langs, 1, -1, -1, $conf->currency).'</td></tr>';
 		}
 
 		// Mode of payment
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index e0d96112aec..d38b09d81ca 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1307,7 +1307,7 @@ class FormFile
 							// $section is inside $param
 							$newparam .= preg_replace('/&file=.*$/', '', $param); // We don't need param file=
 							$backtopage = DOL_URL_ROOT.'/ecm/index.php?&section_dir='.urlencode($relativepath).$newparam;
-							print '<a class="editfielda" href="'.DOL_URL_ROOT.'/ecm/file_card.php?urlfile='.urlencode($file['name']).$param.'&backtopage='.urlencode($backtopage).'" class="editfilelink" rel="'.urlencode($file['name']).'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';
+							print '<a class="editfielda editfilelink" href="'.DOL_URL_ROOT.'/ecm/file_card.php?urlfile='.urlencode($file['name']).$param.'&backtopage='.urlencode($backtopage).'" rel="'.urlencode($file['name']).'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';
 						}
 
 						if (empty($useinecm) || $useinecm == 2 || $useinecm == 6)	// 6=Media file manager
@@ -1333,7 +1333,7 @@ class FormFile
 							if ($permtoeditline)
 							{
 								$paramsectiondir = (in_array($modulepart, array('medias', 'ecm')) ? '&section_dir='.urlencode($relativepath) : '');
-								print '<a class="editfielda reposition" href="'.(($useinecm == 1 || $useinecm == 5) ? '#' : ($url.'?action=editfile&urlfile='.urlencode($filepath).$paramsectiondir.$param)).'" class="editfilelink" rel="'.$filepath.'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';
+								print '<a class="editfielda reposition editfilelink" href="'.(($useinecm == 1 || $useinecm == 5) ? '#' : ($url.'?action=editfile&urlfile='.urlencode($filepath).$paramsectiondir.$param)).'" rel="'.$filepath.'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';
 							}
 						}
 						if ($permonobject)
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index cc00738ebeb..33e483ee757 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -422,6 +422,7 @@ if ($sql_select)
 		$documentstatic->statut = $objp->status;
 		$documentstatic->status = $objp->status;
 		$documentstatic->paye = $objp->paid;
+		$documentstatic->alreadypaid = $objp->paid;
 
 		if (is_object($documentstaticline)) $documentstaticline->statut = $objp->status;
 
@@ -435,6 +436,8 @@ if ($sql_select)
 		print '<td class="center">';
 		if ($type_element == 'contract') {
 			print $documentstaticline->getLibStatut(5);
+		} elseif ($type_element == 'invoice') {
+			print $documentstatic->getLibStatut(5, $objp->paid);
 		} else {
 			print $documentstatic->getLibStatut(5);
 		}