mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-06 01:28:19 +01:00
Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
@@ -3528,7 +3528,12 @@ if ($action == 'create') {
|
|||||||
|
|
||||||
// Overwrite some values if creation of invoice is from a predefined invoice
|
// Overwrite some values if creation of invoice is from a predefined invoice
|
||||||
if (empty($origin) && empty($originid) && GETPOSTINT('fac_rec') > 0) {
|
if (empty($origin) && empty($originid) && GETPOSTINT('fac_rec') > 0) {
|
||||||
$invoice_predefined->fetch(GETPOSTINT('fac_rec'));
|
//$invoice_predefined->fetch(GETPOSTINT('fac_rec'));
|
||||||
|
foreach ($invoice_predefined->array_options as $key => $option) {
|
||||||
|
if (!isset($object->array_options[$key])) {
|
||||||
|
$object->array_options[$key] = $invoice_predefined->array_options[$key];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$dateinvoice = $invoice_predefined->date_when; // To use next gen date by default later
|
$dateinvoice = $invoice_predefined->date_when; // To use next gen date by default later
|
||||||
if (empty($projectid)) {
|
if (empty($projectid)) {
|
||||||
|
|||||||
Reference in New Issue
Block a user