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

(-)a/acqui/modordernotes.pl (+72 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
modordernotes.pl
22
23
=head1 DESCRIPTION
24
25
Modify just notes when basket is closed.
26
27
=cut
28
29
use Modern::Perl;
30
31
use CGI;
32
use C4::Auth;
33
use C4::Output;
34
use C4::Acquisition;
35
36
my $input = new CGI;
37
my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
38
    template_name   => 'acqui/modordernotes.tmpl',
39
    query           => $input,
40
    type            => 'intranet',
41
    authnotrequired => 0,
42
    flagsrequired   => { 'acquisition' => '*' },
43
    debug           => 1,
44
} );
45
46
my $op = $input->param('op');
47
my $ordernumber = $input->param('ordernumber');
48
my $referrer = $input->param('referrer') || $input->referer();
49
50
my $order = GetOrder($ordernumber);
51
52
if($op and $op eq 'save') {
53
    my $ordernotes = $input->param('ordernotes');
54
    $order->{'notes'} = $ordernotes;
55
    ModOrder($order);
56
} else {
57
    $template->param(
58
        ordernotes => $order->{'notes'},
59
    );
60
}
61
62
if($op) {
63
    $template->param($op => 1);
64
}
65
66
$template->param(
67
    ordernumber => $ordernumber,
68
    referrer => $referrer,
69
);
70
71
72
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/acqui/neworderempty.pl (+5 lines)
Lines 121-126 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
121
    }
121
    }
122
);
122
);
123
123
124
if(!$basketno) {
125
    my $order = GetOrder($ordernumber);
126
    $basketno = $order->{'basketno'};
127
}
128
124
my $basket = GetBasket($basketno);
129
my $basket = GetBasket($basketno);
125
my $contract = &GetContract($basket->{contractnumber});
130
my $contract = &GetContract($basket->{contractnumber});
126
131
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-12 / +17 lines)
Lines 278-296 Link Here
278
                        <td>
278
                        <td>
279
                            <p>[% IF ( books_loo.order_received ) %] (rcvd)[% END %]
279
                            <p>[% IF ( books_loo.order_received ) %] (rcvd)[% END %]
280
                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% books_loo.biblionumber %]">[% books_loo.title |html %]</a> by [% books_loo.author %]
280
                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% books_loo.biblionumber %]">[% books_loo.title |html %]</a> by [% books_loo.author %]
281
                                    [% IF ( books_loo.notes ) %] [% books_loo.notes %][% END %]
281
                                <br />
282
                                    [% IF ( books_loo.isbn ) %] - [% books_loo.isbn %][% END %]
282
                                [% IF ( books_loo.notes ) %]
283
                                    [% IF ( books_loo.issn ) %] - [% books_loo.issn %][% END %]
283
                                    [% books_loo.notes|html %] - <a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno %]">Change note</a>
284
                                    [% IF ( books_loo.publishercode ) %], [% books_loo.publishercode %][% END %]
284
                                [% ELSE %]
285
                                    [% IF ( books_loo.publicationyear ) %], [% books_loo.publicationyear %][% END %]
285
                                    <a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno %]">Add note</a>
286
                                    [% IF ( books_loo.suggestionid ) %]
286
                                [% END %]
287
                                        <br/>
287
                                [% IF ( books_loo.isbn ) %] - [% books_loo.isbn %][% END %]
288
                                        Suggested by: [% books_loo.surnamesuggestedby %][% IF ( books_loo.firstnamesuggestedby ) %], [% books_loo.firstnamesuggestedby %] [% END %]
288
                                [% IF ( books_loo.issn ) %] - [% books_loo.issn %][% END %]
289
                                        (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid %]">suggestion #[% books_loo.suggestionid %]</a>)
289
                                [% IF ( books_loo.publishercode ) %], [% books_loo.publishercode %][% END %]
290
                                    [% END %]
290
                                [% IF ( books_loo.publicationyear ) %], [% books_loo.publicationyear %][% END %]
291
                                    [% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %]
291
                                [% IF ( books_loo.suggestionid ) %]
292
                                    <br/>
293
                                    Suggested by: [% books_loo.surnamesuggestedby %][% IF ( books_loo.firstnamesuggestedby ) %], [% books_loo.firstnamesuggestedby %] [% END %]
294
                                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid %]">suggestion #[% books_loo.suggestionid %]</a>)
295
                                [% END %]
296
                                [% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %]
292
                            </p>
297
                            </p>
293
                            </td>
298
                        </td>
294
                        <td class="number">[% books_loo.rrp %]</td>
299
                        <td class="number">[% books_loo.rrp %]</td>
295
                        <td class="number">[% books_loo.ecost %]</td>
300
                        <td class="number">[% books_loo.ecost %]</td>
296
                        <td class="number">[% books_loo.quantity %]</td>
