Skip to content
Snippets Groups Projects
Commit 41b09d8c authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge pull request #2448 from atm-maxime/3.6

Fix : display proposal date on proposal list
parents 242a71e9 05a2a6af
No related branches found
No related tags found
No related merge requests found
...@@ -390,7 +390,7 @@ if ($result) ...@@ -390,7 +390,7 @@ if ($result)
// Date proposal // Date proposal
print '<td align="center">'; print '<td align="center">';
print dol_print_date($db->jdate($obj->dp), 'day'); print dol_print_date($db->jdate($objp->dp), 'day');
print "</td>\n"; print "</td>\n";
// Date end validity // Date end validity
......
...@@ -365,7 +365,7 @@ if ($id) ...@@ -365,7 +365,7 @@ if ($id)
print "<div class=\"tabsAction\">\n"; print "<div class=\"tabsAction\">\n";
if ($salpayment->rappro == 0) if ($salpayment->rappro == 0)
{ {
if (! empty($user->rights->tax->charges->supprimer)) if (! empty($user->rights->salaries->delete))
{ {
print '<a class="butActionDelete" href="fiche.php?id='.$salpayment->id.'&action=delete">'.$langs->trans("Delete").'</a>'; print '<a class="butActionDelete" href="fiche.php?id='.$salpayment->id.'&action=delete">'.$langs->trans("Delete").'</a>';
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment