Debug v18

htdocs/adherents/class/subscription.class.php

@@ -96,10 +96,13 @@ class Subscription extends CommonObject
 	public $amount;
 
 	/**
-	 * @var int ID
+	 * @var int 	ID of bank in llx_bank
 	 */
 	public $fk_bank;
 
+	/**
+	 * @var array  Array with all fields into database and their property. Do not use it as a static var. It may be modified by constructor.
+	 */
 	public $fields = array(
 		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
 		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>15),
@@ -128,7 +131,7 @@ class Subscription extends CommonObject
 
 
 	/**
-	 *	Function who permitted cretaion of the subscription
+	 *	Function who permitted creation of the subscription
 	 *
 	 *	@param	User	$user			User that create
 	 *	@param  bool 	$notrigger 		false=launch triggers after, true=disable triggers
@@ -151,7 +154,6 @@ class Subscription extends CommonObject
 			$this->datec = $now;
 		}
 
-
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."subscription (fk_adherent, fk_type, datec, dateadh, datef, subscription, note)";
@@ -217,7 +219,7 @@ class Subscription extends CommonObject
 		$sql .= " datef,";
 		$sql .= " subscription, note as note_public, fk_bank";
 		$sql .= " FROM ".MAIN_DB_PREFIX."subscription";
-		$sql .= "	WHERE rowid=".((int) $rowid);
+		$sql .= " WHERE rowid = ".((int) $rowid);
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -274,11 +276,11 @@ class Subscription extends CommonObject
 		$sql = "UPDATE ".MAIN_DB_PREFIX."subscription SET ";
 		$sql .= " fk_type = ".((int) $this->fk_type).",";
 		$sql .= " fk_adherent = ".((int) $this->fk_adherent).",";
-		$sql .= " note=".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : 'null').",";
+		$sql .= " note = ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : 'null').",";
 		$sql .= " subscription = ".price2num($this->amount).",";
-		$sql .= " dateadh='".$this->db->idate($this->dateh)."',";
-		$sql .= " datef='".$this->db->idate($this->datef)."',";
-		$sql .= " datec='".$this->db->idate($this->datec)."',";
+		$sql .= " dateadh = '".$this->db->idate($this->dateh)."',";
+		$sql .= " datef = '".$this->db->idate($this->datef)."',";
+		$sql .= " datec = '".$this->db->idate($this->datec)."',";
 		$sql .= " fk_bank = ".($this->fk_bank ? ((int) $this->fk_bank) : 'null');
 		$sql .= " WHERE rowid = ".((int) $this->id);
 

htdocs/adherents/subscription.php

@@ -41,11 +41,12 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 
 $langs->loadLangs(array("companies", "bills", "members", "users", "mails", 'other'));
 
-$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
-
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
-$id = GETPOST('rowid', 'int') ?GETPOST('rowid', 'int') : GETPOST('id', 'int');
+$contextpage = GETPOST('contextpage', 'aZ09');
+$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+
+$id = GETPOST('rowid', 'int') ? GETPOST('rowid', 'int') : GETPOST('id', 'int');
 $rowid = $id;
 $ref = GETPOST('ref', 'alphanohtml');
 $typeid = GETPOST('typeid', 'int');
@@ -461,755 +462,754 @@ if ($optioncss != '') {
 //include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 
-if ($rowid > 0) {
-	$res = $object->fetch($rowid);
+if (! ($object->id > 0)) {
+	$langs->load("errors");
+	print $langs->trans("ErrorRecordNotFound");
+}
+
+/*$res = $object->fetch($rowid);
 	if ($res < 0) {
 		dol_print_error($db, $object->error);
 		exit;
 	}
+*/
 
-	$adht->fetch($object->typeid);
+$adht->fetch($object->typeid);
 
-	$head = member_prepare_head($object);
+$head = member_prepare_head($object);
 
-	$rowspan = 10;
-	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
-		$rowspan++;
-	}
-	if (isModEnabled('societe')) {
-		$rowspan++;
-	}
+$rowspan = 10;
+if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
+	$rowspan++;
+}
+if (isModEnabled('societe')) {
+	$rowspan++;
+}
 
-	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="rowid" value="'.$object->id.'">';
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="rowid" value="'.$object->id.'">';
 
-	print dol_get_fiche_head($head, 'subscription', $langs->trans("Member"), -1, 'user');
+print dol_get_fiche_head($head, 'subscription', $langs->trans("Member"), -1, 'user');
 
-	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/adherents/vcard.php?id='.$object->id.'" class="refid">';
-	$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
-	$morehtmlref .= '</a>';
+$morehtmlref = '<a href="'.DOL_URL_ROOT.'/adherents/vcard.php?id='.$object->id.'" class="refid">';
+$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
+$morehtmlref .= '</a>';
 
-	dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
 
-	print '<div class="fichecenter">';
-	print '<div class="fichehalfleft">';
+print '<div class="fichecenter">';
+print '<div class="fichehalfleft">';
 
-	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent tableforfield">';
+print '<div class="underbanner clearboth"></div>';
+print '<table class="border centpercent tableforfield">';
 
-	// Login
-	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
-		print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.dol_escape_htmltag($object->login).'</td></tr>';
-	}
+// Login
+if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
+	print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.dol_escape_htmltag($object->login).'</td></tr>';
+}
 
-	// Type
-	print '<tr><td class="titlefield">'.$langs->trans("Type").'</td>';
-	print '<td class="valeur">'.$adht->getNomUrl(1)."</td></tr>\n";
+// Type
+print '<tr><td class="titlefield">'.$langs->trans("Type").'</td>';
+print '<td class="valeur">'.$adht->getNomUrl(1)."</td></tr>\n";
 
-	// Morphy
-	print '<tr><td>'.$langs->trans("MemberNature").'</td>';
-	print '<td class="valeur" >'.$object->getmorphylib('', 1).'</td>';
-	print '</tr>';
+// Morphy
+print '<tr><td>'.$langs->trans("MemberNature").'</td>';
+print '<td class="valeur" >'.$object->getmorphylib('', 1).'</td>';
+print '</tr>';
 
-	// Company
-	print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.dol_escape_htmltag($object->company).'</td></tr>';
+// Company
+print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.dol_escape_htmltag($object->company).'</td></tr>';
 
-	// Civility
-	print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'</td>';
-	print '</tr>';
+// Civility
+print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'</td>';
+print '</tr>';
 
-	// Password
-	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
-		print '<tr><td>'.$langs->trans("Password").'</td><td>';
-		if ($object->pass) {
-			print preg_replace('/./i', '*', $object->pass);
-		} else {
-			if ($user->admin) {
-				print '<!-- '.$langs->trans("Crypted").': '.$object->pass_indatabase_crypted.' -->';
-			}
-			print '<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
-		}
-		if (!empty($object->pass_indatabase) && empty($object->user_id)) {	// Show warning only for old password still in clear (does not happen anymore)
-			$langs->load("errors");
-			$htmltext = $langs->trans("WarningPasswordSetWithNoAccount");
-			print ' '.$form->textwithpicto('', $htmltext, 1, 'warning');
+// Password
+if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
+	print '<tr><td>'.$langs->trans("Password").'</td><td>';
+	if ($object->pass) {
+		print preg_replace('/./i', '*', $object->pass);
+	} else {
+		if ($user->admin) {
+			print '<!-- '.$langs->trans("Crypted").': '.$object->pass_indatabase_crypted.' -->';
 		}
-		print '</td></tr>';
+		print '<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
+	}
+	if (!empty($object->pass_indatabase) && empty($object->user_id)) {	// Show warning only for old password still in clear (does not happen anymore)
+		$langs->load("errors");
+		$htmltext = $langs->trans("WarningPasswordSetWithNoAccount");
+		print ' '.$form->textwithpicto('', $htmltext, 1, 'warning');
 	}
+	print '</td></tr>';
+}
 
