@@ -, +, @@ funds" option --- C4/Budgets.pm | 19 +++++++++++-- admin/aqbudgetperiods.pl | 2 ++ .../prog/en/modules/admin/aqbudgetperiods.tt | 5 ++++ t/db_dependent/Budgets.t | 29 +++++++++++++++++++- 4 files changed, 51 insertions(+), 4 deletions(-) --- a/C4/Budgets.pm +++ a/C4/Budgets.pm @@ -985,15 +985,19 @@ sub ConvertCurrency { my $new_budget_period_id = CloneBudgetPeriod({ budget_period_id => $budget_period_id, - budget_period_startdate => $budget_period_startdate; - budget_period_enddate => $budget_period_enddate; - mark_original_budget_as_inactive => 1 + budget_period_startdate => $budget_period_startdate, + budget_period_enddate => $budget_period_enddate, + mark_original_budget_as_inactive => 1n + reset_all_budgets => 1, }); Clone a budget period with all budgets. If the mark_origin_budget_as_inactive is set (0 by default), the original budget will be marked as inactive. +If the reset_all_budgets is set (0 by default), all budget (fund) +amounts will be reset. + =cut sub CloneBudgetPeriod { @@ -1003,6 +1007,7 @@ sub CloneBudgetPeriod { my $budget_period_enddate = $params->{budget_period_enddate}; my $mark_original_budget_as_inactive = $params->{mark_original_budget_as_inactive} || 0; + my $reset_all_budgets = $params->{reset_all_budgets} || 0; my $budget_period = GetBudgetPeriod($budget_period_id); @@ -1029,6 +1034,14 @@ sub CloneBudgetPeriod { ); } + if ( $reset_all_budgets ) { + my $budgets = GetBudgets({ budget_period_id => $new_budget_period_id }); + for my $budget ( @$budgets ) { + $budget->{budget_amount} = 0; + ModBudget( $budget ); + } + } + return $new_budget_period_id; } --- a/admin/aqbudgetperiods.pl +++ a/admin/aqbudgetperiods.pl @@ -186,6 +186,7 @@ elsif ( $op eq 'duplicate_budget' ){ my $budget_period_startdate = $input->param('budget_period_startdate'); my $budget_period_enddate = $input->param('budget_period_enddate'); my $mark_original_budget_as_inactive = $input->param('mark_original_budget_as_inactive'); + my $reset_all_budgets = $input->param('reset_all_budgets'); my $new_budget_period_id = C4::Budgets::CloneBudgetPeriod( { @@ -193,6 +194,7 @@ elsif ( $op eq 'duplicate_budget' ){ budget_period_startdate => $budget_period_startdate, budget_period_enddate => $budget_period_enddate, mark_original_budget_as_inactive => $mark_original_budget_as_inactive, + reset_all_budgets => $reset_all_budgets, } ); --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -190,6 +190,11 @@ +
  • + + +
  • + --- a/t/db_dependent/Budgets.t +++ a/t/db_dependent/Budgets.t @@ -1,5 +1,5 @@ use Modern::Perl; -use Test::More tests => 29; +use Test::More tests => 31; BEGIN {use_ok('C4::Budgets') } use C4::Biblio; @@ -345,6 +345,14 @@ is( $budget_period->{budget_period_active}, 1, 'CloneBudgetPeriod does not mark as inactive the budgetperiod if not needed' ); +$budget_hierarchy_cloned = GetBudgetHierarchy($budget_period_id_cloned); +my $number_of_budgets_not_reset = 0; +for my $budget (@$budget_hierarchy_cloned) { + $number_of_budgets_not_reset++ if $budget->{budget_amount} > 0; +} +is( $number_of_budgets_not_reset, 5, + 'CloneBudgetPeriod does not reset budgets (funds) if not needed' ); + $budget_period_id_cloned = C4::Budgets::CloneBudgetPeriod( { budget_period_id => $budget_period_id, @@ -370,6 +378,25 @@ is( $budget_period->{budget_period_active}, 0, 'CloneBudgetPeriod (with inactive param) marks as inactive the budgetperiod' ); +# CloneBudgetPeriod with param reset_all_budgets +$budget_period_id_cloned = C4::Budgets::CloneBudgetPeriod( + { + budget_period_id => $budget_period_id, + budget_period_startdate => '2014-01-01', + budget_period_enddate => '2014-12-31', + reset_all_budgets => 1, + } +); + +$budget_hierarchy_cloned = GetBudgetHierarchy($budget_period_id_cloned); +$number_of_budgets_not_reset = 0; +for my $budget (@$budget_hierarchy_cloned) { + $number_of_budgets_not_reset++ if $budget->{budget_amount} > 0; +} +is( $number_of_budgets_not_reset, 0, + 'CloneBudgetPeriod has reset all budgets (funds)' ); + + sub _get_dependencies { my ($budget_hierarchy) = @_; my $graph; --