View | Details | Raw Unified | Return to bug 7162
Collapse All | Expand All

(-)a/C4/Acquisition.pm (-5 / +42 lines)
Lines 1278-1298 cancelled. Link Here
1278
=cut
1278
=cut
1279
1279
1280
sub DelOrder {
1280
sub DelOrder {
1281
    my ( $bibnum, $ordernumber ) = @_;
1281
    my ( $bibnum, $ordernumber, $delete_biblio, $reason ) = @_;
1282
1283
    my $error;
1282
    my $dbh = C4::Context->dbh;
1284
    my $dbh = C4::Context->dbh;
1283
    my $query = "
1285
    my $query = "
1284
        UPDATE aqorders
1286
        UPDATE aqorders
1285
        SET    datecancellationprinted=now()
1287
        SET    datecancellationprinted=now()
1286
        WHERE  biblionumber=? AND ordernumber=?
1288
    ";
1289
    if($reason) {
1290
        $query .= "
1291
            , notes = IF(notes IS NULL,
1292
                CONCAT('Cancellation reason: ', ?),
1293
                CONCAT(notes, ' - Cancellation reason: ', ?)
1294
            )
1295
        ";
1296
    }
1297
    $query .= "
1298
        WHERE biblionumber=? AND ordernumber=?
1287
    ";
1299
    ";
1288
    my $sth = $dbh->prepare($query);
1300
    my $sth = $dbh->prepare($query);
1289
    $sth->execute( $bibnum, $ordernumber );
1301
    if($reason) {
1302
        $sth->execute($reason, $reason, $bibnum, $ordernumber);
1303
    } else {
1304
        $sth->execute( $bibnum, $ordernumber );
1305
    }
1290
    $sth->finish;
1306
    $sth->finish;
1307
1291
    my @itemnumbers = GetItemnumbersFromOrder( $ordernumber );
1308
    my @itemnumbers = GetItemnumbersFromOrder( $ordernumber );
1292
    foreach my $itemnumber (@itemnumbers){
1309
    foreach my $itemnumber (@itemnumbers){
1293
    	C4::Items::DelItem( $dbh, $bibnum, $itemnumber );
1310
        my $delcheck = C4::Items::DelItemCheck( $dbh, $bibnum, $itemnumber );
1311
1312
        if($delcheck != 1) {
1313
            $error->{'delitem'} = 1;
1314
        }
1315
    }
1316
1317
    if($delete_biblio) {
1318
        # We get the number of remaining items
1319
        my $itemcount = C4::Items::GetItemsCount($bibnum);
1320
1321
        # If there are no items left,
1322
        if ( $itemcount == 0 ) {
1323
            # We delete the record
1324
            my $delcheck = DelBiblio($bibnum);
1325
1326
            if($delcheck) {
1327
                $error->{'delbiblio'} = 1;
1328
            }
1329
        }
1294
    }
1330
    }
1295
    
1331
1332
    return $error;
1296
}
1333
}
1297
1334
1298
=head2 FUNCTIONS ABOUT PARCELS
1335
=head2 FUNCTIONS ABOUT PARCELS
(-)a/acqui/addorder.pl (-45 / +3 lines)
Lines 123-129 use strict; Link Here
123
use warnings;
123
use warnings;
124
use CGI;
124
use CGI;
125
use C4::Auth;			# get_template_and_user
125
use C4::Auth;			# get_template_and_user
126
use C4::Acquisition;	# NewOrder DelOrder ModOrder
126
use C4::Acquisition;	# NewOrder ModOrder
127
use C4::Suggestions;	# ModStatus
127
use C4::Suggestions;	# ModStatus
128
use C4::Biblio;			# AddBiblio TransformKohaToMarc
128
use C4::Biblio;			# AddBiblio TransformKohaToMarc
129
use C4::Items;
129
use C4::Items;
Lines 153-196 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
153
my $orderinfo					= $input->Vars;
153
my $orderinfo					= $input->Vars;
154
$orderinfo->{'list_price'}    ||=  0;
154
$orderinfo->{'list_price'}    ||=  0;
155
$orderinfo->{'uncertainprice'} ||= 0;
155
$orderinfo->{'uncertainprice'} ||= 0;
156
#my $ordernumber        = $input->param('ordernumber');
157
#my $basketno      = $input->param('basketno');
158
#my $booksellerid  = $input->param('booksellerid');
159
#my $existing      = $input->param('existing');    # existing biblio, (not basket or order)
160
#my $title         = $input->param('title');
161
#my $author        = $input->param('author');
162
#my $publicationyear= $input->param('publicationyear');
163
#my $isbn          = $input->param('ISBN');
164
#my $itemtype      = $input->param('format');
165
#my $quantity      = $input->param('quantity');		# FIXME: else ERROR!
166
#my $branch        = $input->param('branch');
167
#my $series        = $input->param('series');
168
#my $notes         = $input->param('notes');
169
#my $budget_id     = $input->param('budget_id');
170
#my $sort1         = $input->param('sort1');
171
#my $sort2         = $input->param('sort2');
172
#my $rrp           = $input->param('rrp');
173
#my $ecost         = $input->param('ecost');
174
#my $gst           = $input->param('GST');
175
#my $budget        = $input->param('budget');
176
#my $cost          = $input->param('cost');
177
#my $sub           = $input->param('sub');
178
#my $purchaseorder = $input->param('purchaseordernumber');
179
#my $invoice       = $input->param('invoice');
180
#my $publishercode = $input->param('publishercode');
181
#my $suggestionid  = $input->param('suggestionid');
182
#my $biblionumber  = $input->param('biblionumber');
183
#my $uncertainprice = $input->param('uncertainprice');
184
#my $import_batch_id= $input->param('import_batch_id');
185
#
186
#my $createbibitem = $input->param('createbibitem');
187
#
188
my $user          = $input->remote_user;
189
# create, modify or delete biblio
156
# create, modify or delete biblio
190
# create if $quantity>=0 and $existing='no'
157
# create if $quantity>0 and $existing='no'
191
# modify if $quantity>=0 and $existing='yes'
158
# modify if $quantity>0 and $existing='yes'
192
# delete if $quantity has been set to 0 by the librarian
193
# delete biblio if delbiblio has been set to 1 by the librarian
194
my $bibitemnum;
159
my $bibitemnum;
195
if ( $orderinfo->{quantity} ne '0' ) {
160
if ( $orderinfo->{quantity} ne '0' ) {
196
    #TODO:check to see if biblio exists
161
    #TODO:check to see if biblio exists
Lines 270-282 if ( $orderinfo->{quantity} ne '0' ) { Link Here
270
235
271
}
236
}
272
237
273
else { # qty=0, delete the line
274
    my $biblionumber = $input->param('biblionumber');
275
    DelOrder( $biblionumber, $$orderinfo{ordernumber} );
276
    if ($orderinfo->{delbiblio} == 1){
277
     DelBiblio($biblionumber);
278
    }
279
}
280
my $basketno=$$orderinfo{basketno};
238
my $basketno=$$orderinfo{basketno};
281
my $booksellerid=$$orderinfo{booksellerid};
239
my $booksellerid=$$orderinfo{booksellerid};
282
if (my $import_batch_id=$$orderinfo{import_batch_id}) {
240
if (my $import_batch_id=$$orderinfo{import_batch_id}) {
(-)a/acqui/cancelorder.pl (+79 lines)
Line 0 Link Here
1
#!/usr/bin/perl
2
3
# Copyright 2011 BibLibre SARL
4
# This file is part of Koha.
5
#
6
# Koha is free software; you can redistribute it and/or modify it under the
7
# terms of the GNU General Public License as published by the Free Software
8
# Foundation; either version 2 of the License, or (at your option) any later
9
# version.
10
#
11
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
12
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
13
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
14
#
15
# You should have received a copy of the GNU General Public License along
16
# with Koha; if not, write to the Free Software Foundation, Inc.,
17
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18
19
=head1 NAME
20
21
cancelorder.pl
22
23
=head1 DESCRIPTION
24
25
Ask confirmation for cancelling an order line
26
and add possibility to indicate a reason for cancellation
27
(saved in aqorders.notes)
28
29
=cut
30
31
use Modern::Perl;
32
33
use CGI;
34
use C4::Auth;
35
use C4::Output;
36
# FIXME: C4::Search is needed by C4::Items::GetAnalyticsCount, which is called
37
# by C4::Acquisition::DelOrder. But C4::Search is not imported by C4::Items.
38
# Once this problem is resolved, the following line can be removed.
39
# See Bug 7847.
40
use C4::Search;
41
use C4::Acquisition;
42
43
my $input = new CGI;
44
my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
45
    template_name   => 'acqui/cancelorder.tt',
46
    query           => $input,
47
    type            => 'intranet',
48
    authnotrequired => 0,
49
    flagsrequired   => { 'acquisition' => 'order_manage' },
50
    debug           => 1,
51
} );
52
53
my $action = $input->param('action');
54
my $ordernumber = $input->param('ordernumber');
55
my $biblionumber = $input->param('biblionumber');
56
my $referrer = $input->param('referrer') || $input->referer;
57
my $del_biblio = $input->param('del_biblio') ? 1 : 0;
58
59
if($action and $action eq "confirmcancel") {
60
    my $reason = $input->param('reason');
61
    my $error = DelOrder($biblionumber, $ordernumber, $del_biblio, $reason);
62
63
    if($error) {
64
        $template->param(error_delitem => 1) if $error->{'delitem'};
65
        $template->param(error_delbiblio => 1) if $error->{'delbiblio'};
66
    } else {
67
        $template->param(success_cancelorder => 1);
68
    }
69
    $template->param(confirmcancel => 1);
70
}
71
72
$template->param(
73
    ordernumber => $ordernumber,
74
    biblionumber => $biblionumber,
75
    referrer => $referrer,
76
    del_biblio => $del_biblio,
77
);
78
79
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-15 / +2 lines)
Lines 27-45 Link Here
27
                    window.location = "[% script_name %]?op=delete_confirm&basketno=[% basketno %]&booksellerid=[% booksellerid %]";
