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

(-)a/C4/Acquisition.pm (-1 / +1 lines)
Lines 1113-1119 Else, the upcoming July 1st is used. Link Here
1113
1113
1114
=item defaults entrydate to Now
1114
=item defaults entrydate to Now
1115
1115
1116
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".
1116
The following keys are used: "biblionumber", "title", "basketno", "quantity", "notes", "orderstaffnote", "rrp", "ecost", "gstrate", "unitprice", "subscription", "sort1", "sort2", "booksellerinvoicenumber", "listprice", "budgetdate", "purchaseordernumber", "branchcode", "booksellerinvoicenumber", "budget_id".
1117
1117
1118
=back
1118
=back
1119
1119
(-)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->{'notes'} = $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->{'notes'});
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 (-2 / +2 lines)
Lines 220-231 $template->param( Link Here
220
    invoice               => $invoice->{invoicenumber},
220
    invoice               => $invoice->{invoicenumber},
221
    datereceived          => $datereceived->output(),
221
    datereceived          => $datereceived->output(),
222
    datereceived_iso      => $datereceived->output('iso'),
222
    datereceived_iso      => $datereceived->output('iso'),
223
    notes                 => $order->{notes},
223
    order_internalnote    => $order->{notes},
224
    order_vendornote      => $order->{order_vendornote},
224
    suggestionid          => $suggestion->{suggestionid},
225
    suggestionid          => $suggestion->{suggestionid},
225
    surnamesuggestedby    => $suggestion->{surnamesuggestedby},
226
    surnamesuggestedby    => $suggestion->{surnamesuggestedby},
226
    firstnamesuggestedby  => $suggestion->{firstnamesuggestedby},
227
    firstnamesuggestedby  => $suggestion->{firstnamesuggestedby},
227
);
228
);
228
229
# regardless of the content of $unitprice e.g 0 or '' or any string will return in these cases 0.00
229
# regardless of the content of $unitprice e.g 0 or '' or any string will return in these cases 0.00
230
# and the 'IF' in the .tt will show 0.00 and not 'ecost' (see BZ 7129)
230
# and the 'IF' in the .tt will show 0.00 and not 'ecost' (see BZ 7129)
231
# So if $unitprice == 0 we don't create unitprice
231
# So if $unitprice == 0 we don't create unitprice
(-)a/installer/data/mysql/kohastructure.sql (-1 / +2 lines)
Lines 2913-2919 CREATE TABLE `aqorders` ( -- information related to the basket line items Link Here
2913
  `quantityreceived` smallint(6) NOT NULL default 0, -- the quantity that have been received so far
2913
  `quantityreceived` smallint(6) NOT NULL default 0, -- the quantity that have been received so far
2914
  `cancelledby` varchar(10) default NULL, -- not used? always NULL
2914
  `cancelledby` varchar(10) default NULL, -- not used? always NULL
2915
  `datecancellationprinted` date default NULL, -- the date the line item was deleted
2915
  `datecancellationprinted` date default NULL, -- the date the line item was deleted
2916
  `notes` mediumtext, -- notes related to this order line
2916
  `notes` mediumtext, -- notes related to this order line, made for staff
2917
  `order_vendornote` mediumtext, -- notes related to this order line, made for vendor
2917
  `supplierreference` mediumtext, -- not used? always NULL
2918
  `supplierreference` mediumtext, -- not used? always NULL
2918
  `purchaseordernumber` mediumtext, -- not used? always NULL
2919
  `purchaseordernumber` mediumtext, -- not used? always NULL
2919
  `basketno` int(11) default NULL, -- links this order line to a specific basket (aqbasket.basketno)
2920
  `basketno` int(11) default NULL, -- links this order line to a specific basket (aqbasket.basketno)
(-)a/installer/data/mysql/updatedatabase.pl (+7 lines)
Lines 7169-7174 if ( CheckVersion($DBversion) ) { Link Here
7169
    SetVersion ($DBversion);
7169
    SetVersion ($DBversion);
7170
}
7170
}
7171
7171
7172
$DBversion = "3.13.00.XXX";
7173
if ( CheckVersion($DBversion) ) {
7174
    $dbh->do("ALTER TABLE aqorders ADD COLUMN order_vendornote MEDIUMTEXT AFTER notes;");
7175
    print "Upgrade to $DBversion done (Bug 9416 - We should have 2 kinds of notes for each order line\n";
7176
    SetVersion($DBversion);
7177
}
7178
7172
=head1 FUNCTIONS
7179
=head1 FUNCTIONS
7173
7180
7174
=head2 TableExists($table)
7181
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-1 / +1 lines)
Lines 197-203 Link Here
197
                            [% END %]
197
                            [% END %]
198
                        </li>
198
                        </li>
199
                        <li>
199
                        <li>
200
                            <label for="notes">Notes: </label>
200
                            <label for="notes">Internal note: </label>
201
                            <textarea id="notes" cols="30" rows="3" name="notes"></textarea>
201
                            <textarea id="notes" cols="30" rows="3" name="notes"></textarea>
