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}, |