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

Fix bug in date compare

Browse Source
This commit is contained in:
Laurent Destailleur 2016-03-03 12:31:29 +01:00
parent f3745511fd
commit d842d05639
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/compta/facture/fiche-rec.php
View File

@ -905,8 +905,8 @@ else
*/ */
print '<div class="tabsAction">'; print '<div class="tabsAction">';
if ($object->statut == Facture::STATUS_DRAFT) //if ($object->statut == Facture::STATUS_DRAFT) // there is no draft status on templates.
{ //{
if ($user->rights->facture->creer) if ($user->rights->facture->creer)
{ {
if (empty($object->frequency) || $object->date_when <= $today) if (empty($object->frequency) || $object->date_when <= $today)
@ -922,9 +922,10 @@ else
{ {
print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">'.$langs->trans("CreateBill").'</a></div>'; print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">'.$langs->trans("CreateBill").'</a></div>';
} }
} //}
if ($object->statut == Facture::STATUS_DRAFT && $user->rights->facture->supprimer) //if ($object->statut == Facture::STATUS_DRAFT && $user->rights->facture->supprimer)
if ($user->rights->facture->supprimer)
{ {
print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&id='.$object->id.'">'.$langs->trans('Delete').'</a></div>'; print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&id='.$object->id.'">'.$langs->trans('Delete').'</a></div>';
} }
@ -1014,7 +1015,7 @@ else
print '<td align="center">'; print '<td align="center">';
if ($user->rights->facture->creer) if ($user->rights->facture->creer)
{ {
if (empty($objp->frequency) || $objp->date_when <= $today) if (empty($objp->frequency) || $db->jdate($objp->date_when) <= $today)
{ {
print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;socid='.$objp->socid.'&amp;fac_rec='.$objp->facid.'">'; print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;socid='.$objp->socid.'&amp;fac_rec='.$objp->facid.'">';
print $langs->trans("CreateBill").'</a>'; print $langs->trans("CreateBill").'</a>';