27
                    window.location = "[% script_name %]?op=delete_confirm&basketno=[% basketno %]&booksellerid=[% booksellerid %]";
28
                }
28
                }
29
            }
29
            }
30
            function confirm_delete_item(ordernumber, biblionumber) {
31
                var is_confirmed = confirm(_('Are you sure you want to delete this order ?'));
32
                if (is_confirmed) {
33
                    window.location = "addorder.pl?ordernumber="+ordernumber+"&basketno=[% basketno %]&quantity=0&biblionumber="+biblionumber;
34
                }
35
            }
36
            
37
            function confirm_delete_biblio(ordernumber, biblionumber) {
38
                var is_confirmed = confirm(_('Are you sure you want to delete this catalog record and order ?'));
39
                if (is_confirmed) {
40
                    window.location = "addorder.pl?ordernumber="+ordernumber+"&basketno=[% basketno %]&quantity=0&biblionumber="+biblionumber+"&delbiblio=1";
41
                    }
42
            }
43
30
44
//]]>
31
//]]>
45
</script>
32
</script>
Lines 312-321 Link Here
312
                            [% IF ( books_loo.left_holds_on_order ) %]
299
                            [% IF ( books_loo.left_holds_on_order ) %]
313
                            <span class="button" title="Can't delete order, ([% books_loo.holds_on_order %]) holds are linked with this order cancel holds first">Can't delete order</span><br>
