X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FForm.pm;h=f946606483ba89fc20e5d219ee06051ff2e6f88b;hb=5d140e0792ba53700a266f21fcb14a51852bde95;hp=a3990f9cb19db768b559cd0929cbc7552beedd84;hpb=e2cad7d4056cf13ba8df9d4127e76273c56bf305;p=kivitendo-erp.git
diff --git a/SL/Form.pm b/SL/Form.pm
index a3990f9cb..f94660648 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -40,11 +40,14 @@ package Form;
use Carp;
use Data::Dumper;
+use Carp;
+use Config;
use CGI;
use Cwd;
use Encode;
use File::Copy;
use IO::File;
+use Math::BigInt;
use SL::Auth;
use SL::Auth::DB;
use SL::Auth::LDAP;
@@ -76,6 +79,7 @@ use Template;
use URI;
use List::Util qw(first max min sum);
use List::MoreUtils qw(all any apply);
+use SL::DB::Tax;
use strict;
@@ -87,7 +91,8 @@ END {
sub disconnect_standard_dbh {
return unless $standard_dbh;
- $standard_dbh->disconnect();
+
+ $standard_dbh->rollback();
undef $standard_dbh;
}
@@ -307,8 +312,7 @@ sub error {
$self->show_generic_error($msg);
} else {
- print STDERR "Error: $msg\n";
- ::end_of_request();
+ confess "Error: $msg\n";
}
$main::lxdebug->leave_sub();
@@ -464,16 +468,18 @@ sub header {
# standard css for all
# this should gradually move to the layouts that need it
$layout->use_stylesheet("$_.css") for qw(
- main menu list_accounts jquery.autocomplete
+ main menu common list_accounts jquery.autocomplete
jquery.multiselect2side
ui-lightness/jquery-ui
jquery-ui.custom
+ tooltipster themes/tooltipster-light
);
$layout->use_javascript("$_.js") for (qw(
jquery jquery-ui jquery.cookie jquery.checkall jquery.download
- jquery/jquery.form client_js
- common part_selection switchmenuframe autocomplete_part
+ jquery/jquery.form jquery/fixes client_js
+ jquery/jquery.tooltipster.min
+ common part_selection switchmenuframe
), "jquery/ui/i18n/jquery.ui.datepicker-$::myconfig{countrycode}");
$self->{favicon} ||= "favicon.ico";
@@ -533,7 +539,7 @@ sub footer {
print $::request->{layout}->post_content;
if (my @inline_scripts = $::request->{layout}->javascripts_inline) {
- print "\n";
+ print "\n";
}
print <header;
print qq|$info
|;
::end_of_request();
}
@@ -941,28 +950,47 @@ sub parse_amount {
# Make sure no code wich is not a math expression ends up in eval().
return 0 unless $amount =~ /^ [\s \d \( \) \- \+ \* \/ \. ]* $/x;
+
+ # Prevent numbers from being parsed as octals;
+ $amount =~ s{ (?enter_sub(2);
-
my ($self, $amount, $places) = @_;
- my $round_amount;
- # Rounding like "Kaufmannsrunden" (see http://de.wikipedia.org/wiki/Rundung )
+ return 0 if !defined $amount;
- # 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));
+ # We use Perl's knowledge of string representation for
+ # rounding. First, convert the floating point number to a string
+ # with a high number of places. Then split the string on the decimal
+ # sign and use integer calculation for rounding the decimal places
+ # part. If an overflow occurs then apply that overflow to the part
+ # before the decimal sign as well using integer arithmetic again.
- $main::lxdebug->leave_sub(2);
+ my $amount_str = sprintf '%.*f', $places + 10, abs($amount);
+
+ return $amount unless $amount_str =~ m{^(\d+)\.(\d+)$};
+
+ my ($pre, $post) = ($1, $2);
+ my $decimals = '1' . substr($post, 0, $places);
- return $round_amount;
+ my $propagation_limit = $Config{i32size} == 4 ? 7 : 18;
+ my $add_for_rounding = substr($post, $places, 1) >= 5 ? 1 : 0;
+ if ($places > $propagation_limit) {
+ $decimals = Math::BigInt->new($decimals)->badd($add_for_rounding);
+ $pre = Math::BigInt->new($decimals)->badd(1) if substr($decimals, 0, 1) eq '2';
+
+ } else {
+ $decimals += $add_for_rounding;
+ $pre += 1 if substr($decimals, 0, 1) eq '2';
+ }
+
+ $amount = ("${pre}." . substr($decimals, 1)) * ($amount <=> 0);
+
+ return $amount;
}
sub parse_template {
@@ -1019,10 +1047,11 @@ sub parse_template {
file_name => $self->{IN},
form => $self,
myconfig => $myconfig,
- userspath => $userspath);
+ userspath => $userspath,
+ %{ $self->{TEMPLATE_DRIVER_OPTIONS} || {} });
# Copy the notes from the invoice/sales order etc. back to the variable "notes" because that is where most templates expect it to be.
- $self->{"notes"} = $self->{ $self->{"formname"} . "notes" };
+ $self->{"notes"} = $self->{ $self->{"formname"} . "notes" } if exists $self->{ $self->{"formname"} . "notes" };
if (!$self->{employee_id}) {
$self->{"employee_${_}"} = $myconfig->{$_} for qw(email tel fax name signature);
@@ -1099,7 +1128,7 @@ sub parse_template {
if ($self->{media} eq 'email') {
- my $mail = new Mailer;
+ my $mail = Mailer->new;
map { $mail->{$_} = $self->{$_} }
qw(cc bcc subject message version format);
@@ -1117,7 +1146,7 @@ sub parse_template {
$full_signature =~ s/\n/
\n/g;
$mail->{message} .= $full_signature;
- open(IN, "<", $self->{tmpfile})
+ open(IN, "<:encoding(UTF-8)", $self->{tmpfile})
or $self->error($self->cleanup . "$self->{tmpfile} : $!");
$mail->{message} .= $_ while ;
close(IN);
@@ -1215,6 +1244,7 @@ sub get_formname_translation {
sales_delivery_order => $main::locale->text('Delivery Order'),
purchase_delivery_order => $main::locale->text('Delivery Order'),
dunning => $main::locale->text('Dunning'),
+ letter => $main::locale->text('Letter')
);
$main::lxdebug->leave_sub();
@@ -1229,8 +1259,13 @@ sub get_number_prefix_for_type {
(first { $self->{type} eq $_ } qw(invoice credit_note)) ? 'inv'
: ($self->{type} =~ /_quotation$/) ? 'quo'
: ($self->{type} =~ /_delivery_order$/) ? 'do'
+ : ($self->{type} =~ /letter/) ? 'letter'
: 'ord';
+ # better default like this?
+ # : ($self->{type} =~ /(sales|purcharse)_order/ : 'ord';
+ # : 'prefix_undefined';
+
$main::lxdebug->leave_sub();
return $prefix;
}
@@ -1306,7 +1341,7 @@ sub cleanup {
push @err, $::locale->text('The application "#1" was not found on the system.', $application || 'pdflatex') . ' ' . $::locale->text('Please contact your administrator.');
} elsif (-f "$self->{tmpfile}.err") {
- open(FH, "$self->{tmpfile}.err");
+ open(FH, "<:encoding(UTF-8)", "$self->{tmpfile}.err");
@err = ;
close(FH);
}
@@ -1670,36 +1705,19 @@ sub get_default_currency {
}
sub set_payment_options {
- $main::lxdebug->enter_sub();
-
my ($self, $myconfig, $transdate) = @_;
- return $main::lxdebug->leave_sub() unless ($self->{payment_id});
-
- my $dbh = $self->get_standard_dbh($myconfig);
-
- my $query =
- qq|SELECT p.terms_netto, p.terms_skonto, p.percent_skonto, p.description_long , p.description | .
- qq|FROM payment_terms p | .
- qq|WHERE p.id = ?|;
+ my $terms = $self->{payment_id} ? SL::DB::PaymentTerm->new(id => $self->{payment_id})->load : undef;
+ return if !$terms;
- ($self->{terms_netto}, $self->{terms_skonto}, $self->{percent_skonto},
- $self->{payment_terms}, $self->{payment_description}) =
- selectrow_query($self, $dbh, $query, $self->{payment_id});
-
- if ($transdate eq "") {
- if ($self->{invdate}) {
- $transdate = $self->{invdate};
- } else {
- $transdate = $self->{transdate};
- }
- }
+ $transdate ||= $self->{invdate} || $self->{transdate};
+ my $due_date = $self->{duedate} || $self->{reqdate};
- $query =
- qq|SELECT ?::date + ?::integer AS netto_date, ?::date + ?::integer AS skonto_date | .
- qq|FROM payment_terms|;
- ($self->{netto_date}, $self->{skonto_date}) =
- selectrow_query($self, $dbh, $query, $transdate, $self->{terms_netto}, $transdate, $self->{terms_skonto});
+ $self->{$_} = $terms->$_ for qw(terms_netto terms_skonto percent_skonto);
+ $self->{payment_terms} = $terms->description_long;
+ $self->{payment_description} = $terms->description;
+ $self->{netto_date} = $terms->calc_date(reference_date => $transdate, due_date => $due_date, terms => 'net')->to_kivitendo;
+ $self->{skonto_date} = $terms->calc_date(reference_date => $transdate, due_date => $due_date, terms => 'discount')->to_kivitendo;
my ($invtotal, $total);
my (%amounts, %formatted_amounts);
@@ -1729,7 +1747,8 @@ sub set_payment_options {
}
if ($self->{"language_id"}) {
- $query =
+ my $dbh = $self->get_standard_dbh($myconfig);
+ my $query =
qq|SELECT t.translation, l.output_numberformat, l.output_dateformat, l.output_longdates | .
qq|FROM generic_translations t | .
qq|LEFT JOIN language l ON t.language_id = l.id | .
@@ -1773,8 +1792,6 @@ sub set_payment_options {
$self->{skonto_in_percent} = $formatted_amounts{skonto_in_percent};
- $main::lxdebug->leave_sub();
-
}
sub get_template_language {
@@ -1947,23 +1964,6 @@ sub get_employee_data {
$main::lxdebug->leave_sub();
}
-sub get_duedate {
- $main::lxdebug->enter_sub();
-
- my ($self, $myconfig, $reference_date) = @_;
-
- my $terms = $self->{payment_id} ? SL::DB::PaymentTerm->new(id => $self->{payment_id}) ->load
- : $self->{customer_id} ? SL::DB::Customer ->new(id => $self->{customer_id})->load->payment
- : $self->{vendor_id} ? SL::DB::Vendor ->new(id => $self->{vendor_id}) ->load->payment
- : $self->{invdate} ? undef # no payment terms, therefore invdate == duedate
- : croak("Missing field in \$::form: payment_id, customer_id, vendor_id or invdate");
- my $duedate = $terms ? $terms->calc_date(reference_date => $reference_date)->to_kivitendo : undef;
-
- $main::lxdebug->leave_sub();
-
- return $duedate;
-}
-
sub _get_contacts {
$main::lxdebug->enter_sub();
@@ -2133,8 +2133,10 @@ sub _get_taxzones {
my ($self, $dbh, $key) = @_;
$key = "all_taxzones" unless ($key);
+ my $tzfilter = "";
+ $tzfilter = "WHERE obsolete is FALSE" if $key eq 'ALL_ACTIVE_TAXZONES';
- my $query = qq|SELECT * FROM tax_zones ORDER BY id|;
+ my $query = qq|SELECT * FROM tax_zones $tzfilter ORDER BY sortkey|;
$self->{$key} = selectall_hashref_query($self, $dbh, $query);
@@ -2361,8 +2363,13 @@ sub get_lists {
my $dbh = $self->get_standard_dbh(\%main::myconfig);
my ($sth, $query, $ref);
- my $vc = $self->{"vc"} eq "customer" ? "customer" : "vendor";
- my $vc_id = $self->{"${vc}_id"};
+ my ($vc, $vc_id);
+ if ($params{contacts} || $params{shipto}) {
+ $vc = 'customer' if $self->{"vc"} eq "customer";
+ $vc = 'vendor' if $self->{"vc"} eq "vendor";
+ die "invalid use of get_lists, need 'vc'" unless $vc;
+ $vc_id = $self->{"${vc}_id"};
+ }
if ($params{"contacts"}) {
$self->_get_contacts($dbh, $vc_id, $params{"contacts"});
@@ -2403,7 +2410,7 @@ sub get_lists {
}
if ($params{"salesmen"}) {
- $self->_get_employees($dbh, "all_salesmen", $params{"salesmen"});
+ $self->_get_employees($dbh, $params{"salesmen"});
}
if ($params{"business_types"}) {
@@ -2879,7 +2886,6 @@ sub lastname_used {
"d.description" => "department",
"ct.name" => $table,
"cu.name" => "currency",
- "current_date + ct.terms" => "duedate",
);
if ($self->{type} =~ /delivery_order/) {
@@ -3333,11 +3339,10 @@ sub prepare_for_printing {
$self->{"employee_${_}"} = $defaults->$_ for qw(address businessnumber co_ustid company duns sepa_creditor_id taxnumber);
}
- # set shipto from billto unless set
- my $has_shipto = any { $self->{"shipto$_"} } qw(name street zipcode city country contact);
- if (!$has_shipto && ($self->{type} =~ m/^(?:purchase_order|request_quotation)$/)) {
- $self->{shiptoname} = $defaults->company;
- $self->{shiptostreet} = $defaults->address;
+ # Load shipping address from database if shipto_id is set.
+ if ($self->{shipto_id}) {
+ my $shipto = SL::DB::Shipto->new(shipto_id => $self->{shipto_id})->load;
+ $self->{$_} = $shipto->$_ for grep { m{^shipto} } map { $_->name } @{ $shipto->meta->columns };
}
my $language = $self->{language} ? '_' . $self->{language} : '';
@@ -3345,15 +3350,15 @@ sub prepare_for_printing {
my ($language_tc, $output_numberformat, $output_dateformat, $output_longdates);
if ($self->{language_id}) {
($language_tc, $output_numberformat, $output_dateformat, $output_longdates) = AM->get_language_details(\%::myconfig, $self, $self->{language_id});
- } else {
- $output_dateformat = $::myconfig{dateformat};
- $output_numberformat = $::myconfig{numberformat};
- $output_longdates = 1;
}
- $self->{myconfig_output_dateformat} = $output_dateformat;
- $self->{myconfig_output_longdates} = $output_longdates;
- $self->{myconfig_output_numberformat} = $output_numberformat;
+ $output_dateformat ||= $::myconfig{dateformat};
+ $output_numberformat ||= $::myconfig{numberformat};
+ $output_longdates //= 1;
+
+ $self->{myconfig_output_dateformat} = $output_dateformat // $::myconfig{dateformat};
+ $self->{myconfig_output_longdates} = $output_longdates // 1;
+ $self->{myconfig_output_numberformat} = $output_numberformat // $::myconfig{numberformat};
# Retrieve accounts for tax calculation.
IC->retrieve_accounts(\%::myconfig, $self, map { $_ => $self->{"id_$_"} } 1 .. $self->{rowcount});
@@ -3421,6 +3426,82 @@ sub prepare_for_printing {
return $self;
}
+sub calculate_arap {
+ my ($self,$buysell,$taxincluded,$exchangerate,$roundplaces) = @_;
+
+ # this function is used to calculate netamount, total_tax and amount for AP and
+ # AR transactions (Kreditoren-/Debitorenbuchungen) by going over all lines
+ # (1..$rowcount)
+ # Thus it needs a fully prepared $form to work on.
+ # calculate_arap assumes $form->{amount_$i} entries still need to be parsed
+
+ # The calculated total values are all rounded (default is to 2 places) and
+ # returned as parameters rather than directly modifying form. The aim is to
+ # make the calculation of AP and AR behave identically. There is a test-case
+ # for this function in t/form/arap.t
+
+ # While calculating the totals $form->{amount_$i} and $form->{tax_$i} are
+ # modified and formatted and receive the correct sign for writing straight to
+ # acc_trans, depending on whether they are ar or ap.
+
+ # check parameters
+ die "taxincluded needed in Form->calculate_arap" unless defined $taxincluded;
+ die "exchangerate needed in Form->calculate_arap" unless defined $exchangerate;
+ die 'illegal buysell parameter, has to be \"buy\" or \"sell\" in Form->calculate_arap\n' unless $buysell =~ /^(buy|sell)$/;
+ $roundplaces = 2 unless $roundplaces;
+
+ my $sign = 1; # adjust final results for writing amount to acc_trans
+ $sign = -1 if $buysell eq 'buy';
+
+ my ($netamount,$total_tax,$amount);
+
+ my $tax;
+
+ # parse and round amounts, setting correct sign for writing to acc_trans
+ for my $i (1 .. $self->{rowcount}) {
+ $self->{"amount_$i"} = $self->round_amount($self->parse_amount(\%::myconfig, $self->{"amount_$i"}) * $exchangerate * $sign, $roundplaces);
+
+ $amount += $self->{"amount_$i"} * $sign;
+ }
+
+ for my $i (1 .. $self->{rowcount}) {
+ next unless $self->{"amount_$i"};
+ ($self->{"tax_id_$i"}) = split /--/, $self->{"taxchart_$i"};
+ my $tax_id = $self->{"tax_id_$i"};
+
+ my $selected_tax = SL::DB::Manager::Tax->find_by(id => "$tax_id");
+
+ if ( $selected_tax ) {
+
+ if ( $buysell eq 'sell' ) {
+ $self->{AR_amounts}{"tax_$i"} = $selected_tax->chart->accno if defined $selected_tax->chart;
+ } else {
+ $self->{AP_amounts}{"tax_$i"} = $selected_tax->chart->accno if defined $selected_tax->chart;
+ };
+
+ $self->{"taxkey_$i"} = $selected_tax->taxkey;
+ $self->{"taxrate_$i"} = $selected_tax->rate;
+ };
+
+ ($self->{"amount_$i"}, $self->{"tax_$i"}) = $self->calculate_tax($self->{"amount_$i"},$self->{"taxrate_$i"},$taxincluded,$roundplaces);
+
+ $netamount += $self->{"amount_$i"};
+ $total_tax += $self->{"tax_$i"};
+
+ }
+ $amount = $netamount + $total_tax;
+
+ # due to $sign amount_$i und tax_$i already have the right sign for acc_trans
+ # but reverse sign of totals for writing amounts to ar
+ if ( $buysell eq 'buy' ) {
+ $netamount *= -1;
+ $amount *= -1;
+ $total_tax *= -1;
+ };
+
+ return($netamount,$total_tax,$amount);
+}
+
sub format_dates {
my ($self, $dateformat, $longformat, @indices) = @_;
@@ -3533,6 +3614,39 @@ sub layout {
return $layout;
}
+sub calculate_tax {
+ # this function calculates the net amount and tax for the lines in ar, ap and
+ # gl and is used for update as well as post. When used with update the return
+ # value of amount isn't needed
+
+ # calculate_tax should always work with positive values, or rather as the user inputs them
+ # calculate_tax uses db/perl numberformat, i.e. parsed numbers
+ # convert to negative numbers (when necessary) only when writing to acc_trans
+ # the amount from $form for ap/ar/gl is currently always rounded to 2 decimals before it reaches here
+ # for post_transaction amount already contains exchangerate and correct sign and is rounded
+ # calculate_tax doesn't (need to) know anything about exchangerate
+
+ my ($self,$amount,$taxrate,$taxincluded,$roundplaces) = @_;
+
+ $roundplaces = 2 unless defined $roundplaces;
+
+ my $tax;
+
+ if ($taxincluded *= 1) {
+ # calculate tax (unrounded), subtract from amount, round amount and round tax
+ $tax = $amount - ($amount / ($taxrate + 1)); # equivalent to: taxrate * amount / (taxrate + 1)
+ $amount = $self->round_amount($amount - $tax, $roundplaces);
+ $tax = $self->round_amount($tax, $roundplaces);
+ } else {
+ $tax = $amount * $taxrate;
+ $tax = $self->round_amount($tax, $roundplaces);
+ }
+
+ $tax = 0 unless $tax;
+
+ return ($amount,$tax);
+};
+
1;
__END__