From 4e86d9ea9e127d8a7d1deba59865220d19823183 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 20 Mar 2013 10:55:49 +0100 Subject: [PATCH] Bug 5343: Followup FIX quantity received if items are created when receiving For subscriptions, if items are created when receiving, the quantity received is always 1, not 0. + UI: Show the subscription search form (instead of hidden) Signed-off-by: Leila Arkab --- .../prog/en/modules/acqui/newordersubscription.tt | 2 ++ koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt index 38dc638..4ca5e31 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt @@ -34,6 +34,8 @@ }); $("#show_only_renewed").attr('checked', false); updateRowsVisibility(false); + + $("#advsearch_form").show(); }); //]]> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt index 5ee0ec2..9e16755 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -122,7 +122,7 @@ function IEEventHandler_KeyDown() { $(document).ready(function() { [% IF (AcqCreateItemReceiving) %] cloneItemBlock(0, '[% UniqueItemFields %]'); - [% ELSIF (AcqCreateItem == 'ordering') %] + [% ELSIF (AcqCreateItem == 'ordering') && not subscriptionid %] $("input[name='items_to_receive']").change(function() { CalcQtyToReceive(); }); @@ -304,7 +304,11 @@ function IEEventHandler_KeyDown() {
  • [% IF (AcqCreateItemReceiving) %] - + [% IF ( subscriptionid ) %] + + [% ELSE %] + + [% END %] [% ELSE %] [% IF ( quantityreceived ) %] [% IF ( edit ) %] -- 1.7.10.4