202
                        </li>
202
                        </li>
203
                        <li><div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
203
                        <li><div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-2 / +7 lines)
Lines 350-358 Link Here
350
                                [% END %]
350
                                [% END %]
351
                            </p>
351
                            </p>
352
                                [% IF ( books_loo.notes ) %]
352
                                [% IF ( books_loo.notes ) %]
353
                                    <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>
353
                                    <p class="ordernote"><strong>Internal note: </strong>[% books_loo.notes|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=internal">Change internal note</a>]</p>
354
                                [% ELSE %]
354
                                [% ELSE %]
355
                                    <p>[<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]">Add note</a>]</p>
355
                                    [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=internal">Add internal note</a>]
356
                                [% END %]
357
                                [% IF ( books_loo.order_vendornote ) %]
358
                                    <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>
359
                                [% ELSE %]
360
                                    [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=vendor">Add vendor note</a>]
356
                                [% END %]
361
                                [% END %]
357
                            [% IF (books_loo.transferred_from) %]
362
                            [% IF (books_loo.transferred_from) %]
358
                              [% basket = books_loo.transferred_from.basket %]
363
                              [% basket = books_loo.transferred_from.basket %]
(-)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 (-1 / +5 lines)
Lines 535-543 $(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="notes">Internal note: </label>
539
                <textarea id="notes" cols="30" rows="3" name="notes" >[% IF ( notes ) %][% notes %][% END %]</textarea>
539
                <textarea id="notes" cols="30" rows="3" name="notes" >[% IF ( notes ) %][% notes %][% END %]</textarea>
540
            </li>
540
            </li>
541
	    <li>
542
                <label for="notes">Vendor note: </label>
543
                <textarea id="notes" cols="30" rows="3" name="order_vendornote" >[% IF ( order_vendornote ) %][% order_vendornote %][% END %]</textarea>
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>
543
                <span id="sort1_zone">
547
                <span id="sort1_zone">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-2 / +4 lines)
Lines 315-322 Link Here
315
         <input type="text" size="20" name="cost" id="cost" value="[% unitprice %]" />
315
         <input type="text" size="20" name="cost" id="cost" value="[% unitprice %]" />
316
        [% ELSE %]
316
        [% ELSE %]
317
            <input type="text" size="20" name="cost" id="cost" value="[% ecost %]" />
317
            <input type="text" size="20" name="cost" id="cost" value="[% ecost %]" />
318
        [% END %]</li></ol>
318
        [% END %]</li>
319
        <label for="note">Notes: </label><textarea name="note" width="40" rows="8" >[% notes %]</textarea>
319
        <li><label for="order_internalnote">Internal note: </label><textarea name="order_internalnote" width="40" rows="8" >[% order_internalnote %]</textarea></li>
320
        <li><label for="order_vendornote">Vendor note: </label><textarea name="order_vendornote" width="40" rows="8" >[% order_vendornote %]</textarea></li>
321
        </ol>
320
    </fieldset>
322
    </fieldset>
321
323
322
</div>
324
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-4 / +8 lines)
Lines 202-208 Link Here
202
                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a>
202
                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a>
203
                [% IF ( loop_order.author ) %] by [% loop_order.author %][% END %]
203
                [% IF ( loop_order.author ) %] by [% loop_order.author %][% END %]
204
                [% IF ( loop_order.isbn ) %] &ndash; [% loop_order.isbn %][% END %]
204
                [% IF ( loop_order.isbn ) %] &ndash; [% loop_order.isbn %][% END %]
205
                [% IF ( loop_order.publishercode ) %]<br />Publisher :[% loop_order.publishercode %][% END %]
205
                [% IF ( loop_order.publishercode ) %]<br />Publisher:[% loop_order.publishercode %][% END %]
206
                [% IF ( loop_order.suggestionid ) %]
206
                [% IF ( loop_order.suggestionid ) %]
207
                    <br/>
207
                    <br/>
208
                    Suggested by: [% loop_order.surnamesuggestedby %][% IF ( loop_order.firstnamesuggestedby ) %], [% loop_order.firstnamesuggestedby %] [% END %]
208
                    Suggested by: [% loop_order.surnamesuggestedby %][% IF ( loop_order.firstnamesuggestedby ) %], [% loop_order.firstnamesuggestedby %] [% END %]
Lines 210-218 Link Here
210
                [% END %]
210
                [% END %]
211
                <br />
211
                <br />
212
                [% IF ( loop_order.notes ) %]
212
                [% IF ( loop_order.notes ) %]
213
                    <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>
213
                    <p class="ordernote"><strong>Internal 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 %]&type=internal">Change internal note</a>]</p>
214
                [% ELSE %]
214
                [% ELSE %]
215
                    [<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>]
215
                    [<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>]
216
                [% END %]
217
		[% IF ( loop_order.order_vendornote ) %]
218
                    <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>
219
                [% ELSE %]
220
                    [<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>]
216
                [% END %]
221
                [% END %]
217
                </td>
222
                </td>
218
                <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>
223
                <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>
219
- 

Return to bug 9416