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

(-)a/acqui/booksellers.pl (-6 lines)
Lines 56-62 use C4::Biblio; Link Here
56
use C4::Output;
56
use C4::Output;
57
use CGI;
57
use CGI;
58
58
59
use C4::Dates qw/format_date/;
60
use C4::Acquisition qw/ GetBasketsInfosByBookseller /;
59
use C4::Acquisition qw/ GetBasketsInfosByBookseller /;
61
use C4::Bookseller qw/ GetBookSellerFromId GetBookSeller /;
60
use C4::Bookseller qw/ GetBookSellerFromId GetBookSeller /;
62
use C4::Members qw/GetMember/;
61
use C4::Members qw/GetMember/;
Lines 126-136 for my $vendor (@suppliers) { Link Here
126
                   ) 
125
                   ) 
127
                ) 
126
                ) 
128
           ) { 
127
           ) { 
129
            for my $date_field (qw( creationdate closedate)) {
130
                if ( $basket->{$date_field} ) {
131
                    $basket->{$date_field} = format_date( $basket->{$date_field} );
132
                }
133
            }
134
            foreach (qw(total_items total_biblios expected_items)) {
128
            foreach (qw(total_items total_biblios expected_items)) {
135
                $basket->{$_} ||= 0;
129
                $basket->{$_} ||= 0;
136
            }
130
            }
(-)a/acqui/supplier.pl (-6 lines)
Lines 46-52 use C4::Auth; Link Here
46
use C4::Contract qw/GetContract/;
46
use C4::Contract qw/GetContract/;
47
use C4::Biblio;
47
use C4::Biblio;
48
use C4::Output;
48
use C4::Output;
49
use C4::Dates qw/format_date /;
50
use CGI;
49
use CGI;
51
50
52
use C4::Bookseller qw( GetBookSellerFromId DelBookseller );
51
use C4::Bookseller qw( GetBookSellerFromId DelBookseller );
Lines 79-89 if ( $op eq 'display' ) { Link Here
79
78
80
    my $contracts = GetContract( { booksellerid => $booksellerid } );
79
    my $contracts = GetContract( { booksellerid => $booksellerid } );
81
80
82
    for ( @{$contracts} ) {
83
        $_->{contractstartdate} = format_date( $_->{contractstartdate} );
84
        $_->{contractenddate}   = format_date( $_->{contractenddate} );
85
    }
86
87
    $template->param(
81
    $template->param(
88
        booksellerid  => $booksellerid,
82
        booksellerid  => $booksellerid,
89
        name          => $supplier->{'name'},
83
        name          => $supplier->{'name'},
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt (-2 / +3 lines)
Lines 1-3 Link Here
1
[% USE KohaDates %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Search for vendor [% supplier %]</title>
3
<title>Koha &rsaquo; Search for vendor [% supplier %]</title>
3
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
Lines 110-119 $(document).ready(function() { Link Here
110
                                            [% basket.authorisedby_firstname %]
111
                                            [% basket.authorisedby_firstname %]
111
                                            [% basket.authorisedby_surname %]
112
                                            [% basket.authorisedby_surname %]
112
                                        </td>
113
                                        </td>
113
                                        <td>[% basket.creationdate %]</td>
114
                                        <td>[% basket.creationdate | $KohaDates %]</td>
114
                                        <td>
115
                                        <td>
115
                                            [% IF ( basket.closedate ) %]
116
                                            [% IF ( basket.closedate ) %]
116
                                                closed on [% basket.closedate %]
117
                                                closed on [% basket.closedate | $KohaDates %]
117
                                                <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno %]">View</a>
118
                                                <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno %]">View</a>
118
                                            [% ELSE %]
119
                                            [% ELSE %]
119
                                                [% IF ( basket.active ) %]
120
                                                [% IF ( basket.active ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt (-3 / +3 lines)
Lines 1-3 Link Here
1
[% USE KohaDates %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Vendor [% bookselname %]</title>
3
<title>Koha &rsaquo; Vendor [% bookselname %]</title>
3
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
Lines 217-224 if (f.company.value == "") { Link Here
217
                            <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;contractnumber=[% contract.contractnumber %]&amp;booksellerid=[% contract.booksellerid %]">[% contract.contractname %]</a>
218
                            <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;contractnumber=[% contract.contractnumber %]&amp;booksellerid=[% contract.booksellerid %]">[% contract.contractname %]</a>
218
                        </td>
219
                        </td>
219
                        <td>[% contract.contractdescription %]</td>
220
                        <td>[% contract.contractdescription %]</td>
220
                        <td>[% contract.contractstartdate %]</td>
221
                        <td>[% contract.contractstartdate | $KohaDates %]</td>
221
                        <td>[% contract.contractenddate %]</td>
222
                        <td>[% contract.contractenddate | $KohaDates %]</td>
222
                        <td><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;contractnumber=[% contract.contractnumber %]&amp;booksellerid=[% contract.booksellerid %]">Edit</a></td>
223
                        <td><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;contractnumber=[% contract.contractnumber %]&amp;booksellerid=[% contract.booksellerid %]">Edit</a></td>
223
                        <td><a href="/cgi-bin/koha/admin/aqcontract.pl?op=delete_confirm&amp;contractnumber=[% contract.contractnumber %]&amp;booksellerid=[% contract.booksellerid %]">Delete</a></td>
224
                        <td><a href="/cgi-bin/koha/admin/aqcontract.pl?op=delete_confirm&amp;contractnumber=[% contract.contractnumber %]&amp;booksellerid=[% contract.booksellerid %]">Delete</a></td>
224
                        </tr>
225
                        </tr>
225
- 

Return to bug 7737