-	// Date end subscription
-	print '<tr><td>'.$langs->trans("SubscriptionEndDate").'</td><td class="valeur">';
-	if ($object->datefin) {
-		print dol_print_date($object->datefin, 'day');
-		if ($object->hasDelay()) {
-			print " ".img_warning($langs->trans("Late"));
+// Date end subscription
+print '<tr><td>'.$langs->trans("SubscriptionEndDate").'</td><td class="valeur">';
+if ($object->datefin) {
+	print dol_print_date($object->datefin, 'day');
+	if ($object->hasDelay()) {
+		print " ".img_warning($langs->trans("Late"));
+	}
+} else {
+	if ($object->need_subscription == 0) {
+		print $langs->trans("SubscriptionNotNeeded");
+	} elseif (!$adht->subscription) {
+		print $langs->trans("SubscriptionNotRecorded");
+		if (Adherent::STATUS_VALIDATED == $object->statut) {
+			print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft, not excluded and not resiliated
 		}
 	} else {
-		if ($object->need_subscription == 0) {
-			print $langs->trans("SubscriptionNotNeeded");
-		} elseif (!$adht->subscription) {
-			print $langs->trans("SubscriptionNotRecorded");
-			if (Adherent::STATUS_VALIDATED == $object->statut) {
-				print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft, not excluded and not resiliated
-			}
-		} else {
-			print $langs->trans("SubscriptionNotReceived");
-			if (Adherent::STATUS_VALIDATED == $object->statut) {
-				print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft, not excluded and not resiliated
-			}
+		print $langs->trans("SubscriptionNotReceived");
+		if (Adherent::STATUS_VALIDATED == $object->statut) {
+			print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft, not excluded and not resiliated
 		}
 	}
-	print '</td></tr>';
+}
+print '</td></tr>';
 
-	print '</table>';
+print '</table>';
 
-	print '</div>';
+print '</div>';
 
-	print '<div class="fichehalfright">';
-	print '<div class="underbanner clearboth"></div>';
+print '<div class="fichehalfright">';
+print '<div class="underbanner clearboth"></div>';
 
-	print '<table class="border tableforfield centpercent">';
+print '<table class="border tableforfield centpercent">';
 
-	// Tags / Categories
-	if (isModEnabled('categorie') && !empty($user->rights->categorie->lire)) {
-		print '<tr><td>'.$langs->trans("Categories").'</td>';
-		print '<td colspan="2">';
-		print $form->showCategories($object->id, Categorie::TYPE_MEMBER, 1);
-		print '</td></tr>';
-	}
+// Tags / Categories
+if (isModEnabled('categorie') && !empty($user->rights->categorie->lire)) {
+	print '<tr><td>'.$langs->trans("Categories").'</td>';
+	print '<td colspan="2">';
+	print $form->showCategories($object->id, Categorie::TYPE_MEMBER, 1);
+	print '</td></tr>';
+}
 
-	// Birth Date
-	print '<tr><td class="titlefield">'.$langs->trans("DateOfBirth").'</td><td class="valeur">'.dol_print_date($object->birth, 'day').'</td></tr>';
-
-	// Default language
-	if (getDolGlobalInt('MAIN_MULTILANGS')) {
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		print '<tr><td>'.$langs->trans("DefaultLang").'</td><td>';
-		//$s=picto_from_langcode($object->default_lang);
-		//print ($s?$s.' ':'');
-		$langs->load("languages");
-		$labellang = ($object->default_lang ? $langs->trans('Language_'.$object->default_lang) : '');
-		print picto_from_langcode($object->default_lang, 'class="paddingrightonly saturatemedium opacitylow"');
-		print $labellang;
-		print '</td></tr>';
-	}
+// Birth Date
+print '<tr><td class="titlefield">'.$langs->trans("DateOfBirth").'</td><td class="valeur">'.dol_print_date($object->birth, 'day').'</td></tr>';
+
+// Default language
+if (getDolGlobalInt('MAIN_MULTILANGS')) {
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+	print '<tr><td>'.$langs->trans("DefaultLang").'</td><td>';
+	//$s=picto_from_langcode($object->default_lang);
+	//print ($s?$s.' ':'');
+	$langs->load("languages");
+	$labellang = ($object->default_lang ? $langs->trans('Language_'.$object->default_lang) : '');
+	print picto_from_langcode($object->default_lang, 'class="paddingrightonly saturatemedium opacitylow"');
+	print $labellang;
+	print '</td></tr>';
+}
 
-	// Public
-	print '<tr><td>'.$langs->trans("Public").'</td><td class="valeur">'.yn($object->public).'</td></tr>';
+// Public
+print '<tr><td>'.$langs->trans("Public").'</td><td class="valeur">'.yn($object->public).'</td></tr>';
 
-	// Other attributes
-	$cols = 2;
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+// Other attributes
+$cols = 2;
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
-	// Third party Dolibarr
-	if (isModEnabled('societe')) {
-		print '<tr><td>';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans("LinkedToDolibarrThirdParty");
-		print '</td>';
-		if ($action != 'editthirdparty' && $user->hasRight('adherent', 'creer')) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editthirdparty&token='.newToken().'&rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToThirdParty'), 1).'</a></td>';
-		}
-		print '</tr></table>';
-		print '</td><td colspan="2" class="valeur">';
-		if ($action == 'editthirdparty') {
-			$htmlname = 'socid';
-			print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" name="form'.$htmlname.'">';
-			print '<input type="hidden" name="rowid" value="'.$object->id.'">';
-			print '<input type="hidden" name="action" value="set'.$htmlname.'">';
-			print '<input type="hidden" name="token" value="'.newToken().'">';
-			print '<table class="nobordernopadding">';
-			print '<tr><td>';
-			print $form->select_company($object->fk_soc, 'socid', '', 1);
-			print '</td>';
-			print '<td class="left"><input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'"></td>';
-			print '</tr></table></form>';
-		} else {
-			if ($object->fk_soc) {
-				$company = new Societe($db);
-				$result = $company->fetch($object->fk_soc);
-				print $company->getNomUrl(1);
-
-				// Show link to invoices
-				$tmparray = $company->getOutstandingBills('customer');
-				if (!empty($tmparray['refs'])) {
-					print ' - '.img_picto($langs->trans("Invoices"), 'bill', 'class="paddingright"').'<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->socid.'">'.$langs->trans("Invoices").' ('.count($tmparray['refs']).')';
-					// TODO Add alert if warning on at least one invoice late
-					print '</a>';
-				}
-			} else {
-				print '<span class="opacitymedium">'.$langs->trans("NoThirdPartyAssociatedToMember").'</span>';
-			}
-		}
-		print '</td></tr>';
-	}
-
-	// Login Dolibarr - Link to user
+// Third party Dolibarr
+if (isModEnabled('societe')) {
 	print '<tr><td>';
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
-	print $langs->trans("LinkedToDolibarrUser");
+	print $langs->trans("LinkedToDolibarrThirdParty");
 	print '</td>';
-	if ($action != 'editlogin' && $user->hasRight('adherent', 'creer')) {
-		print '<td class="right">';
-		if ($user->hasRight("user", "user", "creer")) {
-			print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editlogin&token='.newToken().'&rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToUser'), 1).'</a>';
-		}
-		print '</td>';
+	if ($action != 'editthirdparty' && $user->hasRight('adherent', 'creer')) {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editthirdparty&token='.newToken().'&rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToThirdParty'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td colspan="2" class="valeur">';
-	if ($action == 'editlogin') {
-		$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'userid', '');
+	if ($action == 'editthirdparty') {
+		$htmlname = 'socid';
+		print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" name="form'.$htmlname.'">';
+		print '<input type="hidden" name="rowid" value="'.$object->id.'">';
+		print '<input type="hidden" name="action" value="set'.$htmlname.'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<table class="nobordernopadding">';
+		print '<tr><td>';
+		print $form->select_company($object->fk_soc, 'socid', '', 1);
+		print '</td>';
+		print '<td class="left"><input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'"></td>';
+		print '</tr></table></form>';
 	} else {
-		if ($object->user_id) {
-			$linkeduser = new User($db);
-			$linkeduser->fetch($object->user_id);
-			print $linkeduser->getNomUrl(-1);
+		if ($object->fk_soc) {
+			$company = new Societe($db);
+			$result = $company->fetch($object->fk_soc);
+			print $company->getNomUrl(1);
+
+			// Show link to invoices
+			$tmparray = $company->getOutstandingBills('customer');
+			if (!empty($tmparray['refs'])) {
+				print ' - '.img_picto($langs->trans("Invoices"), 'bill', 'class="paddingright"').'<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->socid.'">'.$langs->trans("Invoices").' ('.count($tmparray['refs']).')';
+				// TODO Add alert if warning on at least one invoice late
+				print '</a>';
+			}
 		} else {
-			print '<span class="opacitymedium">'.$langs->trans("NoDolibarrAccess").'</span>';
+			print '<span class="opacitymedium">'.$langs->trans("NoThirdPartyAssociatedToMember").'</span>';
 		}
 	}
 	print '</td></tr>';
+}
 
-	print "</table>\n";
+// Login Dolibarr - Link to user
+print '<tr><td>';
+print '<table class="nobordernopadding" width="100%"><tr><td>';
+print $langs->trans("LinkedToDolibarrUser");
+print '</td>';
+if ($action != 'editlogin' && $user->hasRight('adherent', 'creer')) {
+	print '<td class="right">';
+	if ($user->hasRight("user", "user", "creer")) {
+		print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editlogin&token='.newToken().'&rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToUser'), 1).'</a>';
+	}
+	print '</td>';
+}
+print '</tr></table>';
+print '</td><td colspan="2" class="valeur">';
+if ($action == 'editlogin') {
+	$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'userid', '');
+} else {
+	if ($object->user_id) {
+		$linkeduser = new User($db);
+		$linkeduser->fetch($object->user_id);
+		print $linkeduser->getNomUrl(-1);
+	} else {
+		print '<span class="opacitymedium">'.$langs->trans("NoDolibarrAccess").'</span>';
+	}
+}
+print '</td></tr>';
 
-	print "</div></div>\n";
-	print '<div class="clearboth"></div>';
+print "</table>\n";
 
-	print dol_get_fiche_end();
+print "</div></div>\n";
+print '<div class="clearboth"></div>';
 
+print dol_get_fiche_end();
 
-	/*
-	 * Action bar
-	 */
 
-	// Button to create a new subscription if member no draft (-1) neither resiliated (0) neither excluded (-2)
-	if ($user->hasRight('adherent', 'cotisation', 'creer')) {
-		if ($action != 'addsubscription' && $action != 'create_thirdparty') {
-			print '<div class="tabsAction">';
+/*
+ * Action bar
+ */
 
-			if ($object->statut > 0) {
-				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$rowid.'&action=addsubscription&token='.newToken().'">'.$langs->trans("AddSubscription")."</a></div>";
-			} else {
-				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("AddSubscription").'</a></div>';
-			}
+// Button to create a new subscription if member no draft (-1) neither resiliated (0) neither excluded (-2)
+if ($user->hasRight('adherent', 'cotisation', 'creer')) {
+	if ($action != 'addsubscription' && $action != 'create_thirdparty') {
+		print '<div class="tabsAction">';
 
-			print '</div>';
+		if ($object->statut > 0) {
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$rowid.'&action=addsubscription&token='.newToken().'">'.$langs->trans("AddSubscription")."</a></div>";
+		} else {
+			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("AddSubscription").'</a></div>';
 		}
-	}
 
-	/*
-	 * List of subscriptions
-	 */
-	if ($action != 'addsubscription' && $action != 'create_thirdparty') {
-		$sql = "SELECT d.rowid, d.firstname, d.lastname, d.societe, d.fk_adherent_type as type,";
-		$sql .= " c.rowid as crowid, c.subscription,";
-		$sql .= " c.datec, c.fk_type as cfk_type,";
-		$sql .= " c.dateadh as dateh,";
-		$sql .= " c.datef,";
-		$sql .= " c.fk_bank,";
-		$sql .= " b.rowid as bid,";
-		$sql .= " ba.rowid as baid, ba.label, ba.bank, ba.ref, ba.account_number, ba.fk_accountancy_journal, ba.number, ba.currency_code";
-		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."subscription as c";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON c.fk_bank = b.rowid";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
-		$sql .= " WHERE d.rowid = c.fk_adherent AND d.rowid=".((int) $rowid);
-		$sql .= $db->order($sortfield, $sortorder);
-
-		$result = $db->query($sql);
-		if ($result) {
-			$subscriptionstatic = new Subscription($db);
-
-			$num = $db->num_rows($result);
-
-			print '<table class="noborder centpercent">'."\n";
-
-			print '<tr class="liste_titre">';
-			print_liste_field_titre('Ref', $_SERVER["PHP_SELF"], 'c.rowid', '', $param, '', $sortfield, $sortorder);
-			print_liste_field_titre('DateCreation', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
-			print_liste_field_titre('Type', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
-			print_liste_field_titre('DateStart', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
-			print_liste_field_titre('DateEnd', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
-			print_liste_field_titre('Amount', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-			if (isModEnabled('banque')) {
-				print_liste_field_titre('Account', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-			}
-			print "</tr>\n";
+		print '</div>';
+	}
+}
 
-			$accountstatic = new Account($db);
-			$adh = new Adherent($db);
-			$adht = new AdherentType($db);
+/*
+ * List of subscriptions
+ */
+if ($action != 'addsubscription' && $action != 'create_thirdparty') {
+	$sql = "SELECT d.rowid, d.firstname, d.lastname, d.societe, d.fk_adherent_type as type,";
+	$sql .= " c.rowid as crowid, c.subscription,";
+	$sql .= " c.datec, c.fk_type as cfk_type,";
+	$sql .= " c.dateadh as dateh,";
+	$sql .= " c.datef,";
+	$sql .= " c.fk_bank,";
+	$sql .= " b.rowid as bid,";
+	$sql .= " ba.rowid as baid, ba.label, ba.bank, ba.ref, ba.account_number, ba.fk_accountancy_journal, ba.number, ba.currency_code";
+	$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."subscription as c";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON c.fk_bank = b.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
+	$sql .= " WHERE d.rowid = c.fk_adherent AND d.rowid=".((int) $rowid);
+	$sql .= $db->order($sortfield, $sortorder);
+
+	$result = $db->query($sql);
+	if ($result) {
+		$subscriptionstatic = new Subscription($db);
+
+		$num = $db->num_rows($result);
+
+		print '<table class="noborder centpercent">'."\n";
+
+		print '<tr class="liste_titre">';
+		print_liste_field_titre('Ref', $_SERVER["PHP_SELF"], 'c.rowid', '', $param, '', $sortfield, $sortorder);
+		print_liste_field_titre('DateCreation', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
+		print_liste_field_titre('Type', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
+		print_liste_field_titre('DateStart', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
+		print_liste_field_titre('DateEnd', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
+		print_liste_field_titre('Amount', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+		if (isModEnabled('banque')) {
+			print_liste_field_titre('Account', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+		}
+		print "</tr>\n";
 
-			$i = 0;
-			while ($i < $num) {
-				$objp = $db->fetch_object($result);
+		$accountstatic = new Account($db);
+		$adh = new Adherent($db);
+		$adht = new AdherentType($db);
 
-				$adh->id = $objp->rowid;
-				$adh->typeid = $objp->type;
+		$i = 0;
+		while ($i < $num) {
+			$objp = $db->fetch_object($result);
 
-				$subscriptionstatic->ref = $objp->crowid;
-				$subscriptionstatic->id = $objp->crowid;
+			$adh->id = $objp->rowid;
+			$adh->typeid = $objp->type;
 
-				$typeid = $objp->cfk_type;
-				if ($typeid > 0) {
-					$adht->fetch($typeid);
-				}
+			$subscriptionstatic->ref = $objp->crowid;
+			$subscriptionstatic->id = $objp->crowid;
 
-				print '<tr class="oddeven">';
-				print '<td>'.$subscriptionstatic->getNomUrl(1).'</td>';
-				print '<td class="center">'.dol_print_date($db->jdate($objp->datec), 'dayhour')."</td>\n";
-				print '<td class="center">';
-				if ($typeid > 0) {
-					print $adht->getNomUrl(1);
-				}
-				print '</td>';
-				print '<td class="center">'.dol_print_date($db->jdate($objp->dateh), 'day')."</td>\n";
-				print '<td class="center">'.dol_print_date($db->jdate($objp->datef), 'day')."</td>\n";
-				print '<td class="right amount">'.price($objp->subscription).'</td>';
-				if (isModEnabled('banque')) {
-					print '<td class="right">';
-					if ($objp->bid) {
-						$accountstatic->label = $objp->label;
-						$accountstatic->id = $objp->baid;
-						$accountstatic->number = $objp->number;
-						$accountstatic->account_number = $objp->account_number;
-						$accountstatic->currency_code = $objp->currency_code;
-
-						if (isModEnabled('accounting') && $objp->fk_accountancy_journal > 0) {
-							$accountingjournal = new AccountingJournal($db);
-							$accountingjournal->fetch($objp->fk_accountancy_journal);
-
-							$accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
-						}
+			$typeid = $objp->cfk_type;
+			if ($typeid > 0) {
+				$adht->fetch($typeid);
+			}
 
-						$accountstatic->ref = $objp->ref;
-						print $accountstatic->getNomUrl(1);
-					} else {
-						print '&nbsp;';
-					}
-					print '</td>';
-				}
-				print "</tr>";
-				$i++;
+			print '<tr class="oddeven">';
+			print '<td>'.$subscriptionstatic->getNomUrl(1).'</td>';
+			print '<td class="center">'.dol_print_date($db->jdate($objp->datec), 'dayhour')."</td>\n";
+			print '<td class="center">';
+			if ($typeid > 0) {
+				print $adht->getNomUrl(1);
 			}
+			print '</td>';
+			print '<td class="center">'.dol_print_date($db->jdate($objp->dateh), 'day')."</td>\n";
+			print '<td class="center">'.dol_print_date($db->jdate($objp->datef), 'day')."</td>\n";
+			print '<td class="right amount">'.price($objp->subscription).'</td>';
+			if (isModEnabled('banque')) {
+				print '<td class="right">';
+				if ($objp->bid) {
+					$accountstatic->label = $objp->label;
+					$accountstatic->id = $objp->baid;
+					$accountstatic->number = $objp->number;
+					$accountstatic->account_number = $objp->account_number;
+					$accountstatic->currency_code = $objp->currency_code;
+
+					if (isModEnabled('accounting') && $objp->fk_accountancy_journal > 0) {
+						$accountingjournal = new AccountingJournal($db);
+						$accountingjournal->fetch($objp->fk_accountancy_journal);
+
+						$accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+					}
 
-			if (empty($num)) {
-				$colspan = 6;
-				if (isModEnabled('banque')) {
-					$colspan++;
+					$accountstatic->ref = $objp->ref;
+					print $accountstatic->getNomUrl(1);
+				} else {
+					print '&nbsp;';
 				}
-				print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
+				print '</td>';
 			}
-
-			print "</table>";
-		} else {
-			dol_print_error($db);
+			print "</tr>";
+			$i++;
 		}
-	}
 
+		if (empty($num)) {
+			$colspan = 6;
+			if (isModEnabled('banque')) {
+				$colspan++;
+			}
+			print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
+		}
 
-	if (($action != 'addsubscription' && $action != 'create_thirdparty')) {
-		// Shon online payment link
-		$useonlinepayment = (isModEnabled('paypal') || isModEnabled('stripe') || isModEnabled('paybox'));
+		print "</table>";
+	} else {
+		dol_print_error($db);
+	}
+}
 
-		if ($useonlinepayment) {
-			print '<br>';
 
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-			print showOnlinePaymentUrl('membersubscription', $object->ref);
-			print '<br>';
-		}
-	}
+if (($action != 'addsubscription' && $action != 'create_thirdparty')) {
+	// Shon online payment link
+	$useonlinepayment = (isModEnabled('paypal') || isModEnabled('stripe') || isModEnabled('paybox'));
 
-	/*
-	 * Add new subscription form
-	 */
-	if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->hasRight('adherent', 'cotisation', 'creer')) {
+	if ($useonlinepayment) {
 		print '<br>';
 
-		print load_fiche_titre($langs->trans("NewCotisation"));
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+		print showOnlinePaymentUrl('membersubscription', $object->ref);
+		print '<br>';
+	}
+}
 
-		// Define default choice for complementary actions
-		$bankdirect = 0; // 1 means option by default is write to bank direct with no invoice
-		$invoiceonly = 0; // 1 means option by default is invoice only
-		$bankviainvoice = 0; // 1 means option by default is write to bank via invoice
-		if (GETPOST('paymentsave')) {
-			if (GETPOST('paymentsave') == 'bankdirect') {
-				$bankdirect = 1;
-			}
-			if (GETPOST('paymentsave') == 'invoiceonly') {
-				$invoiceonly = 1;
-			}
-			if (GETPOST('paymentsave') == 'bankviainvoice') {
-				$bankviainvoice = 1;
-			}
-		} else {
-			if (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankviainvoice' && isModEnabled('banque') && isModEnabled('societe') && isModEnabled('facture')) {
-				$bankviainvoice = 1;
-			} elseif (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankdirect' && isModEnabled('banque')) {
-				$bankdirect = 1;
-			} elseif (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'invoiceonly' && isModEnabled('banque') && isModEnabled('societe') && isModEnabled('facture')) {
-				$invoiceonly = 1;
-			}
+/*
+ * Add new subscription form
+ */
+if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->hasRight('adherent', 'cotisation', 'creer')) {
+	print '<br>';
+
+	print load_fiche_titre($langs->trans("NewCotisation"));
+
+	// Define default choice for complementary actions
+	$bankdirect = 0; // 1 means option by default is write to bank direct with no invoice
+	$invoiceonly = 0; // 1 means option by default is invoice only
+	$bankviainvoice = 0; // 1 means option by default is write to bank via invoice
+	if (GETPOST('paymentsave')) {
+		if (GETPOST('paymentsave') == 'bankdirect') {
+			$bankdirect = 1;
+		}
+		if (GETPOST('paymentsave') == 'invoiceonly') {
+			$invoiceonly = 1;
+		}
+		if (GETPOST('paymentsave') == 'bankviainvoice') {
+			$bankviainvoice = 1;
 		}
+	} else {
+		if (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankviainvoice' && isModEnabled('banque') && isModEnabled('societe') && isModEnabled('facture')) {
+			$bankviainvoice = 1;
+		} elseif (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankdirect' && isModEnabled('banque')) {
+			$bankdirect = 1;
+		} elseif (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'invoiceonly' && isModEnabled('banque') && isModEnabled('societe') && isModEnabled('facture')) {
+			$invoiceonly = 1;
+		}
+	}
 
-		print "\n\n<!-- Form add subscription -->\n";
-
-		if ($conf->use_javascript_ajax) {
-			//var_dump($bankdirect.'-'.$bankviainvoice.'-'.$invoiceonly.'-'.empty($conf->global->ADHERENT_BANK_USE));
-			print "\n".'<script type="text/javascript">';
-			print '$(document).ready(function () {
-						$(".bankswitchclass, .bankswitchclass2").'.(($bankdirect || $bankviainvoice) ? 'show()' : 'hide()').';
-						$("#none, #invoiceonly").click(function() {
-							$(".bankswitchclass").hide();
-							$(".bankswitchclass2").hide();
-						});
-						$("#bankdirect, #bankviainvoice").click(function() {
-							$(".bankswitchclass").show();
-							$(".bankswitchclass2").show();
-						});
-						$("#selectoperation").change(function() {
-							var code = $(this).val();
-							if (code == "CHQ")
+	print "\n\n<!-- Form add subscription -->\n";
+
+	if ($conf->use_javascript_ajax) {
+		//var_dump($bankdirect.'-'.$bankviainvoice.'-'.$invoiceonly.'-'.empty($conf->global->ADHERENT_BANK_USE));
+		print "\n".'<script type="text/javascript">';
+		print '$(document).ready(function () {
+					$(".bankswitchclass, .bankswitchclass2").'.(($bankdirect || $bankviainvoice) ? 'show()' : 'hide()').';
+					$("#none, #invoiceonly").click(function() {
+						$(".bankswitchclass").hide();
+						$(".bankswitchclass2").hide();
+					});
+					$("#bankdirect, #bankviainvoice").click(function() {
+						$(".bankswitchclass").show();
+						$(".bankswitchclass2").show();
+					});
+					$("#selectoperation").change(function() {
+						var code = $(this).val();
+						if (code == "CHQ")
+						{
+							$(".fieldrequireddyn").addClass("fieldrequired");
+							if ($("#fieldchqemetteur").val() == "")
 							{
-								$(".fieldrequireddyn").addClass("fieldrequired");
-								if ($("#fieldchqemetteur").val() == "")
-								{
-									$("#fieldchqemetteur").val($("#memberlabel").val());
-								}
+								$("#fieldchqemetteur").val($("#memberlabel").val());
 							}
-							else
-							{
-								$(".fieldrequireddyn").removeClass("fieldrequired");
-							}
-						});
-						';
-			if (GETPOST('paymentsave')) {
-				print '$("#'.GETPOST('paymentsave', 'aZ09').'").prop("checked", true);';
-			}
-			print '});';
-			print '</script>'."\n";
+						}
+						else
+						{
+							$(".fieldrequireddyn").removeClass("fieldrequired");
+						}
+					});
+					';
+		if (GETPOST('paymentsave')) {
+			print '$("#'.GETPOST('paymentsave', 'aZ09').'").prop("checked", true);';
 		}
+		print '});';
+		print '</script>'."\n";
+	}
 
 
-		// Confirm create third party
-		if ($action == 'create_thirdparty') {
-			$companyalias = '';
-			$fullname = $object->getFullName($langs);
+	// Confirm create third party
+	if ($action == 'create_thirdparty') {
+		$companyalias = '';
+		$fullname = $object->getFullName($langs);
 
-			if ($object->morphy == 'mor') {
-				$companyname = $object->company;
-				if (!empty($fullname)) {
-					$companyalias = $fullname;
-				}
-			} else {
-				$companyname = $fullname;
-				if (!empty($object->company)) {
-					$companyalias = $object->company;
-				}
+		if ($object->morphy == 'mor') {
+			$companyname = $object->company;
+			if (!empty($fullname)) {
+				$companyalias = $fullname;
 			}
-
-			// Create a form array
-			$formquestion = array(
-				array('label' => $langs->trans("NameToCreate"), 'type' => 'text', 'name' => 'companyname', 'value' => $companyname, 'morecss' => 'minwidth300', 'moreattr' => 'maxlength="128"'),
-				array('label' => $langs->trans("AliasNames"), 'type' => 'text', 'name' => 'companyalias', 'value' => $companyalias, 'morecss' => 'minwidth300', 'moreattr' => 'maxlength="128"')
-			);
-			// If customer code was forced to "required", we ask it at creation to avoid error later
-			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) {
-				$tmpcompany = new Societe($db);
-				$tmpcompany->name = $companyname;
-				$tmpcompany->get_codeclient($tmpcompany, 0);
-				$customercode = $tmpcompany->code_client;
-				$formquestion[] = array(
-					'label' => $langs->trans("CustomerCode"),
-					'type' => 'text',
-					'name' => 'customercode',
-					'value' => $customercode,
-					'morecss' => 'minwidth300',
-					'moreattr' => 'maxlength="128"',
-				);
+		} else {
+			$companyname = $fullname;
+			if (!empty($object->company)) {
+				$companyalias = $object->company;
 			}
-			// @todo Add other extrafields mandatory for thirdparty creation
+		}
 
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?rowid=".$object->id, $langs->trans("CreateDolibarrThirdParty"), $langs->trans("ConfirmCreateThirdParty"), "confirm_create_thirdparty", $formquestion, 1);
+		// Create a form array
+		$formquestion = array(
+			array('label' => $langs->trans("NameToCreate"), 'type' => 'text', 'name' => 'companyname', 'value' => $companyname, 'morecss' => 'minwidth300', 'moreattr' => 'maxlength="128"'),
+			array('label' => $langs->trans("AliasNames"), 'type' => 'text', 'name' => 'companyalias', 'value' => $companyalias, 'morecss' => 'minwidth300', 'moreattr' => 'maxlength="128"')
+		);
+		// If customer code was forced to "required", we ask it at creation to avoid error later
+		if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) {
+			$tmpcompany = new Societe($db);
+			$tmpcompany->name = $companyname;
+			$tmpcompany->get_codeclient($tmpcompany, 0);
+			$customercode = $tmpcompany->code_client;
+			$formquestion[] = array(
+				'label' => $langs->trans("CustomerCode"),
+				'type' => 'text',
+				'name' => 'customercode',
+				'value' => $customercode,
+				'morecss' => 'minwidth300',
+				'moreattr' => 'maxlength="128"',
+			);
 		}
+		// @todo Add other extrafields mandatory for thirdparty creation
 
+		print $form->formconfirm($_SERVER["PHP_SELF"]."?rowid=".$object->id, $langs->trans("CreateDolibarrThirdParty"), $langs->trans("ConfirmCreateThirdParty"), "confirm_create_thirdparty", $formquestion, 1);
+	}
 
-		print '<form name="subscription" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="action" value="subscription">';
-		print '<input type="hidden" name="rowid" value="'.$rowid.'">';
-		print '<input type="hidden" name="memberlabel" id="memberlabel" value="'.dol_escape_htmltag($object->getFullName($langs)).'">';
-		print '<input type="hidden" name="thirdpartylabel" id="thirdpartylabel" value="'.dol_escape_htmltag($object->company).'">';
 
-		print dol_get_fiche_head('');
+	print '<form name="subscription" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="subscription">';
+	print '<input type="hidden" name="rowid" value="'.$rowid.'">';
+	print '<input type="hidden" name="memberlabel" id="memberlabel" value="'.dol_escape_htmltag($object->getFullName($langs)).'">';
+	print '<input type="hidden" name="thirdpartylabel" id="thirdpartylabel" value="'.dol_escape_htmltag($object->company).'">';
 
-		print "<table class=\"border\" width=\"100%\">\n";
-		print '<tbody>';
+	print dol_get_fiche_head('');
 
-		$today = dol_now();
+	print '<div class="div-table-responsive">';
+	print '<table class="border centpercent">'."\n";
+	print '<tbody>';
 
-		// Date payment
-		if (GETPOST('paymentyear') && GETPOST('paymentmonth') && GETPOST('paymentday')) {
-			$paymentdate = dol_mktime(0, 0, 0, GETPOST('paymentmonth'), GETPOST('paymentday'), GETPOST('paymentyear'));
-		}
+	$now = dol_now();
 
-		print '<tr>';
-		// Date start subscription
-		$currentyear = dol_print_date(time(), "%Y");
-		$currentmonth = dol_print_date(time(), "%m");
-		print '<td class="fieldrequired">'.$langs->trans("DateSubscription").'</td><td>';
-		if (GETPOST('reday')) {
-			$datefrom = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-		}
-		if (!$datefrom) {
-			$datefrom = $object->datevalid;
-			if ($object->datefin > 0 && dol_time_plus_duree($object->datefin, $defaultdelay, $defaultdelayunit) > dol_now()) {
-				$datefrom = dol_time_plus_duree($object->datefin, 1, 'd');
-			} else {
-				$datefrom = dol_get_first_day($currentyear);
-			}
+	// Date payment
+	if (GETPOST('paymentyear') && GETPOST('paymentmonth') && GETPOST('paymentday')) {
+		$paymentdate = dol_mktime(0, 0, 0, GETPOST('paymentmonth'), GETPOST('paymentday'), GETPOST('paymentyear'));
+	}
+
+	print '<tr>';
+	// Date start subscription
+	$currentyear = dol_print_date($now, "%Y");
+	$currentmonth = dol_print_date($now, "%m");
+	print '<td class="fieldrequired">'.$langs->trans("DateSubscription").'</td><td>';
+	if (GETPOST('reday')) {
+		$datefrom = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+	}
+	if (!$datefrom) {
+		$datefrom = $object->datevalid;
+		if ($object->datefin > 0 && dol_time_plus_duree($object->datefin, $defaultdelay, $defaultdelayunit) > dol_now()) {
+			$datefrom = dol_time_plus_duree($object->datefin, 1, 'd');
+		} else {
+			$datefrom = dol_get_first_day($currentyear);
 		}
-		print $form->selectDate($datefrom, '', '', '', '', "subscription", 1, 1);
-		print "</td></tr>";
+	}
+	print $form->selectDate($datefrom, '', '', '', '', "subscription", 1, 1);
+	print "</td></tr>";
 
-		// Date end subscription
-		if (GETPOST('endday')) {
-			$dateto = dol_mktime(0, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
+	// Date end subscription
+	if (GETPOST('endday')) {
+		$dateto = dol_mktime(0, 0, 0, GETPOST('endmonth', 'int'), GETPOST('endday', 'int'), GETPOST('endyear', 'int'));
+	}
+	if (!$dateto) {
+		if (getDolGlobalInt('MEMBER_SUBSCRIPTION_SUGGEST_END_OF_MONTH')) {
+			$dateto = dol_get_last_day($currentyear, $currentmonth);
+		} elseif (getDolGlobalInt('MEMBER_SUBSCRIPTION_SUGGEST_END_OF_YEAR')) {
+			$dateto = dol_get_last_day($currentyear);
+		} else {
+			$dateto = -1; // By default, no date is suggested
 		}
-		if (!$dateto) {
-			if (getDolGlobalInt('MEMBER_SUBSCRIPTION_SUGGEST_END_OF_MONTH')) {
-				$dateto = dol_get_last_day($currentyear, $currentmonth);
-			} elseif (getDolGlobalInt('MEMBER_SUBSCRIPTION_SUGGEST_END_OF_YEAR')) {
-				$dateto = dol_get_last_day($currentyear);
-			} else {
-				$dateto = -1; // By default, no date is suggested
-			}
+	}
+	print '<tr><td>'.$langs->trans("DateEndSubscription").'</td><td>';
+	print $form->selectDate($dateto, 'end', '', '', '', "subscription", 1, 0);
+	print "</td></tr>";
+
+	if ($adht->subscription) {
+		// Amount
+		print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="subscription" size="6" value="'.(GETPOSTISSET('subscription') ? GETPOST('subscription') : price($adht->amount, 0, '', 0)).'"> '.$langs->trans("Currency".$conf->currency) .'</td></tr>';
+
+		// Label
+		print '<tr><td>'.$langs->trans("Label").'</td>';
+		print '<td><input name="label" type="text" size="32" value="';
+		if (!getDolGlobalString('MEMBER_NO_DEFAULT_LABEL')) {
+			print $langs->trans("Subscription").' '.dol_print_date(($datefrom ? $datefrom : time()), "%Y");
 		}
-		print '<tr><td>'.$langs->trans("DateEndSubscription").'</td><td>';
-		print $form->selectDate($dateto, 'end', '', '', '', "subscription", 1, 0);
-		print "</td></tr>";
-
-		if ($adht->subscription) {
-			// Amount
-			print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="subscription" size="6" value="'.(GETPOSTISSET('subscription') ? GETPOST('subscription') : price($adht->amount, 0, '', 0)).'"> '.$langs->trans("Currency".$conf->currency) .'</td></tr>';
-
-			// Label
-			print '<tr><td>'.$langs->trans("Label").'</td>';
-			print '<td><input name="label" type="text" size="32" value="';
-			if (empty($conf->global->MEMBER_NO_DEFAULT_LABEL)) {
-				print $langs->trans("Subscription").' '.dol_print_date(($datefrom ? $datefrom : time()), "%Y");
+		print '"></td></tr>';
+
+		// Complementary action
+		if ((isModEnabled('banque') || isModEnabled('facture')) && !getDolGlobalString('ADHERENT_SUBSCRIPTION_HIDECOMPLEMENTARYACTIONS')) {
+			$company = new Societe($db);
+			if ($object->socid) {
+				$result = $company->fetch($object->socid);
 			}
-			print '"></td></tr>';
 
-			// Complementary action
-			if ((isModEnabled('banque') || isModEnabled('facture')) && empty($conf->global->ADHERENT_SUBSCRIPTION_HIDECOMPLEMENTARYACTIONS)) {
-				$company = new Societe($db);
+			// No more action
+			print '<tr><td class="tdtop fieldrequired">'.$langs->trans('MoreActions');
+			print '</td>';
+			print '<td class="line-height-large">';
+
+			print '<input type="radio" class="moreaction" id="none" name="paymentsave" value="none"'.(empty($bankdirect) && empty($invoiceonly) && empty($bankviainvoice) ? ' checked' : '').'>';
+			print '<label for="none"> '.$langs->trans("None").'</label><br>';
+			// Add entry into bank accoun
+			if (isModEnabled('banque')) {
+				print '<input type="radio" class="moreaction" id="bankdirect" name="paymentsave" value="bankdirect"'.(!empty($bankdirect) ? ' checked' : '');
+				print '><label for="bankdirect">  '.$langs->trans("MoreActionBankDirect").'</label><br>';
+			}
+			// Add invoice with no payments
+			if (isModEnabled('societe') && isModEnabled('facture')) {
+				print '<input type="radio" class="moreaction" id="invoiceonly" name="paymentsave" value="invoiceonly"'.(!empty($invoiceonly) ? ' checked' : '');
+				//if (empty($object->fk_soc)) print ' disabled';
+				print '><label for="invoiceonly"> '.$langs->trans("MoreActionInvoiceOnly");
 				if ($object->fk_soc) {
-					$result = $company->fetch($object->fk_soc);
+					print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')';
+				} else {
+					print ' (';
+					if (empty($object->fk_soc)) {
+						print img_warning($langs->trans("NoThirdPartyAssociatedToMember"));
+					}
+					print $langs->trans("NoThirdPartyAssociatedToMember");
+					print ' - <a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">';
+					print $langs->trans("CreateDolibarrThirdParty");
+					print '</a>)';
 				}
-
-				// Title payments
-				//print '<tr><td colspan="2"><b>'.$langs->trans("Payment").'</b></td></tr>';
-
-				// No more action
-				print '<tr><td class="tdtop fieldrequired">'.$langs->trans('MoreActions');
-				print '</td>';
-				print '<td>';
-				print '<input type="radio" class="moreaction" id="none" name="paymentsave" value="none"'.(empty($bankdirect) && empty($invoiceonly) && empty($bankviainvoice) ? ' checked' : '').'>';
-				print '<label for="none"> '.$langs->trans("None").'</label><br>';
-				// Add entry into bank accoun
-				if (isModEnabled('banque')) {
-					print '<input type="radio" class="moreaction" id="bankdirect" name="paymentsave" value="bankdirect"'.(!empty($bankdirect) ? ' checked' : '');
-					print '><label for="bankdirect">  '.$langs->trans("MoreActionBankDirect").'</label><br>';
+				if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') {
+					print '. <span class="opacitymedium">'.$langs->trans("NoVatOnSubscription", 0).'</span>';
 				}
-				// Add invoice with no payments
-				if (isModEnabled('societe') && isModEnabled('facture')) {
-					print '<input type="radio" class="moreaction" id="invoiceonly" name="paymentsave" value="invoiceonly"'.(!empty($invoiceonly) ? ' checked' : '');
-					//if (empty($object->fk_soc)) print ' disabled';
-					print '><label for="invoiceonly"> '.$langs->trans("MoreActionInvoiceOnly");
-					if ($object->fk_soc) {
-						print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')';
-					} else {
-						print ' (';
-						if (empty($object->fk_soc)) {
-							print img_warning($langs->trans("NoThirdPartyAssociatedToMember"));
-						}
-						print $langs->trans("NoThirdPartyAssociatedToMember");
-						print ' - <a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">';
-						print $langs->trans("CreateDolibarrThirdParty");
-						print '</a>)';
-					}
-					if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') {
-						print '. <span class="opacitymedium">'.$langs->trans("NoVatOnSubscription", 0).'</span>';
-					}
-					if (!empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (isModEnabled('product') || isModEnabled('service'))) {
-						$prodtmp = new Product($db);
-						$result = $prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
-						if ($result < 0) {
-							setEventMessage($prodtmp->error, 'errors');
-						}
-						print '. '.$langs->transnoentitiesnoconv("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS", $prodtmp->getNomUrl(1)); // must use noentitiesnoconv to avoid to encode html into getNomUrl of product
+				if (!empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (isModEnabled('product') || isModEnabled('service'))) {
+					$prodtmp = new Product($db);
+					$result = $prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
+					if ($result < 0) {
+						setEventMessage($prodtmp->error, 'errors');
 					}
-					print '</label><br>';
+					print '. '.$langs->transnoentitiesnoconv("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS", $prodtmp->getNomUrl(1)); // must use noentitiesnoconv to avoid to encode html into getNomUrl of product
 				}
-				// Add invoice with payments
-				if (isModEnabled('banque') && isModEnabled('societe') && isModEnabled('facture')) {
-					print '<input type="radio" class="moreaction" id="bankviainvoice" name="paymentsave" value="bankviainvoice"'.(!empty($bankviainvoice) ? ' checked' : '');
-					//if (empty($object->fk_soc)) print ' disabled';
-					print '><label for="bankviainvoice">  '.$langs->trans("MoreActionBankViaInvoice");
-					if ($object->fk_soc) {
-						print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')';
-					} else {
-						print ' (';
-						if (empty($object->fk_soc)) {
-							print img_warning($langs->trans("NoThirdPartyAssociatedToMember"));
-						}
-						print $langs->trans("NoThirdPartyAssociatedToMember");
-						print ' - <a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">';
-						print $langs->trans("CreateDolibarrThirdParty");
-						print '</a>)';
-					}
-					if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') {
-						print '. <span class="opacitymedium">'.$langs->trans("NoVatOnSubscription", 0).'</span>';
+				print '</label><br>';
+			}
+			// Add invoice with payments
+			if (isModEnabled('banque') && isModEnabled('societe') && isModEnabled('facture')) {
+				print '<input type="radio" class="moreaction" id="bankviainvoice" name="paymentsave" value="bankviainvoice"'.(!empty($bankviainvoice) ? ' checked' : '');
+				//if (empty($object->fk_soc)) print ' disabled';
+				print '><label for="bankviainvoice">  '.$langs->trans("MoreActionBankViaInvoice");
+				if ($object->socid) {
+					print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')';
+				} else {
+					print ' (';
+					if (empty($object->socid)) {
+						print img_warning($langs->trans("NoThirdPartyAssociatedToMember"));
 					}
-					if (!empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (isModEnabled('product')|| isModEnabled('service'))) {
-						$prodtmp = new Product($db);
-						$result = $prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
-						if ($result < 0) {
-							setEventMessage($prodtmp->error, 'errors');
-						}
-						print '. '.$langs->transnoentitiesnoconv("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS", $prodtmp->getNomUrl(1)); // must use noentitiesnoconv to avoid to encode html into getNomUrl of product
+					print $langs->trans("NoThirdPartyAssociatedToMember");
+					print ' - <a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">';
+					print $langs->trans("CreateDolibarrThirdParty");
+					print '</a>)';
+				}
+				if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') {
+					print '. <span class="opacitymedium">'.$langs->trans("NoVatOnSubscription", 0).'</span>';
+				}
+				if (!empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (isModEnabled('product')|| isModEnabled('service'))) {
+					$prodtmp = new Product($db);
+					$result = $prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
+					if ($result < 0) {
+						setEventMessage($prodtmp->error, 'errors');
 					}
-					print '</label><br>';
+					print '. '.$langs->transnoentitiesnoconv("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS", $prodtmp->getNomUrl(1)); // must use noentitiesnoconv to avoid to encode html into getNomUrl of product
 				}
-				print '</td></tr>';
-
-				// Bank account
-				print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("FinancialAccount").'</td><td>';
-				print img_picto('', 'bank_account');
-				$form->select_comptes(GETPOST('accountid'), 'accountid', 0, '', 2, '', 0, 'minwidth200');
-				print "</td></tr>\n";
-
-				// Payment mode
-				print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
-				print $form->select_types_paiements(GETPOST('operation'), 'operation', '', 2, 1, 0, 0, 1, 'minwidth200', 1);
-				print "</td></tr>\n";
-
-				// Date of payment
-				print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
-				print $form->selectDate(isset($paymentdate) ? $paymentdate : -1, 'payment', 0, 0, 1, 'subscription', 1, 1);
-				print "</td></tr>\n";
-
-				print '<tr class="bankswitchclass2"><td>'.$langs->trans('Numero');
-				print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
-				print '</td>';
-				print '<td><input id="fieldnum_chq" name="num_chq" type="text" size="8" value="'.(!GETPOST('num_chq') ? '' : GETPOST('num_chq')).'"></td></tr>';
+				print '</label><br>';
+			}
+			print '</td></tr>';
+
+			// Bank account
+			print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("FinancialAccount").'</td><td>';
+			print img_picto('', 'bank_account');
+			$form->select_comptes(GETPOST('accountid'), 'accountid', 0, '', 2, '', 0, 'minwidth200');
+			print "</td></tr>\n";
+
+			// Payment mode
+			print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
+			print $form->select_types_paiements(GETPOST('operation'), 'operation', '', 2, 1, 0, 0, 1, 'minwidth200', 1);
+			print "</td></tr>\n";
+
+			// Date of payment
+			print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
+			print $form->selectDate(isset($paymentdate) ? $paymentdate : -1, 'payment', 0, 0, 1, 'subscription', 1, 1);
+			print "</td></tr>\n";
+
+			print '<tr class="bankswitchclass2"><td>'.$langs->trans('Numero');
+			print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
+			print '</td>';
+			print '<td><input id="fieldnum_chq" name="num_chq" type="text" size="8" value="'.(!GETPOST('num_chq') ? '' : GETPOST('num_chq')).'"></td></tr>';
 
-				print '<tr class="bankswitchclass2 fieldrequireddyn"><td>'.$langs->trans('CheckTransmitter');
-				print ' <em>('.$langs->trans("ChequeMaker").')</em>';
-				print '</td>';
-				print '<td><input id="fieldchqemetteur" name="chqemetteur" size="32" type="text" value="'.(!GETPOST('chqemetteur') ? '' : GETPOST('chqemetteur')).'"></td></tr>';
+			print '<tr class="bankswitchclass2 fieldrequireddyn"><td>'.$langs->trans('CheckTransmitter');
+			print ' <em>('.$langs->trans("ChequeMaker").')</em>';
+			print '</td>';
+			print '<td><input id="fieldchqemetteur" name="chqemetteur" size="32" type="text" value="'.(!GETPOST('chqemetteur') ? '' : GETPOST('chqemetteur')).'"></td></tr>';
 
-				print '<tr class="bankswitchclass2"><td>'.$langs->trans('Bank');
-				print ' <em>('.$langs->trans("ChequeBank").')</em>';
-				print '</td>';
-				print '<td><input id="chqbank" name="chqbank" size="32" type="text" value="'.(!GETPOST('chqbank') ? '' : GETPOST('chqbank')).'"></td></tr>';
-			}
+			print '<tr class="bankswitchclass2"><td>'.$langs->trans('Bank');
+			print ' <em>('.$langs->trans("ChequeBank").')</em>';
+			print '</td>';
+			print '<td><input id="chqbank" name="chqbank" size="32" type="text" value="'.(!GETPOST('chqbank') ? '' : GETPOST('chqbank')).'"></td></tr>';
 		}
+	}
 
-		print '<tr><td></td><td></td></tr>';
+	print '<tr><td></td><td></td></tr>';
 
-		print '<tr><td>'.$langs->trans("SendAcknowledgementByMail").'</td>';
-		print '<td>';
-		if (!$object->email) {
-			print $langs->trans("NoEMail");
-		} else {
-			$adht = new AdherentType($db);
-			$adht->fetch($object->typeid);
-
-			// Send subscription email
-			$subject = '';
-			$msg = '';
-
-			// Send subscription email
-			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-			$formmail = new FormMail($db);
-			// Set output language
-			$outputlangs = new Translate('', $conf);
-			$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
-			// Load traductions files required by page
-			$outputlangs->loadLangs(array("main", "members"));
-			// Get email content from template
-			$arraydefaultmessage = null;
-			$labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION;
-
-			if (!empty($labeltouse)) {
-				$arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
-			}
+	print '<tr><td>'.$langs->trans("SendAcknowledgementByMail").'</td>';
+	print '<td>';
+	if (!$object->email) {
+		print $langs->trans("NoEMail");
+	} else {
+		$adht = new AdherentType($db);
+		$adht->fetch($object->typeid);
+
+		// Send subscription email
+		$subject = '';
+		$msg = '';
+
+		// Send subscription email
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+		$formmail = new FormMail($db);
+		// Set output language
+		$outputlangs = new Translate('', $conf);
+		$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
+		// Load traductions files required by page
+		$outputlangs->loadLangs(array("main", "members"));
+		// Get email content from template
+		$arraydefaultmessage = null;
+		$labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION;
+
+		if (!empty($labeltouse)) {
+			$arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
+		}
 
-			if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
-				$subject = $arraydefaultmessage->topic;
-				$msg     = $arraydefaultmessage->content;
-			}
+		if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+			$subject = $arraydefaultmessage->topic;
+			$msg     = $arraydefaultmessage->content;
+		}
 
-			$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
-			complete_substitutions_array($substitutionarray, $outputlangs, $object);
-			$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
-			$texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnSubscription()), $substitutionarray, $outputlangs);
-
-			$tmp = '<input name="sendmail" type="checkbox"'.(GETPOST('sendmail', 'alpha') ? ' checked' : (!empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL) ? ' checked' : '')).'>';
-			$helpcontent = '';
-			$helpcontent .= '<b>'.$langs->trans("MailFrom").'</b>: '.getDolGlobalString('ADHERENT_MAIL_FROM').'<br>'."\n";
-			$helpcontent .= '<b>'.$langs->trans("MailRecipient").'</b>: '.$object->email.'<br>'."\n";
-			$helpcontent .= '<b>'.$langs->trans("MailTopic").'</b>:<br>'."\n";
-			if ($subjecttosend) {
-				$helpcontent .= $subjecttosend."\n";
-			} else {
-				$langs->load("errors");
-				$helpcontent .= '<span class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Module310Name")).'</span>'."\n";
-			}
-			$helpcontent .= "<br>";
-			$helpcontent .= '<b>'.$langs->trans("MailText").'</b>:<br>';
-			if ($texttosend) {
-				$helpcontent .= dol_htmlentitiesbr($texttosend)."\n";
-			} else {
-				$langs->load("errors");
-				$helpcontent .= '<span class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Module310Name")).'</span>'."\n";
-			}
-			print $form->textwithpicto($tmp, $helpcontent, 1, 'help', '', 0, 2, 'helpemailtosend');
+		$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+		complete_substitutions_array($substitutionarray, $outputlangs, $object);
+		$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+		$texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnSubscription()), $substitutionarray, $outputlangs);
+
+		$tmp = '<input name="sendmail" type="checkbox"'.(GETPOST('sendmail', 'alpha') ? ' checked' : (!empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL) ? ' checked' : '')).'>';
+		$helpcontent = '';
+		$helpcontent .= '<b>'.$langs->trans("MailFrom").'</b>: '.getDolGlobalString('ADHERENT_MAIL_FROM').'<br>'."\n";
+		$helpcontent .= '<b>'.$langs->trans("MailRecipient").'</b>: '.$object->email.'<br>'."\n";
+		$helpcontent .= '<b>'.$langs->trans("MailTopic").'</b>:<br>'."\n";
+		if ($subjecttosend) {
+			$helpcontent .= $subjecttosend."\n";
+		} else {
+			$langs->load("errors");
+			$helpcontent .= '<span class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Module310Name")).'</span>'."\n";
 		}
-		print '</td></tr>';
-		print '</tbody>';
-		print '</table>';
-
-		print dol_get_fiche_end();
-
-		print '<div class="center">';
-		$parameters = array();
-		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action);
-		if (empty($reshook)) {
-			print '<input type="submit" class="button" name="add" value="'.$langs->trans("AddSubscription").'">';
-			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-			print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+		$helpcontent .= "<br>";
+		$helpcontent .= '<b>'.$langs->trans("MailText").'</b>:<br>';
+		if ($texttosend) {
+			$helpcontent .= dol_htmlentitiesbr($texttosend)."\n";
+		} else {
+			$langs->load("errors");
+			$helpcontent .= '<span class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Module310Name")).'</span>'."\n";
 		}
-		print '</div>';
+		print $form->textwithpicto($tmp, $helpcontent, 1, 'help', '', 0, 2, 'helpemailtosend');
+	}
+	print '</td></tr>';
+	print '</tbody>';
+	print '</table>';
+	print '</div>';
 
-		print '</form>';
+	print dol_get_fiche_end();
 
-		print "\n<!-- End form subscription -->\n\n";
+	print '<div class="center">';
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action);
+	if (empty($reshook)) {
+		print '<input type="submit" class="button" name="add" value="'.$langs->trans("AddSubscription").'">';
+		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	}
+	print '</div>';
 
-	//print '</td></tr>';
-	//print '</table>';
-} else {
-	$langs->load("errors");
-	print $langs->trans("ErrorRecordNotFound");
+	print '</form>';
+
+	print "\n<!-- End form subscription -->\n\n";
 }
 
+
 // End of page
 llxFooter();
 $db->close();

htdocs/adherents/subscription/card.php

@@ -148,7 +148,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('adheren
 		header("Location: ".DOL_URL_ROOT."/adherents/card.php?rowid=".$object->fk_adherent);
 		exit;
 	} else {
-		$mesg = $adh->error;
+		$errmesg = $adh->error;
 	}
 }
 
@@ -194,45 +194,51 @@ if ($user->hasRight('adherent', 'cotisation', 'creer') && $action == 'edit') {
 
 	// Ref
 	print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td>';
-	print '<td class="valeur" colspan="3">';
+	print '<td class="valeur">';
 	print $form->showrefnav($object, 'rowid', $linkback, 1);
 	print '</td></tr>';
 
 	// Member
 	$adh->ref = $adh->getFullName($langs);
 	print '<tr>';
-	print '<td>'.$langs->trans("Member").'</td><td class="valeur" colspan="3">'.$adh->getNomUrl(1, 0, 'subscription').'</td>';
+	print '<td>'.$langs->trans("Member").'</td>';
+	print '<td class="valeur">'.$adh->getNomUrl(1, 0, 'subscription').'</td>';
 	print '</tr>';
 
 	// Type
 	print '<tr>';
-	print '<td>'.$langs->trans("Type").'</td><td class="valeur" colspan="3">';
+	print '<td>'.$langs->trans("Type").'</td>';
+	print '<td class="valeur">';
 	print $form->selectarray("typeid", $adht->liste_array(), (GETPOSTISSET("typeid") ? GETPOST("typeid") : $object->fk_type));
 	print'</td></tr>';
 
 	// Date start subscription
-	print '<tr><td>'.$langs->trans("DateSubscription").'</td><td class="valeur" colspan="2">';
+	print '<tr><td>'.$langs->trans("DateSubscription").'</td>';
+	print '<td class="valeur">';
 	print $form->selectDate($object->dateh, 'datesub', 1, 1, 0, 'update', 1);
 	print '</td>';
 	print '</tr>';
 
 	// Date end subscription
-	print '<tr><td>'.$langs->trans("DateEndSubscription").'</td><td class="valeur" colspan="2">';
+	print '<tr><td>'.$langs->trans("DateEndSubscription").'</td>';
+	print '<td class="valeur">';
 	print $form->selectDate($object->datef, 'datesubend', 0, 0, 0, 'update', 1);
 	print '</td>';
 	print '</tr>';
 
 	// Amount
-	print '<tr><td>'.$langs->trans("Amount").'</td><td class="valeur" colspan="2">';
-	print '<input type="text" class="flat" size="10" name="amount" value="'.price($object->amount).'"></td></tr>';
+	print '<tr><td>'.$langs->trans("Amount").'</td>';
+	print '<td class="valeur">';
+	print '<input type="text" class="flat width200" name="amount" value="'.price($object->amount).'"></td></tr>';
 
 	// Label
-	print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur" colspan="2">';
-	print '<input type="text" class="flat" size="60" name="note" value="'.$object->note.'"></td></tr>';
+	print '<tr><td>'.$langs->trans("Label").'</td>';
+	print '<td class="valeur">';
+	print '<input type="text" class="flat" name="note" value="'.$object->note_private.'"></td></tr>';
 
 	// Bank line
 	if (isModEnabled("banque") && (!empty($conf->global->ADHERENT_BANK_USE) || $object->fk_bank)) {
-		print '<tr><td>'.$langs->trans("BankTransactionLine").'</td><td class="valeur" colspan="2">';
+		print '<tr><td>'.$langs->trans("BankTransactionLine").'</td><td class="valeur">';
 		if ($object->fk_bank) {
 			$bankline = new AccountLine($db);
 			$result = $bankline->fetch($object->fk_bank);

htdocs/compta/bank/class/account.class.php

@@ -2570,8 +2570,9 @@ class AccountLine extends CommonObjectLine
 			$result .= $langs->trans("BankLineConciliated").': ';
 			$result .= yn($this->rappro);
 		}
-		if ($option == 'showall' || $option == 'showconciliatedandaccounted') {
-			$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping WHERE doc_type = 'bank' AND fk_doc = ".((int) $this->id);
+		if (isModEnabled('accounting') && ($option == 'showall' || $option == 'showconciliatedandaccounted')) {
+			$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
+			$sql .= " WHERE doc_type = 'bank' AND fk_doc = ".((int) $this->id);
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				$obj = $this->db->fetch_object($resql);