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

(-)a/acqui/neworderempty.pl (-3 / +4 lines)
Lines 335-341 if ( defined $subscriptionid ) { Link Here
335
        $data->{ecost}          = $lastOrderReceived->{ecost};
335
        $data->{ecost}          = $lastOrderReceived->{ecost};
336
        $data->{quantity}       = $lastOrderReceived->{quantity};
336
        $data->{quantity}       = $lastOrderReceived->{quantity};
337
        $data->{unitprice}      = $lastOrderReceived->{unitprice};
337
        $data->{unitprice}      = $lastOrderReceived->{unitprice};
338
        $data->{notes}          = $lastOrderReceived->{notes};
338
        $data->{order_internalnote} = $lastOrderReceived->{order_internalnote};
339
        $data->{order_vendornote}   = $lastOrderReceived->{order_vendornote};
339
        $data->{sort1}          = $lastOrderReceived->{sort1};
340
        $data->{sort1}          = $lastOrderReceived->{sort1};
340
        $data->{sort2}          = $lastOrderReceived->{sort2};
341
        $data->{sort2}          = $lastOrderReceived->{sort2};
341
342
Lines 384-389 $template->param( Link Here
384
    discount             => $bookseller->{'discount'},
385
    discount             => $bookseller->{'discount'},
385
    orderdiscount_2dp    => sprintf( "%.2f", $data->{'discount'} || 0 ),
386
    orderdiscount_2dp    => sprintf( "%.2f", $data->{'discount'} || 0 ),
386
    orderdiscount        => $data->{'discount'},
387
    orderdiscount        => $data->{'discount'},
388
    order_internalnote   => $data->{'order_internalnote'},
389
    order_vendornote     => $data->{'order_vendornote'},
387
    listincgst       => $bookseller->{'listincgst'},
390
    listincgst       => $bookseller->{'listincgst'},
388
    invoiceincgst    => $bookseller->{'invoiceincgst'},
391
    invoiceincgst    => $bookseller->{'invoiceincgst'},
389
    name             => $bookseller->{'name'},
392
    name             => $bookseller->{'name'},
Lines 418-425 $template->param( Link Here
418
    (uc(C4::Context->preference("marcflavour"))) => 1
421
    (uc(C4::Context->preference("marcflavour"))) => 1
419
);
422
);
420
423
421
$template->param ( notes => $data->{'notes'} ) if ( $ordernumber );
422
423
output_html_with_http_headers $input, $cookie, $template->output;
424
output_html_with_http_headers $input, $cookie, $template->output;
424
425
425
426
(-)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,Vendor 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,Vendor 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 (-3 / +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>
19
- 

Return to bug 9416