Attachment #8297 for bug #7744

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




use C4::Acquisition;
use C4::Budgets;
use C4::Bookseller qw( GetBookSellerFromId);
use C4::Dates qw/format_date/;
use C4::Debug;
use C4::Biblio;
use C4::Members qw/GetMember/;  #needed for permissions checking for changing basketgroup of a basket

        basketbooksellernote => $basket->{booksellernote},
        basketcontractno     => $basket->{contractnumber},
        basketcontractname   => $contract->{contractname},
        creationdate         => $basket->{creationdate},
        authorisedby         => $basket->{authorisedby},
        authorisedbyname     => $basket->{authorisedbyname},
        closedate            => $basket->{closedate},
        active               => $bookseller->{'active'},
        booksellerid         => $bookseller->{'id'},
        name                 => $bookseller->{'name'},

        basketbooksellernote => $basket->{booksellernote},
        basketcontractno     => $basket->{contractnumber},
        basketcontractname   => $contract->{contractname},
        creationdate         => $basket->{creationdate},
        authorisedby         => $basket->{authorisedby},
        authorisedbyname     => $basket->{authorisedbyname},
        closedate            => $basket->{closedate},
        active               => $bookseller->{'active'},
        booksellerid         => $bookseller->{'id'},
        name                 => $bookseller->{'name'},
        entrydate            => C4::Dates->new($results[0]->{'entrydate'},'iso')->output,
        books_loop           => \@books_loop,
        cancelledorders_loop => \@cancelledorders,
        gist_rate            => sprintf( "%.2f", $gist * 100 ) . '%',




use C4::Auth;
use C4::Budgets;
use C4::Input;
use C4::Dates;

use C4::Bookseller  qw/ GetBookSellerFromId /;
use C4::Acquisition;

    basketbooksellernote => $basket->{booksellernote},
    basketcontractno     => $basket->{contractnumber},
    basketcontractname   => $contract->{contractname},
    creationdate         => $basket->{creationdate},
    authorisedby         => $basket->{'authorisedby'},
    authorisedbyname     => $basket->{'authorisedbyname'},
    closedate            => $basket->{'closedate'},
    # order details
    suggestionid         => $suggestion->{suggestionid},
    surnamesuggestedby   => $suggestion->{surnamesuggestedby},

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-2 / +3 lines)
		1	[% USE KohaDates %]
1	[% INCLUDE 'doc-head-open.inc' %]	2	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Koha &rsaquo; Acquisitions &rsaquo; [% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname\|html %] ([% basketno %]) for [% name\|html %]</title>	3	<title>Koha &rsaquo; Acquisitions &rsaquo; [% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname\|html %] ([% basketno %]) for [% name\|html %]</title>
3	[% INCLUDE 'doc-head-close.inc' %]	4	[% INCLUDE 'doc-head-close.inc' %]
Lines 178-185 Link Here
178	<li><span class="label">Contract name:</span> <a href="../admin/aqcontract.pl?op=add_form&contractnumber=[% basketcontractno %]&booksellerid=[% booksellerid %]">[% basketcontractname %]</a></li>	179	<li><span class="label">Contract name:</span> <a href="../admin/aqcontract.pl?op=add_form&contractnumber=[% basketcontractno %]&booksellerid=[% booksellerid %]">[% basketcontractname %]</a></li>
179	[% END %]	180	[% END %]
180	[% IF ( authorisedbyname ) %]<li><span class="label">Managed by:</span> [% authorisedbyname %]</li>[% END %]	181	[% IF ( authorisedbyname ) %]<li><span class="label">Managed by:</span> [% authorisedbyname %]</li>[% END %]
181	[% IF ( creationdate ) %]<li><span class="label">Opened on:</span> [% creationdate %]</li>[% END %]	182	[% IF ( creationdate ) %]<li><span class="label">Opened on:</span> [% creationdate \| $KohaDates %]</li>[% END %]
182	[% IF ( closedate ) %]<li><span class="label">Closed on:</span> [% closedate %]</li>[% END %]	183	[% IF ( closedate ) %]<li><span class="label">Closed on:</span> [% closedate \| $KohaDates %]</li>[% END %]
183		184
184	</ol>	185	</ol>
185	</div>	186	</div>

Return to bug 7744

Lines 29-35 use CGI; Link Here

