--- /tmp/dsg/dolibarr/htdocs/compta/paiement/cheque/github_19.0.3_card.php
+++ /tmp/dsg/dolibarr/htdocs/compta/paiement/cheque/client_card.php
@@ -8 +8 @@
- * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>

+ * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>

@@ -30 +29,0 @@
-// Load Dolibarr environment

@@ -42 +41 @@
-$action = GETPOST('action', 'aZ09');

+$action = GETPOST('action', 'alpha');

@@ -44,35 +42,0 @@
-

-$type = GETPOST('type');

-if (empty($type)) {

-	$type = 'CHQ';

-}

-

-$object = new RemiseCheque($db);

-

-$sortfield = GETPOST('sortfield', 'aZ09comma');

-$sortorder = GETPOST('sortorder', 'aZ09comma');

-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');

-if (!$sortorder) {

-	$sortorder = "ASC";

-}

-if (!$sortfield) {

-	$sortfield = "b.dateo,b.rowid";

-}

-if (empty($page) || $page == -1) {

-	$page = 0;

-}

-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;

-$offset = $limit * $page;

-

-$upload_dir = $conf->bank->multidir_output[$object->entity ? $object->entity : $conf->entity]."/checkdeposits";

-

-// filter by dates from / to

-$search_date_start_day = GETPOST('search_date_start_day', 'int');

-$search_date_start_month = GETPOST('search_date_start_month', 'int');

-$search_date_start_year = GETPOST('search_date_start_year', 'int');

-$search_date_end_day = GETPOST('search_date_end_day', 'int');

-$search_date_end_month = GETPOST('search_date_end_month', 'int');

-$search_date_end_year = GETPOST('search_date_end_year', 'int');

-$search_date_start = dol_mktime(0, 0, 0, $search_date_start_month, $search_date_start_day, $search_date_start_year);

-$search_date_end = dol_mktime(23, 59, 59, $search_date_end_month, $search_date_end_day, $search_date_end_year);

-$filteraccountid = GETPOST('accountid', 'int');

@@ -82,3 +46 @@
-if ($user->socid) {

-	$socid = $user->socid;

-}

+if ($user->socid) $socid = $user->socid;

@@ -87,9 +49,14 @@
-$usercanread = $user->rights->banque->cheque;

-$usercancreate = $user->rights->banque->cheque;

-$usercandelete = $user->rights->banque->cheque;

-

-$permissiontodelete = $user->rights->banque->cheque;

-

-// List of payment mode to support

-// Example: BANK_PAYMENT_MODES_FOR_DEPOSIT_MANAGEMENT = 'CHQ','TRA'

-$arrayofpaymentmodetomanage = explode(',', getDolGlobalString('BANK_PAYMENT_MODES_FOR_DEPOSIT_MANAGEMENT', 'CHQ'));

+$sortfield = GETPOST('sortfield', 'alpha');

+$sortorder = GETPOST('sortorder', 'alpha');

+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');

+if (!$sortorder) $sortorder = "ASC";

+if (!$sortfield) $sortfield = "b.dateo,b.rowid";

+if (empty($page) || $page == -1) { $page = 0; }

+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;

+$offset = $limit * $page;

+

+$dir = $conf->bank->dir_output.'/checkdeposits/';

+$filterdate = dol_mktime(0, 0, 0, GETPOST('fdmonth'), GETPOST('fdday'), GETPOST('fdyear'));

+$filteraccountid = GETPOST('accountid');

+

+$object = new RemiseCheque($db);

