close #1753 Fixed: Incorrect next number for a new document in the module

This commit is contained in:
Cüneyt Şentürk 2021-01-13 22:30:19 +03:00
parent c50c8acd75
commit 5fdaf8f8f5

View File

@ -532,7 +532,7 @@ abstract class DocumentForm extends Base
$issued_at = $type . '_at'; $issued_at = $type . '_at';
if (request()->has($issued_at)) { if (request()->has($issued_at)) {
$issuedAt = request()->get($issued_at); $issuedAt = request()->get($issued_at);
} else { } else {
$issuedAt = request()->get('invoiced_at', Date::now()->toDateString()); $issuedAt = request()->get('invoiced_at', Date::now()->toDateString());
} }
@ -553,7 +553,7 @@ abstract class DocumentForm extends Base
$next = $type; $next = $type;
if ($alias = config('type.' . $type . '.alias')) { if ($alias = config('type.' . $type . '.alias')) {
$next = $alias . '.' . $type; $next = $alias . '.' . str_replace('-', '_', $type);
} }
$document_number = $this->getNextDocumentNumber($next); $document_number = $this->getNextDocumentNumber($next);
@ -578,7 +578,7 @@ abstract class DocumentForm extends Base
if ($document) { if ($document) {
return $document->due_at; return $document->due_at;
} }
$addDays = (setting($type . '.payment_terms', 0)) ? setting($type . '.payment_terms', 0) : setting('invoice.payment_terms', 0); $addDays = (setting($type . '.payment_terms', 0)) ? setting($type . '.payment_terms', 0) : setting('invoice.payment_terms', 0);
switch ($type) { switch ($type) {