@@ -, +, @@
1 - Receive some orders via acquisitions
2 - View the invoice with these orders
3 - Click 'Modify fund' on the received orders list
4 - Confirm you can change the fund
5 - Set some authorised value categories for funds
6 - Reload the invoice
7 - Confirm the categories dropdowns change when different funds selected
8 - Confirm updating the statistic fields saves correctly
9 - Add an inactive budget with some funds
---
acqui/invoice.pl | 3 +
.../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 175 +++++++++++++++------
2 files changed, 132 insertions(+), 46 deletions(-)
--- a/acqui/invoice.pl
+++ a/acqui/invoice.pl
@@ -236,6 +236,8 @@ foreach my $r ( @{$budgets} ) {
b_txt => $r->{budget_name},
b_active => $r->{budget_period_active},
selected => $selected,
+ b_sort1_authcat => $r->{'sort1_authcat'},
+ b_sort2_authcat => $r->{'sort2_authcat'},
};
}
@@ -251,6 +253,7 @@ $template->param(
suppliername => $details->{'suppliername'},
booksellerid => $details->{'booksellerid'},
shipmentdate => $details->{'shipmentdate'},
+ shipment_budget_id => $shipmentcost_budgetid,
billingdate => $details->{'billingdate'},
invoiceclosedate => $details->{'closedate'},
shipmentcost => $shipmentcost,
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
@@ -5,6 +5,53 @@
[% USE Price %]
[% SET footerjs = 1 %]
[% USE AuthorisedValues %]
+[% Asset.css("css/humanmsg.css") | $raw %]
+
+
+
+ [% FOREACH budget IN budgets %]
+ [% IF ( budget.b_active ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ [% END %]
+
+[% BLOCK fund_dropdown %]
+
+
+
+
+
+
+[% END %]
+
+
+
+
+
+
+
Updating the fund may change available statistics for the order, please check values before submitting.
+ [% PROCESS fund_dropdown form_id => 'modify_budget_id' form_name => 'modify_budget_id' selected => "" %]
+
+
+
+
+
+
+
Update fund
+
+
+
+
+
+
[% INCLUDE 'doc-head-open.inc' %]
Koha › Acquisitions › Invoice
@@ -75,25 +122,7 @@
[% END %]
-
- [% IF readonly %]
- [% budget.budget_name | html %]
- [% ELSE %]
-
-
-
- [% END %]
+ [% PROCESS fund_dropdown form_id => 'shipment_budget_id' form_name => 'shipment_budget_id' selected => shipment_budget_id %]
[% IF ( invoiceclosedate ) %]
@@ -197,18 +226,7 @@
[% IF readonly %]
[% adjustement.fund.budget_name | html %]
[% ELSE %]
-
+ [% PROCESS fund_dropdown form_id => "budget_id_" _ adjustment.adjustment_id form_name => 'budget_id' selected => adjustment.budget_id %]
[% END %]
[% IF adjustment.encumber_open %]
@@ -276,15 +294,7 @@
-
-
+ [% PROCESS fund_dropdown form_id => "budget_id_new" form_name => 'budget_id' selected => "" %]
@@ -359,7 +369,10 @@
[% order.total_tax_included | $Price %] |
[% order.tax_rate * 100 | html %] |
[% order.tax_value | $Price %] |
- [% order.budget_name | html %] |
+
+ [% order.budget_name | html %]
+ Modify fund
+ |
[% END %]
@@ -450,6 +463,8 @@
[% MACRO jsinclude BLOCK %]
[% Asset.js("js/acquisitions-menu.js") | $raw %]
+ [% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %]
+ [% Asset.js("js/acq.js") | $raw %]
[% INCLUDE 'calendar.inc' %]
[% INCLUDE 'datatables.inc' %]
--