From 538a6870f1f2dbe926a0a3db2120fee042ae9160 Mon Sep 17 00:00:00 2001 From: Gauthier PC portable 024 Date: Wed, 29 Mar 2023 11:00:20 +0200 Subject: [PATCH 1/5] FIX : it was not possible to update extrafields of expedition lines with batch without editing batch value --- htdocs/expedition/card.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 8aa54ca8904..4ff1614f26f 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -581,6 +581,7 @@ if (empty($reshook)) { $num_prod = count($lines); for ($i = 0; $i < $num_prod; $i++) { if ($lines[$i]->id == $line_id) { // we have found line to update + $update_done = false; $line = new ExpeditionLigne($db); $line->fk_expedition = $object->id; @@ -621,6 +622,8 @@ if (empty($reshook)) { if ($line->update($user) < 0) { setEventMessages($line->error, $line->errors, 'errors'); $error++; + } else { + $update_done=true; } } else { setEventMessages($lotStock->error, $lotStock->errors, 'errors'); @@ -663,6 +666,8 @@ if (empty($reshook)) { if ($line->update($user) < 0) { setEventMessages($line->error, $line->errors, 'errors'); $error++; + } else { + $update_done=true; } } else { setEventMessages($line->error, $line->errors, 'errors'); @@ -680,6 +685,8 @@ if (empty($reshook)) { if ($object->create_line_batch($line, $line->array_options) < 0) { setEventMessages($object->error, $object->errors, 'errors'); $error++; + } else { + $update_done=true; } } } else { @@ -717,6 +724,8 @@ if (empty($reshook)) { if ($line->update($user) < 0) { setEventMessages($line->error, $line->errors, 'errors'); $error++; + } else { + $update_done=true; } } unset($_POST[$stockLocation]); @@ -731,6 +740,8 @@ if (empty($reshook)) { if ($line->update($user) < 0) { setEventMessages($line->error, $line->errors, 'errors'); $error++; + } else { + $update_done=true; } unset($_POST[$qty]); } @@ -743,10 +754,18 @@ if (empty($reshook)) { if ($line->update($user) < 0) { setEventMessages($line->error, $line->errors, 'errors'); $error++; + } else { + $update_done=true; } unset($_POST[$qty]); } } + + if(empty($update_done)) { + $line->id = $lines[$i]->id; + $line->insertExtraFields(); + } + } } From cb63bbba325b46dd63de9b4af3c28b7f107d1a4e Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Wed, 29 Mar 2023 09:06:53 +0000 Subject: [PATCH 2/5] Fixing style errors. --- htdocs/expedition/card.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 4ff1614f26f..e2220ec6367 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -761,11 +761,10 @@ if (empty($reshook)) { } } - if(empty($update_done)) { + if (empty($update_done)) { $line->id = $lines[$i]->id; $line->insertExtraFields(); } - } } From 0173688d0577ca9305d13fc36347528ec08698a7 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Mon, 3 Apr 2023 15:49:38 +0200 Subject: [PATCH 3/5] FIX Propagate extrafields from supplier order to reception --- htdocs/reception/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php index 3ee755bef37..3c2c0ba53ba 100644 --- a/htdocs/reception/card.php +++ b/htdocs/reception/card.php @@ -871,7 +871,7 @@ if ($action == 'create') { if ($objectsrc->fetch_optionals() > 0) { $recept->array_options = array_merge($recept->array_options, $objectsrc->array_options); } - print $object->showOptionals($extrafields, 'create', $parameters); + print $recept->showOptionals($extrafields, 'create', $parameters); } // Incoterms From 144d061db3612c04a7b66299ad22bfdd1462f09a Mon Sep 17 00:00:00 2001 From: VESSILLER Date: Tue, 4 Apr 2023 11:01:03 +0200 Subject: [PATCH 4/5] FIX supplier link on bank transfer line --- htdocs/compta/prelevement/line.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php index 6eb10ce6a1a..a7690ca51a2 100644 --- a/htdocs/compta/prelevement/line.php +++ b/htdocs/compta/prelevement/line.php @@ -315,7 +315,11 @@ if ($id) { print ''.$obj->ref."\n"; } - print ''; + if ($type == 'bank-transfer') { + print ''; + } else { + print ''; + } print img_object($langs->trans("ShowCompany"), "company").' '.$obj->name."\n"; print ''.price($obj->total_ttc)."\n"; From 9f8b67a6ec5ba35d642a1a02de920c68f40b8f46 Mon Sep 17 00:00:00 2001 From: VESSILLER Date: Tue, 4 Apr 2023 11:33:23 +0200 Subject: [PATCH 5/5] FIX supplier invoice status on bank transfer line --- htdocs/compta/prelevement/line.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php index 6eb10ce6a1a..d094a61e0b8 100644 --- a/htdocs/compta/prelevement/line.php +++ b/htdocs/compta/prelevement/line.php @@ -116,7 +116,13 @@ if ($action == 'confirm_rejet') { * View */ -$invoicestatic = new Facture($db); +if ($type == 'bank-transfer') { + require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; + $invoicestatic = new FactureFournisseur($db); +} else { + require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; + $invoicestatic = new Facture($db); +} $title = $langs->trans("WithdrawalsLine"); if ($type == 'bank-transfer') {