diff --git a/htdocs/compta/salaries/fiche.php b/htdocs/compta/salaries/fiche.php index 26bc30907e0..5476fd595be 100644 --- a/htdocs/compta/salaries/fiche.php +++ b/htdocs/compta/salaries/fiche.php @@ -79,6 +79,11 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel")) $sal->type_payment=GETPOST("paymenttype"); $sal->num_payment=GETPOST("num_payment"); + if (empty($datep) || empty($datesp) || empty($dateep)) + { + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date")),'errors'); + $error++; + } if (empty($sal->fk_user) || $sal->fk_user < 0) { setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Employee")),'errors'); @@ -98,7 +103,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel")) if (! $error) { $db->begin(); - + $ret=$sal->create($user); if ($ret > 0) { @@ -210,11 +215,11 @@ if ($action == 'create') print ""; print ''.$langs->trans("DatePayment").''; - print $form->select_date($datep,"datep",'','','','add'); + print $form->select_date((empty($datep)?-1:$datep),"datep",'','','','add'); print ''; - print ''.$langs->trans("DateValue").''; - print $form->select_date($datev,"datev",'','','','add'); + print ''.$langs->trans("DateValue").''; + print $form->select_date((empty($datev)?-1:$datev),"datev",'','','','add'); print ''; // Employee @@ -244,19 +249,22 @@ if ($action == 'create') print ''.$langs->trans("Account").''; $form->select_comptes($_POST["accountid"],"accountid",0,"courant=1",1); // Affiche liste des comptes courant print ''; - - // Type payment - print ''.$langs->trans("PaymentMode").''; - $form->select_types_paiements(GETPOST("paymenttype"), "paymenttype"); - print "\n"; - print ""; - + } + + // Type payment + print ''.$langs->trans("PaymentMode").''; + $form->select_types_paiements(GETPOST("paymenttype"), "paymenttype"); + print "\n"; + print ""; + + if (! empty($conf->banque->enabled)) + { // Number print ''.$langs->trans('Numero'); print ' ('.$langs->trans("ChequeOrTransferNumber").')'; print ''."\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