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

(-)a/C4/Acquisition.pm (-3 / +3 lines)
Lines 310-316 sub GetBasketAsCSV { Link Here
310
            publicationyear => $bd->{'publicationyear'},
310
            publicationyear => $bd->{'publicationyear'},
311
            publishercode => $bd->{'publishercode'},
311
            publishercode => $bd->{'publishercode'},
312
            collectiontitle => $bd->{'collectiontitle'},
312
            collectiontitle => $bd->{'collectiontitle'},
313
            notes => $order->{'notes'},
313
            notes => $order->{'order_internalnote'},
314
            quantity => $order->{'quantity'},
314
            quantity => $order->{'quantity'},
315
            rrp => $order->{'rrp'},
315
            rrp => $order->{'rrp'},
316
            deliveryplace => C4::Branch::GetBranchName( $basket->{'deliveryplace'} ),
316
            deliveryplace => C4::Branch::GetBranchName( $basket->{'deliveryplace'} ),
Lines 381-387 sub GetBasketGroupAsCSV { Link Here
381
                rrp => $order->{rrp},
381
                rrp => $order->{rrp},
382
                discount => $bookseller->{discount},
382
                discount => $bookseller->{discount},
383
                ecost => $order->{ecost},
383
                ecost => $order->{ecost},
384
                notes => $order->{notes},
384
                notes => $order->{order_internalnote},
385
                entrydate => $order->{entrydate},
385
                entrydate => $order->{entrydate},
386
                booksellername => $bookseller->{name},
386
                booksellername => $bookseller->{name},
387
                bookselleraddress => $bookseller->{address1},
387
                bookselleraddress => $bookseller->{address1},
Lines 1234-1240 Else, the upcoming July 1st is used. Link Here
1234
1234
1235
=item defaults entrydate to Now
1235
=item defaults entrydate to Now
1236
1236
1237
The following keys are used: "biblionumber", "title", "basketno", "quantity", "notes", "rrp", "ecost", "gstrate", "unitprice", "subscription", "sort1", "sort2", "booksellerinvoicenumber", "listprice", "budgetdate", "purchaseordernumber", "branchcode", "booksellerinvoicenumber", "budget_id".
1237
The following keys are used: "biblionumber", "title", "basketno", "quantity", "order_vendornote", "order_internalnote", "rrp", "ecost", "gstrate", "unitprice", "subscription", "sort1", "sort2", "booksellerinvoicenumber", "listprice", "budgetdate", "purchaseordernumber", "branchcode", "booksellerinvoicenumber", "budget_id".
1238
1238
1239
=back
1239
=back
1240
1240
(-)a/acqui/modordernotes.pl (-5 / +12 lines)
Lines 47-53 my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( { Link Here
47
my $op = $input->param('op');
47
my $op = $input->param('op');
48
my $ordernumber = $input->param('ordernumber');
48
my $ordernumber = $input->param('ordernumber');
49
my $referrer = $input->param('referrer') || $input->referer();
49
my $referrer = $input->param('referrer') || $input->referer();
50
50
my $type = $input->param('type');
51
my $order = GetOrder($ordernumber);
51
my $order = GetOrder($ordernumber);
52
my $basket = GetBasket($order->{basketno});
52
my $basket = GetBasket($order->{basketno});
53
my ($bookseller) = GetBookSellerFromId($basket->{booksellerid});
53
my ($bookseller) = GetBookSellerFromId($basket->{booksellerid});
Lines 55-68 my ($bookseller) = GetBookSellerFromId($basket->{booksellerid}); Link Here
55
55
56
if($op and $op eq 'save') {
56
if($op and $op eq 'save') {
57
    my $ordernotes = $input->param('ordernotes');
57
    my $ordernotes = $input->param('ordernotes');
58
    $order->{'notes'} = $ordernotes;
58
    if ($type eq "vendor") {
59
        $order->{'order_vendornote'} = $ordernotes;
60
    } else {
61
        $order->{'order_internalnote'} = $ordernotes;
62
    }
59
    ModOrder($order);
63
    ModOrder($order);
60
    print $input->redirect($referrer);
64
    print $input->redirect($referrer);
61
    exit;
65
    exit;
62
} else {
66
} else {
63
    $template->param(
67
    if ($type eq "vendor") {
64
        ordernotes => $order->{'notes'},
68
        $template->param(ordernotes => $order->{'order_vendornote'});
65
    );
69
    } else {
70
        $template->param(ordernotes => $order->{'order_internalnote'});
71
    }
66
}
72
}
67
73
68
if($op) {
74
if($op) {
Lines 76-81 $template->param( Link Here
76
    booksellername       => $bookseller->{'name'},
82
    booksellername       => $bookseller->{'name'},
77
    ordernumber => $ordernumber,
83
    ordernumber => $ordernumber,
78
    referrer => $referrer,
84
    referrer => $referrer,
85
    type => $type,
79
);
86
);
80
87
81
88
(-)a/acqui/orderreceive.pl (-1 / +2 lines)
Lines 222-228 $template->param( Link Here
222
    invoice               => $invoice->{invoicenumber},
222
    invoice               => $invoice->{invoicenumber},
223
    datereceived          => $datereceived->output(),
223
    datereceived          => $datereceived->output(),
224
    datereceived_iso      => $datereceived->output('iso'),
224
    datereceived_iso      => $datereceived->output('iso'),
225
    notes                 => $order->{notes},
225
    order_internalnote    => $order->{order_internalnote},
226
    order_vendornote      => $order->{order_vendornote},
226
    suggestionid          => $suggestion->{suggestionid},
227
    suggestionid          => $suggestion->{suggestionid},
227
    surnamesuggestedby    => $suggestion->{surnamesuggestedby},
228
    surnamesuggestedby    => $suggestion->{surnamesuggestedby},
228
    firstnamesuggestedby  => $suggestion->{firstnamesuggestedby},
229
    firstnamesuggestedby  => $suggestion->{firstnamesuggestedby},
(-)a/installer/data/mysql/kohastructure.sql (-1 / +2 lines)
Lines 2979-2985 CREATE TABLE `aqorders` ( -- information related to the basket line items Link Here
2979
  `quantityreceived` smallint(6) NOT NULL default 0, -- the quantity that have been received so far
2979
  `quantityreceived` smallint(6) NOT NULL default 0, -- the quantity that have been received so far
2980
  `cancelledby` varchar(10) default NULL, -- not used? always NULL
2980
  `cancelledby` varchar(10) default NULL, -- not used? always NULL
2981
  `datecancellationprinted` date default NULL, -- the date the line item was deleted
2981
  `datecancellationprinted` date default NULL, -- the date the line item was deleted
2982
  `notes` mediumtext, -- notes related to this order line
2982
  `order_internalnote` mediumtext, -- notes related to this order line, made for staff
2983
  `order_vendornote` mediumtext, -- notes related to this order line, made for vendor
2983
  `supplierreference` mediumtext, -- not used? always NULL
2984
  `supplierreference` mediumtext, -- not used? always NULL
2984
  `purchaseordernumber` mediumtext, -- not used? always NULL
2985
  `purchaseordernumber` mediumtext, -- not used? always NULL
2985
  `basketno` int(11) default NULL, -- links this order line to a specific basket (aqbasket.basketno)
2986
  `basketno` int(11) default NULL, -- links this order line to a specific basket (aqbasket.basketno)
(-)a/installer/data/mysql/updatedatabase.pl (+7 lines)
Lines 8136-8141 if ( CheckVersion($DBversion) ) { Link Here
8136
   print "Upgrade to $DBversion done (Bug 9448 - Add separate permission for writing off fees)\n";
8136
   print "Upgrade to $DBversion done (Bug 9448 - Add separate permission for writing off fees)\n";
8137
   SetVersion ($DBversion);
8137
   SetVersion ($DBversion);
8138
}
8138
}
8139
$DBversion = "3.15.00.XXX";
8140
if ( CheckVersion($DBversion) ) {
8141
    $dbh->do("ALTER TABLE aqorders CHANGE notes order_internalnote MEDIUMTEXT;");
8142
    $dbh->do("ALTER TABLE aqorders ADD COLUMN order_vendornote MEDIUMTEXT AFTER order_internalnote;");
8143
    print "Upgrade to $DBversion done (Bug 9416 - In each order, add a new note made for the vendor)\n";
8144
    SetVersion($DBversion);
8145
}
8139
8146
8140
=head1 FUNCTIONS
8147
=head1 FUNCTIONS
8141
8148
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-2 / +2 lines)
Lines 231-238 Link Here
231
                            [% END %]
231
                            [% END %]
232
                        </li>
232
                        </li>
233
                        <li>
233
                        <li>
234
                            <label for="notes">Notes: </label>
234
                            <label for="order_internalnote">Internal note: </label>
235
                            <textarea id="notes" cols="30" rows="3" name="notes"></textarea>
235
                            <textarea id="order_internalnote" cols="30" rows="3" name="order_internalnote"></textarea>
236
                        </li>
236
                        </li>
237
                        <li><div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
237
                        <li><div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
238
                            <label for="sort1">Planning value1: </label>
238
                            <label for="sort1">Planning value1: </label>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-4 / +9 lines)
Lines 491-500 Link Here
491
                                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid %]&amp;op=show">suggestion #[% books_loo.suggestionid %]</a>)
491
                                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid %]&amp;op=show">suggestion #[% books_loo.suggestionid %]</a>)
492
                                [% END %]
492
                                [% END %]
493
                            </p>
493
                            </p>
494
                                [% IF ( books_loo.notes ) %]
494
                                [% IF ( books_loo.order_internalnote ) %]
495
                                    <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>
495
                                    <p class="ordernote"><strong>Internal note: </strong>[% books_loo.order_internalnote|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=internal">Change internal note</a>]</p>
496
                                [% ELSE %]
496
                                [% ELSE %]
497
                                    <p>[<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]">Add note</a>]</p>
497
                                    [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=internal">Add internal note</a>]
498
                                [% END %]
499
                                [% IF ( books_loo.order_vendornote ) %]
500
                                    <p class="ordernote"><strong>Vendor note: </strong>[% books_loo.order_vendornote|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=vendor">Change vendor note</a>]</p>
501
                                [% ELSE %]
502
                                    [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=vendor">Add vendor note</a>]
498
                                [% END %]
503
                                [% END %]
499
                            [% IF (books_loo.transferred_from) %]
504
                            [% IF (books_loo.transferred_from) %]
500
                              [% basket = books_loo.transferred_from.basket %]
505
                              [% basket = books_loo.transferred_from.basket %]
Lines 598-604 Link Here
598
                        [% ELSE %]
603
                        [% ELSE %]
599
                          <em>Deleted bibliographic record, can't find title</em><br />
604
                          <em>Deleted bibliographic record, can't find title</em><br />
600
                        [% END %]
605
                        [% END %]
601
                        [% IF ( order.notes ) %] [% order.notes %][% END %]
606
                        [% IF ( order.order_internalnote ) %] [% order.order_internalnote %][% END %]
602
                        [% IF ( order.isbn ) %] - [% order.isbn %][% END %]
607
                        [% IF ( order.isbn ) %] - [% order.isbn %][% END %]
603
                        [% IF ( order.issn ) %] - [% order.issn %][% END %]
608
                        [% IF ( order.issn ) %] - [% order.issn %][% END %]
604
                        [% IF ( order.publishercode ) %], [% order.publishercode %][% END %]
609
                        [% IF ( order.publishercode ) %], [% order.publishercode %][% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt (-4 / +5 lines)
Lines 1-26 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 [% IF (type == "vendor") %]vendor[% ELSE %]internal[% END %] note</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
</head>
4
</head>
5
5
6
<body>
6
<body>
7
[% INCLUDE 'header.inc' %]
7
[% INCLUDE 'header.inc' %]
8
8
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>
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 [% IF (type == "vendor") %]vendor[% ELSE %]internal[% END %] note</div>
10
10
11
<div id="doc" class="yui-t7">
11
<div id="doc" class="yui-t7">
12
12
13
<div id="bd">
13
<div id="bd">
14
  <div id="yui-main">
14
  <div id="yui-main">
15
      <h1>Change order notes (order no. [% ordernumber %])</h1>
15
      <h1>Change order [% IF (type == "vendor") %]vendor[% ELSE %]internal[% END %] note (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">Notes:</label>
18
          <label for="ordernotes">Note:</label>
19
          <textarea id="ordernotes" name="ordernotes" rows="3" cols="30" class="focus">[% ordernotes %]</textarea>
19
          <textarea id="ordernotes" name="ordernotes" rows="3" cols="30" class="focus">[% ordernotes %]</textarea>
20
        </fieldset>
20
        </fieldset>
21
        <input type="hidden" name="referrer" value="[% referrer %]" />
21
        <input type="hidden" name="referrer" value="[% referrer %]" />
22
        <input type="hidden" name="ordernumber" value="[% ordernumber %]" />
22
        <input type="hidden" name="ordernumber" value="[% ordernumber %]" />
23
        <input type="hidden" name="op" value="save" />
23
        <input type="hidden" name="op" value="save" />
24
        <input type="hidden" name="type" value="[% type %]" />
24
        <fieldset class="action">
25
        <fieldset class="action">
25
          <input type="submit" value="Save" />
26
          <input type="submit" value="Save" />
26
          <a class="cancel" href="[% referrer %]">Cancel</a>
27
          <a class="cancel" href="[% referrer %]">Cancel</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-2 / +6 lines)
Lines 535-542 $(document).ready(function() Link Here
535
                [% END %]
535
                [% END %]
536
            </li>
536
            </li>
537
            <li>
537
            <li>
538
                <label for="notes">Notes: </label>
538
                <label for="order_internalnote">Internal note: </label>
539
                <textarea id="notes" cols="30" rows="3" name="notes" >[% IF ( notes ) %][% notes %][% END %]</textarea>
539
                <textarea id="order_internalnote" cols="30" rows="3" name="order_internalnote" >[% IF ( order_internalnote ) %][% order_internalnote %][% END %]</textarea>
540
            </li>
541
	    <li>
542
                <label for="order_vendornote">Vendor note: </label>
543
                <textarea id="order_vendornote" cols="30" rows="3" name="order_vendornote" >[% IF ( order_vendornote ) %][% order_vendornote %][% END %]</textarea>
540
            </li>
544
            </li>
541
            <li><div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
545
            <li><div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
542
                <label for="sort1">Statistic 1: </label>
546
                <label for="sort1">Statistic 1: </label>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-2 / +4 lines)
Lines 328-335 Link Here
328
         <input type="text" size="20" name="cost" id="cost" value="[% unitprice %]" />
328
         <input type="text" size="20" name="cost" id="cost" value="[% unitprice %]" />
329
        [% ELSE %]
329
        [% ELSE %]
330
            <input type="text" size="20" name="cost" id="cost" value="[% ecost %]" />
330
            <input type="text" size="20" name="cost" id="cost" value="[% ecost %]" />
331
        [% END %]</li></ol>
331
        [% END %]</li>
332
        <label for="note">Notes: </label><textarea name="note" width="40" rows="8" >[% notes %]</textarea>
332
        <li><label for="order_internalnote">Internal note: </label><textarea name="order_internalnote" width="40" rows="8" >[% order_internalnote %]</textarea></li>
333
        <li><label for="order_vendornote">Vendor note: </label><textarea name="order_vendornote" width="40" rows="8" >[% order_vendornote %]</textarea></li>
334
        </ol>
333
    </fieldset>
335
    </fieldset>
334
336
335
</div>
337
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-5 / +9 lines)
Lines 268-284 Link Here
268
                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a>
268
                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a>
269
                [% IF ( loop_order.author ) %] by [% loop_order.author %][% END %]
269
                [% IF ( loop_order.author ) %] by [% loop_order.author %][% END %]
270
                [% IF ( loop_order.isbn ) %] &ndash; [% loop_order.isbn %][% END %]
270
                [% IF ( loop_order.isbn ) %] &ndash; [% loop_order.isbn %][% END %]
271
                [% IF ( loop_order.publishercode ) %]<br />Publisher :[% loop_order.publishercode %][% END %]
271
                [% IF ( loop_order.publishercode ) %]<br />Publisher:[% loop_order.publishercode %][% END %]
272
                [% IF ( loop_order.suggestionid ) %]
272
                [% IF ( loop_order.suggestionid ) %]
273
                    <br/>
273
                    <br/>
274
                    Suggested by: [% loop_order.surnamesuggestedby %][% IF ( loop_order.firstnamesuggestedby ) %], [% loop_order.firstnamesuggestedby %] [% END %]
274
                    Suggested by: [% loop_order.surnamesuggestedby %][% IF ( loop_order.firstnamesuggestedby ) %], [% loop_order.firstnamesuggestedby %] [% END %]
275
                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% loop_order.suggestionid %]&amp;op=show">suggestion #[% loop_order.suggestionid %]</a>)
275
                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% loop_order.suggestionid %]&amp;op=show">suggestion #[% loop_order.suggestionid %]</a>)
276
                [% END %]
276
                [% END %]
277
                <br />
277
                <br />
278
                [% IF ( loop_order.notes ) %]
278
                [% IF ( loop_order.order_internalnote ) %]
279
                    <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%3Finvoiceid=[% invoiceid %]">Change note</a>]</p>
279
                    f<p class="ordernote"><strong>Internal note: </strong>[% loop_order.order_internalnote|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&amp;referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid %]&type=internal">Change internal note</a>]</p>
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 %]">Add 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 %]
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>
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>]
282
                [% END %]
287
                [% END %]
283
                </td>
288
                </td>
284
                <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>
289
                <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>
285
- 

Return to bug 9416