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

(-)a/acqui/parcel.pl (-19 / +12 lines)
Lines 118-123 my ($template, $loggedinuser, $cookie) Link Here
118
});
118
});
119
119
120
my $invoiceid = $input->param('invoiceid');
120
my $invoiceid = $input->param('invoiceid');
121
my $invoice;
122
$invoice = GetInvoiceDetails($invoiceid) if $invoiceid;
123
124
unless( $invoiceid and $invoice->{invoiceid} ) {
125
    $template->param(
126
        error_invoice_not_known => 1,
127
        no_orders_to_display    => 1
128
    );
129
    output_html_with_http_headers $input, $cookie, $template->output;
130
    exit;
131
}
132
121
my $op = $input->param('op') // '';
133
my $op = $input->param('op') // '';
122
134
123
if ($op eq 'cancelreceipt') {
135
if ($op eq 'cancelreceipt') {
Lines 128-156 if ($op eq 'cancelreceipt') { Link Here
128
    }
140
    }
129
}
141
}
130
142
131
my $invoice = GetInvoiceDetails($invoiceid);
132
my $booksellerid = $invoice->{booksellerid};
143
my $booksellerid = $invoice->{booksellerid};
133
my $bookseller = GetBookSellerFromId($booksellerid);
144
my $bookseller = GetBookSellerFromId($booksellerid);
134
my $gst = $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
145
my $gst = $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
135
my $datereceived = C4::Dates->new();
146
my $datereceived = C4::Dates->new();
136
my $code            = $input->param('code');
137
my @rcv_err         = $input->param('error');
138
my @rcv_err_barcode = $input->param('error_bc');
139
140
141
142
# If receiving error, report the error (coming from finishrecieve.pl(sic)).
143
if( scalar(@rcv_err) ) {
144
	my $cnt=0;
145
	my $error_loop;
146
	for my $err (@rcv_err) {
147
		push @$error_loop, { "error_$err" => 1 , barcode => $rcv_err_barcode[$cnt] };
148
		$cnt++;
149
	}
150
	$template->param( receive_error => 1 ,
151
						error_loop => $error_loop,
152
					);
153
}
154
147
155
my $cfstr         = "%.2f";                                                           # currency format string -- could get this from currency table.
148
my $cfstr         = "%.2f";                                                           # currency format string -- could get this from currency table.
156
my @parcelitems   = @{ $invoice->{orders} };
149
my @parcelitems   = @{ $invoice->{orders} };
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-10 / +18 lines)
Lines 14-19 Link Here
14
    dt_overwrite_html_sorting_localeCompare();
14
    dt_overwrite_html_sorting_localeCompare();
15
15
16
    $(document).ready(function(){
16
    $(document).ready(function(){
17
      if ( $("#pendingt").length ) {
17
        var pendingt = $("#pendingt").dataTable($.extend(true, {}, dataTablesDefaults, {
18
        var pendingt = $("#pendingt").dataTable($.extend(true, {}, dataTablesDefaults, {
18
            "bStateSave": true,
19
            "bStateSave": true,
19
            "iCookieDuration": 60*60*24*1000, // 1000 days
20
            "iCookieDuration": 60*60*24*1000, // 1000 days
Lines 35-40 Link Here
35
            ],
36
            ],
36
            "sPaginationType": "four_button"
37
            "sPaginationType": "four_button"
37
        } ) );
38
        } ) );
39
      }
40
      if ( $("#receivedt").length ) {
38
        var receivedt = $("#receivedt").dataTable($.extend(true, {}, dataTablesDefaults, {
41
        var receivedt = $("#receivedt").dataTable($.extend(true, {}, dataTablesDefaults, {
39
            "bStateSave": true,
42
            "bStateSave": true,
40
            "iCookieDuration": 60*60*24*1000, // 1000 days
43
            "iCookieDuration": 60*60*24*1000, // 1000 days
Lines 55-65 Link Here
55
            ],
58
            ],
56
            "sPaginationType": "four_button"
59
            "sPaginationType": "four_button"
57
        } ) );
60
        } ) );
58
/*
61
      }
59
    $("#pendingt").tablesorter({
60
		headers: { 2: { sorter: 'articles' },3: { sorter: false },8:{sorter:false}}
61
    });
62
*/
63
62
64
    });
