$self->{action} = lc $self->{action};
$self->{action} =~ s/( |-|,|\#)/_/g;
- $self->{version} = "2.6.0";
+ $self->{version} = "2.6.1 Beta 1";
$main::lxdebug->leave_sub();
my ($self, $file, $additional_params) = @_;
my $language;
- if (!defined(%main::myconfig) || !defined($main::myconfig{"countrycode"})) {
+ if (!%::myconfig || !$::myconfig{"countrycode"}) {
$language = $main::language;
} else {
$language = $main::myconfig{"countrycode"};
$additional_params->{"conf_latex_templates"} = $main::latex;
$additional_params->{"conf_opendocument_templates"} = $main::opendocument_templates;
$additional_params->{"conf_vertreter"} = $main::vertreter;
+ $additional_params->{"conf_show_best_before"} = $main::show_best_before;
if (%main::debug_options) {
map { $additional_params->{'DEBUG_' . uc($_)} = $main::debug_options{$_} } keys %main::debug_options;
my ($self, $amount, $places) = @_;
my $round_amount;
- # Rounding like "Kaufmannsrunden"
- # Descr. http://de.wikipedia.org/wiki/Rundung
- # Inspired by
- # http://www.perl.com/doc/FAQs/FAQ/oldfaq-html/Q4.13.html
- # Solves Bug: 189
- # Udo Spallek
- $amount = $amount * (10**($places));
+ # Rounding like "Kaufmannsrunden" (see http://de.wikipedia.org/wiki/Rundung )
+
+ # Round amounts to eight places before rounding to the requested
+ # number of places. This gets rid of errors due to internal floating
+ # point representation.
+ $amount = $self->round_amount($amount, 8) if $places < 8;
+ $amount = $amount * (10**($places));
$round_amount = int($amount + .5 * ($amount <=> 0)) / (10**($places));
$main::lxdebug->leave_sub(2);
return $exchangerate;
}
-sub get_default_currency {
+sub get_all_currencies {
$main::lxdebug->enter_sub();
my ($self, $myconfig) = @_;
my $query = qq|SELECT curr FROM defaults|;
- my ($curr) = selectrow_query($self, $dbh, $query);
- my ($defaultcurrency) = split m/:/, $curr;
+ my ($curr) = selectrow_query($self, $dbh, $query);
+ my @currencies = grep { $_ } map { s/\s//g; $_ } split m/:/, $curr;
$main::lxdebug->leave_sub();
- return $defaultcurrency;
+ return @currencies;
}
+sub get_default_currency {
+ $main::lxdebug->enter_sub();
+
+ my ($self, $myconfig) = @_;
+ my @currencies = $self->get_all_currencies($myconfig);
+
+ $main::lxdebug->leave_sub();
+
+ return $currencies[0];
+}
sub set_payment_options {
$main::lxdebug->enter_sub();
my ($count) = selectrow_query($self, $dbh, $query);
# build selection list
- if ($count < $myconfig->{vclimit}) {
+ if ($count <= $myconfig->{vclimit}) {
$query = qq|SELECT id, name, salesman_id
FROM $table WHERE NOT obsolete
ORDER BY name|;