diff --git a/htdocs/salaries/paiement_salary.php b/htdocs/salaries/paiement_salary.php index 0c2c757e2dc..3cf34df6ed9 100644 --- a/htdocs/salaries/paiement_salary.php +++ b/htdocs/salaries/paiement_salary.php @@ -212,7 +212,7 @@ if ($action == 'create') { print ''.$langs->trans("Date").''; $datepaye = dol_mktime(GETPOST("rehour", 'int'), GETPOST("remin", 'int'), GETPOST("resec", 'int'), GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int')); $datepayment = empty($conf->global->MAIN_AUTOFILL_DATE) ? (GETPOST("remonth") ? $datepaye : -1) : ''; - print $form->selectDate($datepayment, '', 1, 1, 0, "add_payment", 1, 1); + print $form->selectDate($datepayment, '', 1, 1, 0, "add_payment", 1, 1, 0, '', '', $salary->dateep, '', 1, $langs->trans("DateEnd")); print ""; print ''; diff --git a/htdocs/salaries/payment_salary/card.php b/htdocs/salaries/payment_salary/card.php index e66ef74a4ee..21304469296 100644 --- a/htdocs/salaries/payment_salary/card.php +++ b/htdocs/salaries/payment_salary/card.php @@ -133,8 +133,6 @@ $linkback = ''.$langs->trans("B dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'id', ''); -$salary->fetch($object->fk_salary); - print '
'; print '
'; @@ -151,7 +149,7 @@ print '';*/ print ''; print $form->editfieldkey("Date", 'datep', $object->datep, $object, 1, 'datehourpicker'); print ''; -print $form->editfieldval("Date", 'datep', $object->datep, $object, 1, 'datehourpicker', '', null, null, '', 0, '', 'id', 'tzuserrel', array('addnowlink'=>1, 'adddateof'=>$salary->datesp, 'labeladddateof'=>$langs->transnoentitiesnoconv("DateStart"))); +print $form->editfieldval("Date", 'datep', $object->datep, $object, 1, 'datehourpicker', '', null, null, '', 0, '', 'id', 'tzuserrel', array('addnowlink'=>1)); print ""; print ''; @@ -164,10 +162,10 @@ print ''; print ''.$langs->trans('Numero').''.dol_escape_htmltag($object->num_payment).''; // Montant -print ''.$langs->trans('Amount').''.price($object->amount, 0, $langs, 1, -1, -1, $conf->currency).''; +print ''.$langs->trans('Amount').''.price($object->amount, 0, $langs, 1, -1, -1, $conf->currency).''; // Note -print ''.$langs->trans('Note').''.dol_nl2br($object->note).''; +print ''.$langs->trans('Note').''.dol_nl2br($object->note_private).''; // Bank account if (isModEnabled("banque")) { @@ -177,7 +175,7 @@ if (isModEnabled("banque")) { print ''; print ''.$langs->trans('BankTransactionLine').''; - print ''; + print ''; print $bankline->getNomUrl(1, 0, 'showall'); print ''; print '';