diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php index 50e12bf4f72de3520160abff1f3c3f6eb5352c6f..54edd9ec45c066514d7f27216d72fab52a9267f2 100644 --- a/htdocs/compta/salaries/class/paymentsalary.class.php +++ b/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)."'"; diff --git a/htdocs/compta/salaries/fiche.php b/htdocs/compta/salaries/fiche.php index d6ffab1012b48a41e2fd87898fe5055f11308827..1615c2972146fa1bc8f9cae24fe7210688bd4cd9 100644 --- a/htdocs/compta/salaries/fiche.php +++ b/htdocs/compta/salaries/fiche.php @@ -244,20 +244,19 @@ if ($action == 'create') print '<tr><td class="fieldrequired">'.$langs->trans("Account").'</td><td>'; $form->select_comptes($_POST["accountid"],"accountid",0,"courant=1",1); // Affiche liste des comptes courant print '</td></tr>'; - - } - - // TYpe payment - print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>'; - $form->select_types_paiements(GETPOST("paymenttype"), "paymenttype"); - print "</td>\n"; - print "</tr>"; - - // Number - 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"; + + // Type payment + print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>'; + $form->select_types_paiements(GETPOST("paymenttype"), "paymenttype"); + print "</td>\n"; + print "</tr>"; + // Number + 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"'); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php index f32c1bad951d0b2846cd920f6990b16ce0dc3a7b..e6fcfab763ce157a704d009db73ed6988c4f8bdc 100644 --- a/htdocs/compta/salaries/index.php +++ b/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;