diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 00f28b30aff..45c557f68c9 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4560,7 +4560,7 @@ elseif ($id > 0 || ! empty($ref))
 				}
 				else
 				{
-					print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="' . $langs->trans("DisabledBecauseDispatchedInAccounting") . '">' . $langs->trans('Modify') . '</span></div>';
+					print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="' . $langs->trans("DisabledBecauseDispatchedInBookkeeping") . '">' . $langs->trans('Modify') . '</span></div>';
 				}
 			}
 
diff --git a/htdocs/core/modules/expensereport/mod_expensereport_jade.php b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
index fb571a65c8b..b4d1b7b2b6e 100644
--- a/htdocs/core/modules/expensereport/mod_expensereport_jade.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
@@ -44,7 +44,7 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
 	/**
 	 * @var string Nom du modele
 	 * @deprecated
-	 * @see name
+	 * @see $name
 	 */
 	public $nom='Jade';
 
@@ -154,7 +154,6 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
 			endif;
 
 			$ref_number_int = ($newref+1)-1;
-			$update_number_int = true;
 
 			$user_author_infos = dolGetFirstLastname($fuser->firstname, $fuser->lastname);
 
diff --git a/htdocs/langs/en_ZA/main.lang b/htdocs/langs/en_ZA/main.lang
index 4c30b385ef8..1f6a0b9245d 100644
--- a/htdocs/langs/en_ZA/main.lang
+++ b/htdocs/langs/en_ZA/main.lang
@@ -7,8 +7,8 @@ SeparatorThousand=,
 FormatDateShort=%Y/%m/%d
 FormatDateShortInput=%Y/%m/%d
 FormatDateShortJava=yyy/MM/dd
-FormatDateShortJavaInput=yyyy/MM/yy
-FormatDateShortJQuery=yy/mm/yy
+FormatDateShortJavaInput=yyyy/MM/dd
+FormatDateShortJQuery=yy/mm/dd
 FormatDateShortJQueryInput=yy/mm/dd
 FormatHourShortJQuery=HH:MI
 FormatHourShort=%H:%M
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index c8b59f35400..223740efc64 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -446,6 +446,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 $parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
 $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $object);    // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
+// Action column
 print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n";
 print '</tr>'."\n";
 
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 886bc47fb08..62d709fc674 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -663,7 +663,7 @@ if ($ispaymentok)
 						$result=$paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, '', '');
 						if ($result < 0)
 						{
-							$postactionmessages[] = $paiement->error.' '.joint("<br>\n", $paiement->errors);
+							$postactionmessages[] = $paiement->error.' '.join("<br>\n", $paiement->errors);
 							$ispostactionok = -1;
 							$error++;
 						}
diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
index 66481fedc96..f5202d87b96 100644
--- a/htdocs/societe/checkvat/checkVatPopup.php
+++ b/htdocs/societe/checkvat/checkVatPopup.php
@@ -40,8 +40,7 @@ $conf->dol_hide_leftmenu=1;
 
 llxHeader('', $langs->trans("VATIntraCheckableOnEUSite"));
 
-print '<div>';
-print '<div>';
+print '<div class="vatcheckarea" style="margin-bottom: 10px">';
 
 print load_fiche_titre($langs->trans("VATIntraCheckableOnEUSite"), '', 'title_setup');
 
@@ -174,6 +173,8 @@ if ($messagetoshow)
 	print nl2br($messagetoshow);
 }
 
+print '</div>';
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 34d79a7290a..20df70fda70 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -832,6 +832,11 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		print '<td align="center">'.$langs->trans('Default').'</td>';
 		print '<td>'.$langs->trans('Note').'</td>';
 		print '<td>'.$langs->trans('DateModification').'</td>';
+		// Hook fields
+		$parameters=array('arrayfields'=>array(),'param'=>'','sortfield'=>'','sortorder'=>'', 'linetype'=>'stripetitle');
+		$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $object);    // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		// Action column
 		print "<td></td>";
 		print "</tr>\n";
 
@@ -846,7 +851,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			$companypaymentmodetemp = new CompanyPaymentMode($db);
 
 			$sql='SELECT rowid FROM '.MAIN_DB_PREFIX."societe_rib";
-			$sql.=" WHERE type in ('card', 'paypal')";
+			$sql.=" WHERE type in ('card')";
 			$sql.=" AND fk_soc = ".$object->id;
 			$sql.=" AND status = ".$servicestatus;
 
@@ -917,6 +922,11 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 							print '<td>';
 							print dol_print_date($companypaymentmodetemp->tms, 'dayhour');
 							print '</td>';
+							// Fields from hook
+							$parameters=array('arrayfields'=>array(), 'obj'=>$obj, 'linetype'=>'stripecard');
+							$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $object);    // Note that $action and $object may have been modified by hook
+							print $hookmanager->resPrint;
+							// Action column
 							print '<td align="right" class="nowraponall">';
 							if ($user->rights->societe->creer)
 							{
@@ -1042,6 +1052,11 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				//var_dump($src);
 				print '';
 				print '</td>';
+				// Fields from hook
+				$parameters=array('arrayfields'=>array(), 'stripesource'=>$src, 'linetype'=>'stripecardremoteonly');
+				$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $object);    // Note that $action and $object may have been modified by hook
+				print $hookmanager->resPrint;
+				// Action column
 				print '<td align="right" class="nowraponall">';
 				if ($user->rights->societe->creer)
 				{