300
                            <span class="button" title="Can't delete order, ([% books_loo.holds_on_order %]) holds are linked with this order cancel holds first">Can't delete order</span><br>
314
                            [% ELSE %]
301
                            [% ELSE %]
315
                            <a href="javascript:confirm_delete_item([% books_loo.ordernumber %],[% books_loo.biblionumber %])" class="button">Delete order</a><br>
302
                            <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber %]&biblionumber=[% books_loo.biblionumber %]&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno %]" class="button">Delete order</a><br>
316
                            [% END %]
303
                            [% END %]
317
                            [% IF ( books_loo.can_del_bib ) %]
304
                            [% IF ( books_loo.can_del_bib ) %]
318
                            <a href="javascript:confirm_delete_biblio([% books_loo.ordernumber %],[% books_loo.biblionumber %])" class="button">Delete order and catalog record</a><br>
305
                            <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber %]&biblionumber=[% books_loo.biblionumber %]&del_biblio=1&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno %]" class="button">Delete order and catalog record</a><br>
319
                            [% ELSE %]
306
                            [% ELSE %]
320
                            <span class="button" title="Can't delete catalog record, see constraints below">Can't delete order and catalog record</span><br>
307
                            <span class="button" title="Can't delete catalog record, see constraints below">Can't delete order and catalog record</span><br>
