Bugzilla – Attachment 26447 Details for
Bug 11744
cancel receipt doesn't work for one item
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11744: A receipt should not be cancelled if holds exist
Bug-11744-A-receipt-should-not-be-cancelled-if-hol.patch (text/plain), 2.83 KB, created by
Jonathan Druart
on 2014-03-19 12:05:09 UTC
(
hide
)
Description:
Bug 11744: A receipt should not be cancelled if holds exist
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2014-03-19 12:05:09 UTC
Size:
2.83 KB
patch
obsolete
>From 40d2b065e0292738c557c5dcf08f5accc291c16d Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Wed, 19 Mar 2014 12:54:15 +0100 >Subject: [PATCH] Bug 11744: A receipt should not be cancelled if holds exist > >Test plan: >1/ Set acqCreateItem pref to on receiving >2/ Receive 1 of 2 items ordered >3/ Place a hold on the record >4/ Verify you are not able to cancel the receipt. > >This is not the best way to do that but it is the easy one. >--- > .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 17 +++++++++++++---- > 1 file changed, 13 insertions(+), 4 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >index b537148..fc45f9e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -1,3 +1,4 @@ >+[% USE Koha %] > [% USE currency = format('%.2f') -%] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › [% IF ( date ) %] >@@ -431,7 +432,8 @@ > <td>[% loop_receive.unitprice %]</td> > <td>[% loop_receive.total %]</td> > <td> >- [% IF (loop_receive.cannot_cancel) %] >+ [% IF loop_receive.cannot_cancel or ( Koha.Preference("AcqCreateItem") == "receiving" and loop_receive.holds > 0 ) %] >+ [% IF loop_receive.cannot_cancel %] > [% span_title = BLOCK %] > Cannot cancel receipt of this order line because it > was created from a partial receipt of order line no. >@@ -439,9 +441,16 @@ > already received. Try cancelling this one first and > retry. > [% END %] >- <span title="[% span_title | collapse %]"> >- Can't cancel receipt >- </span> >+ [% ELSE %] >+ [%# FIXME Here we block the cancellation if holds exist. Actually it could be possible if items will be exist after the deletion %] >+ [%# Some additional checks should be added in the pl file %] >+ [% span_title = BLOCK %] >+ Cannot cancel receipt of this order line because at least one reservation exists on the records. >+ [% END %] >+ [% END %] >+ <span title="[% span_title | collapse %]"> >+ Can't cancel receipt >+ </span> > [% ELSE %] > <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid %]&op=cancelreceipt&ordernumber=[% loop_receive.ordernumber %]">Cancel receipt</a> > [% END %] >-- >1.7.10.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 11744
:
25201
|
25444
|
25445
|
25682
|
25683
|
26447
|
29622
|
29626
|
29627
|
29628