@@ -, +, @@
---
C4/Budgets.pm | 8 +++--
.../prog/en/modules/reports/orders_by_budget.tt | 32 +++++++++++++++++---
.../prog/en/modules/reports/reports-home.tt | 2 +-
reports/{orders_by_budget.pl => orders_by_fund.pl} | 9 +++---
t/db_dependent/Budgets.t | 9 ++----
5 files changed, 41 insertions(+), 19 deletions(-)
rename reports/{orders_by_budget.pl => orders_by_fund.pl} (96%)
--- a/C4/Budgets.pm
+++ a/C4/Budgets.pm
@@ -82,7 +82,6 @@ BEGIN {
# ----------------------------BUDGETS.PM-----------------------------";
-
=head1 FUNCTIONS ABOUT BUDGETS
=cut
@@ -463,6 +462,7 @@ sub GetBudgetPeriod {
}
# -------------------------------------------------------------------
+
=head2 GetBudgetPeriodDescription
$description = GetBudgetPeriodDescription($budget_id);
@@ -474,6 +474,7 @@ sub GetBudgetPeriod {
Description is fetched from aqbudgetperiods, id is compared aqbudgets. (INNER JOIN on budget_period_id)
=cut
+
sub GetBudgetPeriodDescription {
my ($budget_id) = @_;
my $dbh = C4::Context->dbh;
@@ -638,6 +639,7 @@ sub DelBudget {
# -------------------------------------------------------------------
+
=head2 GetBudget
&GetBudget($budget_id);
@@ -750,6 +752,7 @@ sub GetBudgetsByActivity {
return @results;
}
# --------------------------------------------------------------------
+
=head2 GetBudgetsReport
&GetBudgetsReport( [$activity] );
@@ -1151,7 +1154,6 @@ sub ConvertCurrency {
return ( $price / $cur );
}
-
=head2 CloneBudgetPeriod
my $new_budget_period_id = CloneBudgetPeriod({
@@ -1383,4 +1385,4 @@ __END__
Koha Development Team
Fund | Basket | +Basket Name | Basket By | Title | Currency | @@ -46,6 +55,8 @@Date Received | Notes | |||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
[% ordersloo.basketno |html %] | +[% ordersloo.basketname |html %] | [% ordersloo.authorisedbyname %] | [% ordersloo.title |html %] @@ -72,12 +84,15 @@ | [% ordersloo.notes |html %] | ||||||||||
TOTAL | [% total_quantity %] | [% total_rrp %] | [% total_ecost %] | |||||||||||
TOTAL | [% total_quantity %] | [% total_rrp %] | [% total_ecost %] |