321
                            [% END %]
308
                            [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt (+62 lines)
Line 0 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Acquisition &rsaquo; Cancel order</title>
3
[% INCLUDE 'doc-head-close.inc' %]
4
</head>
5
6
<body>
7
[% INCLUDE 'header.inc' %]
8
9
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a> &rsaquo; Cancel order</div>
10
11
<div id="doc3" class="yui-t2">
12
13
<div id="bd">
14
  <div id="yui-main">
15
    <div class="yui-b">
16
      [% UNLESS ( confirmcancel ) %]
17
      <form method="post" action="">
18
        <div class="dialog alert">
19
          <h3>Are you sure you want to cancel this order ([% ordernumber %])</h3>
20
          <p>
21
            [% IF (del_biblio) %]
22
              Bibliographic record will be deleted too.
23
            [% ELSE %]
24
              Bibliographic record will not be deleted.
25
            [% END %]
26
          </p>
27
          <p>
28
            <textarea name="reason" placeholder="Reason of cancellation"></textarea>
29
          </p>
30
          <input type="hidden" name="action" value="confirmcancel" />
31
          <input type="hidden" value="[% ordernumber %]" name="ordernumber" />
32
          <input type="hidden" value="[% biblionumber %]" name="biblionumber" />
33
          <input type="hidden" value="[% referrer %]" name="referrer" />
34
          [% IF (del_biblio) %]
35
            <input type="hidden" value="1" name="del_biblio" />
36
          [% END %]
37
          <input type="submit" class="approve" value="Yes, Cancel (Y)" accesskey="y" />
38
          <input type="submit" class="deny" value="No, Don't Cancel (N)" accesskey="n" onclick="window.location='[% referrer %]';return false;" />
39
        </div>
40
      </form>
41
      [% ELSE %]
42
        [% IF ( success_cancelorder ) %]
43
            <div class="dialog message">
44
                The order has been successfully canceled
45
        [% ELSE %]
46
            <div class="dialog alert">
47
                An error has occured.
48
                [% IF ( error_delitem ) %]
49
                    <p>The order has been canceled, although one or more items could not have been deleted.</p>
50
                [% END %]
51
                [% IF ( error_delbiblio ) %]
52
                <p>The order has been canceled, although the record has not been deleted.</p>
53
                [% END %]
54
        [% END %]
55
                <p>Click <a href="[% referrer %]">here</a> to return to previous page</p>
56
            </div>
57
      [% END %]
58
59
    </div>
60
  </div>
61
</div>
62
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-22 / +3 lines)
Lines 107-113 Link Here
107
                       + '<td>' + order.ordertotal + '</td>'
107
                       + '<td>' + order.ordertotal + '</td>'
108
                       + '<td>'
108
                       + '<td>'
109
                       + '<a href="orderreceive.pl?ordernumber=' + order.ordernumber + '&amp;datereceived=[% invoicedatereceived %]&amp;invoice=[% invoice %]&amp;gst=' + gst + '&amp;freight=' + order.freight + '&amp;booksellerid=[% booksellerid %]">Receive</a> /'
109
                       + '<a href="orderreceive.pl?ordernumber=' + order.ordernumber + '&amp;datereceived=[% invoicedatereceived %]&amp;invoice=[% invoice %]&amp;gst=' + gst + '&amp;freight=' + order.freight + '&amp;booksellerid=[% booksellerid %]">Receive</a> /'
