Bugzilla – Attachment 147105 Details for
Bug 31631
Optionally choose for tax-exclusive values to be used for calculating fund values (spent, ordered)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 31631: (follow-up) Fixes for QA test tool
Bug-31631-follow-up-Fixes-for-QA-test-tool.patch (text/plain), 2.49 KB, created by
Alex Buckley
on 2023-02-21 23:40:21 UTC
(
hide
)
Description:
Bug 31631: (follow-up) Fixes for QA test tool
Filename:
MIME Type:
Creator:
Alex Buckley
Created:
2023-02-21 23:40:21 UTC
Size:
2.49 KB
patch
obsolete
>From 0201f2c73cf9927ce4398819f996a82b48636592 Mon Sep 17 00:00:00 2001 >From: Alex Buckley <alexbuckley@catalyst.net.nz> >Date: Tue, 21 Feb 2023 22:02:03 +0000 >Subject: [PATCH] Bug 31631: (follow-up) Fixes for QA test tool > >--- > C4/Budgets.pm | 16 ++++++++-------- > acqui/spent.pl | 2 +- > 2 files changed, 9 insertions(+), 9 deletions(-) > >diff --git a/C4/Budgets.pm b/C4/Budgets.pm >index d22e32245c..26e4c49143 100644 >--- a/C4/Budgets.pm >+++ b/C4/Budgets.pm >@@ -352,7 +352,7 @@ sub GetBudgetSpent { > quantityreceived > 0 AND > datecancellationprinted IS NULL > |); >- $sth->execute($budget_id); >+ $sth->execute($budget_id); > my $sum = ( $sth->fetchrow_array || 0 ) + 0; > > $sth = $dbh->prepare(qq| >@@ -370,24 +370,24 @@ sub GetBudgetSpent { > $sum += $adj->adjustment; > } > >- return $sum; >+ return $sum; > } > > # ------------------------------------------------------------------- > sub GetBudgetOrdered { >- my ($budget_id) = @_; >- my $dbh = C4::Context->dbh; >+ my ($budget_id) = @_; >+ my $dbh = C4::Context->dbh; > > # Get correct unitprice and ecost prices as possible > my ( $unitprice_field, $ecost_field ) = FieldsForCalculatingFundValues(); > >- my $sth = $dbh->prepare(qq| >+ my $sth = $dbh->prepare(qq| > SELECT SUM(| . C4::Acquisition::get_rounding_sql(qq|$ecost_field|) . qq| * quantity) AS sum FROM aqorders > WHERE budget_id = ? AND > quantityreceived = 0 AND > datecancellationprinted IS NULL > |); >- $sth->execute($budget_id); >+ $sth->execute($budget_id); > my $sum = ( $sth->fetchrow_array || 0 ) + 0; > > my $adjustments = Koha::Acquisition::Invoice::Adjustments->search({budget_id => $budget_id, encumber_open => 1, closedate => undef},{ join => 'invoiceid' }); >@@ -395,7 +395,7 @@ sub GetBudgetOrdered { > $sum += $adj->adjustment; > } > >- return $sum; >+ return $sum; > } > > =head2 GetBudgetName >@@ -1414,7 +1414,7 @@ sub MoveOrders { > > my ( $unitprice_field, $ecost_field ) = FieldsForCalculatingFundValues(); > >-Fetch the tax inclusive or tax exclusive database fields for caclulating fund values based >+Fetch the tax inclusive or tax exclusive database fields for calculating fund values based > on the value of the CalculateFundValuesIncludingTax system preference. > > =cut >diff --git a/acqui/spent.pl b/acqui/spent.pl >index 25a5622a02..dfa3a041ae 100755 >--- a/acqui/spent.pl >+++ b/acqui/spent.pl >@@ -21,7 +21,7 @@ > > =head1 NAME > >- spent.pl >+ acqui/spent.pl > > =head1 DESCRIPTION > >-- >2.20.1
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 31631
:
141017
|
141018
|
141019
|
142597
|
142661
|
143156
|
143157
|
143158
|
143159
|
147011
|
147012
|
147013
|
147014
|
147015
|
147098
|
147099
|
147100
|
147101
|
147102
|
147103
|
147104
|
147105
|
150146
|
156062
|
156063
|
156064
|
156065
|
156066
|
156067
|
156068
|
156069