[Koha-patches] [PATCH 2/2] [SIGNED-OFF] Follow-up patch : use the subfield associated with items.barcode

[Katrin Fischer]

From: Frédérick Capovilla <frederick.capovilla at libeo.com>

Instead of using the 'p' subfield directly, use the subfield letter
associated with the items.barcode column.

http://bugs.koha-community.org/show_bug.cgi?id=6963
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>

Test cases tested:
- 1 item, barcode empty
- 2 items, barcodes both empty
- 1 item, existing barcode
- 1 item, new barcode
- 2 items, one barcode empty, one existing

All test cases worked nicely and gave correct error messages.
---
 acqui/neworderempty.pl                             |    4 ++++
 .../prog/en/modules/acqui/neworderempty.tt         |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl
index 6361125..592758e 100755
--- a/acqui/neworderempty.pl
+++ b/acqui/neworderempty.pl
@@ -333,6 +333,9 @@ if (C4::Context->preference('AcqCreateItem') eq 'ordering' && !$ordernumber) {
 my @itemtypes;
 @itemtypes = C4::ItemType->all unless C4::Context->preference('item-level_itypes');
 
+# Find the items.barcode subfield for barcode validations
+my (undef, $barcode_subfield) = GetMarcFromKohaField('items.barcode', '');
+
 # fill template
 $template->param(
     close        => $close,
@@ -385,6 +388,7 @@ $template->param(
     ecost            => $data->{'ecost'},
     notes            => $data->{'notes'},
     publishercode    => $data->{'publishercode'},
+    barcode_subfield => $barcode_subfield,
     
     import_batch_id  => $import_batch_id,
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index ed5ee82..58b8493 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -53,7 +53,7 @@ function Check(ff) {
             if (ff.field_value[i].value.length == 0 && ff.mandatory[i].value == 1) {
                 empty_item_mandatory++;
             }
-            if(ff.subfield[i].value === 'p' && ff.field_value[i].value.length != 0) {
+            if(ff.subfield[i].value === '[% barcode_subfield %]' && ff.field_value[i].value.length != 0) {
                 barcodes.push(ff.field_value[i].value);
             }
         }
-- 
1.7.5.4