@@ -102 +69,41 @@
-if ($action == 'setdate' && $user->hasRight('banque', 'cheque')) {

+if ($action == 'setdate' && $user->rights->banque->cheque)

+{

+    $result = $object->fetch(GETPOST('id', 'int'));

+    if ($result > 0)

+    {

+        //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];

+        $date = dol_mktime(0, 0, 0, $_POST['datecreate_month'], $_POST['datecreate_day'], $_POST['datecreate_year']);

+

+        $result = $object->set_date($user, $date);

+        if ($result < 0)

+        {

+			setEventMessages($object->error, $object->errors, 'errors');

+        }

+    }

+    else

+    {

+        setEventMessages($object->error, $object->errors, 'errors');

+    }

+}

+

+if ($action == 'setrefext' && $user->rights->banque->cheque)

+{

+    $result = $object->fetch(GETPOST('id', 'int'));

+    if ($result > 0)

+    {

+        $ref_ext = GETPOST('ref_ext');

+

+        $result = $object->setValueFrom('ref_ext', $ref_ext, '', null, 'text', '', $user, 'CHECKDEPOSIT_MODIFY');

+        if ($result < 0)

+        {

+            setEventMessages($object->error, $object->errors, 'errors');

+        }

+    }

+    else

+    {

+        setEventMessages($object->error, $object->errors, 'errors');

+    }

+}

+

+if ($action == 'setref' && $user->rights->banque->cheque)

+{

@@ -104,5 +111,7 @@
-	if ($result > 0) {

-		$date = dol_mktime(0, 0, 0, GETPOST('datecreate_month', 'int'), GETPOST('datecreate_day', 'int'), GETPOST('datecreate_year', 'int'));

-

-		$result = $object->set_date($user, $date);

-		if ($result < 0) {

+	if ($result > 0)

+	{

+		$ref = GETPOST('ref');

+

+		$result = $object->set_number($user, $ref);

+		if ($result < 0)

+		{

@@ -111 +120,3 @@
-	} else {

+	}

+	else

+	{

@@ -116,7 +127,28 @@
-if ($action == 'setrefext' && $user->hasRight('banque', 'cheque')) {

-	$result = $object->fetch(GETPOST('id', 'int'));

-	if ($result > 0) {

-		$ref_ext = GETPOST('ref_ext');

-

-		$result = $object->setValueFrom('ref_ext', $ref_ext, '', null, 'text', '', $user, 'CHECKDEPOSIT_MODIFY');

-		if ($result < 0) {

+if ($action == 'create' && $_POST["accountid"] > 0 && $user->rights->banque->cheque)

+{

+	if (is_array($_POST['toRemise']))

+	{

+		$result = $object->create($user, $_POST["accountid"], 0, $_POST['toRemise']);

+		if ($result > 0)

+		{

+	        if ($object->statut == 1)     // If statut is validated, we build doc

+	        {

+	            $object->fetch($object->id); // To force to reload all properties in correct property name

+	    	    // Define output language

+	    	    $outputlangs = $langs;

+	            $newlang = '';

+	            if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id'])) $newlang = $_REQUEST['lang_id'];

+	            //if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;

+	            if (!empty($newlang))

+	            {

+	                $outputlangs = new Translate("", $conf);

+	                $outputlangs->setDefaultLang($newlang);

+	            }

+	            $result = $object->generatePdf($_POST["model"], $outputlangs);

+	        }

+

+       		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);

+        	exit;

+		}

+		else

+		{

@@ -125,48 +157,3 @@
-	} else {

-		setEventMessages($object->error, $object->errors, 'errors');

-	}

-}

-

-if ($action == 'setref' && $user->hasRight('banque', 'cheque')) {

-	$result = $object->fetch(GETPOST('id', 'int'));

-	if ($result > 0) {

-		$ref = GETPOST('ref');

-

-		$result = $object->set_number($user, $ref);

-		if ($result < 0) {

-			setEventMessages($object->error, $object->errors, 'errors');

-		}

-	} else {

-		setEventMessages($object->error, $object->errors, 'errors');

-	}

-}

-

-if ($action == 'create' && GETPOST("accountid", "int") > 0 && $user->hasRight('banque', 'cheque')) {

-	if (GETPOSTISARRAY('toRemise')) {

-		$object->type = $type;

-		$arrayofid = GETPOST('toRemise', 'array:int');

-

-		$result = $object->create($user, GETPOST("accountid", "int"), 0, $arrayofid);

-		if ($result > 0) {

-			if ($object->statut == 1) {     // If statut is validated, we build doc

-				$object->fetch($object->id); // To force to reload all properties in correct property name

-				// Define output language

-				$outputlangs = $langs;

-				$newlang = '';

-				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {

-					$newlang = GETPOST('lang_id', 'aZ09');

-				}

-				//if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang)) $newlang=$object->client->default_lang;

-				if (!empty($newlang)) {

-					$outputlangs = new Translate("", $conf);

-					$outputlangs->setDefaultLang($newlang);

-				}

-				$result = $object->generatePdf(GETPOST("model"), $outputlangs);

-			}

-

-			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);

-			exit;

-		} else {

-			setEventMessages($object->error, $object->errors, 'errors');

-		}

-	} else {

+	}

+	else

+	{

@@ -174,5 +161,6 @@
-		$action = 'new';

-	}

-}

-

-if ($action == 'remove' && $id > 0 && GETPOST("lineid", 'int') > 0 && $user->hasRight('banque', 'cheque')) {

+	    $action = 'new';

+	}

+}

+

+if ($action == 'remove' && $id > 0 && $_GET["lineid"] > 0 && $user->rights->banque->cheque)

+{

@@ -180,2 +168,3 @@
-	$result = $object->removeCheck(GETPOST("lineid", "int"));

-	if ($result === 0) {

+	$result = $object->removeCheck($_GET["lineid"]);

+	if ($result === 0)

+	{

@@ -184 +173,3 @@
-	} else {

+	}

+	else

+	{

@@ -189 +180,2 @@
-if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('banque', 'cheque')) {

+if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->banque->cheque)

+{

@@ -191,2 +183,3 @@
-	$result = $object->delete($user);

-	if ($result == 0) {

+	$result = $object->delete();

+	if ($result == 0)

+	{

@@ -195 +188,3 @@
-	} else {

+	}

+	else

+	{

@@ -200 +195,2 @@
-if ($action == 'confirm_validate' && $confirm == 'yes' && $user->hasRight('banque', 'cheque')) {

+if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->banque->cheque)

+{

@@ -203,15 +199,15 @@
-	if ($result >= 0) {

-		// Define output language

-		$outputlangs = $langs;

-		$newlang = '';

-		if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {

-			$newlang = GETPOST('lang_id', 'aZ09');

-		}

-		//if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang)) $newlang=$object->client->default_lang;

-		if (!empty($newlang)) {

-			$outputlangs = new Translate("", $conf);

-			$outputlangs->setDefaultLang($newlang);

-		}

-		$result = $object->generatePdf(GETPOST('model'), $outputlangs);

-

-		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);

+	if ($result >= 0)

+	{

+        // Define output language

+        $outputlangs = $langs;

+        $newlang = '';

+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id'])) $newlang = $_REQUEST['lang_id'];

+        //if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;

+        if (!empty($newlang))

+        {

+            $outputlangs = new Translate("", $conf);

+            $outputlangs->setDefaultLang($newlang);

+        }

+        $result = $object->generatePdf(GETPOST('model'), $outputlangs);

+

+        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);

@@ -219 +215,3 @@
-	} else {

+	}

+	else

+	{

@@ -224 +222,2 @@
-if ($action == 'confirm_reject_check' && $confirm == 'yes' && $user->hasRight('banque', 'cheque')) {

+if ($action == 'confirm_reject_check' && $confirm == 'yes' && $user->rights->banque->cheque)

+{

@@ -226 +225 @@
-	$rejected_check = GETPOST('bankid', 'int');

+	$rejected_check = GETPOST('bankid');

@@ -230 +229,2 @@
-	if ($paiement_id > 0) {

+	if ($paiement_id > 0)

+	{

@@ -235 +235,3 @@
-	} else {

+	}

+	else

+	{

@@ -241 +243,2 @@
-if ($action == 'builddoc' && $user->hasRight('banque', 'cheque')) {

+if ($action == 'builddoc' && $user->rights->banque->cheque)

+{

@@ -247,12 +250,12 @@
-	$outputlangs = $langs;

-	$newlang = '';

-	if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {

-		$newlang = GETPOST('lang_id', 'aZ09');

-	}

-	//if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang)) $newlang=$object->client->default_lang;

-	if (!empty($newlang)) {

-		$outputlangs = new Translate("", $conf);

-		$outputlangs->setDefaultLang($newlang);

-	}

-	$result = $object->generatePdf(GETPOST("model"), $outputlangs);

-	if ($result <= 0) {

+    $outputlangs = $langs;

+    $newlang = '';

+    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id'])) $newlang = $_REQUEST['lang_id'];

+    //if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;

+    if (!empty($newlang))

+    {

+        $outputlangs = new Translate("", $conf);

+        $outputlangs->setDefaultLang($newlang);

+    }

+	$result = $object->generatePdf($_POST["model"], $outputlangs);

+	if ($result <= 0)

+	{

@@ -261,2 +264,4 @@
-	} else {

-		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.(!getDolGlobalString('MAIN_JUMP_TAG') ? '' : '#builddoc'));

+	}

+	else

+	{

+		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#builddoc'));

@@ -265,3 +270,7 @@
-} elseif ($action == 'remove_file' && $user->hasRight('banque', 'cheque')) {

-	// Remove file in doc form

-	if ($object->fetch($id) > 0) {

+}

+

+// Remove file in doc form

+elseif ($action == 'remove_file' && $user->rights->banque->cheque)

+{

+	if ($object->fetch($id) > 0)

+	{

@@ -272,3 +281 @@
-		$filetodelete = GETPOST('file', 'alpha');

-		$file = $upload_dir.'/'.$filetodelete;

-

+		$file = $dir.get_exdir($object->ref, 0, 1, 0, $object, 'cheque').GETPOST('file');

@@ -276,5 +283,2 @@
-		if ($ret) {

-			setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');

-		} else {

-			setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');

-		}

+		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');

+		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');

@@ -289,23 +293,7 @@
-if (GETPOST('removefilter')) {

-	// filter by dates from / to

-	$search_date_start_day = '';

-	$search_date_start_month = '';

-	$search_date_start_year = '';

-	$search_date_end_day = '';

-	$search_date_end_month = '';

-	$search_date_end_year = '';

-	$search_date_start = '';

-	$search_date_end = '';

-	$filteraccountid = 0;

-}

-

-if ($action == 'new') {

-	$title = $langs->trans("NewChequeDeposit");

-} else {

-	if ($type == 'CHQ') {

-		$title = $langs->trans("Cheques");

-	} else {

-		$title = ($langs->trans("PaymentType".$type) != "PaymentType".$type ? $langs->trans("PaymentType".$type) : $langs->trans("PaymentMode").' '.$type);

-	}

-}

-

+if (GETPOST('removefilter'))

+{

+    $filterdate = '';

+    $filteraccountid = 0;

+}

+

+$title = $langs->trans("Cheques")." - ".$langs->trans("Card");

@@ -319 +307,2 @@
-if ($action == 'new') {

+if ($action == 'new')

+{

@@ -327,2 +316,4 @@
-	print load_fiche_titre($title, '', 'bank_account');

-} else {

+	print load_fiche_titre($langs->trans("Cheques"), '', 'bank_account');

+}

+else

+{

@@ -330 +321,2 @@
-	if ($result < 0) {

+	if ($result < 0)

+	{

@@ -344 +336 @@
-	print dol_get_fiche_head($head, $hselected, $langs->trans("Cheques"), -1, 'payment');

+	dol_fiche_head($head, $hselected, $langs->trans("Cheques"), -1, 'payment');

@@ -347 +339 @@
-	 * Confirmation of slip's delete

+	 * Confirmation de la suppression du bordereau

@@ -349 +341,2 @@
-	if ($action == 'delete') {

+	if ($action == 'delete')

+	{

@@ -354 +347 @@
-	 * Confirmation of slip's validation

+	 * Confirmation de la validation du bordereau

@@ -356,2 +349,3 @@
-	if ($action == 'valide') {

-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("ValidateCheckReceipt"), $langs->trans("ConfirmValidateCheckReceipt"), 'confirm_validate', '', '', 1);

+	if ($action == 'valide')

+	{

+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("ValidateCheckReceipt"), $langs->trans("ConfirmValidateCheckReceipt"), 'confirm_valide', '', '', 1);

@@ -363 +357,2 @@
-	if ($action == 'reject_check') {

+	if ($action == 'reject_check')

+	{

@@ -365 +360 @@
-			array('type' => 'hidden', 'name' => 'bankid', 'value' => GETPOST('lineid', 'int')),

+			array('type' => 'hidden', 'name' => 'bankid', 'value' => GETPOST('lineid')),

@@ -374 +369,2 @@
-if ($action == 'new') {

+if ($action == 'new')

+{

@@ -382,6 +378 @@
-	$labeltype = ($langs->trans("PaymentType".$type) != "PaymentType".$type ? $langs->trans("PaymentType".$type) : $type);

-	if ($type == 'CHQ') {

-		print '<span class="opacitymedium">'.$langs->trans("SelectChequeTransactionAndGenerate").'</span><br><br>'."\n";

-	} else {

-		print '<span class="opacitymedium">'.$langs->trans("SelectPaymentTransactionAndGenerate", $labeltype).'</span><br><br>'."\n";

-	}

+	print '<span class="opacitymedium">'.$langs->trans("SelectChequeTransactionAndGenerate").'</span><br><br>'."\n";

@@ -393 +384 @@
-	print dol_get_fiche_head();

+	dol_fiche_head();

@@ -396,25 +387,19 @@
-

-	if (count($arrayofpaymentmodetomanage) > 1) {

-		$arrayoflabels = array();

-		foreach ($arrayofpaymentmodetomanage as $key => $val) {

-			$labelval = ($langs->trans("PaymentType".$val) != "PaymentType".$val ? $langs->trans("PaymentType".$val) : $val);

-			$arrayoflabels[$key] = $labelval;

-		}

-		// Type

-		print '<tr><td>';

-		print $langs->trans("Type");

-		print '</td><td>';

-		print $form->selectarray('type', $arrayoflabels, $type);

-		print '</td></tr>';

-	}

-	// Date

-	print '<tr><td class="titlefieldcreate">';

-	if ($type == 'CHQ') {

-		print $langs->trans("DateChequeReceived");

-	} else {

-		print $langs->trans("DatePaymentReceived");

-	}

-	print '</td><td>';

-	// filter by dates from / to

-	print '<div class="nowrapfordate">';

-	print $form->selectDate($search_date_start, 'search_date_start_', 0, 0, 1, '', 1, 1, 0, '', '', '', '', 1, '', $langs->trans('From'));

+	//print '<tr><td width="30%">'.$langs->trans('Date').'</td><td width="70%">'.dol_print_date($now,'day').'</td></tr>';

+	// Filter

+	print '<tr><td class="titlefieldcreate">'.$langs->trans("DateChequeReceived").'</td><td>';

+	print $form->selectDate($filterdate, 'fd', 0, 0, 1, '', 1, 1);

+	print '</td></tr>';

+    print '<tr><td>'.$langs->trans("BankAccount").'</td><td>';

+    $form->select_comptes($filteraccountid, 'accountid', 0, 'courant <> 2', 1);

+    print '</td></tr>';

+	print '</table>';

+

+	dol_fiche_end();

+

+    print '<div class="center">';

+	print '<input type="submit" class="button" name="filter" value="'.dol_escape_htmltag($langs->trans("ToFilter")).'">';

+    if ($filterdate || $filteraccountid > 0)

+    {

+    	print ' &nbsp; ';

+    	print '<input type="submit" class="button" name="removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';

+    }

@@ -422,19 +407 @@
-	print '<div class="nowrapfordate">';

-	print $form->selectDate($search_date_end, 'search_date_end_', 0, 0, 1, '', 1, 1, 0, '', '', '', '', 1, '', $langs->trans('to'));

-	print '</div>';

-	print '</td></tr>';

-	print '<tr><td>'.$langs->trans("BankAccount").'</td><td>';

-	$form->select_comptes($filteraccountid, 'accountid', 0, 'courant <> 2', 1);

-	print '</td></tr>';

-	print '</table>';

-

-	print dol_get_fiche_end();

-

-	print '<div class="center">';

-	print '<input type="submit" class="button small" name="filter" value="'.dol_escape_htmltag($langs->trans("ToFilter")).'">';

-	if ($search_date_start || $search_date_end || $filteraccountid > 0) {

-		print ' &nbsp; ';

-		print '<input type="submit" class="button" name="removefilter small" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';

-	}

-	print '</div>';

-	print '</form>';

+    print '</form>';

@@ -442,6 +409,4 @@
-	print '<br>';

-

-	$sql = "SELECT ba.rowid as bid, ba.label,";

-	$sql .= " b.rowid as transactionid, b.label as transactionlabel, b.datec as datec, b.dateo as date, ";

-	$sql .= " b.amount, b.emetteur, b.num_chq, b.banque,";

-	$sql .= " p.rowid as paymentid, p.ref as paymentref";

+

+	$sql = "SELECT ba.rowid as bid, b.datec as datec, b.dateo as date, b.rowid as transactionid, ";

+	$sql .= " b.amount, ba.label, b.emetteur, b.num_chq, b.banque,";

+	$sql .= " p.rowid as paymentid";

@@ -451 +416 @@
-	$sql .= " WHERE b.fk_type = '".$db->escape($type)."'";

+	$sql .= " WHERE b.fk_type = 'CHQ'";

@@ -455,9 +420,2 @@
-	if ($search_date_start) {

-		$sql .= " AND b.dateo >= '".$db->idate($search_date_start)."'";

-	}

-	if ($search_date_end) {

-		$sql .= " AND b.dateo <= '".$db->idate($search_date_end)."'";

-	}

-	if ($filteraccountid > 0) {

-		$sql .= " AND ba.rowid = ".((int) $filteraccountid);

-	}

+	if ($filterdate)          $sql .= " AND b.dateo = '".$db->idate($filterdate)."'";

+    if ($filteraccountid > 0) $sql .= " AND ba.rowid= '".$filteraccountid."'";

@@ -467 +425,2 @@
-	if ($resql) {

+	if ($resql)

+	{

@@ -469 +428,2 @@
-		while ($obj = $db->fetch_object($resql)) {

+		while ($obj = $db->fetch_object($resql))

+		{

@@ -471 +431 @@
-			$lines[$obj->bid][$i]["date"] = $db->jdate($obj->datec);

+			$lines[$obj->bid][$i]["date"] = $db->jdate($obj->date);

@@ -477,2 +436,0 @@
-			$lines[$obj->bid][$i]["ref"] = $obj->transactionid;

-			$lines[$obj->bid][$i]["label"] = $obj->transactionlabel;

@@ -480,2 +437,0 @@
-			$lines[$obj->bid][$i]["paymentref"] = $obj->paymentref;

-			$lines[$obj->bid][$i]["paymentdate"] = $db->jdate($obj->date);

@@ -485,6 +441,3 @@
-		if ($i == 0) {

-			if ($type == 'CHQ') {

-				print '<div class="opacitymedium">'.$langs->trans("NoWaitingChecks").'</div><br>';

-			} else {

-				print '<div class="opacitymedium">'.$langs->trans("NoWaitingPaymentForDeposit", $labeltype).'</div><br>';

-			}

+		if ($i == 0)

+		{

+			print '<div class="opacitymedium">'.$langs->trans("NoWaitingChecks").'</div><br>';

@@ -494,3 +447,4 @@
-	foreach ($accounts as $bid => $account_label) {

-		print '

-        <script type="text/javascript">

+	foreach ($accounts as $bid => $account_label)

+	{

+        print '

+        <script language="javascript" type="text/javascript">

@@ -512 +465,0 @@
-

@@ -516 +468,0 @@
-		print '<input type="hidden" name="type" value="'.$type.'">';

@@ -520,2 +472,2 @@
-		print '<div class="div-table-responsive-no-min">';

-		print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";

+        print '<div class="div-table-responsive-no-min">';

+        print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";

@@ -524,7 +476 @@
-		print '<td>';

-		if ($type == 'CHQ') {

-			print $langs->trans("DateChequeReceived");

-		} else {

-			print $langs->trans("DatePaymentForDepositReceived", $type);

-		}

-		print '</td>'."\n";

+		print '<td>'.$langs->trans("DateChequeReceived").'</td>'."\n";

@@ -534 +480 @@
-		print '<td class="right">'.$langs->trans("Amount")."</td>\n";

+		print '<td>'.$langs->trans("Amount")."</td>\n";

@@ -538,3 +484 @@
-		if ($conf->use_javascript_ajax) {

-			print '<a href="#" id="checkall_'.$bid.'">'.$langs->trans("All").'</a> / <a href="#" id="checknone_'.$bid.'">'.$langs->trans("None").'</a>';

-		}

+		if ($conf->use_javascript_ajax) print '<a href="#" id="checkall_'.$bid.'">'.$langs->trans("All").'</a> / <a href="#" id="checknone_'.$bid.'">'.$langs->trans("None").'</a>';

@@ -544,2 +488,11 @@
-		if (count($lines[$bid])) {

-			foreach ($lines[$bid] as $lid => $value) {

+		if (count($lines[$bid]))

+		{

+			foreach ($lines[$bid] as $lid => $value)

+			{

+				//$account_id = $bid; FIXME not used

+

+				// FIXME $accounts[$bid] is a label !

+				/*if (! isset($accounts[$bid]))

+					$accounts[$bid]=0;

+				$accounts[$bid] += 1;*/

+

@@ -551 +504 @@
-				print '<td class="right"><span class="amount">'.price($value["amount"], 0, $langs, 1, -1, -1, $conf->currency).'</span></td>';

+				print '<td class="right">'.price($value["amount"], 0, $langs, 1, -1, -1, $conf->currency).'</td>';

@@ -556,3 +509,3 @@
-				$paymentstatic->ref = $value["paymentref"];

-				$paymentstatic->date = $value["paymentdate"];

-				if ($paymentstatic->id) {

+				$paymentstatic->ref = $value["paymentid"];

+				if ($paymentstatic->id)

+				{

@@ -560 +513,3 @@
-				} else {

+				}

+				else

+				{

@@ -566,3 +521,3 @@
-				$accountlinestatic->id = $value["id"];

-				$accountlinestatic->ref = $value["ref"];

-				if ($accountlinestatic->id > 0) {

+				$accountlinestatic->rowid = $value["id"];

+				if ($accountlinestatic->rowid)

+				{

@@ -570 +525,3 @@
-				} else {

+				}

+				else

+				{

@@ -578,0 +536,2 @@
+

+				$i++;

@@ -582 +541 @@
-		print '</div>';

+        print '</div>';

@@ -585 +544,2 @@
-		if ($user->hasRight('banque', 'cheque')) {

+		if ($user->rights->banque->cheque)

+		{

@@ -587 +547,3 @@
-		} else {

+		}

+		else

+		{

@@ -593 +555,3 @@
-} else {

+}

+else

+{

@@ -602,7 +566 @@
-	$morehtmlleft = '';

-	$moreghtmlright = '';

-

-	$labelval = ($langs->trans("PaymentType".$object->type) != "PaymentType".$object->type ? $langs->trans("PaymentType".$object->type) : $object->type);

-	$morehtmlref = '<br><div class="refidno">'.$langs->trans("Type").' : '.$labelval.'</div>';

-

-	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, $morehtmlleft, '', 0, $moreghtmlright);

+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);

@@ -613,0 +572 @@
+

@@ -618,19 +577,19 @@
-	print '<table class="nobordernopadding centpercent"><tr><td>';

-	print $langs->trans('Date');

-	print '</td>';

-	if ($action != 'editdate') {

-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';

-	}

-	print '</tr></table>';

-

-	print '</td><td>';

-	if ($action == 'editdate') {

-		print '<form name="setdate" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';

-		print '<input type="hidden" name="token" value="'.newToken().'">';

-		print '<input type="hidden" name="action" value="setdate">';

-		print $form->selectDate($object->date_bordereau, 'datecreate_', '', '', '', "setdate");

-		print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';

-		print '</form>';

-	} else {

-		print $object->date_bordereau ? dol_print_date($object->date_bordereau, 'day') : '&nbsp;';

-	}

+    print '<table class="nobordernopadding" width="100%"><tr><td>';

+    print $langs->trans('Date');

+    print '</td>';

+    if ($action != 'editdate') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';

+    print '</tr></table>';

+    print '</td><td colspan="2">';

+    if ($action == 'editdate')

+    {

+        print '<form name="setdate" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';

+        print '<input type="hidden" name="token" value="'.newToken().'">';

+        print '<input type="hidden" name="action" value="setdate">';

+        print $form->selectDate($object->date_bordereau, 'datecreate_', '', '', '', "setdate");

+        print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';

+        print '</form>';

+    }

+    else

+    {

+        print $object->date_bordereau ? dol_print_date($object->date_bordereau, 'day') : '&nbsp;';

+    }

@@ -641,25 +600,29 @@
-	// External ref - Ext ref are not visible field on standard usage

-	if (getDolGlobalString('MAIN_SHOW_EXTREF')) {

-		print '<tr><td>';

-		print '<table class="nobordernopadding" width="100%"><tr><td>';

-		print $langs->trans('RefExt');

-		print '</td>';

-		if ($action != 'editrefext') {

-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editrefext&token='.newToken().'&id='.((int) $object->id).'">'.img_edit($langs->trans('SetRefExt'), 1).'</a></td>';

-		}

-		print '</tr></table>';

-		print '</td><td>';

-		if ($action == 'editrefext') {

-			print '<form name="setrefext" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';

-			print '<input type="hidden" name="token" value="'.newToken().'">';

-			print '<input type="hidden" name="action" value="setrefext">';

-			print '<input type="text" name="ref_ext" value="'.$object->ref_ext.'">';

-			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';

-			print '</form>';

-		} else {

-			print $object->ref_ext;

-		}

-		print '</td></tr>';

-	}

-

-	print '<tr><td>'.$langs->trans('Account').'</td><td>';

+	// External ref

+	/* Ext ref are not visible field on standard usage

+	print '<tr><td>';

+

+	print '<table class="nobordernopadding" width="100%"><tr><td>';

+    print $langs->trans('RefExt');

+    print '</td>';

+    if ($action != 'editrefext') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editrefext&amp;id='.$object->id.'">'.img_edit($langs->trans('SetRefExt'),1).'</a></td>';

+    print '</tr></table>';

+    print '</td><td colspan="2">';

+    if ($action == 'editrefext')

+    {

+        print '<form name="setrefext" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';

+        print '<input type="hidden" name="token" value="'.newToken().'">';

+        print '<input type="hidden" name="action" value="setrefext">';

+        print '<input type="text" name="ref_ext" value="'.$object->ref_ext.'">';

+        print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';

+        print '</form>';

+    }

+    else

+    {

+        print $object->ref_ext;

+    }

+

+	print '</td>';

+	print '</tr>';

+	*/

+

+	print '<tr><td>'.$langs->trans('Account').'</td><td colspan="2">';

@@ -669,2 +632,2 @@
-	// Number of bank checks

-	print '<tr><td>'.$langs->trans('NbOfCheques').'</td><td>';

+	// Nb of cheques

+	print '<tr><td>'.$langs->trans('NbOfCheques').'</td><td colspan="2">';

@@ -674,2 +637,2 @@
-	print '<tr><td>'.$langs->trans('Total').'</td><td>';

-	print '<span class="amount">'.price($object->amount).'</span>';

+	print '<tr><td>'.$langs->trans('Total').'</td><td colspan="2">';

+	print price($object->amount);

@@ -677,0 +641,4 @@
+	/*print '<tr><td>'.$langs->trans('Status').'</td><td colspan="2">';

+	print $object->getLibStatut(4);

+	print '</td></tr>';*/

+

@@ -683,2 +650,2 @@
-	// List of bank checks

-	$sql = "SELECT b.rowid, b.rowid as ref, b.label, b.amount, b.num_chq, b.emetteur,";

+	// List of cheques

+	$sql = "SELECT b.rowid, b.amount, b.num_chq, b.emetteur,";

@@ -686 +653 @@
-	$sql .= " p.rowid as pid, p.ref as pref, ba.rowid as bid, p.statut";

+	$sql .= " p.rowid as pid, ba.rowid as bid, p.statut";

@@ -691,2 +658,2 @@
-	$sql .= " AND b.fk_type= '".$db->escape($object->type)."'";

-	$sql .= " AND b.fk_bordereau = ".((int) $object->id);

+	$sql .= " AND b.fk_type= 'CHQ'";

+	$sql .= " AND b.fk_bordereau = ".$object->id;

@@ -696 +663,2 @@
-	if ($resql) {

+	if ($resql)

+	{

@@ -699 +667 @@
-		print '<div class="div-table-responsive">';

+	    print '<div class="div-table-responsive">';

@@ -717,52 +685,62 @@
-		if ($num > 0) {

-			while ($objp = $db->fetch_object($resql)) {

-				$paymentstatic->id = $objp->pid;

-				$paymentstatic->ref = $objp->pref;

-

-				$accountlinestatic->id = $objp->rowid;

-				$accountlinestatic->ref = $objp->ref;

-

-				print '<tr class="oddeven">';

-				print '<td class="center">'.$i.'</td>';

-				print '<td class="center">'.dol_print_date($db->jdate($objp->date), 'day').'</td>'; // Operation date

-				print '<td class="center">'.($objp->num_chq ? $objp->num_chq : '&nbsp;').'</td>';

-				print '<td>'.dol_trunc($objp->emetteur, 24).'</td>';

-				print '<td>'.dol_trunc($objp->banque, 24).'</td>';

-				print '<td class="right"><span class="amount">'.price($objp->amount).'</span></td>';

-				// Link to payment

-				print '<td class="center">';

-				if ($paymentstatic->id) {

-					print $paymentstatic->getNomUrl(1);

-				} else {

-					print '&nbsp;';

-				}

-				print '</td>';

-				// Link to bank transaction

-				print '<td class="center">';

-				if ($accountlinestatic->id > 0) {

-					print $accountlinestatic->getNomUrl(1);

-				} else {

-					print '&nbsp;';

-				}

-				print '</td>';

-				// Action button

-				print '<td class="right">';

-				if ($object->statut == 0) {

-					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=remove&token='.newToken().'&lineid='.$objp->rowid.'">'.img_delete().'</a>';

-				}

-				if ($object->statut == 1 && $objp->statut != 2) {

-					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reject_check&token='.newToken().'&lineid='.$objp->rowid.'">'.img_picto($langs->trans("RejectCheck"), 'disable').'</a>';

-				}

-				if ($objp->statut == 2) {

-					print ' &nbsp; '.img_picto($langs->trans('CheckRejected'), 'statut8').'</a>';

-				}

-				print '</td>';

-				print '</tr>';

-

-				$i++;

-			}

-		} else {

-			print '<td colspan="9"><span class="opacitymedium">';

-			print $langs->trans("None");

-			print '</span></td>';

-		}

+        if ($num > 0)

+        {

+    		while ($objp = $db->fetch_object($resql))

+    		{

+    			print '<tr class="oddeven">';

+    			print '<td class="center">'.$i.'</td>';

+    			print '<td class="center">'.dol_print_date($db->jdate($objp->date), 'day').'</td>'; // Date operation

+    			print '<td class="center">'.($objp->num_chq ? $objp->num_chq : '&nbsp;').'</td>';

+    			print '<td>'.dol_trunc($objp->emetteur, 24).'</td>';

+    			print '<td>'.dol_trunc($objp->banque, 24).'</td>';

+    			print '<td class="right">'.price($objp->amount).'</td>';

+    			// Link to payment

+    			print '<td class="center">';

+    			$paymentstatic->id = $objp->pid;

+    			$paymentstatic->ref = $objp->pid;

+    			if ($paymentstatic->id)

+    			{

+    				print $paymentstatic->getNomUrl(1);

+    			}

+    			else

+    			{

+    				print '&nbsp;';

+    			}

+    			print '</td>';

+    			// Link to bank transaction

+    			print '<td class="center">';

+    			$accountlinestatic->rowid = $objp->rowid;

+    			if ($accountlinestatic->rowid)

+    			{

+    				print $accountlinestatic->getNomUrl(1);

+    			}

+    			else

+    			{

+    				print '&nbsp;';

+    			}

+    			print '</td>';

+    			// Action button

+    			print '<td class="right">';

+    			if ($object->statut == 0)

+    			{

+    				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=remove&amp;lineid='.$objp->rowid.'">'.img_delete().'</a>';

+    			}

+       			if ($object->statut == 1 && $objp->statut != 2)

+       			{

+       				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reject_check&amp;lineid='.$objp->rowid.'">'.img_picto($langs->trans("RejectCheck"), 'disable').'</a>';

+       			}

+    			if ($objp->statut == 2)

+    			{

+    				print ' &nbsp; '.img_picto($langs->trans('CheckRejected'), 'statut8').'</a>';

+    			}

+    		    print '</td>';

+    			print '</tr>';

+

+    			$i++;

+    		}

+        }

+        else

+        {

+            print '<td colspan="8" class="opacitymedium">';

+            print $langs->trans("None");

+            print '</td>';

+        }

@@ -772 +750 @@
-		// Cheque denormalized data nbcheque is similar to real number of bank check

+		// Cheque denormalized data nbcheque is similar to real number of cheque

@@ -781 +759,3 @@
-	} else {

+	}

+	else

+	{

@@ -785 +765 @@
-	print dol_get_fiche_end();

+	dol_fiche_end();

@@ -792 +772 @@
- * Actions Buttons

+ * Boutons Actions

@@ -797,6 +777,8 @@
-if ($user->socid == 0 && !empty($object->id) && $object->statut == 0 && $user->hasRight('banque', 'cheque')) {

-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=valide&token='.newToken().'&sortfield='.$sortfield.'&sortorder='.$sortorder.'">'.$langs->trans('Validate').'</a>';

-}

-

-if ($user->socid == 0 && !empty($object->id) && $user->hasRight('banque', 'cheque')) {

-	print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', $permissiontodelete);

+if ($user->socid == 0 && !empty($object->id) && $object->statut == 0 && $user->rights->banque->cheque)

+{

+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valide&amp;sortfield='.$sortfield.'&amp;sortorder='.$sortorder.'">'.$langs->trans('Validate').'</a>';

+}

+

+if ($user->socid == 0 && !empty($object->id) && $user->rights->banque->cheque)

+{

+	print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;sortfield='.$sortfield.'&amp;sortorder='.$sortorder.'">'.$langs->trans('Delete').'</a>';

@@ -808,5 +790,6 @@
-if ($action != 'new') {

-	if ($object->statut == 1) {

-		// Documents

-		$objref = dol_sanitizeFileName($object->ref);

-		$filedir = $upload_dir.'/'.$objref;

+if ($action != 'new')

+{

+	if ($object->statut == 1)

+	{

+		$filename = dol_sanitizeFileName($object->ref);

+		$filedir = $dir.get_exdir($object->ref, 0, 1, 0, $object, 'cheque').dol_sanitizeFileName($object->ref);

@@ -814,3 +797,2 @@
-		$genallowed = $usercancreate;

-		$delallowed = $usercandelete;

-		print $formfile->showdocuments('remisecheque', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);

+

+		print $formfile->showdocuments('remisecheque', $filename, $filedir, $urlsource, 1, 1);

--- /tmp/dsg/dolibarr/htdocs/compta/paiement/cheque/github_19.0.3_index.php
+++ /tmp/dsg/dolibarr/htdocs/compta/paiement/cheque/client_index.php
@@ -27 +26,0 @@
-// Load Dolibarr environment

@@ -34,0 +34,5 @@
+// Security check

+if ($user->socid) $socid = $user->socid;

+$result = restrictedArea($user, 'banque', '', '');

+

+

@@ -37,19 +40,0 @@
-

-// Security check

-if ($user->socid) {

-	$socid = $user->socid;

-}

-$result = restrictedArea($user, 'banque', '', '');

-

-$usercancreate = $user->hasRight('banque', 'cheque');

-

-// List of payment mode to support

-// Example: BANK_PAYMENT_MODES_FOR_DEPOSIT_MANAGEMENT = 'CHQ','TRA'

-$arrayofpaymentmodetomanage = explode(',', getDolGlobalString('BANK_PAYMENT_MODES_FOR_DEPOSIT_MANAGEMENT', 'CHQ'));

-

-

-/*

- * Actions

- */

-

-// None

@@ -62,5 +47 @@
-if (getDolGlobalString('BANK_PAYMENT_MODES_FOR_DEPOSIT_MANAGEMENT', 'CHQ') == 'CHQ') {

-	$title = $langs->trans("ChequesArea");

-} else {

-	$title = $langs->trans("DocumentsDepositArea");

-}

+llxHeader('', $langs->trans("ChequesArea"));

@@ -68,8 +49 @@
-llxHeader('', $title);

-

-$newcardbutton = '';

-if ($usercancreate) {

-	$newcardbutton .= dolGetButtonTitle($langs->trans('NewDeposit'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/paiement/cheque/card.php?action=new');

-}

-

-print load_fiche_titre($title, $newcardbutton, $checkdepositstatic->picto);

+print load_fiche_titre($langs->trans("ChequesArea"), '', 'bank_account');

@@ -79 +53,11 @@
-print '<div class="div-table-responsive-no-min">';

+$sql = "SELECT count(b.rowid)";

+$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";

+$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";

+$sql .= " WHERE ba.rowid = b.fk_account";

+$sql .= " AND ba.entity IN (".getEntity('bank_account').")";

+$sql .= " AND b.fk_type = 'CHQ'";

+$sql .= " AND b.fk_bordereau = 0";

+$sql .= " AND b.amount > 0";

+

+$resql = $db->query($sql);

+

@@ -82 +66 @@
-print '<th colspan="2">'.$langs->trans("DocumentsForDeposit")."</th>\n";

+print '<th colspan="2">'.$langs->trans("BankChecks")."</th>\n";

@@ -85,30 +69,14 @@
-foreach ($arrayofpaymentmodetomanage as $val) {

-	$sql = "SELECT count(b.rowid) as nb";

-	$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";

-	$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";

-	$sql .= " WHERE ba.rowid = b.fk_account";

-	$sql .= " AND ba.entity IN (".getEntity('bank_account').")";

-	$sql .= " AND b.fk_type = '".$db->escape($val)."'";

-	$sql .= " AND b.fk_bordereau = 0";

-	$sql .= " AND b.amount > 0";

-

-	$resql = $db->query($sql);

-	if ($resql) {

-		$num = '';

-		if ($obj = $db->fetch_object($resql)) {

-			$num = $obj->nb;

-		}

-		print '<tr class="oddeven">';

-		print '<td>';

-		if ($val == 'CHQ') {

-			print $langs->trans("BankChecks");

-		} else {

-			print($langs->trans("PaymentType".$val) != "PaymentType".$val ? $langs->trans("PaymentType".$val) : $langs->trans("PaymentMode").' '.$val);

-		}

-		print '</td>';

-		print '<td class="right">';

-		print '<a class="badge badge-info" href="'.DOL_URL_ROOT.'/compta/paiement/cheque/card.php?leftmenu=customers_bills_checks&action=new&type='.urlencode($val).'">'.dol_escape_htmltag($num).'</a>';

-		print '</td></tr>';

-	} else {

-		dol_print_error($db);

-	}

+if ($resql) {

+    if ($row = $db->fetch_row($resql)) {

+        $num = $row[0];

+    }

+    print '<tr class="oddeven">';

+    print '<td>'.$langs->trans("BankChecksToReceipt").'</td>';

+    print '<td class="right">';

+    print '<a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/card.php?leftmenu=customers_bills_checks&action=new">'.$num.'</a>';

+    print '</td></tr>';

+    print "</table>\n";

+}

+else

+{

+    dol_print_error($db);

@@ -117 +84,0 @@
-print "</table></div>\n";

@@ -119,2 +86 @@
-

-print '</div><div class="fichetwothirdright">';

+print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';

@@ -124,12 +90,10 @@
-foreach ($arrayofpaymentmodetomanage as $val) {

-	$sql = "SELECT bc.rowid, bc.date_bordereau as db, bc.amount, bc.ref as ref,";

-	$sql .= " bc.statut as status, bc.nbcheque, bc.type,";

-	$sql .= " ba.ref as bref, ba.label, ba.rowid as bid, ba.number, ba.currency_code, ba.account_number, ba.fk_accountancy_journal,";

-	$sql .= " aj.code";

-	$sql .= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc, ".MAIN_DB_PREFIX."bank_account as ba";

-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_journal as aj ON aj.rowid = ba.fk_accountancy_journal";

-	$sql .= " WHERE ba.rowid = bc.fk_bank_account";

-	$sql .= " AND bc.entity = ".((int) $conf->entity);

-	$sql .= " AND bc.type = '".$db->escape($val)."'";

-	$sql .= " ORDER BY bc.date_bordereau DESC, rowid DESC";

-	$sql .= $db->plimit($max);

+$sql = "SELECT bc.rowid, bc.date_bordereau as db, bc.amount, bc.ref as ref,";

+$sql .= " bc.statut, bc.nbcheque,";

+$sql .= " ba.ref as bref, ba.label, ba.rowid as bid, ba.number, ba.currency_code, ba.account_number, ba.fk_accountancy_journal,";

+$sql .= " aj.code";

+$sql .= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc, ".MAIN_DB_PREFIX."bank_account as ba";

+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_journal as aj ON aj.rowid = ba.fk_accountancy_journal";

+$sql .= " WHERE ba.rowid = bc.fk_bank_account";

+$sql .= " AND bc.entity = ".$conf->entity;

+$sql .= " ORDER BY bc.date_bordereau DESC, rowid DESC";

+$sql .= $db->plimit($max);

@@ -137,19 +101,12 @@
-	$resql = $db->query($sql);

-	if ($resql) {

-		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table

-		print '<table class="noborder centpercent">';

-		print '<tr class="liste_titre">';

-		print '<th>';

-		if ($val == 'CHQ') {

-			print $langs->trans("LastCheckReceiptShort", $max);

-		} else {

-			$labelpaymentmode = ($langs->trans("PaymentType".$val) != "PaymentType".$val ? $langs->trans("PaymentType".$val) : $val);

-			print $langs->trans("LastPaymentForDepositShort", $max, $labelpaymentmode);

-		}

-		print '</th>';

-		print '<th>'.$langs->trans("Date")."</th>";

-		print '<th>'.$langs->trans("Account").'</th>';

-		print '<th class="right">'.$langs->trans("NbOfCheques").'</th>';

-		print '<th class="right">'.$langs->trans("Amount").'</th>';

-		print '<th class="right">'.$langs->trans("Status").'</th>';

-		print "</tr>\n";

+$resql = $db->query($sql);

+if ($resql)

+{

+	print '<table class="noborder centpercent">';

+	print '<tr class="liste_titre">';

+	print '<th>'.$langs->trans("LastCheckReceiptShort", $max).'</th>';

+	print '<th>'.$langs->trans("Date")."</th>";

+	print '<th>'.$langs->trans("Account").'</th>';

+	print '<th class="right">'.$langs->trans("NbOfCheques").'</th>';

+	print '<th class="right">'.$langs->trans("Amount").'</th>';

+	print '<th class="right">'.$langs->trans("Status").'</th>';

+	print "</tr>\n";

@@ -157,3 +114,5 @@
-		$i = 0;

-		while ($objp = $db->fetch_object($resql)) {

-			$i++;

+	while ($objp = $db->fetch_object($resql))

+	{

+        $checkdepositstatic->id = $objp->rowid;

+        $checkdepositstatic->ref = ($objp->ref ? $objp->ref : $objp->rowid);

+	    $checkdepositstatic->statut = $objp->statut;

@@ -161,4 +120,8 @@
-			$checkdepositstatic->id = $objp->rowid;

-			$checkdepositstatic->ref = ($objp->ref ? $objp->ref : $objp->rowid);

-			$checkdepositstatic->statut = $objp->status;

-			$checkdepositstatic->status = $objp->status;

+		$accountstatic->id = $objp->bid;

+		$accountstatic->ref = $objp->bref;

+		$accountstatic->label = $objp->label;

+		$accountstatic->number = $objp->number;

+		$accountstatic->currency_code = $objp->currency_code;

+		$accountstatic->account_number = $objp->account_number;

+		$accountstatic->accountancy_journal = $objp->code;

+		$accountstatic->fk_accountancy_journal = $objp->fk_accountancy_journal;

@@ -166,8 +129 @@
-			$accountstatic->id = $objp->bid;

-			$accountstatic->ref = $objp->bref;

-			$accountstatic->label = $objp->label;

-			$accountstatic->number = $objp->number;

-			$accountstatic->currency_code = $objp->currency_code;

-			$accountstatic->account_number = $objp->account_number;

-			$accountstatic->accountancy_journal = $objp->code;

-			$accountstatic->fk_accountancy_journal = $objp->fk_accountancy_journal;

+		print '<tr class="oddeven">'."\n";

@@ -175 +131,6 @@
-			print '<tr class="oddeven">'."\n";

+		print '<td>'.$checkdepositstatic->getNomUrl(1).'</td>';

+		print '<td>'.dol_print_date($db->jdate($objp->db), 'day').'</td>';

+		print '<td>'.$accountstatic->getNomUrl(1).'</td>';

+		print '<td class="right">'.$objp->nbcheque.'</td>';

+		print '<td class="right">'.price($objp->amount).'</td>';

+		print '<td class="right">'.$checkdepositstatic->LibStatut($objp->statut, 3).'</td>';

@@ -177,6 +138,3 @@
-			print '<td class="nowraponall">'.$checkdepositstatic->getNomUrl(1).'</td>';

-			print '<td>'.dol_print_date($db->jdate($objp->db), 'day').'</td>';

-			print '<td class="nowraponall">'.$accountstatic->getNomUrl(1).'</td>';

-			print '<td class="right">'.$objp->nbcheque.'</td>';

-			print '<td class="right"><span class="amount">'.price($objp->amount).'</span></td>';

-			print '<td class="right">'.$checkdepositstatic->LibStatut($objp->status, 3).'</td>';

+		print '</tr>';

+	}

+	print "</table>";

@@ -184,13 +142,5 @@
-			print '</tr>';

-		}

-		if ($i == 0) {

-			print '<tr><td colspan="6"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';

-		}

-

-		print "</table>";

-		print '</div>';

-

-		$db->free($resql);

-	} else {

-		dol_print_error($db);

-	}

+	$db->free($resql);

+}

+else

+{

+    dol_print_error($db);

@@ -199 +149,2 @@
-print '</div></div>';

+

+print '</div></div></div>';

--- /tmp/dsg/dolibarr/htdocs/compta/paiement/cheque/github_19.0.3_list.php
+++ /tmp/dsg/dolibarr/htdocs/compta/paiement/cheque/client_list.php
@@ -28 +27,0 @@
-// Load Dolibarr environment

@@ -39,3 +38 @@
-if ($user->socid) {

-	$socid = $user->socid;

-}

+if ($user->socid) $socid = $user->socid;

@@ -45,8 +41,0 @@
-$search_date_startday = GETPOST('search_date_startday', 'int');

-$search_date_startmonth = GETPOST('search_date_startmonth', 'int');

-$search_date_startyear = GETPOST('search_date_startyear', 'int');

-$search_date_endday = GETPOST('search_date_endday', 'int');

-$search_date_endmonth = GETPOST('search_date_endmonth', 'int');

-$search_date_endyear = GETPOST('search_date_endyear', 'int');

-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver

-$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);

@@ -55,5 +44,4 @@
-$mode = GETPOST('mode', 'alpha');

-

-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;

-$sortfield = GETPOST('sortfield', 'aZ09comma');

-$sortorder = GETPOST('sortorder', 'aZ09comma');

+

+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;

+$sortfield = GETPOST("sortfield", 'alpha');

+$sortorder = GETPOST("sortorder", 'alpha');

@@ -61,3 +49 @@
-if (empty($page) || $page == -1) {

-	$page = 0;

-}     // If $page is not defined, or '' or -1

+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1

@@ -67,9 +53,5 @@
-if (!$sortorder) {

-	$sortorder = "DESC";

-}

-if (!$sortfield) {

-	$sortfield = "bc.date_bordereau";

-}

-

-$optioncss = GETPOST('optioncss', 'alpha');

-$view = GETPOST("view", 'alpha');

+if (!$sortorder) $sortorder = "DESC";

+if (!$sortfield) $sortfield = "dp";

+

+$year = GETPOST("year");

+$month = GETPOST("month");

@@ -82,24 +63,0 @@
-// List of payment mode to support

-// Example: BANK_PAYMENT_MODES_FOR_DEPOSIT_MANAGEMENT = 'CHQ','TRA'

-$arrayofpaymentmodetomanage = explode(',', getDolGlobalString('BANK_PAYMENT_MODES_FOR_DEPOSIT_MANAGEMENT', 'CHQ'));

-

-$arrayoflabels = array();

-foreach ($arrayofpaymentmodetomanage as $key => $val) {

-	$labelval = ($langs->trans("PaymentType".$val) != "PaymentType".$val ? $langs->trans("PaymentType".$val) : $val);

-	$arrayoflabels[$key] = $labelval;

-}

-

-$arrayfields = array(

-	'bc.ref'            => array('label'=>"Ref", 'checked'=>1, 'position'=>10),

-	'bc.type'			=> array('label'=>"Type", 'checked'=>1, 'position'=>20),

-	'bc.date_bordereau' => array('label'=>"DateCreation", 'checked'=>1, 'position'=>30),

-	'ba.label'			=> array('label'=>"Account", 'checked'=>1, 'position'=>40),

-	'bc.nbcheque'		=> array('label'=>"NbOfCheques", 'checked'=>1, 'position'=>50),

-	'bc.amount'			=> array('label'=>"Amount", 'checked'=>1, 'position'=>60),

-	'bc.statut'			=> array('label'=>"Status", 'checked'=>1, 'position'=>70)

-);

-$arrayfields = dol_sort_array($arrayfields, 'position');

-

-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context

-$hookmanager->initHooks(array('chequelist'));

-$object = new RemiseCheque($db);

@@ -111,23 +69,8 @@
-$parameters = array('socid'=>$socid);

-$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');

-}

-

-if (empty($reshook)) {

-	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';

-

-	// All tests are required to be compatible with all browsers

-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {

-		$search_ref = '';

-		$search_amount = '';

-		$search_account = '';

-		$search_date_startday = '';

-		$search_date_startmonth = '';

-		$search_date_startyear = '';

-		$search_date_endday = '';

-		$search_date_endmonth = '';

-		$search_date_endyear = '';

-		$search_date_start = '';

-		$search_date_end = '';

-	}

+// If click on purge search criteria ?

+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers

+{

+    $search_ref = '';

+    $search_amount = '';

+    $search_account = '';

+    $year = '';

+    $month = '';

@@ -142,6 +85,4 @@
-$form = new Form($db);

-

-llxHeader('', $langs->trans("ChequeDeposits"));

-

-$sql = "SELECT bc.rowid, bc.ref, bc.date_bordereau,";

-$sql .= " bc.nbcheque, bc.amount, bc.statut, bc.type,";

+llxHeader('', $langs->trans("ChequesReceipts"));

+

+$sql = "SELECT bc.rowid, bc.ref as ref, bc.date_bordereau as dp,";

+$sql .= " bc.nbcheque, bc.amount, bc.statut,";

@@ -149,8 +89,0 @@
-

-// Add fields from hooks

-$parameters = array();

-$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook

-$sql .= $hookmanager->resPrint;

-

-$sqlfields = $sql; // $sql fields to remove for count total

-

@@ -160 +93 @@
-$sql .= " AND bc.entity = ".((int) $conf->entity);

+$sql .= " AND bc.entity = ".$conf->entity;

@@ -163,22 +96,7 @@
-if ($search_ref) {

-	$sql .= natural_search("bc.ref", $search_ref);

-}

-if ($search_account > 0) {

-	$sql .= " AND bc.fk_bank_account = ".((int) $search_account);

-}

-if ($search_amount) {

-	$sql .= natural_search("bc.amount", price2num($search_amount));

-}

-if ($search_date_start) {

-	$sql .= " AND bc.date_bordereau >= '" . $db->idate($search_date_start) . "'";

-}

-if ($search_date_end) {

-	$sql .= " AND bc.date_bordereau <= '" . $db->idate($search_date_end) . "'";

-}

-

-// Add where from hooks

-$parameters = array();

-$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook

-$sql .= $hookmanager->resPrint;

-

-// Count total nb of records

+if ($search_ref)			$sql .= natural_search("bc.ref", $search_ref);

+if ($search_account > 0)	$sql .= " AND bc.fk_bank_account=".$search_account;

+if ($search_amount)			$sql .= natural_search("bc.amount", price2num($search_amount));

+$sql .= dolSqlDateFilter('bc.date_bordereau', 0, $month, $year);

+

+$sql .= $db->order($sortfield, $sortorder);

+

@@ -186,13 +104,6 @@
-if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {

-	/* The fast and low memory method to get and count full list converts the sql into a sql count */

-	$sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);

-	$sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);

-	$resql = $db->query($sqlforcount);

-	if ($resql) {

-		$objforcount = $db->fetch_object($resql);

-		$nbtotalofrecords = $objforcount->nbtotalofrecords;

-	} else {

-		dol_print_error($db);

-	}

-

-	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0

+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))

+{

+	$result = $db->query($sql);

+	$nbtotalofrecords = $db->num_rows($result);

+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0

+	{

@@ -202,8 +113,3 @@
-	$db->free($resql);

-}

-

-// Complete request and execute it with limit

-$sql .= $db->order($sortfield, $sortorder);

-if ($limit) {

-	$sql .= $db->plimit($limit + 1, $offset);

-}

+}

+

+$sql .= $db->plimit($limit + 1, $offset);

@@ -213 +119,2 @@
-if ($resql) {

+if ($resql)

+{

@@ -217,2 +124,7 @@
-	if (!empty($mode)) {

-		$param .= '&mode='.urlencode($mode);

+    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;

+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;

+

+	$newcardbutton = '';

+	if ($user->rights->banque->cheque)

+	{

+        $newcardbutton .= dolGetButtonTitle($langs->trans('NewCheckDeposit'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/paiement/cheque/card.php?action=new');

@@ -220,40 +131,0 @@
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {

-		$param .= '&contextpage='.$contextpage;

-	}

-	if ($search_date_startday) {

-		$param .= '&search_date_startday='.urlencode($search_date_startday);

-	}

-	if ($search_date_startmonth) {

-		$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);

-	}

-	if ($search_date_startyear) {

-		$param .= '&search_date_startyear='.urlencode($search_date_startyear);

-	}

-	if ($search_date_endday) {

-		$param .= '&search_date_endday='.urlencode($search_date_endday);

-	}

-	if ($search_date_endmonth) {

-		$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);

-	}

-	if ($search_date_endyear) {

-		$param .= '&search_date_endyear='.urlencode($search_date_endyear);

-	}

-	if ($limit > 0 && $limit != $conf->liste_limit) {

-		$param .= '&limit='.$limit;

-	}

-	if ($search_amount != '') {

-		$param .= '&search_amount='.urlencode($search_amount);

-	}

-	if ($search_account > 0) {

-		$param .= '&search_account='.urlencode($search_account);

-	}

-

-	$url = DOL_URL_ROOT.'/compta/paiement/cheque/card.php?action=new';

-	if (!empty($socid)) {

-		$url .= '&socid='.$socid;

-	}

-	$newcardbutton  = '';

-	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));

-	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));

-	$newcardbutton .= dolGetButtonTitleSeparator();

-	$newcardbutton .= dolGetButtonTitle($langs->trans('NewCheckDeposit'), '', 'fa fa-plus-circle', $url, '', $user->hasRight('banque', 'cheque'));

@@ -262,3 +134 @@
-	if ($optioncss != '') {

-		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';

-	}

+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';

@@ -271,2 +140,0 @@
-	print '<input type="hidden" name="mode" value="'.$mode.'">';

-

@@ -276,7 +143,0 @@
-	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;

-	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields

-	$massactionbutton = '';

-	if ($massactionbutton) {

-		$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);

-	}

-

@@ -284,2 +145,3 @@
-	print '<div class="div-table-responsive">';

-	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : '').'">';

+

+    print '<div class="div-table-responsive">';

+    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";

@@ -288,73 +150,31 @@
-	// --------------------------------------------------------------------

-	print '<tr class="liste_titre_filter">';

-

-	// Action column

-	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-		print '<td class="liste_titre center maxwidthsearch actioncolumn">';

-		$searchpicto = $form->showFilterButtons('left');

-		print $searchpicto;

-		print '</td>';

-	}

-

-	// Filter: Ref

-	if (!empty($arrayfields['bc.ref']['checked'])) {

-		print '<td class="liste_titre">';

-		print '<input class="flat" type="text" size="4" name="search_ref" value="' . $search_ref . '">';

-		print '</td>';

-	}

-

-	// Filter: Type

-	if (!empty($arrayfields['bc.type']['checked'])) {

-		print '<td class="liste_titre">';

-		print '</td>';

-	}

-

-	// Filter: Date

-	if (!empty($arrayfields['bc.date_bordereau']['checked'])) {

-		print '<td class="liste_titre center">';

-		print '<div class="nowrapfordate">';

-		print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));

-		print '</div>';

-		print '<div class="nowrapfordate">';

-		print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));

-		print '</div>';

-		print '</td>';

-	}

-

-	// Filter: Bank account

-	if (!empty($arrayfields['ba.label']['checked'])) {

-		print '<td class="liste_titre">';

-		$form->select_comptes($search_account, 'search_account', 0, '', 1);

-		print '</td>';

-	}

-

-	// Filter: Number of cheques

-	if (!empty($arrayfields['bc.nbcheque']['checked'])) {

-		print '<td class="liste_titre">&nbsp;</td>';

-	}

-

-	// Filter: Amount

-	if (!empty($arrayfields['bc.amount']['checked'])) {

-		print '<td class="liste_titre right">';

-		print '<input class="flat maxwidth50" type="text" name="search_amount" value="' . $search_amount . '">';

-		print '</td>';

-	}

-

-	// Filter: Status (only placeholder)

-	if (!empty($arrayfields['bc.statut']['checked'])) {

-		print '<td class="liste_titre"></td>';

-	}

-

-	// Fields from hook

-	$parameters = array('arrayfields'=>$arrayfields);

-	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook

-	print $hookmanager->resPrint;

-

-	// Action column

-	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-		print '<td class="liste_titre center maxwidthsearch actioncolumn">';

-		$searchpicto = $form->showFilterButtons();

-		print $searchpicto;

-		print '</td>';

-	}

-

+	print '<tr class="liste_titre">';

+	print '<td class="liste_titre" align="left">';

+	print '<input class="flat" type="text" size="4" name="search_ref" value="'.$search_ref.'">';

+    print '</td>';

+	print '<td class="liste_titre" align="center">';

+    if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';

+    print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';

+    $formother->select_year($year ? $year : -1, 'year', 1, 20, 5);

+    print '</td>';

+    print '<td class="liste_titre">';

+    $form->select_comptes($search_account, 'search_account', 0, '', 1);

+    print '</td>';

+	print '<td class="liste_titre">&nbsp;</td>';

+	print '<td class="liste_titre right">';

+	print '<input class="flat maxwidth50" type="text" name="search_amount" value="'.$search_amount.'">';

+	print '</td>';

+	print '<td class="liste_titre"></td>';

+    print '<td class="liste_titre maxwidthsearch">';

+    $searchpicto = $form->showFilterAndCheckAddButtons(0);

+    print $searchpicto;

+    print '</td>';

+    print "</tr>\n";

+

+    print '<tr class="liste_titre">';

+	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "bc.ref", "", $param, "", $sortfield, $sortorder);

+	print_liste_field_titre("DateCreation", $_SERVER["PHP_SELF"], "dp", "", $param, 'align="center"', $sortfield, $sortorder);

+	print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);

+	print_liste_field_titre("NbOfCheques", $_SERVER["PHP_SELF"], "bc.nbcheque", "", $param, 'class="right"', $sortfield, $sortorder);

+	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "bc.amount", "", $param, 'class="right"', $sortfield, $sortorder);

+	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "bc.statut", "", $param, 'class="right"', $sortfield, $sortorder);

+	print_liste_field_titre('');

@@ -363,200 +183,48 @@
-	$totalarray = array();

-	$totalarray['nbfield'] = 0;

-

-	// Fields title label

-	// --------------------------------------------------------------------

-	print '<tr class="liste_titre">';

-	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['bc.ref']['checked'])) {

-		print_liste_field_titre($arrayfields['bc.ref']['label'], $_SERVER["PHP_SELF"], "bc.ref", "", $param, "", $sortfield, $sortorder);

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['bc.type']['checked'])) {

-		print_liste_field_titre($arrayfields['bc.type']['label'], $_SERVER["PHP_SELF"], "bc.type", "", $param, "", $sortfield, $sortorder);

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['bc.date_bordereau']['checked'])) {

-		print_liste_field_titre($arrayfields['bc.date_bordereau']['label'], $_SERVER["PHP_SELF"], "bc.date_bordereau", "", $param, 'align="center"', $sortfield, $sortorder);

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['ba.label']['checked'])) {

-		print_liste_field_titre($arrayfields['ba.label']['label'], $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['bc.nbcheque']['checked'])) {

-		print_liste_field_titre($arrayfields['bc.nbcheque']['label'], $_SERVER["PHP_SELF"], "bc.nbcheque", "", $param, 'class="right"', $sortfield, $sortorder);

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['bc.amount']['checked'])) {

-		print_liste_field_titre($arrayfields['bc.amount']['label'], $_SERVER["PHP_SELF"], "bc.amount", "", $param, 'class="right"', $sortfield, $sortorder);

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['bc.statut']['checked'])) {

-		print_liste_field_titre($arrayfields['bc.statut']['label'], $_SERVER["PHP_SELF"], "bc.statut", "", $param, 'class="right"', $sortfield, $sortorder);

-		$totalarray['nbfield']++;

-	}

-

-	// Hook fields

-	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);

-	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook

-	print $hookmanager->resPrint;

-

-	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');

-		$totalarray['nbfield']++;

-	}

-

-	print "</tr>\n";

-

-	$checkedCount = 0;

-	foreach ($arrayfields as $column) {

-		if ($column['checked']) {

-			$checkedCount++;

-		}

-	}

-

-	if ($num > 0) {

-		$savnbfield = 8;

-

-		$i = 0;

-		$totalarray = array();

-		$totalarray['nbfield'] = 0;

-		$imaxinloop = ($limit ? min($num, $limit) : $num);

-		while ($i < $imaxinloop) {

-			$objp = $db->fetch_object($resql);

-

-			$checkdepositstatic->id = $objp->rowid;

-			$checkdepositstatic->ref = ($objp->ref ? $objp->ref : $objp->rowid);

-			$checkdepositstatic->statut = $objp->statut;

-			$checkdepositstatic->nbcheque = $objp->nbcheque;

-			$checkdepositstatic->amount = $objp->amount;

-			$checkdepositstatic->date_bordereau = $objp->date_bordereau;

-			$checkdepositstatic->type = $objp->type;

-

-			$account = new Account($db);

-			$account->fetch($objp->bid);

-			$checkdepositstatic->account_id = $account->getNomUrl(1);

-

-			if ($mode == 'kanban') {

-				if ($i == 0) {

-					print '<tr class="trkanban"><td colspan="'.$savnbfield.'">';

-					print '<div class="box-flex-container kanban">';

-				}

-				// Output Kanban

-				print $checkdepositstatic->getKanbanView('', array('selected' => in_array($checkdepositstatic->id, $arrayofselected)));

-				if ($i == ($imaxinloop - 1)) {

-					print '</div>';

-					print '</td></tr>';

-				}

-			} else {

-				print '<tr class="oddeven">';

-

-				// Action column

-				if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-					print '<td class="nowrap center"></td>';

-					if (!$i) {

-						$totalarray['nbfield']++;

-					}

-				}

-

-				// Num ref cheque

-				if (!empty($arrayfields['bc.ref']['checked'])) {

-					print '<td>';

-					print $checkdepositstatic->getNomUrl(1);

-					print '</td>';

-					if (!$i) {

-						$totalarray['nbfield']++;

-					}

-				}

-

-				// Type

-				if (!empty($arrayfields['bc.type']['checked'])) {

-					$labelpaymentmode = ($langs->transnoentitiesnoconv("PaymentType".$checkdepositstatic->type) != "PaymentType".$checkdepositstatic->type ? $langs->transnoentitiesnoconv("PaymentType".$checkdepositstatic->type) : $checkdepositstatic->type);

-					print '<td>'.dol_escape_htmltag($labelpaymentmode).'</td>';

-					if (!$i) {

-						$totalarray['nbfield']++;

-					}

-				}

-

-				// Date

-				if (!empty($arrayfields['bc.date_bordereau']['checked'])) {

-					print '<td class="center">'.dol_print_date($db->jdate($objp->date_bordereau), 'dayhour', 'tzuser').'</td>';

-					if (!$i) {

-						$totalarray['nbfield']++;

-					}

-				}

-

-				// Bank

-				if (!empty($arrayfields['ba.label']['checked'])) {

-					print '<td>';

-					if ($objp->bid) {

-						print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"), 'account').' '.$objp->label.'</a>';

-					} else {

-						print '&nbsp;';

-					}

-					print '</td>';

-					if (!$i) {

-						$totalarray['nbfield']++;

-					}

-				}

-

-				// Number of cheques

-				if (!empty($arrayfields['bc.nbcheque']['checked'])) {

-					print '<td class="right">'.$objp->nbcheque.'</td>';

-					if (!$i) {

-						$totalarray['nbfield']++;

-					}

-				}

-

-				// Amount

-				if (!empty($arrayfields['bc.amount']['checked'])) {

-					print '<td class="right"><span class="amount">'.price($objp->amount).'</span></td>';

-					if (!$i) {

-						$totalarray['nbfield']++;

-					}

-					if (empty($totalarray['val']['amount'])) {

-						$totalarray['val']['amount'] = $objp->amount;

-					} else {

-						$totalarray['val']['amount'] += $objp->amount;

-					}

-				}

-

-				// Status

-				if (!empty($arrayfields['bc.statut']['checked'])) {

-					print '<td class="right">';

-					print $checkdepositstatic->LibStatut($objp->statut, 5);

-					print '</td>';

-					if (!$i) {

-						$totalarray['nbfield']++;

-					}

-				}

-

-				// Action column

-				if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-					print '<td class="nowrap center"></td>';

-					if (!$i) {

-						$totalarray['nbfield']++;

-					}

-				}

-

-				print "</tr>\n";

-			}

-			$i++;

-		}

-	} else {

-		// If no record found

-		if ($num == 0) {

-			$colspan = 1;

-			foreach ($arrayfields as $key => $val) {

-				if (!empty($val['checked'])) {

-					$colspan++;

-				}

-			}

-			print '<tr class="oddeven">';

-			print '<td colspan="' . $colspan . '" class="opacitymedium">' . $langs->trans("NoRecordFound") . "</td>";

-			print '</tr>';

-		}

-	}

+    if ($num > 0)

+    {

+    	while ($i < min($num, $limit))

+    	{

+    		$objp = $db->fetch_object($resql);

+

+    		print '<tr class="oddeven">';

+

+    		// Num ref cheque

+    		print '<td>';

+    		$checkdepositstatic->id = $objp->rowid;

+    		$checkdepositstatic->ref = ($objp->ref ? $objp->ref : $objp->rowid);

+    		$checkdepositstatic->statut = $objp->statut;

+    		print $checkdepositstatic->getNomUrl(1);

+    		print '</td>';

+

+    		// Date

+    		print '<td class="center">'.dol_print_date($db->jdate($objp->dp), 'day').'</td>'; // TODO Use date hour

+

+    		// Bank

+    		print '<td>';

+    		if ($objp->bid) print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"), 'account').' '.$objp->label.'</a>';

+    		else print '&nbsp;';

+    		print '</td>';

+

+    		// Number of cheques

+    		print '<td class="right">'.$objp->nbcheque.'</td>';

+

+    		// Amount

+    		print '<td class="right">'.price($objp->amount).'</td>';

+

+    		// Statut

+    		print '<td class="right">';

+    		print $checkdepositstatic->LibStatut($objp->statut, 5);

+    		print '</td>';

+

+    		print '<td></td>';

+

+            print "</tr>\n";

+    		$i++;

+    	}

+    }

+    else

+    {

+   		print '<tr class="oddeven">';

+   		print '<td colspan="7" class="opacitymedium">'.$langs->trans("None")."</td>";

+   		print '</tr>';

+    }

@@ -566 +234,3 @@
-} else {

+}

+else

+{