301
                        <td class="number">[% books_loo.quantity %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt (+47 lines)
Line 0 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Acquisition &rsaquo; Change order notes</title>
3
[% INCLUDE 'doc-head-close.inc' %]
4
<script type="text/javascript">
5
//<![CDATA[
6
function returnToReferrer() {
7
    window.location.href = "[% referrer %]";
8
}
9
//]]>
10
</script>
11
</head>
12
13
<body>
14
[% INCLUDE 'header.inc' %]
15
16
<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; Change order notes</div>
17
18
<div id="doc3" class="yui-t2">
19
20
<div id="bd">
21
  <div id="yui-main">
22
    <div class="yui-b">
23
        [% IF ( save ) %]
24
            <p>Order [% ordernumber %] successfully modified.</p>
25
            <p>Return to <a href="[% referrer %]">previous page</a></p>
26
        [% ELSE %]
27
          <h1>Change order notes (order no. [% ordernumber %])</h1>
28
29
          <form action="/cgi-bin/koha/acqui/modordernotes.pl" method="post">
30
            <fieldset>
31
              <label for="ordernotes">Notes:</label>
32
              <textarea id="ordernotes" name="ordernotes">[% ordernotes %]</textarea>
33
            </fieldset>
34
            <input type="hidden" name="referrer" value="[% referrer %]" />
35
            <input type="hidden" name="ordernumber" value="[% ordernumber %]" />
36
            <input type="hidden" name="op" value="save" />
37
            <fieldset class="action">
38
              <input type="submit" value="Change" />
39
              <input type="button" value="Cancel" onclick="returnToReferrer();" />
40
            </fieldset>
41
          </form>
42
        [% END %]
43
    </div>
44
  </div>
45
</div>
46
[% INCLUDE 'intranet-bottom.inc' %]
47
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-6 / +6 lines)
Lines 170-178 $(document).ready(function() Link Here
170
170
171
[% IF ( basketno ) %]
171
[% IF ( basketno ) %]
172
    <div id="acqui_basket_summary"  class="yui-g">
172
    <div id="acqui_basket_summary"  class="yui-g">
173
	<fieldset class="rows">
173
    <fieldset class="rows">
174
        <legend>Basket details</legend>
174
        <legend>Basket details</legend>
175
		<ol>
175
        <ol>
176
        [% IF ( basketnote ) %]<li><span class="label">Internal note:</span> [% basketnote %]</li>[% END %]
176
        [% IF ( basketnote ) %]<li><span class="label">Internal note:</span> [% basketnote %]</li>[% END %]
177
        [% IF ( basketbooksellernote ) %]<li><span class="label">Vendor note:</span> [% basketbooksellernote %]</li>[% END %]
177
        [% IF ( basketbooksellernote ) %]<li><span class="label">Vendor note:</span> [% basketbooksellernote %]</li>[% END %]
178
        [% IF ( basketcontractno ) %]
178
        [% IF ( basketcontractno ) %]
Lines 198-209 $(document).ready(function() Link Here
198
                <input type="hidden" value="mod_basket" name="op" />
198
                <input type="hidden" value="mod_basket" name="op" />
199
                <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
199
                <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
200
            </li>
200
            </li>
201
		<fieldset class="action"><input type="submit" value="Change basketgroup" /></fieldset>
201
            <fieldset class="action"><input type="submit" value="Change basketgroup" /></fieldset>
202
        </form>
203
        [% END %]
202
        [% END %]
203
        </form>
204
        [% END %]
204
        [% END %]
205
			</ol>
205
        </ol>
206
</fieldset>
206
    </fieldset>
207
    </div>
207
    </div>
208
[% END %]
208
[% END %]
209
209
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-1 / +6 lines)
Lines 246-251 Link Here
246
                    Suggested by: [% loop_order.surnamesuggestedby %][% IF ( loop_order.firstnamesuggestedby ) %], [% loop_order.firstnamesuggestedby %] [% END %]
246
                    Suggested by: [% loop_order.surnamesuggestedby %][% IF ( loop_order.firstnamesuggestedby ) %], [% loop_order.firstnamesuggestedby %] [% END %]
247
                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% loop_order.suggestionid %]">suggestion #[% loop_order.suggestionid %]</a>)
247
                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% loop_order.suggestionid %]">suggestion #[% loop_order.suggestionid %]</a>)
248
                [% END %]
248
                [% END %]
249
                <br />
250
                [% IF ( loop_order.notes ) %]
251
                    [% loop_order.notes|html %] - <a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&referrer=/cgi-bin/koha/acqui/parcel.pl%3Fsupplierid=[% loop_order.supplierid %]&datereceived=[% loop_order.invoicedatereceived %]&invoice=[% loop_order.invoice %]">Change note</a>
252
                [% ELSE %]
253
                    <a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&referrer=/cgi-bin/koha/acqui/parcel.pl%3Fsupplierid=[% loop_order.supplierid %]&datereceived=[% loop_order.invoicedatereceived %]&invoice=[% loop_order.invoice %]">Add note</a>
254
                [% END %]
249
                </td>
255
                </td>
250
                <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>
256
                <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>
251
                <td>[% loop_order.quantity %]</td>
257
                <td>[% loop_order.quantity %]</td>
252
- 

Return to bug 7166