63
    });
65
64
Lines 144-150 Link Here
144
    [% END %]
143
    [% END %]
145
144
146
    [% IF (error_cancelling_receipt) %]
145
    [% IF (error_cancelling_receipt) %]
147
      <div class="error">
146
      <div class="dialog error">
148
      Cannot cancel receipt. Possible reasons :
147
      Cannot cancel receipt. Possible reasons :
149
      <ul>
148
      <ul>
150
        <li>
149
        <li>
Lines 161-166 Link Here
161
      </div>
160
      </div>
162
    [% END %]
161
    [% END %]
163
162
163
    [% IF error_invoice_not_known %]
164
        <div class="dialog error">
165
            The invoice referenced by this invoiceid does not exist.
166
        </div>
167
    [% END %]
168
169
[% UNLESS no_orders_to_display %]
164
<div id="acqui_receive_summary">
170
<div id="acqui_receive_summary">
165
<p><strong>Invoice number:</strong> [% invoice %] <strong>Received by:</strong> [% loggedinusername %] <strong>On:</strong> [% formatteddatereceived %]</p>
171
<p><strong>Invoice number:</strong> [% invoice %] <strong>Received by:</strong> [% loggedinusername %] <strong>On:</strong> [% formatteddatereceived %]</p>
166
</div>
172
</div>
Lines 200-208 Link Here
200
                [% END %]
206
                [% END %]
201
                <br />
207
                <br />
202
                [% IF ( loop_order.notes ) %]
208
                [% IF ( loop_order.notes ) %]
203
                    <p class="ordernote"><strong>Note: </strong>[% loop_order.notes|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&amp;referrer=/cgi-bin/koha/acqui/parcel.pl%3Fbooksellerid=[% loop_order.booksellerid %]&amp;datereceived=[% loop_order.invoicedatereceived %]&amp;invoice=[% loop_order.invoice %]">Change note</a>]</p>
209
                    <p class="ordernote"><strong>Note: </strong>[% loop_order.notes|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&amp;referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid %]">Change note</a>]</p>
204
                [% ELSE %]
210
                [% ELSE %]
205
                    [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&amp;referrer=/cgi-bin/koha/acqui/parcel.pl%3Fbooksellerid=[% loop_order.booksellerid %]&amp;datereceived=[% loop_order.invoicedatereceived %]&amp;invoice=[% loop_order.invoice %]">Add note</a>]
211
                    [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&amp;referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid %]">Add note</a>]
206
                [% END %]
212
                [% END %]
207
                </td>
213
                </td>
208
                <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_order.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% loop_order.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">Card</a></td>
214
                <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_order.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% loop_order.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">Card</a></td>
Lines 333-339 Link Here
333
	[% ELSE %]There are no received orders.[% END %]
339
	[% ELSE %]There are no received orders.[% END %]
334
</div>
340
</div>
335
341
336
<!--<form action="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]" method="post">-->
337
[% IF (invoiceclosedate) %]
342
[% IF (invoiceclosedate) %]
338
    <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid %]">View invoice</a>
343
    <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid %]">View invoice</a>
339
[% ELSE %]
344
[% ELSE %]
Lines 345-352 Link Here
345
    </form>
350
    </form>
346
[% END %]
351
[% END %]
347
352
353
[% END %]
354
348
</div>
355
</div>
349
</div>
356
</div>
357
358
350
<div class="yui-b">
359
<div class="yui-b">
351
<form action="/cgi-bin/koha/acqui/parcel.pl" id="filterform" method="post">
360
<form action="/cgi-bin/koha/acqui/parcel.pl" id="filterform" method="post">
352
        <fieldset class="brief">
361
        <fieldset class="brief">
353
- 

Return to bug 10317