Fix: Some quality fixes

htdocs/core/class/html.formcontract.class.php

@@ -23,9 +23,9 @@
  */
 
 /**
- *	Class to manage generation of HTML components for bank module
+ *	Class to manage generation of HTML components for contract module
  */
-class Formcontract
+class FormContract
 {
     var $db;
     var $error;
@@ -49,9 +49,10 @@ class Formcontract
 	 *	@param  int		$selected   Id contract preselected
 	 *	@param  string	$htmlname   Nom de la zone html
 	 *	@param	int		$maxlength	Maximum length of label
+	 *	@param	int		$showempty	Show empty line
 	 *	@return int         		Nbre of project if OK, <0 if KO
 	 */
-	function select_contract($socid=-1, $selected='', $htmlname='contrattid', $maxlength=16)
+	function select_contract($socid=-1, $selected='', $htmlname='contrattid', $maxlength=16, $showempty=1)
 	{
 		global $db,$user,$conf,$langs;
 
@@ -59,22 +60,19 @@ class Formcontract
 		if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
 
 		// Search all contacts
-		$sql = 'SELECT c.rowid, c.ref, c.note, c.fk_soc, c.statut';
+		$sql = 'SELECT c.rowid, c.ref, c.fk_soc, c.statut';
 		$sql.= ' FROM '.MAIN_DB_PREFIX .'contrat as c';
 		$sql.= " WHERE c.entity = ".$conf->entity;
 		//if ($contratListId) $sql.= " AND c.rowid IN (".$contratListId.")";
-		if ($socid == 0) 
-			$sql.= " AND (c.fk_soc=0 OR c.fk_soc IS NULL)";
-		else
-			$sql.= " AND c.fk_soc=".$socid;
-		$sql.= " ORDER BY c.note ASC";
+		if ($socid == 0) $sql.= " AND (c.fk_soc = 0 OR c.fk_soc IS NULL)";
+		else $sql.= " AND c.fk_soc = ".$socid;
 
-		dol_syslog("contact.lib::select_contrats sql=".$sql);
+		dol_syslog(get_class($this)."::select_contract sql=".$sql);
 		$resql=$db->query($sql);
 		if ($resql)
 		{
 			print '<select class="flat" name="'.$htmlname.'">';
-			print '<option value="0">&nbsp;</option>';
+			if ($showempty) print '<option value="0">&nbsp;</option>';
 			$num = $db->num_rows($resql);
 			$i = 0;
 			if ($num)
@@ -102,7 +100,7 @@ class Formcontract
 							if (! $obj->statut > 0)
 							{
 								$disabled=1;
-								$labeltoshow.=' - '.$langs->trans("Draft");
+								$labeltoshow.=' ('.$langs->trans("Draft").')';
 							}
 							if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
 							{
@@ -121,7 +119,6 @@ class Formcontract
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
 								//else $labeltoshow.=' ('.$langs->trans("Private").')';
 								$resultat.='>'.$labeltoshow;
-								if (! $disabled) $resultat.=' - '.dol_trunc($obj->title,$maxlength);
 								$resultat.='</option>';
 							}
 							print $resultat;

htdocs/fichinter/fiche.php

@@ -895,8 +895,9 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->ficheint
 
 $form = new Form($db);
 $formfile = new FormFile($db);
+$formcontract = new FormContract($db);
 
-llxHeader();
+llxHeader('',$langs->trans("Fichinter"));
 
 if ($action == 'create')
 {
@@ -1022,12 +1023,12 @@ if ($action == 'create')
             print '</td></tr>';
         }
 
-	// Contrat
+		// Contract
 		if ($conf->contrat->enabled)
 		{
 			$langs->load("contrat");
-		print '<tr><td valign="top">'.$langs->trans("Contrat").'</td><td>';
-		$numcontrat=select_contrats($soc->id,GETPOST('contratid','int'),'contratid');
+			print '<tr><td valign="top">'.$langs->trans("Contract").'</td><td>';
+			$numcontrat=$formcontract->select_contract($soc->id,GETPOST('contratid','int'),'contratid',0,1);
 			if ($numcontrat==0)
 			{
 				print ' &nbsp; <a href="'.DOL_URL_ROOT.'/contrat/fiche.php?socid='.$soc->id.'&action=create">'.$langs->trans("AddContract").'</a>';
@@ -1243,7 +1244,7 @@ else if ($id > 0 || ! empty($ref))
 		if ($action != 'contrat')
 		{
 			print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=contrat&amp;id='.$object->id.'">';
-			print img_edit($langs->trans('SetContrat'),1);
+			print img_edit($langs->trans('SetContract'),1);
 			print '</a></td>';
 		}
 		print '</tr></table>';