From d67d83515a603b16d51d63d23c21d92a51766624 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Mar 2017 01:40:53 +0100
Subject: [PATCH] Fix dol_banner usage

---
 htdocs/compta/paiement/cheque/card.php        | 43 +++++++------------
 .../cheque/class/remisecheque.class.php       | 10 ++++-
 2 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index e351b68df76..3482492a530 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -560,7 +560,6 @@ if ($action == 'new')
 }
 else
 {
-	$linkback='<a href="'.$_SERVER["PHP_SELF"].'?leftmenu=customers_bills_checks&action=new">'.$langs->trans("BackToList").'</a>';
 	$paymentstatic=new Paiement($db);
 	$accountlinestatic=new AccountLine($db);
 	$accountstatic=new Account($db);
@@ -568,34 +567,20 @@ else
 	$accountstatic->id=$object->account_id;
 	$accountstatic->label=$object->account_label;
 
+	$linkback='<a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/list.php">'.$langs->trans("BackToList").'</a>';
+	
+	$morehtmlref='';
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	
+	
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+
+	
 	print '<table class="border" width="100%">';
+
 	print '<tr><td class="titlefield">';
 
-	print '<table class="nobordernopadding" width="100%"><tr><td>';
-	print $langs->trans('Ref');
-	print '</td>';
-	if ($action != 'editref') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editref&amp;id='.$object->id.'">'.img_edit($langs->trans('SetRef'),1).'</a></td>';
-	print '</tr></table>';
-	print '</td><td colspan="2">';
-	if ($action == 'editref')
-	{
-		print '<form name="setdate" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		print '<input type="hidden" name="action" value="setref">';
-		print '<input type="text" name="ref" value="'.$object->ref.'">';
-		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
-		print '</form>';
-	}
-	else
-	{
-	    print $form->showrefnav($object,'ref',$linkback, 1, 'ref');
-	}
-
-	print '</td>';
-	print '</tr>';
-
-	print '<tr><td>';
-
     print '<table class="nobordernopadding" width="100%"><tr><td>';
     print $langs->trans('Date');
     print '</td>';
@@ -660,13 +645,15 @@ else
 	print price($object->amount);
 	print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans('Status').'</td><td colspan="2">';
+	/*print '<tr><td>'.$langs->trans('Status').'</td><td colspan="2">';
 	print $object->getLibStatut(4);
-	print '</td></tr>';
+	print '</td></tr>';*/
 
 	print '</table><br>';
 
+	print '</div>';
 
+	
 	// List of cheques
 	$sql = "SELECT b.rowid, b.amount, b.num_chq, b.emetteur,";
 	$sql.= " b.dateo as date, b.datec as datec, b.banque,";
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 998fd1db7c3..ad53e98693e 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -35,7 +35,8 @@ class RemiseCheque extends CommonObject
 {
 	public $element='chequereceipt';
 	public $table_element='bordereau_cheque';
-
+	public $picto = 'payment';
+	
 	var $num;
 	var $intitule;
 	//! Numero d'erreur Plage 1024-1279
@@ -977,7 +978,7 @@ class RemiseCheque extends CommonObject
 	 *  Return label of a status
 	 *
 	 *  @param	int		$status     Statut
-	 *	@param  int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @param  int		$mode		0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
 	 *  @return string      		Libelle du statut
 	 */
 	function LibStatut($status,$mode=0)
@@ -1014,6 +1015,11 @@ class RemiseCheque extends CommonObject
 			if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut0');
 			if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
 		}
+		if ($mode == 6)
+		{
+			if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut0');
+			if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
+		}
 		return $langs->trans('Unknown');
 	}