projects
/
srvgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/new/bug_5345'
[srvgit]
/
admin
/
aqbudgets.pl
diff --git
a/admin/aqbudgets.pl
b/admin/aqbudgets.pl
index
3ff1bd6
..
39fffdb
100755
(executable)
--- a/
admin/aqbudgets.pl
+++ b/
admin/aqbudgets.pl
@@
-73,11
+73,11
@@
my $script_name = "/cgi-bin/koha/admin/aqbudgets.pl";
my $budget_hash = $input->Vars;
my $budget_id = $$budget_hash{budget_id};
my $budget_permission = $input->param('budget_permission');
my $budget_hash = $input->Vars;
my $budget_id = $$budget_hash{budget_id};
my $budget_permission = $input->param('budget_permission');
-my $budget_period_dropbox = $input->param('budget_period_dropbox');
my $filter_budgetbranch = $input->param('filter_budgetbranch');
my $filter_budgetbranch = $input->param('filter_budgetbranch');
+my $filter_budgetname = $input->param('filter_budgetname');
#filtering non budget keys
delete $$budget_hash{$_} foreach grep {/filter|^op$|show/} keys %$budget_hash;
#filtering non budget keys
delete $$budget_hash{$_} foreach grep {/filter|^op$|show/} keys %$budget_hash;
-my $filter_budgetname = $input->param('filter_budgetname');
+
$template->param(
notree => ($filter_budgetbranch or $show_mine)
);
$template->param(
notree => ($filter_budgetbranch or $show_mine)
);
@@
-91,7
+91,7
@@
$template->param(
# ------- get periods stuff ------------------
# USED FOR PERMISSION COMPARISON LATER
# ------- get periods stuff ------------------
# USED FOR PERMISSION COMPARISON LATER
-my $borrower_id = $template->{
param_map
}->{'USER_INFO'}[0]->{'borrowernumber'};
+my $borrower_id = $template->{
VARS
}->{'USER_INFO'}[0]->{'borrowernumber'};
my $user = GetMemberDetails($borrower_id);
my $user_branchcode = $user->{'branchcode'};
my $user = GetMemberDetails($borrower_id);
my $user_branchcode = $user->{'branchcode'};
@@
-225,9
+225,7
@@
if ($op eq 'add_form') {
}
}
my $branches = GetBranches();
}
}
my $branches = GetBranches();
- my $budget_period_dropbox = GetBudgetPeriodsDropbox($$period{budget_period_id} );
$template->param(
$template->param(
- budget_period_dropbox => $budget_period_dropbox,
budget_id => $budget_id,
%$period,
);
budget_id => $budget_id,
%$period,
);
@@
-249,7
+247,7
@@
if ($op eq 'add_form') {
# PERMISSIONS
unless($staffflags->{'superlibrarian'} % 2 == 1 ) {
#IF NO PERMS, THEN DISABLE EDIT/DELETE
# PERMISSIONS
unless($staffflags->{'superlibrarian'} % 2 == 1 ) {
#IF NO PERMS, THEN DISABLE EDIT/DELETE
- unless ( $template->{
param_map
}->{'CAN_user_acquisition_budget_modify'} ) {
+ unless ( $template->{
VARS
}->{'CAN_user_acquisition_budget_modify'} ) {
$budget->{'budget_lock'} = 1;
}
# check budget permission
$budget->{'budget_lock'} = 1;
}
# check budget permission
@@
-274,9
+272,10
@@
if ($op eq 'add_form') {
} # ...SUPER_LIB END
# if a budget search doesnt match, next
} # ...SUPER_LIB END
# if a budget search doesnt match, next
- if ($filter_budgetname ) {
- next unless $budget->{budget_code} =~ m/$filter_budgetname/ ||
- $budget->{name} =~ m/$filter_budgetname/ ;
+ if ($filter_budgetname) {
+ next
+ unless $budget->{budget_code} =~ m/$filter_budgetname/i
+ || $budget->{budget_name} =~ m/$filter_budgetname/i;
}
if ($filter_budgetbranch ) {
next unless $budget->{budget_branchcode} =~ m/$filter_budgetbranch/;
}
if ($filter_budgetbranch ) {
next unless $budget->{budget_branchcode} =~ m/$filter_budgetbranch/;
@@
-328,12
+327,21
@@
if ($op eq 'add_form') {
$budget_period_total =
$num->format_price( $period->{budget_period_total} );
}
$budget_period_total =
$num->format_price( $period->{budget_period_total} );
}
+
+ if ($period_alloc_total) {
+ $period_alloc_total = $num->format_price($period_alloc_total);
+ }
+
+ if ($base_spent_total) {
+ $base_spent_total = $num->format_price($base_spent_total);
+ }
+
$template->param(
else => 1,
budget => \@loop,
budget_period_total => $budget_period_total,
$template->param(
else => 1,
budget => \@loop,
budget_period_total => $budget_period_total,
- period_alloc_total => $
num->format_price($period_alloc_total)
,
- base_spent_total => $
num->format_price($base_spent_total)
,
+ period_alloc_total => $
period_alloc_total
,
+ base_spent_total => $
base_spent_total
,
branchloop => \@branchloop2,
);
branchloop => \@branchloop2,
);