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

Fix date of invoice in future.

Browse Source
This commit is contained in:
Laurent Destailleur 2017-01-22 23:00:40 +01:00
parent db220e7af5
commit b011d6e188
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/fourn/facture/card.php
View File

@ -315,8 +315,14 @@ if (empty($reshook))
} }
elseif ($action == 'setdatef' && $user->rights->fournisseur->facture->creer) elseif ($action == 'setdatef' && $user->rights->fournisseur->facture->creer)
{ {
$newdate=dol_mktime(0,0,0,$_POST['datefmonth'],$_POST['datefday'],$_POST['datefyear']);
if ($newdate > (dol_now() + (empty($conf->global->INVOICE_MAX_OFFSET_IN_FUTURE)?0:$conf->global->INVOICE_MAX_OFFSET_IN_FUTURE)))
{
if (empty($conf->global->INVOICE_MAX_OFFSET_IN_FUTURE)) setEventMessages($langs->trans("WarningInvoiceDateInFuture"), null, 'warnings');
else setEventMessages($langs->trans("WarningInvoiceDateTooFarInFuture"), null, 'warnings');
}
$object->fetch($id); $object->fetch($id);
$object->date=dol_mktime(12,0,0,$_POST['datefmonth'],$_POST['datefday'],$_POST['datefyear']); $object->date=$newdate;
if ($object->date_echeance && $object->date_echeance < $object->date) $object->date_echeance=$object->date; if ($object->date_echeance && $object->date_echeance < $object->date) $object->date_echeance=$object->date;
$result=$object->update($user); $result=$object->update($user);
if ($result < 0) dol_print_error($db,$object->error); if ($result < 0) dol_print_error($db,$object->error);

3
htdocs/fourn/facture/document.php
View File

@ -240,6 +240,9 @@ if ($object->id > 0)
print '</table>'; print '</table>';
print '</div>'; print '</div>';
dol_fiche_end();
$modulepart = 'facture_fournisseur'; $modulepart = 'facture_fournisseur';
$permission = $user->rights->fournisseur->facture->creer; $permission = $user->rights->fournisseur->facture->creer;
$permtoedit = $user->rights->fournisseur->facture->creer; $permtoedit = $user->rights->fournisseur->facture->creer;

2
htdocs/langs/en_US/bills.lang
View File

@ -333,6 +333,8 @@ InvoiceAutoValidate=Validate invoices automatically
GeneratedFromRecurringInvoice=Generated from template recurring invoice %s GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
DateIsNotEnough=Date not reached yet DateIsNotEnough=Date not reached yet
InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
# PaymentConditions # PaymentConditions
Statut=Status Statut=Status
PaymentConditionShortRECEP=Due Upon Receipt PaymentConditionShortRECEP=Due Upon Receipt