lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2448 from atm-maxime/3.6

Browse Source 
Fix : display proposal date on proposal list
This commit is contained in:
Laurent Destailleur 2015-03-11 02:50:26 +01:00
commit 41b09d8c70
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/propal/list.php
View File

@ -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

2
htdocs/compta/salaries/fiche.php
View File

@ -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>';
} }