Lines 106-113
Link Here
|
106 |
+ '<td>' + order.ecost + '</td>' |
106 |
+ '<td>' + order.ecost + '</td>' |
107 |
+ '<td>' + order.ordertotal + '</td>' |
107 |
+ '<td>' + order.ordertotal + '</td>' |
108 |
+ '<td>' |
108 |
+ '<td>' |
109 |
+ '<a href="orderreceive.pl?ordernumber=' + order.ordernumber + '&datereceived=[% invoicedatereceived %]&invoice=[% invoice %]&gst=' + gst + '&freight=' + order.freight + '&supplierid=[% supplierid %]">Receive</a> /' |
109 |
+ '<a href="orderreceive.pl?ordernumber=' + order.ordernumber + '&datereceived=[% invoicedatereceived %]&invoice=[% invoice %]&gst=' + gst + '&freight=' + order.freight + '&booksellerid=[% booksellerid %]">Receive</a> /' |
110 |
+ '<a href="parcel.pl?type=intra&ordernumber=' + order.ordernumber + '&biblionumber=' + order.biblionumber + '&action=cancelorder&supplierid=[% supplierid %]&datereceived=[% invoicedatereceived %]&invoice=[% invoice %]" onclick="return confirm(\'' + _('Are you sure you want to cancel this order?') + '\');">Cancel</a>' |
110 |
+ '<a href="parcel.pl?type=intra&ordernumber=' + order.ordernumber + '&biblionumber=' + order.biblionumber + '&action=cancelorder&booksellerid=[% booksellerid %]&datereceived=[% invoicedatereceived %]&invoice=[% invoice %]" onclick="return confirm(\'' + _('Are you sure you want to cancel this order?') + '\');">Cancel</a>' |
111 |
+ '</td></tr>').appendTo("table#pendingt"); |
111 |
+ '</td></tr>').appendTo("table#pendingt"); |
112 |
} |
112 |
} |
113 |
|
113 |
|
Lines 118-124
Link Here
|
118 |
}catch(e){alert(e);} |
118 |
}catch(e){alert(e);} |
119 |
} |
119 |
} |
120 |
} |
120 |
} |
121 |
var transaction = YAHOO.util.Connect.asyncRequest('GET', '/cgi-bin/koha/acqui/parcel.pl?supplierid=[% supplierid %]&search='+summaryStatus+'&basketno='+basketStatus+'&orderno='+orderStatus+'&format=json', callback, null); |
121 |
var transaction = YAHOO.util.Connect.asyncRequest('GET', '/cgi-bin/koha/acqui/parcel.pl?booksellerid=[% booksellerid %]&search='+summaryStatus+'&basketno='+basketStatus+'&orderno='+orderStatus+'&format=json', callback, null); |
122 |
|
122 |
|
123 |
return false; |
123 |
return false; |
124 |
} |
124 |
} |
Lines 235-241
Link Here
|
235 |
<tr> |
235 |
<tr> |
236 |
[% END %] |
236 |
[% END %] |
237 |
<td class="basketfilterclass"><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a></td> |
237 |
<td class="basketfilterclass"><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a></td> |
238 |
<td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber %]&booksellerid=[% loop_order.supplierid %]">[% loop_order.ordernumber %]</a></td> |
238 |
<td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber %]&booksellerid=[% loop_order.booksellerid %]">[% loop_order.ordernumber %]</a></td> |
239 |
<td class="summaryfilterclass"> |
239 |
<td class="summaryfilterclass"> |
240 |
<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a> |
240 |
<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a> |
241 |
[% IF ( loop_order.author ) %] by [% loop_order.author %][% END %] |
241 |
[% IF ( loop_order.author ) %] by [% loop_order.author %][% END %] |
Lines 247-253
Link Here
|
247 |
<td>[% loop_order.ecost %]</td> |
247 |
<td>[% loop_order.ecost %]</td> |
248 |
<td>[% loop_order.ordertotal %]</td> |
248 |
<td>[% loop_order.ordertotal %]</td> |
249 |
<td> |
249 |
<td> |
250 |
<a href="orderreceive.pl?ordernumber=[% loop_order.ordernumber %]&datereceived=[% loop_order.invoicedatereceived %]&invoice=[% loop_order.invoice %]&gst=[% loop_order.gst %]&freight=[% loop_order.freight %]&supplierid=[% loop_order.supplierid %]">Receive</a> |
250 |
<a href="orderreceive.pl?ordernumber=[% loop_order.ordernumber %]&datereceived=[% loop_order.invoicedatereceived %]&invoice=[% loop_order.invoice %]&gst=[% loop_order.gst %]&freight=[% loop_order.freight %]&booksellerid=[% loop_order.booksellerid %]">Receive</a> |
251 |
|
251 |
|
252 |
</td> |
252 |
</td> |
253 |
<td> |
253 |
<td> |
Lines 281-297
Link Here
|
281 |
<div id="resultnumber"> |
281 |
<div id="resultnumber"> |
282 |
<!-- Row of numbers corresponding to search result pages --> |
282 |
<!-- Row of numbers corresponding to search result pages --> |
283 |
[% IF ( displayprev ) %] |
283 |
[% IF ( displayprev ) %] |
284 |
<a href="parcel.pl?type=intra&supplierid=[% supplierid %]&startfrom=[% prevstartfrom %][% IF ( datereceived ) %]&datereceived=[% datereceived %][% END %][% IF ( invoice ) %]&invoice=[% invoice %][% END %][% IF ( resultsperpage ) %]&resultsperpage=[% resultsperpage %][% END %]#resultnumber"><< Previous</a> |
284 |
<a href="parcel.pl?type=intra&booksellerid=[% booksellerid %]&startfrom=[% prevstartfrom %][% IF ( datereceived ) %]&datereceived=[% datereceived %][% END %][% IF ( invoice ) %]&invoice=[% invoice %][% END %][% IF ( resultsperpage ) %]&resultsperpage=[% resultsperpage %][% END %]#resultnumber"><< Previous</a> |
285 |
[% END %] |
285 |
[% END %] |
286 |
[% FOREACH number IN numbers %] |
286 |
[% FOREACH number IN numbers %] |
287 |
[% IF ( number.highlight ) %] |
287 |
[% IF ( number.highlight ) %] |
288 |
<span class="current">[% number.number %]</span> |
288 |
<span class="current">[% number.number %]</span> |
289 |
[% ELSE %] |
289 |
[% ELSE %] |
290 |
<a href="parcel.pl?type=intra&supplierid=[% supplierid %]&startfrom=[% number.startfrom %][% IF ( number.datereceived ) %]&datereceived=[% number.datereceived %][% END %][% IF ( number.invoice ) %]&invoice=[% number.invoice %][% END %][% IF ( number.resultsperpage ) %]&resultsperpage=[% number.resultsperpage %][% END %]#resultnumber">[% number.number %]</a> |
290 |
<a href="parcel.pl?type=intra&booksellerid=[% booksellerid %]&startfrom=[% number.startfrom %][% IF ( number.datereceived ) %]&datereceived=[% number.datereceived %][% END %][% IF ( number.invoice ) %]&invoice=[% number.invoice %][% END %][% IF ( number.resultsperpage ) %]&resultsperpage=[% number.resultsperpage %][% END %]#resultnumber">[% number.number %]</a> |
291 |
[% END %] |
291 |
[% END %] |
292 |
[% END %] |
292 |
[% END %] |
293 |
[% IF ( displaynext ) %] |
293 |
[% IF ( displaynext ) %] |
294 |
<a href="parcel.pl?type=intra&supplierid=[% supplierid %]&startfrom=[% nextstartfrom %][% IF ( datereceived ) %]&datereceived=[% datereceived %][% END %][% IF ( invoice ) %]&invoice=[% invoice %][% END %][% IF ( resultsperpage ) %]&resultsperpage=[% resultsperpage %][% END %]#resultnumber">Next >></a> |
294 |
<a href="parcel.pl?type=intra&booksellerid=[% booksellerid %]&startfrom=[% nextstartfrom %][% IF ( datereceived ) %]&datereceived=[% datereceived %][% END %][% IF ( invoice ) %]&invoice=[% invoice %][% END %][% IF ( resultsperpage ) %]&resultsperpage=[% resultsperpage %][% END %]#resultnumber">Next >></a> |
295 |
[% END %] |
295 |
[% END %] |
296 |
</div> |
296 |
</div> |
297 |
</div> |
297 |
</div> |
Lines 356-362
Link Here
|
356 |
<tr> |
356 |
<tr> |
357 |
[% END %] |
357 |
[% END %] |
358 |
<td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a></td> |
358 |
<td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a></td> |
359 |
<td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&booksellerid=[% supplierid %]">[% loop_receive.ordernumber %]</a></td> |
359 |
<td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td> |
360 |
<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.title |html %]</a> |
360 |
<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.title |html %]</a> |
361 |
[% IF ( loop_receive.author ) %] / [% loop_receive.author %][% END %] |
361 |
[% IF ( loop_receive.author ) %] / [% loop_receive.author %][% END %] |
362 |
[% IF ( loop_receive.isbn ) %] - [% loop_receive.isbn %][% END %] |
362 |
[% IF ( loop_receive.isbn ) %] - [% loop_receive.isbn %][% END %] |
Lines 375-383
Link Here
|
375 |
[% ELSE %]There are no received orders.[% END %] |
375 |
[% ELSE %]There are no received orders.[% END %] |
376 |
</div> |
376 |
</div> |
377 |
|
377 |
|
378 |
<!--<form action="/cgi-bin/koha/acqui/parcels.pl?supplierid=[% supplierid %]" method="post">--> |
378 |
<!--<form action="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]" method="post">--> |
379 |
<form action="parcels.pl?supplierid=[% supplierid %]" method="post"> |
379 |
<form action="parcels.pl?booksellerid=[% booksellerid %]" method="post"> |
380 |
<input type="hidden" name="supplierid" value="[% supplierid %]" /> |
380 |
<input type="hidden" name="booksellerid" value="[% booksellerid %]" /> |
381 |
<fieldset class="action"> |
381 |
<fieldset class="action"> |
382 |
<input type="submit" value="Finish receiving" /> |
382 |
<input type="submit" value="Finish receiving" /> |
383 |
</fieldset> |
383 |
</fieldset> |