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

(-)a/acqui/neworderempty.pl (-3 / +4 lines)
Lines 336-342 if ( defined $subscriptionid ) { Link Here
336
        $data->{ecost}          = $lastOrderReceived->{ecost};
336
        $data->{ecost}          = $lastOrderReceived->{ecost};
337
        $data->{quantity}       = $lastOrderReceived->{quantity};
337
        $data->{quantity}       = $lastOrderReceived->{quantity};
338
        $data->{unitprice}      = $lastOrderReceived->{unitprice};
338
        $data->{unitprice}      = $lastOrderReceived->{unitprice};
339
        $data->{notes}          = $lastOrderReceived->{notes};
339
        $data->{order_internalnote} = $lastOrderReceived->{order_internalnote};
340
        $data->{order_vendornote}   = $lastOrderReceived->{order_vendornote};
340
        $data->{sort1}          = $lastOrderReceived->{sort1};
341
        $data->{sort1}          = $lastOrderReceived->{sort1};
341
        $data->{sort2}          = $lastOrderReceived->{sort2};
342
        $data->{sort2}          = $lastOrderReceived->{sort2};
342
343
Lines 385-390 $template->param( Link Here
385
    discount             => $bookseller->{'discount'},
386
    discount             => $bookseller->{'discount'},
386
    orderdiscount_2dp    => sprintf( "%.2f", $data->{'discount'} || 0 ),
387
    orderdiscount_2dp    => sprintf( "%.2f", $data->{'discount'} || 0 ),
387
    orderdiscount        => $data->{'discount'},
388
    orderdiscount        => $data->{'discount'},
389
    order_internalnote   => $data->{'order_internalnote'},
390
    order_vendornote     => $data->{'order_vendornote'},
388
    listincgst       => $bookseller->{'listincgst'},
391
    listincgst       => $bookseller->{'listincgst'},
389
    invoiceincgst    => $bookseller->{'invoiceincgst'},
392
    invoiceincgst    => $bookseller->{'invoiceincgst'},
390
    name             => $bookseller->{'name'},
393
    name             => $bookseller->{'name'},
Lines 419-426 $template->param( Link Here
419
    (uc(C4::Context->preference("marcflavour"))) => 1
422
    (uc(C4::Context->preference("marcflavour"))) => 1
420
);
423
);
421
424
422
$template->param ( notes => $data->{'notes'} ) if ( $ordernumber );
423
424
output_html_with_http_headers $input, $cookie, $template->output;
425
output_html_with_http_headers $input, $cookie, $template->output;
425
426
426
427
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basket.tt (-1 / +1 lines)
Line 1 Link Here
1
Contract name,Order number,Entry date,ISBN,Author,Title,Publication year,Publisher code,Collection title,Notes,Quantity,RRP,Delivery place,Billing place
1
Contract name,Order number,Entry date,ISBN,Author,Title,Publication year,Publisher,Collection title,Internal note,Quantity,RRP,Delivery place,Billing place
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt (-1 / +1 lines)
Line 1 Link Here
1
Account number,Basket name,Order number,Author,Title,Publisher code,Publication year,Collection title,ISBN,Quantity,RRP,Discount,Estimated cost,Notes,Entry date,Bookseller name,Bookseller physical address,Bookseller postal address,Contract number,Contract name,Basket group delivery place,Basket group billing place,Basket delivery place,Basket billing place
1
Account number,Basket name,Order number,Author,Title,Publisher,Publication year,Collection title,ISBN,Quantity,RRP,Discount,Estimated cost,Internal note,Entry date,Bookseller name,Bookseller physical address,Bookseller postal address,Contract number,Contract name,Basket group delivery place,Basket group billing place,Basket delivery place,Basket billing place
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt (-2 / +2 lines)
Lines 1-5 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Acquisition &rsaquo; Change order [% IF (type == "vendor") %]vendor[% ELSE %]internal[% END %] note</title>
2
<title>Koha &rsaquo; Acquisition &rsaquo; Change order [% IF (type == "vendor") %]vendor note[% ELSE %]internal note[% END %]</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
</head>
4
</head>
5
5
Lines 12-18 Link Here
12
12
13
<div id="bd">
13
<div id="bd">
14
  <div id="yui-main">
14
  <div id="yui-main">
15
      <h1>Change order [% IF (type == "vendor") %]vendor[% ELSE %]internal[% END %] note (order no. [% ordernumber %])</h1>
15
      <h1>Change order [% IF (type == "vendor") %]vendor note[% ELSE %]internal note[% END %] (order no. [% ordernumber %])</h1>
16
      <form action="/cgi-bin/koha/acqui/modordernotes.pl" method="post">
16
      <form action="/cgi-bin/koha/acqui/modordernotes.pl" method="post">
17
        <fieldset class="brief">
17
        <fieldset class="brief">
18
          <label for="ordernotes">Note:</label>
18
          <label for="ordernotes">Note:</label>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-1 / +1 lines)
Lines 539-545 $(document).ready(function() Link Here
539
                <label for="order_internalnote">Internal note: </label>
539
                <label for="order_internalnote">Internal note: </label>
540
                <textarea id="order_internalnote" cols="30" rows="3" name="order_internalnote" >[% IF ( order_internalnote ) %][% order_internalnote %][% END %]</textarea>
540
                <textarea id="order_internalnote" cols="30" rows="3" name="order_internalnote" >[% IF ( order_internalnote ) %][% order_internalnote %][% END %]</textarea>
541
            </li>
541
            </li>
542
	    <li>
542
            <li>
543
                <label for="order_vendornote">Vendor note: </label>
543
                <label for="order_vendornote">Vendor note: </label>
544
                <textarea id="order_vendornote" cols="30" rows="3" name="order_vendornote" >[% IF ( order_vendornote ) %][% order_vendornote %][% END %]</textarea>
544
                <textarea id="order_vendornote" cols="30" rows="3" name="order_vendornote" >[% IF ( order_vendornote ) %][% order_vendornote %][% END %]</textarea>
545
            </li>
545
            </li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-2 / +1 lines)
Lines 280-286 Link Here
280
                [% ELSE %]
280
                [% ELSE %]
281
                    [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&amp;referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid %]&type=internal">Add internal note</a>]
281
                    [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&amp;referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid %]&type=internal">Add internal note</a>]
282
                [% END %]
282
                [% END %]
283
		[% IF ( loop_order.order_vendornote ) %]
283
                [% IF ( loop_order.order_vendornote ) %]
284
                    <p class="ordernote"><strong>Vendor note: </strong>[% loop_order.order_vendornote|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&amp;referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid %]&type=vendor">Change vendor note</a>]</p>
284
                    <p class="ordernote"><strong>Vendor note: </strong>[% loop_order.order_vendornote|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&amp;referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid %]&type=vendor">Change vendor note</a>]</p>
285
                [% ELSE %]
285
                [% ELSE %]
286
                    [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&amp;referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid %]&type=vendor">Add vendor note</a>]
286
                    [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&amp;referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid %]&type=vendor">Add vendor note</a>]
287
- 

Return to bug 9416