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

(-)a/C4/Acquisition.pm (-1 / +7 lines)
Lines 1392-1398 sub ModReceiveOrder { Link Here
1392
    my $order_vendornote = $params->{order_vendornote};
1392
    my $order_vendornote = $params->{order_vendornote};
1393
1393
1394
    my $dbh = C4::Context->dbh;
1394
    my $dbh = C4::Context->dbh;
1395
    $datereceived = output_pref({ dt=>dt_from_string, dateonly=>1, dateformat=>'iso' }) unless $datereceived;
1395
    $datereceived = output_pref(
1396
        {
1397
            dt => ( $datereceived ? dt_from_string( $datereceived ) : dt_from_string ),
1398
            dateformat => 'iso',
1399
            dateonly => 1,
1400
        }
1401
    );
1396
    my $suggestionid = GetSuggestionFromBiblionumber( $biblionumber );
1402
    my $suggestionid = GetSuggestionFromBiblionumber( $biblionumber );
1397
    if ($suggestionid) {
1403
    if ($suggestionid) {
1398
        ModSuggestion( {suggestionid=>$suggestionid,
1404
        ModSuggestion( {suggestionid=>$suggestionid,
(-)a/acqui/finishreceive.pl (-1 / +1 lines)
Lines 48-57 my $origquantityrec = $input->param('origquantityrec'); Link Here
48
my $quantityrec      = $input->param('quantityrec');
48
my $quantityrec      = $input->param('quantityrec');
49
my $quantity         = $input->param('quantity');
49
my $quantity         = $input->param('quantity');
50
my $unitprice        = $input->param('cost');
50
my $unitprice        = $input->param('cost');
51
my $datereceived     = $input->param('datereceived'),
51
my $invoiceid        = $input->param('invoiceid');
52
my $invoiceid        = $input->param('invoiceid');
52
my $invoice          = GetInvoice($invoiceid);
53
my $invoice          = GetInvoice($invoiceid);
53
my $invoiceno        = $invoice->{invoicenumber};
54
my $invoiceno        = $invoice->{invoicenumber};
54
my $datereceived     = $invoice->{shipmentdate};
55
my $booksellerid     = $input->param('booksellerid');
55
my $booksellerid     = $input->param('booksellerid');
56
my $cnt              = 0;
56
my $cnt              = 0;
57
my $ecost            = $input->param('ecost');
57
my $ecost            = $input->param('ecost');
(-)a/acqui/orderreceive.pl (-8 / +4 lines)
Lines 67-73 use C4::Koha; # GetKohaAuthorisedValues GetItemTypes Link Here
67
use C4::Acquisition;
67
use C4::Acquisition;
68
use C4::Auth;
68
use C4::Auth;
69
use C4::Output;
69
use C4::Output;
70
use C4::Dates qw/format_date/;
71
use C4::Budgets qw/ GetBudget GetBudgetHierarchy CanUserUseBudget GetBudgetPeriods /;
70
use C4::Budgets qw/ GetBudget GetBudgetHierarchy CanUserUseBudget GetBudgetPeriods /;
72
use C4::Members;
71
use C4::Members;
73
use C4::Branch;    # GetBranches
72
use C4::Branch;    # GetBranches
Lines 76-82 use C4::Biblio; Link Here
76
use C4::Suggestions;
75
use C4::Suggestions;
77
76
78
use Koha::Acquisition::Bookseller;
77
use Koha::Acquisition::Bookseller;
79
78
use Koha::DateUtils qw( dt_from_string );
80
79
81
my $input      = new CGI;
80
my $input      = new CGI;
82
81
Lines 85-95 my $invoiceid = $input->param('invoiceid'); Link Here
85
my $invoice      = GetInvoice($invoiceid);
84
my $invoice      = GetInvoice($invoiceid);
86
my $booksellerid   = $invoice->{booksellerid};
85
my $booksellerid   = $invoice->{booksellerid};
87
my $freight      = $invoice->{shipmentcost};
86
my $freight      = $invoice->{shipmentcost};
88
my $datereceived = $invoice->{shipmentdate};
89
my $ordernumber  = $input->param('ordernumber');
87
my $ordernumber  = $input->param('ordernumber');
90
88
91
$datereceived = $datereceived ? C4::Dates->new($datereceived, 'iso') : C4::Dates->new();
92
93
my $bookseller = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });
89
my $bookseller = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });
94
my $results;
90
my $results;
95
$results = SearchOrders({
91
$results = SearchOrders({
Lines 196-201 my $member = GetMember( borrowernumber => $authorisedby ); Link Here
196
192
197
my $budget = GetBudget( $order->{budget_id} );
193
my $budget = GetBudget( $order->{budget_id} );
198
194
195
my $datereceived = $order->{datereceived} ? dt_from_string( $order->{datereceived} ) : dt_from_string;
196
199
$template->param(
197
$template->param(
200
    AcqCreateItem         => $AcqCreateItem,
198
    AcqCreateItem         => $AcqCreateItem,
201
    count                 => 1,
199
    count                 => 1,
Lines 205-211 $template->param( Link Here
205
    booksellerid          => $order->{'booksellerid'},
203
    booksellerid          => $order->{'booksellerid'},
206
    freight               => $freight,
204
    freight               => $freight,
207
    name                  => $bookseller->{'name'},
205
    name                  => $bookseller->{'name'},
208
    date                  => format_date($order->{entrydate}),
209
    title                 => $order->{'title'},
206
    title                 => $order->{'title'},
210
    author                => $order->{'author'},
207
    author                => $order->{'author'},
211
    copyrightdate         => $order->{'copyrightdate'},
208
    copyrightdate         => $order->{'copyrightdate'},
Lines 221-228 $template->param( Link Here
221
    membersurname         => $member->{surname} || "",
218
    membersurname         => $member->{surname} || "",
222
    invoiceid             => $invoice->{invoiceid},
219
    invoiceid             => $invoice->{invoiceid},
223
    invoice               => $invoice->{invoicenumber},
220
    invoice               => $invoice->{invoicenumber},
224
    datereceived          => $datereceived->output(),
221
    datereceived          => $datereceived,
225
    datereceived_iso      => $datereceived->output('iso'),
226
    order_internalnote    => $order->{order_internalnote},
222
    order_internalnote    => $order->{order_internalnote},
227
    order_vendornote      => $order->{order_vendornote},
223
    order_vendornote      => $order->{order_vendornote},
228
    suggestionid          => $suggestion->{suggestionid},
224
    suggestionid          => $suggestion->{suggestionid},
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-4 / +7 lines)
Lines 1-6 Link Here
1
[% USE KohaDates %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Acquisitions &rsaquo; Receipt summary for : [% name %] [% IF ( invoice ) %]invoice, [% invoice %][% END %]</title>
3
<title>Koha &rsaquo; Acquisitions &rsaquo; Receipt summary for : [% name %] [% IF ( invoice ) %]invoice, [% invoice %][% END %]</title>
3
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
5
[% INCLUDE 'calendar.inc' %]
4
[% INCLUDE 'additem.js.inc' %]
6
[% INCLUDE 'additem.js.inc' %]
5
<script type="text/javascript" src="[% themelang %]/js/additem.js"></script>
7
<script type="text/javascript" src="[% themelang %]/js/additem.js"></script>
6
<script type="text/javascript" src="[% themelang %]/js/cataloging.js"></script>
8
<script type="text/javascript" src="[% themelang %]/js/cataloging.js"></script>
Lines 259-272 Link Here
259
    <input type="hidden" name="invoiceid" value="[% invoiceid %]" />
261
    <input type="hidden" name="invoiceid" value="[% invoiceid %]" />
260
    <input type="hidden" name="ordernumber" value="[% ordernumber %]" />
262
    <input type="hidden" name="ordernumber" value="[% ordernumber %]" />
261
    <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
263
    <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
262
    <input type="hidden" name="datereceived" value="[% datereceived_iso %]" />
263
    <input type="hidden" name="gstrate" value="[% gstrate %]" />
264
    <input type="hidden" name="gstrate" value="[% gstrate %]" />
264
	</div>
265
	</div>
265
	<div class="yui-u">
266
	<div class="yui-u">
266
    <fieldset class="rows">
267
    <fieldset class="rows">
267
    <legend>Accounting details</legend>
268
    <legend>Accounting details</legend>
268
       <ol>
269
        <ol>
269
       <li><label for="datereceived">Date received: </label><span> [% datereceived %] </span></li>
270
            <li>
271
                <label for="datereceived">Date received: </label>
272
                <input type="text" size="10" id="datereceived" name="datereceived" value="[% datereceived | $KohaDates %]" class="datepicker" />
273
            </li>
270
       <li><label for="bookfund">Fund: </label><select id="bookfund" name="bookfund">
274
       <li><label for="bookfund">Fund: </label><select id="bookfund" name="bookfund">
271
            <option value="">Keep current ([% budget_period_description %] - [% bookfund %])</option>
275
            <option value="">Keep current ([% budget_period_description %] - [% bookfund %])</option>
272
            [% FOREACH period IN budget_loop %]
276
            [% FOREACH period IN budget_loop %]
273
- 

Return to bug 8417