Fix for Bug 4980 - Acq: pull down 'Restrict access to:' for funds not translatable

Applied Owen's patch to current head, updated de-DE translation. The pull down values are now  translated.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bd28366523c0778f496a310395f4481348e30ccf)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl
index 95f5f26..34a4021 100755 (executable)
--- a/admin/aqbudgets.pl
+++ b/admin/aqbudgets.pl
@@ -184,16 +184,17 @@ if ($op eq 'add_form') {
     $template->param(authorised_value_categories1 => \@auth_cats_loop1);
     $template->param(authorised_value_categories2 => \@auth_cats_loop2);
 
-    my $budget_perm_dropbox =
-    GetBudgetPermDropbox($budget->{'budget_permission'});
-    
+    if($budget->{'budget_permission'}){
+        my $budget_permission = "budget_perm_".$budget->{'budget_permission'};
+        $template->param($budget_permission => 1);
+    }
+
     # if no buget_id is passed then its an add
     $template->param(
         add_validate                  => 1,
         dateformat                => C4::Dates->new()->visual(),
         budget_parent_id                 => $budget_parent->{'budget_id'},
         budget_parent_name               => $budget_parent->{'budget_name'},
-        budget_perm_dropbox       => $budget_perm_dropbox,
         branchloop_select         => \@branchloop_select,
                %$period,
                %$budget,

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
index 9e8cf85..5e0db00 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
@@ -315,7 +315,11 @@
 
     <li>
     <label for="budget_permission">Restrict access to: </label>
-    <!-- TMPL_VAR name="budget_perm_dropbox" -->
+    <select name="budget_permission" id="budget_permission">
+    <!-- TMPL_IF NAME="budget_perm_0" --><option value="0" selected="selected">None</option><!-- TMPL_ELSE --><option value="0">None</option><!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="budget_perm_1" --><option value="1" selected="selected">Owner</option><!-- TMPL_ELSE --><option value="1">Owner</option><!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="budget_perm_2" --><option value="2" selected="selected">Library</option><!-- TMPL_ELSE --><option value="2">Library</option><!-- /TMPL_IF -->
+    </option>
     </li>
 
     <li>