(-)a/acqui/basket.pl (-6 / +4 lines)
29	use C4::Acquisition;	29	use C4::Acquisition;
30	use C4::Budgets;	30	use C4::Budgets;
31	use C4::Bookseller qw( GetBookSellerFromId);	31	use C4::Bookseller qw( GetBookSellerFromId);
32	use C4::Dates qw/format_date/;
33	use C4::Debug;	32	use C4::Debug;
34	use C4::Biblio;	33	use C4::Biblio;
35	use C4::Members qw/GetMember/; #needed for permissions checking for changing basketgroup of a basket	34	use C4::Members qw/GetMember/; #needed for permissions checking for changing basketgroup of a basket
Lines 126-135 if ( $op eq 'delete_confirm' ) { Link Here
126	basketbooksellernote => $basket->{booksellernote},	125	basketbooksellernote => $basket->{booksellernote},
127	basketcontractno => $basket->{contractnumber},	126	basketcontractno => $basket->{contractnumber},
128	basketcontractname => $contract->{contractname},	127	basketcontractname => $contract->{contractname},
129	creationdate => format_date( $basket->{creationdate} ),	128	creationdate => $basket->{creationdate},
130	authorisedby => $basket->{authorisedby},	129	authorisedby => $basket->{authorisedby},
131	authorisedbyname => $basket->{authorisedbyname},	130	authorisedbyname => $basket->{authorisedbyname},
132	closedate => format_date( $basket->{closedate} ),	131	closedate => $basket->{closedate},
133	active => $bookseller->{'active'},	132	active => $bookseller->{'active'},
134	booksellerid => $bookseller->{'id'},	133	booksellerid => $bookseller->{'id'},
135	name => $bookseller->{'name'},	134	name => $bookseller->{'name'},
Lines 364-377 my $total_est_gste; Link Here
364	basketbooksellernote => $basket->{booksellernote},	363	basketbooksellernote => $basket->{booksellernote},
365	basketcontractno => $basket->{contractnumber},	364	basketcontractno => $basket->{contractnumber},
366	basketcontractname => $contract->{contractname},	365	basketcontractname => $contract->{contractname},
367	creationdate => C4::Dates->new($basket->{creationdate},'iso')->output,	366	creationdate => $basket->{creationdate},
368	authorisedby => $basket->{authorisedby},	367	authorisedby => $basket->{authorisedby},
369	authorisedbyname => $basket->{authorisedbyname},	368	authorisedbyname => $basket->{authorisedbyname},
370	closedate => C4::Dates->new($basket->{closedate},'iso')->output,	369	closedate => $basket->{closedate},
371	active => $bookseller->{'active'},	370	active => $bookseller->{'active'},
372	booksellerid => $bookseller->{'id'},	371	booksellerid => $bookseller->{'id'},
373	name => $bookseller->{'name'},	372	name => $bookseller->{'name'},
374	entrydate => C4::Dates->new($results[0]->{'entrydate'},'iso')->output,
375	books_loop => \@books_loop,	373	books_loop => \@books_loop,
376	cancelledorders_loop => \@cancelledorders,	374	cancelledorders_loop => \@cancelledorders,
377	gist_rate => sprintf( "%.2f", $gist * 100 ) . '%',	375	gist_rate => sprintf( "%.2f", $gist * 100 ) . '%',

Lines 75-81 use C4::Input; Link Here

(-)a/acqui/neworderempty.pl (-3 / +2 lines)
75	use C4::Auth;	75	use C4::Auth;
76	use C4::Budgets;	76	use C4::Budgets;
77	use C4::Input;	77	use C4::Input;
78	use C4::Dates;
79		78
80	use C4::Bookseller qw/ GetBookSellerFromId /;	79	use C4::Bookseller qw/ GetBookSellerFromId /;
81	use C4::Acquisition;	80	use C4::Acquisition;
Lines 340-349 $template->param( Link Here
340	basketbooksellernote => $basket->{booksellernote},	339	basketbooksellernote => $basket->{booksellernote},
341	basketcontractno => $basket->{contractnumber},	340	basketcontractno => $basket->{contractnumber},
342	basketcontractname => $contract->{contractname},	341	basketcontractname => $contract->{contractname},
343	creationdate => C4::Dates->new($basket->{creationdate},'iso')->output,	342	creationdate => $basket->{creationdate},
344	authorisedby => $basket->{'authorisedby'},	343	authorisedby => $basket->{'authorisedby'},
345	authorisedbyname => $basket->{'authorisedbyname'},	344	authorisedbyname => $basket->{'authorisedbyname'},
346	closedate => C4::Dates->new($basket->{'closedate'},'iso')->output,	345	closedate => $basket->{'closedate'},
347	# order details	346	# order details
348	suggestionid => $suggestion->{suggestionid},	347	suggestionid => $suggestion->{suggestionid},
349	surnamesuggestedby => $suggestion->{surnamesuggestedby},	348	surnamesuggestedby => $suggestion->{surnamesuggestedby},