Bugzilla – Attachment 174007 Details for
Bug 34355
Automated MARC record ordering process
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 34355: (QA follow-up) Restore MarcFieldsToOrder prices and budgets
Bug-34355-QA-follow-up-Restore-MarcFieldsToOrder-p.patch (text/plain), 4.47 KB, created by
Nick Clemens (kidclamp)
on 2024-11-05 16:38:34 UTC
(
hide
)
Description:
Bug 34355: (QA follow-up) Restore MarcFieldsToOrder prices and budgets
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2024-11-05 16:38:34 UTC
Size:
4.47 KB
patch
obsolete
>From fa6a60b03f6208369e57fe9b7c8020a3366cb755 Mon Sep 17 00:00:00 2001 >From: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> >Date: Thu, 31 Oct 2024 14:50:39 +0000 >Subject: [PATCH] Bug 34355: (QA follow-up) Restore MarcFieldsToOrder prices > and budgets > >Signed-off-by: Nick Clemens <nick@bywatersolutions.com> >--- > Koha/MarcOrder.pm | 17 +++++++++-------- > 1 file changed, 9 insertions(+), 8 deletions(-) > >diff --git a/Koha/MarcOrder.pm b/Koha/MarcOrder.pm >index 627b7fd85e6..c043727ba71 100644 >--- a/Koha/MarcOrder.pm >+++ b/Koha/MarcOrder.pm >@@ -849,7 +849,7 @@ sub parse_input_into_order_line_fields { > my $fields = $args->{fields}; > my $marcrecord = $args->{marcrecord}; > >- my $quantity = $fields->{quantity} || 1; >+ my $quantity = $fields->{quantity} || $fields->{c_quantity} || 1; > my @homebranches = $fields->{homebranches} ? @{ $fields->{homebranches} } : (); > my @holdingbranches = $fields->{holdingbranches} ? @{ $fields->{holdingbranches} } : (); > my @itypes = $fields->{itypes} ? @{ $fields->{itypes} } : (); >@@ -869,7 +869,7 @@ sub parse_input_into_order_line_fields { > my @enumchrons = $fields->{enumchrons} ? @{ $fields->{enumchrons} } : (); > my @budget_codes = $fields->{budget_codes} ? @{ $fields->{budget_codes} } : (); > my $c_quantity = $fields->{c_quantity}; >- my $c_budget_id = $fields->{c_budget_id}; >+ my $c_budget_code = $fields->{c_budget_code}; > my $c_discount = $fields->{c_discount}; > my $c_sort1 = $fields->{c_sort1}; > my $c_sort2 = $fields->{c_sort2}; >@@ -879,9 +879,9 @@ sub parse_input_into_order_line_fields { > # If using the cronjob, we want to default to the account budget if not mapped on the record > if ( !$client && ( !@budget_codes || scalar(@budget_codes) == 0 ) ) { > for ( 1 .. $quantity ) { >- my $item_budget = GetBudgetByCode($c_budget_id); >+ my $item_budget = GetBudgetByCode($c_budget_code); > if ($item_budget) { >- push( @budget_codes, $item_budget ); >+ push( @budget_codes, $item_budget->{budget_id} ); > } else { > push( @budget_codes, $budget_id ); > } >@@ -912,7 +912,7 @@ sub parse_input_into_order_line_fields { > basket_id => $basket_id, > budget_id => $budget_id, > c_quantity => $c_quantity, >- c_budget_id => $c_budget_id, >+ c_budget_code => $c_budget_code, > c_discount => $c_discount, > c_sort1 => $c_sort1, > c_sort2 => $c_sort2, >@@ -996,9 +996,9 @@ sub create_items_and_generate_order_hash { > for ( my $i = 0 ; $i < $loop_limit ; $i++ ) { > $budget_ids[$i] = $budget_id if !$budget_ids[$i]; # Use default budget if no budget provided > $budget_hash->{ $budget_ids[$i] }->{quantity} += 1; >- $budget_hash->{ $budget_ids[$i] }->{price} = @{ $fields->{price} }[$i]; >+ $budget_hash->{ $budget_ids[$i] }->{price} = @{ $fields->{price} }[$i] || $fields->{c_price}; > $budget_hash->{ $budget_ids[$i] }->{replacementprice} = >- @{ $fields->{replacementprice} }[$i]; >+ @{ $fields->{replacementprice} }[$i] || $fields->{c_replacement_price}; > $budget_hash->{ $budget_ids[$i] }->{itemnumbers} //= []; > push @{ $budget_hash->{ $budget_ids[$i] }->{itemnumbers} }, > $itemnumbers[$i]; >@@ -1062,7 +1062,7 @@ sub create_items_and_generate_order_hash { > basketno => $basket_id, > quantity => $fields->{c_quantity}, > branchcode => C4::Context->userenv()->{'branch'}, >- budget_id => $fields->{c_budget_id}, >+ budget_id => $fields->{c_budget_code}, > uncertainprice => 1, > sort1 => $fields->{c_sort1}, > sort2 => $fields->{c_sort2}, >@@ -1242,6 +1242,7 @@ sub _create_item_fields_from_syspref { > c_discount => $marc_fields_to_order->{discount}, > c_sort1 => $marc_fields_to_order->{sort1}, > c_sort2 => $marc_fields_to_order->{sort2}, >+ c_replacement_price => $marc_fields_to_order->{replacementprice}, > }; > > return $item_fields; >-- >2.39.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 34355
:
154705
|
154706
|
154707
|
154708
|
154709
|
154710
|
157092
|
157093
|
157094
|
157095
|
157096
|
157097
|
157098
|
157099
|
157100
|
160858
|
160859
|
160860
|
160861
|
160862
|
160863
|
160864
|
160865
|
160866
|
160867
|
160868
|
160869
|
160870
|
160871
|
160872
|
160873
|
160874
|
160875
|
169896
|
169897
|
169898
|
169899
|
169900
|
169901
|
169902
|
169903
|
169904
|
170395
|
170401
|
170402
|
170403
|
170404
|
170405
|
170406
|
170407
|
170408
|
170409
|
173054
|
173055
|
173056
|
173057
|
173058
|
173059
|
173060
|
173061
|
173062
|
173063
|
173064
|
173065
|
173066
|
173709
|
173805
|
173806
|
173809
|
173824
|
173825
|
173993
|
173994
|
173995
|
173996
|
173997
|
173998
|
173999
|
174000
|
174001
|
174002
|
174003
|
174004
|
174005
|
174006
|
174007
|
174008
|
174009
|
174010
|
174362
|
174363
|
174364
|
174365
|
174366
|
174367
|
174368
|
174369
|
174370
|
174371
|
174372
|
174373
|
174374
|
174375
|
174376
|
174377
|
174378
|
174379
|
174380
|
174382
|
174383