Bugzilla – Attachment 107466 Details for
Bug 21268
Can't add to basket from staged file if base-level allocated is zero
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21268: Don't remove 0 allocated funds from fund list
Bug-21268-Dont-remove-0-allocated-funds-from-fund-.patch (text/plain), 5.32 KB, created by
Andrew Fuerste-Henry
on 2020-07-28 13:13:04 UTC
(
hide
)
Description:
Bug 21268: Don't remove 0 allocated funds from fund list
Filename:
MIME Type:
Creator:
Andrew Fuerste-Henry
Created:
2020-07-28 13:13:04 UTC
Size:
5.32 KB
patch
obsolete
>From 9e4bdfc429ec52b19d5512c2e90fc57f8ec2ffdf Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Tue, 28 Jul 2020 09:23:35 +0200 >Subject: [PATCH] Bug 21268: Don't remove 0 allocated funds from fund list > >If a fund is created with a amount of 0, it will not appear in the fund >list (when a new order is created for instance). >0 allocated funds can be used to track donations and other situations >where there is not an expected amount for the year. > >Test plan: >0. Do not apply the patch >1. Create 1 active and 1 inactive budgets >2. Create some funds for each budgets, with amount > 0 and amount == 0 >3. Add orders to basket >=> Note that the funds with amount == 0 are not displayed >4. Apply the patch >5. Add orders to basket (using the different possible ways we have) >=> Note that the funds with amount == 0 are displayed > >This change is applied to the different views of the acquisition module. > >Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> >--- > acqui/addorderiso2709.pl | 3 --- > acqui/basket.pl | 3 --- > acqui/booksellers.pl | 3 --- > acqui/duplicate_orders.pl | 4 +--- > acqui/invoice.pl | 4 ---- > acqui/neworderempty.pl | 3 --- > acqui/orderreceive.pl | 3 --- > acqui/parcels.pl | 3 --- > 8 files changed, 1 insertion(+), 25 deletions(-) > >diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl >index 1caee77950..8d394d3ca5 100755 >--- a/acqui/addorderiso2709.pl >+++ b/acqui/addorderiso2709.pl >@@ -411,9 +411,6 @@ my $budget_loop = []; > my $budgets_hierarchy = GetBudgetHierarchy; > foreach my $r ( @{$budgets_hierarchy} ) { > next unless (CanUserUseBudget($patron, $r, $userflags)); >- if ( !defined $r->{budget_amount} || $r->{budget_amount} == 0 ) { >- next; >- } > push @{$budget_loop}, > { b_id => $r->{budget_id}, > b_txt => $r->{budget_name}, >diff --git a/acqui/basket.pl b/acqui/basket.pl >index 8e2929fb2a..639a600fdc 100755 >--- a/acqui/basket.pl >+++ b/acqui/basket.pl >@@ -379,9 +379,6 @@ if ( $op eq 'list' ) { > my $budgets = GetBudgetHierarchy; > my $has_budgets = 0; > foreach my $r (@{$budgets}) { >- if (!defined $r->{budget_amount} || $r->{budget_amount} == 0) { >- next; >- } > next unless (CanUserUseBudget($loggedinuser, $r, $userflags)); > > $has_budgets = 1; >diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl >index 0b69feb497..78b36a9691 100755 >--- a/acqui/booksellers.pl >+++ b/acqui/booksellers.pl >@@ -114,9 +114,6 @@ my $userbranch = $userenv->{branch}; > my $budgets = GetBudgetHierarchy; > my $has_budgets = 0; > foreach my $r (@{$budgets}) { >- if (!defined $r->{budget_amount} || $r->{budget_amount} == 0) { >- next; >- } > next unless (CanUserUseBudget($loggedinuser, $r, $userflags)); > > $has_budgets = 1; >diff --git a/acqui/duplicate_orders.pl b/acqui/duplicate_orders.pl >index eb975da035..7f03221c5b 100755 >--- a/acqui/duplicate_orders.pl >+++ b/acqui/duplicate_orders.pl >@@ -104,9 +104,7 @@ elsif ( $op eq 'batch_edit' ) { > foreach my $r ( @{$budgets_hierarchy} ) { > next > unless ( C4::Budgets::CanUserUseBudget( $patron, $r, $userflags ) ); >- if ( !defined $r->{budget_amount} || $r->{budget_amount} == 0 ) { >- next; >- } >+ > push @{$budget_loop}, > { > b_id => $r->{budget_id}, >diff --git a/acqui/invoice.pl b/acqui/invoice.pl >index 26717e99fe..60724aa5f4 100755 >--- a/acqui/invoice.pl >+++ b/acqui/invoice.pl >@@ -195,10 +195,6 @@ my $budgets = GetBudgetHierarchy(); > foreach my $r ( @{$budgets} ) { > next unless ( CanUserUseBudget( $loggedinuser, $r, $flags ) ); > >- if ( !defined $r->{budget_amount} || $r->{budget_amount} == 0 ) { >- next; >- } >- > my $selected = $shipmentcost_budgetid ? $r->{budget_id} eq $shipmentcost_budgetid : 0; > > push @{$budget_loop}, >diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl >index cf2e7ee945..dfa9ebe9ff 100755 >--- a/acqui/neworderempty.pl >+++ b/acqui/neworderempty.pl >@@ -320,9 +320,6 @@ my $budget_loop = []; > my $budgets = GetBudgetHierarchy; > foreach my $r (@{$budgets}) { > next unless (CanUserUseBudget($patron, $r, $userflags)); >- if (!defined $r->{budget_amount} || $r->{budget_amount} <0) { >- next; >- } > push @{$budget_loop}, { > b_id => $r->{budget_id}, > b_txt => $r->{budget_name}, >diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl >index d73f61b6d3..dea4f439be 100755 >--- a/acqui/orderreceive.pl >+++ b/acqui/orderreceive.pl >@@ -270,9 +270,6 @@ foreach my $period (@$periods) { > my @funds; > foreach my $r ( @{$budget_hierarchy} ) { > next unless ( CanUserUseBudget( $patron, $r, $userflags ) ); >- if ( !defined $r->{budget_amount} || $r->{budget_amount} == 0 ) { >- next; >- } > push @funds, > { > b_id => $r->{budget_id}, >diff --git a/acqui/parcels.pl b/acqui/parcels.pl >index c0a330b479..69aeb78939 100755 >--- a/acqui/parcels.pl >+++ b/acqui/parcels.pl >@@ -182,9 +182,6 @@ my $budget_loop = []; > my $budgets = GetBudgetHierarchy; > foreach my $r (@{$budgets}) { > next unless (CanUserUseBudget($loggedinuser, $r, $flags)); >- if (!defined $r->{budget_amount} || $r->{budget_amount} == 0) { >- next; >- } > push @{$budget_loop}, { > b_id => $r->{budget_id}, > b_txt => $r->{budget_name}, >-- >2.11.0
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 21268
:
107455
|
107466
|
107491