Bugzilla – Attachment 139842 Details for
Bug 15348
Change/Edit estimated delivery date per order line
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15348: (follow-up) Fix filtering results on estimated delivery date
Bug-15348-follow-up-Fix-filtering-results-on-estim.patch (text/plain), 1.91 KB, created by
Katrin Fischer
on 2022-08-26 16:32:08 UTC
(
hide
)
Description:
Bug 15348: (follow-up) Fix filtering results on estimated delivery date
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2022-08-26 16:32:08 UTC
Size:
1.91 KB
patch
obsolete
>From 61181e6e7c4536ac7fded2b0188f17d45061ae6b Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >Date: Tue, 2 Aug 2022 16:57:02 +1200 >Subject: [PATCH] Bug 15348: (follow-up) Fix filtering results on estimated > delivery date >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Adding another clause to the SQL so that the specified estimated >delivery date is used for filtering first, and the calculated delivery >date is used if there is no specified estimated delivery date. > >Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> >Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > Koha/Acquisition/Orders.pm | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > >diff --git a/Koha/Acquisition/Orders.pm b/Koha/Acquisition/Orders.pm >index e345df38f7..e429475dc3 100644 >--- a/Koha/Acquisition/Orders.pm >+++ b/Koha/Acquisition/Orders.pm >@@ -72,6 +72,7 @@ sub filter_by_lates { > my @estimated_delivery_time_conditions; > if ( defined $estimated_from or defined $estimated_to ) { > push @delivery_time_conditions, \[ "$date_add IS NOT NULL" ]; >+ push @delivery_time_conditions, \[ "estimated_delivery_date IS NULL" ]; > push @estimated_delivery_time_conditions, \[ "estimated_delivery_date IS NOT NULL" ]; > } > if ( defined $estimated_from ) { >@@ -118,8 +119,8 @@ sub filter_by_lates { > ( ( @delivery_time_conditions and @estimated_delivery_time_conditions ) ? > ( -or => > [ >- -and => \@delivery_time_conditions, >- -and => \@estimated_delivery_time_conditions >+ -and => \@estimated_delivery_time_conditions, >+ -and => \@delivery_time_conditions > ] > ) > : () >-- >2.30.2
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 15348
:
114430
|
114583
|
114623
|
115121
|
115122
|
115123
|
115124
|
116517
|
118788
|
118789
|
119297
|
119298
|
119299
|
120653
|
120654
|
120655
|
120656
|
136560
|
136561
|
136562
|
136563
|
137057
|
137058
|
137061
|
137098
|
137099
|
137740
|
137741
|
137742
|
137743
|
138110
|
138491
|
138529
|
138530
|
138531
|
138532
|
138533
|
138534
|
138535
|
138536
|
138537
|
138538
|
138539
|
138540
|
139245
|
139274
|
139301
|
139329
|
139330
|
139331
|
139332
|
139333
|
139334
|
139335
|
139336
|
139337
|
139338
|
139339
|
139340
|
139341
|
139342
|
139343
|
139351
|
139352
|
139353
|
139354
|
139355
|
139356
|
139357
|
139358
|
139359
|
139360
|
139361
|
139362
|
139363
|
139364
|
139365
|
139831
|
139832
|
139833
|
139834
|
139835
|
139836
|
139837
|
139838
|
139839
|
139840
|
139841
| 139842 |
139843
|
139844
|
139845
|
140708
|
140735
|
143896
|
143900
|
143903
|
143904