Salaries : typo & presentation

htdocs/compta/salaries/class/paymentsalary.class.php

@@ -331,7 +331,7 @@ class PaymentSalary extends CommonObject
 		$sql.= ", amount";
 		$sql.= ", fk_typepayment";
 		$sql.= ", num_payment";
-		$sql.= ", note";
+		if ($this->note) $sql.= ", note";
 		$sql.= ", label";
 		$sql.= ", datesp";
 		$sql.= ", dateep";
@@ -346,7 +346,7 @@ class PaymentSalary extends CommonObject
 		$sql.= ", '".$this->amount."'";
 		$sql.= ", '".$this->type_payment."'";
 		$sql.= ", '".$this->num_payment."'";
-		$sql.= ", '".$this->db->escape($this->note)."'";
+		if ($this->note) $sql.= ", '".$this->db->escape($this->note)."'";
 		$sql.= ", '".$this->db->escape($this->label)."'";
 		$sql.= ", '".$this->db->idate($this->datesp)."'";
 		$sql.= ", '".$this->db->idate($this->dateep)."'";

htdocs/compta/salaries/fiche.php

@@ -245,9 +245,7 @@ if ($action == 'create')
 		$form->select_comptes($_POST["accountid"],"accountid",0,"courant=1",1);  // Affiche liste des comptes courant
 		print '</td></tr>';
 		
-	}
-
-	// TYpe payment
+		// Type payment
 		print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
 		$form->select_types_paiements(GETPOST("paymenttype"), "paymenttype");
 		print "</td>\n";
@@ -257,6 +255,7 @@ if ($action == 'create')
 		print '<tr><td>'.$langs->trans('Numero');
 		print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
 		print '<td><input name="num_payment" type="text" value="'.GETPOST("num_payment").'"></td></tr>'."\n";
+	}
  
 	// Other attributes
 	$parameters=array('colspan' => ' colspan="1"');

htdocs/compta/salaries/index.php

@@ -69,7 +69,7 @@ if ($result)
     print "<td>".$langs->trans("Person")."</td>";
     print "<td>".$langs->trans("Label")."</td>";
     print '<td class="nowrap" align="left">'.$langs->trans("DatePayment").'</td>';
-    print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"c.libelle","",$paramlist,"",$sortfield,$sortorder);
+    print '<td class="nowrap" align="left">'.$langs->trans("Type").'</td>';
     print "<td align=\"right\">".$langs->trans("PayedByThisPayment")."</td>";
     print "</tr>\n";
     $var=1;