diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index 8207802feaa..98ebe32f970 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -26,11 +26,11 @@
  */
 
 require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsocialcontrib.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/paymentsocialcontribution.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsocialcontrib.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
@@ -46,8 +46,14 @@ if (!empty($conf->accounting->enabled)) {
 $langs->loadLangs(array('compta', 'bills', 'banks', 'hrm'));
 
 $id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
-$confirm = GETPOST('confirm');
+$confirm = GETPOST('confirm', 'alpha');
+$cancel = GETPOST('cancel', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'myobjectcard'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+
 $fk_project = (GETPOST('fk_project') ? GETPOST('fk_project', 'int') : 0);
 
 $dateech = dol_mktime(GETPOST('echhour'), GETPOST('echmin'), GETPOST('echsec'), GETPOST('echmonth'), GETPOST('echday'), GETPOST('echyear'));
@@ -56,11 +62,28 @@ $label = GETPOST('label', 'alpha');
 $actioncode = GETPOST('actioncode');
 $fk_user = GETPOST('userid', 'int');
 
+// Initialize technical objects
 $object = new ChargeSociales($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->tax->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('taxsocialcontributioncard', 'globalcard'));
+
+if (empty($action) && empty($id) && empty($ref)) {
+	$action = 'view';
+}
+
+// Load object
 if ($id > 0) {
 	$object->fetch($id);
 }
 
+$permissiontoread = $user->rights->tax->charges->lire;
+$permissiontoadd = $user->rights->tax->charges->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete = $user->rights->tax->charges->supprimer || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+$permissionnote = $user->rights->tax->charges->creer; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $user->rights->tax->charges->creer; // Used by the include of actions_dellink.inc.php
+$upload_dir = $conf->tax->multidir_output[isset($object->entity) ? $object->entity : 1];
+
 // Security check
 $socid = GETPOST('socid', 'int');
 if ($user->socid) {
@@ -74,6 +97,12 @@ $result = restrictedArea($user, 'tax', $object->id, 'chargesociales', 'charges')
  * Actions
  */
 
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
 // Classify paid
 if ($action == 'confirm_paid' && $user->rights->tax->charges->creer && $confirm == 'yes') {
 	$object->fetch($id);
@@ -122,7 +151,7 @@ if ($action == 'setmode' && $user->rights->tax->charges->creer) {
 	}
 }
 
-// bank account
+// Bank account
 if ($action == 'setbankaccount' && $user->rights->tax->charges->creer) {
 	$object->fetch($id);
 	$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
@@ -151,7 +180,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes') {
 
 // Add social contribution
 if ($action == 'add' && $user->rights->tax->charges->creer) {
-	$amount = price2num(GETPOST('amount'), 'MT');
+	$amount = price2num(GETPOST('amount', 'alpha'), 'MT');
 
 	if (!$dateech) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
@@ -189,7 +218,7 @@ if ($action == 'add' && $user->rights->tax->charges->creer) {
 
 
 if ($action == 'update' && !GETPOST("cancel") && $user->rights->tax->charges->creer) {
-	$amount = price2num(GETPOST('amount'), 'MT');
+	$amount = price2num(GETPOST('amount', 'alpha'), 'MT');
 
 	if (!$dateech) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
@@ -297,6 +326,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->char
  */
 
 $form = new Form($db);
+$formfile = new FormFile($db);
 $formsocialcontrib = new FormSocialContrib($db);
 $bankaccountstatic = new Account($db);
 if (!empty($conf->projet->enabled)) {
@@ -308,7 +338,7 @@ $help_url = 'EN:Module_Taxes_and_social_contributions|FR:Module Taxes et dividen
 llxHeader("", $title, $help_url);
 
 
-// Mode creation
+// Form to create a social contribution
 if ($action == 'create') {
 	print load_fiche_titre($langs->trans("NewSocialContribution"));
 
@@ -411,11 +441,7 @@ if ($action == 'create') {
 	print '</form>';
 }
 
-/* *************************************************************************** */
-/*                                                                             */
-/* Card Mode                                                                   */
-/*                                                                             */
-/* *************************************************************************** */
+// View mode
 if ($id > 0) {
 	$object = new ChargeSociales($db);
 	$result = $object->fetch($id);
@@ -594,7 +620,7 @@ if ($id > 0) {
 		}
 		print '</td></tr>';
 
-		// Bank Account
+		// Bank account
 		if (!empty($conf->banque->enabled)) {
 			print '<tr><td class="nowrap">';
 			print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
@@ -614,6 +640,11 @@ if ($id > 0) {
 			print '</tr>';
 		}
 
+		// Other attributes
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+
 		print '</table>';
 
 		print '</div>';
@@ -627,7 +658,7 @@ if ($id > 0) {
 		/*
 		 * Payments
 		 */
-		$sql = "SELECT p.rowid, p.num_paiement as num_payment, datep as dp, p.amount,";
+		$sql = "SELECT p.rowid, p.num_paiement as num_payment, p.datep as dp, p.amount,";
 		$sql .= " c.code as type_code,c.libelle as paiement_type,";
 		$sql .= ' ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.currency_code as bacurrency_code, ba.fk_accountancy_journal';
 		$sql .= " FROM ".MAIN_DB_PREFIX."paiementcharge as p";
@@ -637,7 +668,7 @@ if ($id > 0) {
 		$sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
 		$sql .= " WHERE p.fk_charge = ".((int) $id);
 		$sql .= " AND p.fk_charge = cs.rowid";
-		$sql .= " AND cs.entity IN (".getEntity('tax').")";
+		$sql .= " AND cs.entity IN (".getEntity('sc').")";
 		$sql .= " ORDER BY dp DESC";
 
 		//print $sql;
@@ -735,22 +766,15 @@ if ($id > 0) {
 		print dol_get_fiche_end();
 
 		if ($action == 'edit') {
-			print '<div align="center">';
-			print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
-			print ' &nbsp; ';
-			print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-			print '</div>';
-		}
+			print $form->buttonsSaveCancel();
 
-		if ($action == 'edit') {
 			print "</form>\n";
 		}
 
 
 
-		/*
-		*   Actions buttons
-		*/
+		// Buttons for actions
+
 		if ($action != 'edit') {
 			print '<div class="tabsAction">'."\n";
 
@@ -788,6 +812,64 @@ if ($id > 0) {
 
 			print "</div>";
 		}
+
+
+		// Select mail models is same action as presend
+		if (GETPOST('modelselected')) {
+			$action = 'presend';
+		}
+
+		if ($action != 'presend') {
+			print '<div class="fichecenter"><div class="fichehalfleft">';
+			print '<a name="builddoc"></a>'; // ancre
+
+			$includedocgeneration = 1;
+
+			// Documents
+			if ($includedocgeneration) {
+				$objref = dol_sanitizeFileName($object->ref);
+				$relativepath = $objref.'/'.$objref.'.pdf';
+				$filedir = $conf->tax->dir_output.'/'.$objref;
+				$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+				//$genallowed = $user->rights->tax->charges->lire; // If you can read, you can build the PDF to read content
+				$genallowed = 0;
+				$delallowed = $user->rights->tax->charges->creer; // If you can create/edit, you can remove a file on card
+				print $formfile->showdocuments('tax', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
+			}
+
+			// Show links to link elements
+			//$linktoelem = $form->showLinkToObjectBlock($object, null, array('myobject'));
+			//$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+
+
+			print '</div><div class="fichehalfright">';
+
+			/*
+			 $MAXEVENT = 10;
+
+			 $morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', dol_buildpath('/mymodule/myobject_agenda.php', 1).'?id='.$object->id);
+
+			 // List of actions on element
+			 include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+			 $formactions = new FormActions($db);
+			 $somethingshown = $formactions->showactions($object, $object->element.'@'.$object->module, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlcenter);
+			 */
+
+			print '</div></div>';
+		}
+
+		//Select mail models is same action as presend
+		if (GETPOST('modelselected')) {
+			$action = 'presend';
+		}
+
+		// Presend form
+		$modelmail = 'sc';
+		$defaulttopic = 'InformationMessage';
+		$diroutput = $conf->tax->dir_output;
+		$trackid = 'sc'.$object->id;
+
+		include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 	} else {
 		/* Social contribution not found */
 		dol_print_error('', $object->error);
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index ef09cd5aabc..530d18d17f9 100755
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -306,7 +306,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes') {
 }
 
 if ($action == 'update' && !GETPOST("cancel") && $user->rights->tax->charges->creer) {
-	$amount = price2num(GETPOST('amount'));
+	$amount = price2num(GETPOST('amount', 'alpha'), 'MT');
 
 	if (empty($amount)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount")), null, 'errors');
@@ -317,7 +317,7 @@ if ($action == 'update' && !GETPOST("cancel") && $user->rights->tax->charges->cr
 	} else {
 		$result = $object->fetch($id);
 
-		$object->amount		= price2num($amount);
+		$object->amount	= $amount;
 
 		$result = $object->update($user);
 		if ($result <= 0) {
@@ -339,8 +339,8 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->char
 	$object->fetch($id);
 
 	if ($object->id > 0) {
-		$object->paye = 0;
 		$object->id = $object->ref = null;
+		$object->paye = 0;
 
 		if (GETPOST('clone_label', 'alphanohtml')) {
 			$object->label = GETPOST('clone_label', 'alphanohtml');
@@ -535,7 +535,7 @@ if ($action == 'create') {
 }
 
 // View mode
-if ($id) {
+if ($id > 0) {
 	$head = vat_prepare_head($object);
 
 	$totalpaye = $object->getSommePaiement();
@@ -705,7 +705,8 @@ if ($id) {
 				$objp = $db->fetch_object($resql);
 
 				print '<tr class="oddeven"><td>';
-				print '<a href="'.DOL_URL_ROOT.'/compta/payment_vat/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"), "payment").' '.$objp->rowid.'</a></td>';
+				print '<a href="'.DOL_URL_ROOT.'/compta/payment_vat/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"), "payment").' '.$objp->rowid.'</a>';
+				print '</td>';
 				print '<td>'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
 				$labeltype = $langs->trans("PaymentType".$objp->type_code) != ("PaymentType".$objp->type_code) ? $langs->trans("PaymentType".$objp->type_code) : $objp->paiement_type;
 				print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
@@ -768,7 +769,7 @@ if ($id) {
 	if ($action == 'edit') {
 		print $form->buttonsSaveCancel();
 
-		print "</form>";
+		print "</form>\n";
 	}