gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 24434: Submit on print slip 

This patch ensures that the print slip option on the WrongTransfer modal
also submits the form and thus triggers the actual transfer of the item.

We also prevent a double transfer submission (and thus a cancellation
line appearing in the branchtransfers table) for the case where a
transfer back home is triggered.

Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Martin Renvoize 2021-05-17 10:42:04 +01:00 committed by Kyle M Hall
parent 43f1480c25
commit 3db6d7dc9c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
View File

@ -459,7 +459,7 @@
<!-- CONFIRM -->
<button class="btn btn-default approve" type="submit"><i class="fa fa-check"></i> OK</button>
<!-- PRINT SLIP -->
<button type="button" data-dismiss="modal" class="btn btn-default transit openWin" data-transfer="[% NewTransfer | html %]" data-url="transfer-slip.pl?transferitem=[% itemnumber | uri %]&amp;&amp;branchcode=[% TransferWaitingAt | uri %]&amp;op=slip"><i class="fa fa-print"></i> Print transfer slip</button>
<button type="button" data-dismiss="modal" class="btn btn-default submit openWin" data-transfer="[% NewTransfer | html %]" data-url="transfer-slip.pl?transferitem=[% itemnumber | uri %]&amp;&amp;branchcode=[% TransferWaitingAt | uri %]&amp;op=slip"><i class="fa fa-print"></i> Print transfer slip</button>
<!-- CANCEL TRANSFER -->
<button type="button" data-dismiss="modal" class="btn btn-default deny cancel"><i class="fa fa-times"></i> Cancel transfer</button>
</div> <!-- /.modal-footer -->
@ -606,7 +606,7 @@
<button type="button" data-dismiss="modal" class="btn btn-default deny" name="notransfer" value="No"><i class="fa fa-times"></i> No</button>
[% ELSE %]
<button type="button" data-dismiss="modal" class="btn btn-default approve"><i class="fa fa-check"></i> OK</button>
<button type="button" data-dismiss="modal" name="dotransfer" class="btn btn-default print openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | uri %]&amp;branchcode=[% transfer | uri %]&amp;op=slip"><i class="fa fa-print"></i> Print slip</button>
<button type="button" data-dismiss="modal" class="btn btn-default print openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | uri %]&amp;branchcode=[% transfer | uri %]&amp;op=slip"><i class="fa fa-print"></i> Print slip</button>
[% END %]
<input type="hidden" name="return_date_override" value="[% return_date_override | html %]" />
<input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember | html %]" />
@ -1128,6 +1128,10 @@
Dopop( $(this).data("url") );
});
$('.submit').on("click",function(e){
this.form.submit();
});
$('.cancel').on("click",function(e){
var docancel = $("<input>").attr("type", "hidden").attr("name", "canceltransfer").val(1);
$('#wrongtransferform').append(docancel);