From 1b760f8e4df32f73861b96ffc5ea4e2d0bd196a5 Mon Sep 17 00:00:00 2001
From: Fridolin Somers <fridolin.somers@biblibre.com>
Date: Wed, 5 Mar 2014 14:26:14 +0100
Subject: [PATCH] Bug 11366: make "no group" option in acq basket group
 drop-down translatable

in Acq baskets, there's a pull-down for basket groups. One of the
entries in that pull-down is "No group", which is untranslatable.
This string is hard-coded in Perl.

This patch removes the string from Perl to set it has first option
in select. To allow it to be default value, the option "Add new group"
is moved to last position.

Test plan :
- Go to a closed aquisition basket in no basket group :
  cgi-bin/koha/acqui/basket.pl?basketno=x
=> You see "No group" selected in combobox "Basket group"
- Cick on this combobox
=> You see "No group", then existing basket groups and then "Add new
   group"
- Select a basket group and click on "change basket group"
=> You see the basket group name in combobox
Use translation, for example fr-FR
- go to src/misc/translator
- run : perl translate update fr-FR
=> You find in PO file :
  #: intranet-tmpl/prog/en/modules/acqui/basket.tt:365
  #, fuzzy, c-format
  msgid "No group"
  msgstr "Nom de groupe"
- remove ", fuzzy" and correct translation : "Pas de groupe"
- run : perl translate install fr-FR
- Go to translated aquisition basket page
=> You see translated option in combobox

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 21e6518d32477fa1fe59da64d735f3f07ae49bcd)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 acqui/basket.pl                                         | 7 -------
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 3 ++-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/acqui/basket.pl b/acqui/basket.pl
index 6833eb6512..1a6a6b04ea 100755
--- a/acqui/basket.pl
+++ b/acqui/basket.pl
@@ -306,13 +306,6 @@ if ( $op eq 'delete_confirm' ) {
                 $basketgroup = $bg;
             }
         }
-        my %emptygroup = ( id   =>   undef,
-                           name =>   "No group");
-        if ( ! $basket->{basketgroupid} ) {
-            $emptygroup{default} = 1;
-            $emptygroup{nogroup} = 1;
-        }
-        unshift( @$basketgroups, \%emptygroup );
     }
 
     # if the basket is closed, calculate estimated delivery date
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
index c94aa8644e..4c1a812ea7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -355,7 +355,7 @@
                             [%- END -%]
                           [% ELSE %]
                             <select id="basketgroupid" name="basketgroupid">
-                              <option value="new">Add new group</option>
+                              <option value="">No group</option>
                               [% FOREACH bg IN basketgroups %]
                                 [% IF ( bg.default ) %]
                                     <option value="[% bg.id %]" selected="selected">[% bg.name %]</option>
@@ -367,6 +367,7 @@
                                   [% END %]
                                 [% END %]
                               [% END %]
+                              <option value="new">Add new group</option>
                             </select>
                             <input type="hidden" id="basketno" value="[% basketno %]" name="basketno" />
                             <input type="hidden" value="mod_basket" name="op" />
-- 
2.39.5