=over 4
-=item supplierid
+=item booksellerid
To know the bookseller this script has to display details.
use C4::Contract qw/GetContract/;
use C4::Biblio;
use C4::Output;
-use C4::Dates qw/format_date /;
use CGI;
-use C4::Bookseller;
+use C4::Bookseller qw( GetBookSellerFromId DelBookseller );
use C4::Budgets;
my $query = CGI->new;
-my $id = $query->param('supplierid');
+my $booksellerid = $query->param('booksellerid');
my $supplier = {};
-if ($id) {
- $supplier = GetBookSellerFromId($id);
+if ($booksellerid) {
+ $supplier = GetBookSellerFromId($booksellerid);
}
my $op = $query->param('op') || 'display';
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
query => $query,
type => 'intranet',
authnotrequired => 0,
- flagsrequired => { acquisition => 'vendors_manage' },
+ flagsrequired => { acquisition => '*' },
debug => 1,
}
);
#build array for currencies
if ( $op eq 'display' ) {
- my $contracts = GetContract( { booksellerid => $id } );
-
- for ( @{$contracts} ) {
- $_->{contractstartdate} = format_date( $_->{contractstartdate} );
- $_->{contractenddate} = format_date( $_->{contractenddate} );
- }
+ my $contracts = GetContract( { booksellerid => $booksellerid } );
$template->param(
- id => $id,
+ booksellerid => $booksellerid,
name => $supplier->{'name'},
postal => $supplier->{'postal'},
address1 => $supplier->{'address1'},
address3 => $supplier->{'address3'},
address4 => $supplier->{'address4'},
phone => $supplier->{'phone'},
+ accountnumber => $supplier->{'accountnumber'},
fax => $supplier->{'fax'},
url => $supplier->{'url'},
contact => $supplier->{'contact'},
listincgst => $supplier->{'listincgst'},
invoiceincgst => $supplier->{'invoiceincgst'},
discount => $supplier->{'discount'},
+ deliverytime => $supplier->{deliverytime},
invoiceprice => $supplier->{'invoiceprice'},
listprice => $supplier->{'listprice'},
GST => $tax_rate,
default_tax => defined($seller_gstrate),
basketcount => $supplier->{'basketcount'},
+ subscriptioncount => $supplier->{'subscriptioncount'},
contracts => $contracts,
+ dateformat => C4::Context->preference("dateformat"),
);
} elsif ( $op eq 'delete' ) {
- DelBookseller($id);
+ # no further message needed for the user
+ # the DELETE button only appears in the template if basketcount == 0
+ if ( $supplier->{'basketcount'} == 0 ) {
+ DelBookseller($booksellerid);
+ }
print $query->redirect('/cgi-bin/koha/acqui/acqui-home.pl');
exit;
} else {
my @currencies = GetCurrencies();
my $loop_currency;
+ my $active_currency = GetCurrency();
+ my $active_listprice = $supplier->{'listprice'};
+ my $active_invoiceprice = $supplier->{'invoiceprice'};
+ if (!$supplier->{listprice}) {
+ $active_listprice = $active_currency->{currency};
+ }
+ if (!$supplier->{invoiceprice}) {
+ $active_invoiceprice = $active_currency->{currency};
+ }
for (@currencies) {
push @{$loop_currency},
- { currency => $_->{currency},
- listprice => ( $_->{currency} eq $supplier->{listprice} ),
- invoiceprice => ( $_->{currency} eq $supplier->{invoiceprice} ),
- };
+ {
+ currency => $_->{currency},
+ listprice => ( $_->{currency} eq $active_listprice ),
+ invoiceprice => ( $_->{currency} eq $active_invoiceprice ),
+ };
}
my $default_gst_rate = (C4::Context->preference('gist') * 100) || '0.0';
my $gstrate = defined $supplier->{gstrate} ? $supplier->{gstrate} * 100 : '';
$template->param(
- id => $id,
+ booksellerid => $booksellerid,
name => $supplier->{'name'},
postal => $supplier->{'postal'},
address1 => $supplier->{'address1'},
address3 => $supplier->{'address3'},
address4 => $supplier->{'address4'},
phone => $supplier->{'phone'},
+ accountnumber=> $supplier->{'accountnumber'},
fax => $supplier->{'fax'},
url => $supplier->{'url'},
contact => $supplier->{'contact'},
contnotes => $supplier->{'contnotes'},
notes => $supplier->{'notes'},
# set active ON by default for supplier add (id empty for add)
- active => $id ? $supplier->{'active'} : 1,
+ active => $booksellerid ? $supplier->{'active'} : 1,
gstreg => $supplier->{'gstreg'},
listincgst => $supplier->{'listincgst'},
invoiceincgst => $supplier->{'invoiceincgst'},
gstrate => $gstrate,
discount => $supplier->{'discount'},
+ deliverytime => $supplier->{deliverytime},
loop_currency => $loop_currency,
GST => $tax_rate,
enter => 1,