From 12070db7d8c4e2878665345f2139ae9793964fc7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9rick=20Capovilla?= Date: Mon, 17 Oct 2011 16:01:29 -0400 Subject: [PATCH] Follow-up patch : use the subfield associated with items.barcode 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 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. Signed-off-by: Paul Poulain (cherry picked from commit 61e1eeee84083f835a85d43128f4b6cbeef636dd) Signed-off-by: Chris Nighswonger --- acqui/neworderempty.pl | 4 ++++ .../intranet-tmpl/prog/en/modules/acqui/neworderempty.tt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl index 02b829a409..459dfe88a6 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, @@ -386,6 +389,7 @@ $template->param( unitprice => sprintf("%.2f", $data->{'unitprice'}), 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 e6e5f624a7..68c290adba 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); } } -- 2.39.5