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

(-)a/acqui/modordernotes.pl (+8 lines)
Lines 32-37 use CGI; Link Here
32
use C4::Auth;
32
use C4::Auth;
33
use C4::Output;
33
use C4::Output;
34
use C4::Acquisition;
34
use C4::Acquisition;
35
use C4::Bookseller qw( GetBookSellerFromId);
35
36
36
my $input = new CGI;
37
my $input = new CGI;
37
my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
38
my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
Lines 48-53 my $ordernumber = $input->param('ordernumber'); Link Here
48
my $referrer = $input->param('referrer') || $input->referer();
49
my $referrer = $input->param('referrer') || $input->referer();
49
50
50
my $order = GetOrder($ordernumber);
51
my $order = GetOrder($ordernumber);
52
my $basket = GetBasket($order->{basketno});
53
my ($bookseller) = GetBookSellerFromId($basket->{booksellerid});
54
51
55
52
if($op and $op eq 'save') {
56
if($op and $op eq 'save') {
53
    my $ordernotes = $input->param('ordernotes');
57
    my $ordernotes = $input->param('ordernotes');
Lines 66-71 if($op) { Link Here
66
}
70
}
67
71
68
$template->param(
72
$template->param(
73
    basketname           => $basket->{'basketname'},
74
    basketno             => $order->{basketno},
75
    booksellerid         => $bookseller->{'id'},
76
    booksellername       => $bookseller->{'name'},
69
    ordernumber => $ordernumber,
77
    ordernumber => $ordernumber,
70
    referrer => $referrer,
78
    referrer => $referrer,
71
);
79
);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-6 / +6 lines)
Lines 279-299 Link Here
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
                                <br />
281
                                <br />
282
                                [% IF ( books_loo.notes ) %]
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
                                [% ELSE %]
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
                                [% END %]
287
                                [% IF ( books_loo.isbn ) %] - [% books_loo.isbn %][% END %]
282
                                [% IF ( books_loo.isbn ) %] - [% books_loo.isbn %][% END %]
288
                                [% IF ( books_loo.issn ) %] - [% books_loo.issn %][% END %]
283
                                [% IF ( books_loo.issn ) %] - [% books_loo.issn %][% END %]
289
                                [% IF ( books_loo.publishercode ) %], [% books_loo.publishercode %][% END %]
284
                                [% IF ( books_loo.publishercode ) %], [% books_loo.publishercode %][% END %]
290
                                [% IF ( books_loo.publicationyear ) %], [% books_loo.publicationyear %][% END %]
285
                                [% IF ( books_loo.publicationyear ) %], [% books_loo.publicationyear %][% END %]
286
                                [% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %]
291
                                [% IF ( books_loo.suggestionid ) %]
287
                                [% IF ( books_loo.suggestionid ) %]
292
                                    <br/>
288
                                    <br/>
293
                                    Suggested by: [% books_loo.surnamesuggestedby %][% IF ( books_loo.firstnamesuggestedby ) %], [% books_loo.firstnamesuggestedby %] [% END %]
289
                                    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>)
290
                                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid %]">suggestion #[% books_loo.suggestionid %]</a>)
295
                                [% END %]
291
                                [% END %]
296
                                [% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %]
292
                                [% IF ( books_loo.notes ) %]
293
                                    <p class="ordernote"><strong>Note: </strong>[% books_loo.notes|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]">Change note</a>]</p>
294
                                [% ELSE %]
295
                                    [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]">Add note</a>]
296
                                [% END %]
297
                            </p>
297
                            </p>
298
                        </td>
298
                        </td>
299
                        <td class="number">[% books_loo.rrp %]</td>
299
                        <td class="number">[% books_loo.rrp %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt (-14 / +5 lines)
Lines 1-40 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Acquisition &rsaquo; Change order notes</title>
2
<title>Koha &rsaquo; Acquisition &rsaquo; Change order notes</title>
3
[% INCLUDE 'doc-head-close.inc' %]
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>
4
</head>
12
5
13
<body>
6
<body>
14
[% INCLUDE 'header.inc' %]
7
[% INCLUDE 'header.inc' %]
15
8
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>
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; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername|html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketname|html %] ([% basketno %])</a> &rsaquo; Change order notes</div>
17
10
18
<div id="doc3" class="yui-t2">
11
<div id="doc" class="yui-t7">
19
12
20
<div id="bd">
13
<div id="bd">
21
  <div id="yui-main">
14
  <div id="yui-main">
22
    <div class="yui-b">
23
      <h1>Change order notes (order no. [% ordernumber %])</h1>
15
      <h1>Change order notes (order no. [% ordernumber %])</h1>
24
      <form action="/cgi-bin/koha/acqui/modordernotes.pl" method="post">
16
      <form action="/cgi-bin/koha/acqui/modordernotes.pl" method="post">
25
        <fieldset>
17
        <fieldset class="brief">
26
          <label for="ordernotes">Notes:</label>
18
          <label for="ordernotes">Notes:</label>
27
          <textarea id="ordernotes" name="ordernotes">[% ordernotes %]</textarea>
19
          <textarea id="ordernotes" name="ordernotes" rows="3" cols="30">[% ordernotes %]</textarea>
28
        </fieldset>
20
        </fieldset>
29
        <input type="hidden" name="referrer" value="[% referrer %]" />
21
        <input type="hidden" name="referrer" value="[% referrer %]" />
30
        <input type="hidden" name="ordernumber" value="[% ordernumber %]" />
22
        <input type="hidden" name="ordernumber" value="[% ordernumber %]" />
31
        <input type="hidden" name="op" value="save" />
23
        <input type="hidden" name="op" value="save" />
32
        <fieldset class="action">
24
        <fieldset class="action">
33
          <input type="submit" value="Save" />
25
          <input type="submit" value="Save" />
34
          <input type="button" value="Cancel" onclick="returnToReferrer();" />
26
          <a class="cancel" href="[% referrer %]">Cancel</a>
35
        </fieldset>
27
        </fieldset>
36
      </form>
28
      </form>
37
    </div>
38
  </div>
29
  </div>
39
</div>
30
</div>
40
[% INCLUDE 'intranet-bottom.inc' %]
31
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-3 / +2 lines)
Lines 248-256 Link Here
248
                [% END %]
248
                [% END %]
249
                <br />
249
                <br />
250
                [% IF ( loop_order.notes ) %]
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>
251
                    <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>
252
                [% ELSE %]
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>
253
                    [<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>]
254
                [% END %]
254
                [% END %]
255
                </td>
255
                </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>
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>
257
- 

Return to bug 7166