From d4a1c1e51f584f1f4dfa9d74993523ed62cd94e0 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 19 Jan 2024 17:00:44 +0000 Subject: [PATCH] Bug 34478: Manual fix - parcels.pl (cud-confirm cud-new) Bug 34478: [TO SQUASH] Manual fix - parcels.pl (cud-confirm cud-new) Signed-off-by: Jonathan Druart --- acqui/parcels.pl | 6 +++--- .../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/acqui/parcels.pl b/acqui/parcels.pl index d8ab1f499e..5c27c3a805 100755 --- a/acqui/parcels.pl +++ b/acqui/parcels.pl @@ -103,7 +103,7 @@ my $shipmentcost = $input->param('shipmentcost'); my $shipmentcost_budgetid = $input->param('shipmentcost_budgetid'); my $shipmentdate = $input->param('shipmentdate'); -if ( $op and $op eq 'new' ) { +if ( $op and $op eq 'cud-new' ) { if ( C4::Context->preference('AcqWarnOnDuplicateInvoice') ) { my @invoices = GetInvoices( supplierid => $booksellerid, @@ -118,10 +118,10 @@ if ( $op and $op eq 'new' ) { $shipmentcost_budgetid; } } - $op = 'confirm' unless $template->{'VARS'}->{'duplicate_invoices'}; + $op = 'cud-confirm' unless $template->{'VARS'}->{'duplicate_invoices'}; } -if ($op and $op eq 'confirm') { +if ($op and $op eq 'cud-confirm') { my $invoiceid = AddInvoice( invoicenumber => $invoicenumber, booksellerid => $booksellerid, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt index f45c8fe46c..703227a53d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt @@ -64,9 +64,10 @@ [% END %] -
+ + [% INCLUDE 'csrf-token.inc' %] - + @@ -144,13 +145,14 @@ [% END %]
- + + [% INCLUDE 'csrf-token.inc' %]
Receive a new shipment
  1. - +
  2. [% IF ( gst ) %] -- 2.39.5