diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index b6fd2fec085..854cac9d59c 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2987,7 +2987,13 @@ if ($action == 'create' && $usercancreate) {
 				}
 
 				// Create bill
-				$arrayforbutaction[] = array('lang'=>'bills', 'enabled'=>(isModEnabled('facture') && $object->statut > Commande::STATUS_DRAFT && !$object->billed && $object->total_ttc >= 0), 'perm'=>($user->hasRight('facture', 'creer') && empty($conf->global->WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER)), 'label'=>'CreateBill', 'url'=>'/compta/facture/card.php?action=create&token='.newToken().'&origin='.urlencode($object->element).'&originid='.$object->id.'&socid='.$object->socid);
+				$arrayforbutaction[] = array(
+					'lang'=>'bills',
+					'enabled'=>(isModEnabled('facture') && $object->statut > Commande::STATUS_DRAFT && !$object->billed && $object->total_ttc >= 0),
+					'perm'=>($user->hasRight('facture', 'creer') && !getDolGlobalInt('WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER')),
+					'label'=>'CreateBill',
+					'url'=>'/compta/facture/card.php?action=create&token='.newToken().'&origin='.urlencode($object->element).'&originid='.$object->id.'&socid='.$object->socid
+				);
 				/*
 				 if (isModEnabled('facture') && $object->statut > Commande::STATUS_DRAFT && !$object->billed && $object->total_ttc >= 0) {
 				 if (isModEnabled('facture') && $user->hasRight('facture', 'creer') && empty($conf->global->WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER)) {
diff --git a/htdocs/core/modules/modMultiCurrency.class.php b/htdocs/core/modules/modMultiCurrency.class.php
index 2abcf240310..20ae486d46c 100644
--- a/htdocs/core/modules/modMultiCurrency.class.php
+++ b/htdocs/core/modules/modMultiCurrency.class.php
@@ -150,7 +150,21 @@ class modMultiCurrency extends DolibarrModules
 		$datestart=dol_mktime(21, 15, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
 
 		$this->cronjobs = array(
-			0 =>array('priority'=>61, 'label'=>'MutltiCurrencyAutoUpdateCurrencies', 'jobtype'=>'method', 'class'=>'multicurrency/class/multicurrency.class.php', 'objectname'=>'MultiCurrency', 'method'=>'syncRates',             'parameters'=>'0,0,cron',      'comment'=>'Update all the currencies using the currencylayer API. An APi key needs to be given in the multi-currency module config page', 'frequency'=>1, 'unitfrequency'=>2678400, 'status'=>$statusatinstall, 'test'=>'isModEnabled("cron")', 'datestart'=>$datestart),
+			0 => array(
+				'priority'=>61,
+				'label'=>'MutltiCurrencyAutoUpdateCurrencies',
+				'jobtype'=>'method',
+				'class'=>'multicurrency/class/multicurrency.class.php',
+				'objectname'=>'MultiCurrency',
+				'method'=>'syncRates',
+				'parameters'=>'0,0,cron',
+				'comment'=>'Update all the currencies using the currencylayer API. An API key needs to be given in the multi-currency module config page',
+				'frequency'=>1,
+				'unitfrequency'=>2678400,
+				'status'=>$statusatinstall,
+				'test'=>'isModEnabled("cron")',
+				'datestart'=>$datestart
+			),
 		);
 
 		// Permissions
diff --git a/htdocs/core/modules/modPartnership.class.php b/htdocs/core/modules/modPartnership.class.php
index 48244ae0455..f8fa512c36e 100644
--- a/htdocs/core/modules/modPartnership.class.php
+++ b/htdocs/core/modules/modPartnership.class.php
@@ -253,8 +253,36 @@ class modPartnership extends DolibarrModules
 		$datestart=dol_mktime(21, 15, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
 
 		$this->cronjobs = array(
-			0	=> array('priority'=>60, 'label'=>'CancelPartnershipForExpiredMembers', 'jobtype'=>'method', 'class'=>'/partnership/class/partnershiputils.class.php', 'objectname'=>'PartnershipUtils', 'method'=>'doCancelStatusOfMemberPartnership', 'parameters'=>'',      'comment'=>'Cancel status of partnership when subscription is expired + x days.', 'frequency'=>1, 'unitfrequency'=>86400, 'status'=>1, 'test'=>'isModEnabled("partnership")', 'datestart'=>$datestart),
-			1	=> array('priority'=>61, 'label'=>'PartnershipCheckBacklink', 'jobtype'=>'method', 'class'=>'/partnership/class/partnershiputils.class.php', 'objectname'=>'PartnershipUtils', 'method'=>'doWarningOfPartnershipIfDolibarrBacklinkNotfound', 'parameters'=>'',      'comment'=>'Add a warning on partnership record if the backlink keyword is not found on the partner website.', 'frequency'=>1, 'unitfrequency'=>86400, 'status'=>0, 'test'=>'isModEnabled("partnership")', 'datestart'=>$datestart),
+			0 => array(
+				'priority'=>60,
+				'label'=>'CancelPartnershipForExpiredMembers',
+				'jobtype'=>'method',
+				'class'=>'/partnership/class/partnershiputils.class.php',
+				'objectname'=>'PartnershipUtils',
+				'method'=>'doCancelStatusOfMemberPartnership',
+				'parameters'=>'',
+				'comment'=>'Cancel status of partnership when subscription is expired + x days.',
+				'frequency'=>1,
+				'unitfrequency'=>86400,
+				'status'=>1,
+				'test'=>'isModEnabled("partnership")',
+				'datestart'=>$datestart
+			),
+			1 => array(
+				'priority'=>61,
+				'label'=>'PartnershipCheckBacklink',
+				'jobtype'=>'method',
+				'class'=>'/partnership/class/partnershiputils.class.php',
+				'objectname'=>'PartnershipUtils',
+				'method'=>'doWarningOfPartnershipIfDolibarrBacklinkNotfound',
+				'parameters'=>'',
+				'comment'=>'Add a warning on partnership record if the backlink keyword is not found on the partner website.',
+				'frequency'=>1,
+				'unitfrequency'=>86400,
+				'status'=>0,
+				'test'=>'isModEnabled("partnership")',
+				'datestart'=>$datestart
+			),
 		);
 
 		// Permissions provided by this module
diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php
index a92e4aaf815..eabf5dff658 100644
--- a/htdocs/website/websiteaccount_card.php
+++ b/htdocs/website/websiteaccount_card.php
@@ -200,7 +200,7 @@ if ($action == 'create') {
 	if (empty($permissiontoadd)) {
 		accessforbidden('NotEnoughPermissions', 0, 1);
 	}
-	
+
 	print load_fiche_titre($langs->trans("NewWebsiteAccount", $langs->transnoentitiesnoconv("WebsiteAccount")));
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -218,9 +218,9 @@ if ($action == 'create') {
 	if ($dol_openinpopup) {
 		print '<input type="hidden" name="dol_openinpopup" value="'.$dol_openinpopup.'">';
 	}
-	
+
 	print dol_get_fiche_head(array(), '');
-	
+
 	print '<table class="border centpercent tableforfieldcreate">'."\n";
 
 	// Common attributes
@@ -280,7 +280,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	//$res = $object->fetch_optionals();
 
 	$head = websiteaccountPrepareHead($object);
-	
+
 	print dol_get_fiche_head($head, 'card', $langs->trans("WebsiteAccount"), -1, 'websiteaccount@website');
 
 	$formconfirm = '';
@@ -385,7 +385,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 
 	// Buttons for actions
-	
 	if ($action != 'presend' && $action != 'editline') {
 		print '<div class="tabsAction">'."\n";
 		$parameters = array();