110
                       + '<a href="parcel.pl?type=intra&amp;ordernumber=' + order.ordernumber + '&amp;biblionumber=' + order.biblionumber + '&amp;action=cancelorder&amp;booksellerid=[% booksellerid %]&amp;datereceived=[% invoicedatereceived %]&amp;invoice=[% invoice %]" onclick="return confirm(\'' + _('Are you sure you want to cancel this order?') + '\');">Cancel</a>'
110
                       + '<a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=' + order.ordernumber + '&amp;biblionumber=' + order.biblionumber + '&amp;referrer=[% "/cgi-bin/koha/acqui/parcel.pl?booksellerid=$booksellerid&datereceived=$datereceived&invoice=$invoice" | uri %]">Cancel</a>'
111
                       + '</td></tr>').appendTo("table#pendingt");
111
                       + '</td></tr>').appendTo("table#pendingt");
112
				}
112
				}
113
113
Lines 133-156 Link Here
133
133
134
//]]>
134
//]]>
135
</script>
135
</script>
136
<script type="text/javascript">
137
//<![CDATA[
138
            function confirm_delete_item(ordernumber, basketno, biblionumber) {
139
                var is_confirmed = confirm(_('Are you sure you want to delete this order ?'));
140
                if (is_confirmed) {
141
                    window.location = "addorder.pl?ordernumber="+ordernumber+"&basketno="+basketno+"&quantity=0&biblionumber="+biblionumber;
142
                }
143
            }
144
            
145
            function confirm_delete_biblio(ordernumber, biblionumber) {
146
                var is_confirmed = confirm(_('Are you sure you want to delete this catalog record and order ?'));
147
                if (is_confirmed) {
148
                    window.location = "addorder.pl?ordernumber="+ordernumber+"&basketno="+basketno+"&quantity=0&biblionumber="+biblionumber+"&delbiblio=1";
149
                    }
150
            }
151
152
//]]>
153
</script>
154
136
155
</head>
137
</head>
156
<body id="acq_parcel" class="acq">
138
<body id="acq_parcel" class="acq">
Lines 265-274 Link Here
265
				    [% IF ( loop_order.left_holds_on_order ) %]
247
				    [% IF ( loop_order.left_holds_on_order ) %]
266
                    <span class="button" title="Can't delete order, ([% loop_order.holds_on_order %]) holds are linked with this order cancel holds first">Can't delete order</span><br>
248
                    <span class="button" title="Can't delete order, ([% loop_order.holds_on_order %]) holds are linked with this order cancel holds first">Can't delete order</span><br>
267
                    [% ELSE %]
249
                    [% ELSE %]
268
                    <a href="javascript:confirm_delete_item([% loop_order.ordernumber %],[% loop_order.basketno %],[% loop_order.biblionumber %])" class="button">Delete order</a><br>
250
                    <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% loop_order.ordernumber %]&biblionumber=[% loop_order.biblionumber %]&referrer=[% "/cgi-bin/koha/acqui/parcel.pl?booksellerid=$booksellerid&datereceived=$datereceived&invoice=$invoice" | uri %]">Delete order</a><br />
269
                    [% END %]
251
                    [% END %]
270
                    [% IF ( loop_order.can_del_bib ) %]
252
                    [% IF ( loop_order.can_del_bib ) %]
271
                    <a href="javascript:confirm_delete_biblio([% loop_order.ordernumber %],[% loop_order.basketno %],[% loop_order.biblionumber %])" class="button">Delete order and catalog record</a><br>
253
                    <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% loop_order.ordernumber %]&biblionumber=[% loop_order.biblionumber %]&del_biblio=1&referrer=[% "/cgi-bin/koha/acqui/parcel.pl?booksellerid=$booksellerid&datereceived=$datereceived&invoice=$invoice" | uri %]">Delete order and catalog record</a><br />
272
                    [% ELSE %]
254
                    [% ELSE %]
273
                    <span class="button" title="Can't delete catalog record, see constraints below">Can't delete order and catalog record</span><br>
255
                    <span class="button" title="Can't delete catalog record, see constraints below">Can't delete order and catalog record</span><br>
274
                    [% END %]
256
                    [% END %]
275
- 

Return to bug 7162