X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FForm.pm;h=b97833e773731029162984937ea5fc9f2bd77281;hb=99a4c7b96e309e52db255c18f17467e86eeb284f;hp=5fbed0d753ac360ad599d1bec60b4ba5f87a45c6;hpb=abc941da2860a2ad1cb3f13c083dcd19fe435883;p=kivitendo-erp.git diff --git a/SL/Form.pm b/SL/Form.pm index 5fbed0d75..b97833e77 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -37,8 +37,11 @@ package Form; +use HTML::Template; +use SL::Menu; + sub _input_to_hash { - $main::lxdebug->enter_sub(); + $main::lxdebug->enter_sub(2); my $input = $_[0]; my %in = (); @@ -49,13 +52,13 @@ sub _input_to_hash { $in{$name} = unescape(undef, $value); } - $main::lxdebug->leave_sub(); + $main::lxdebug->leave_sub(2); return %in; } sub _request_to_hash { - $main::lxdebug->enter_sub(); + $main::lxdebug->enter_sub(2); my ($input) = @_; my ($i, $loc, $key, $val); @@ -106,11 +109,11 @@ sub _request_to_hash { } } - $main::lxdebug->leave_sub(); + $main::lxdebug->leave_sub(2); return %ATTACH; } else { - $main::lxdebug->leave_sub(); + $main::lxdebug->leave_sub(2); return _input_to_hash($input); } } @@ -140,8 +143,7 @@ sub new { $self->{action} = lc $self->{action}; $self->{action} =~ s/( |-|,|#)/_/g; - $self->{version} = "2.1.2"; - $self->{dbversion} = "2.1.2"; + $self->{version} = "2.3.0"; $main::lxdebug->leave_sub(); @@ -161,7 +163,7 @@ sub debug { } sub escape { - $main::lxdebug->enter_sub(); + $main::lxdebug->enter_sub(2); my ($self, $str, $beenthere) = @_; @@ -172,13 +174,13 @@ sub escape { $str =~ s/([^a-zA-Z0-9_.-])/sprintf("%%%02x", ord($1))/ge; - $main::lxdebug->leave_sub(); + $main::lxdebug->leave_sub(2); return $str; } sub unescape { - $main::lxdebug->enter_sub(); + $main::lxdebug->enter_sub(2); my ($self, $str) = @_; @@ -187,7 +189,7 @@ sub unescape { $str =~ s/%([0-9a-fA-Z]{2})/pack("c",hex($1))/eg; - $main::lxdebug->leave_sub(); + $main::lxdebug->leave_sub(2); return $str; } @@ -195,37 +197,43 @@ sub unescape { sub quote { my ($self, $str) = @_; - if ($str && ! ref($str)) { - $str =~ s/"/"/g; + if ($str && !ref($str)) { + $str =~ s/\"/"/g; } $str; } - sub unquote { my ($self, $str) = @_; - if ($str && ! ref($str)) { - $str =~ s/"/"/g; + if ($str && !ref($str)) { + $str =~ s/"/\"/g; } $str; } - sub hide_form { my $self = shift; if (@_) { - for (@_) { print qq|\n| } + for (@_) { + print qq|\n|; + } } else { delete $self->{header}; - for (sort keys %$self) { print qq|\n| } + for (sort keys %$self) { + print qq|\n|; + } } - + } sub error { @@ -235,21 +243,7 @@ sub error { if ($ENV{HTTP_USER_AGENT}) { $msg =~ s/\n/
/g; - - $self->header; - - print qq| - - -

Error!

- -

$msg - - - - |; - - die "Error: $msg\n"; + $self->show_generic_error($msg); } else { @@ -376,7 +370,7 @@ function fokus(){document.$self->{fokus}.focus();} } #Set Calendar - $jsscript = ""; + my $jsscript = ""; if ($self->{jsscript} == 1) { $jsscript = qq| @@ -395,6 +389,7 @@ function fokus(){document.$self->{fokus}.focus();} print qq|Content-Type: text/html + $self->{titlebar} $stylesheet @@ -412,14 +407,129 @@ function fokus(){document.$self->{fokus}.focus();} $main::lxdebug->leave_sub(); } -# write Trigger JavaScript-Code ($qty = 1 - only one Trigger) +sub parse_html_template { + $main::lxdebug->enter_sub(); + + my ($self, $file, $additional_params) = @_; + my $language; + + if (!defined($main::myconfig) || !defined($main::myconfig{"countrycode"})) { + $language = $main::language; + } else { + $language = $main::myconfig{"countrycode"}; + } + + if (-f "templates/webpages/${file}_${language}.html") { + if ((-f ".developer") && + (-f "templates/webpages/${file}_master.html") && + ((stat("templates/webpages/${file}_master.html"))[9] > + (stat("templates/webpages/${file}_${language}.html"))[9])) { + my $info = "Developper information: templates/webpages/${file}_master.html is newer than the localized version.\n" . + "Please re-run 'locales.pl' in 'locale/${language}'."; + print(qq|

$info
|); + die($info); + } + + $file = "templates/webpages/${file}_${language}.html"; + } elsif (-f "templates/webpages/${file}.html") { + $file = "templates/webpages/${file}.html"; + } else { + my $info = "Web page template '${file}' not found.\n" . + "Please re-run 'locales.pl' in 'locale/${language}'."; + print(qq|
$info
|); + die($info); + } + + my $template = HTML::Template->new("filename" => $file, + "die_on_bad_params" => 0, + "strict" => 0, + "case_sensitive" => 1, + "loop_context_vars" => 1, + "global_vars" => 1); + + $additional_params = {} unless ($additional_params); + if ($self->{"DEBUG"}) { + $additional_params->{"DEBUG"} = $self->{"DEBUG"}; + } + + if ($additional_params->{"DEBUG"}) { + $additional_params->{"DEBUG"} = + "
DEBUG INFORMATION:
" . $additional_params->{"DEBUG"} . "
"; + } + + if (%main::myconfig) { + map({ $additional_params->{"myconfig_${_}"} = $main::myconfig{$_}; } keys(%main::myconfig)); + my $jsc_dateformat = $main::myconfig{"dateformat"}; + $jsc_dateformat =~ s/d+/\%d/gi; + $jsc_dateformat =~ s/m+/\%m/gi; + $jsc_dateformat =~ s/y+/\%Y/gi; + $additional_params->{"myconfig_jsc_dateformat"} = $jsc_dateformat; + } + + $additional_params->{"conf_jscalendar"} = $main::jscalendar; + $additional_params->{"conf_lizenzen"} = $main::lizenzen; + $additional_params->{"conf_latex_templates"} = $main::latex; + $additional_params->{"conf_opendocument_templates"} = $main::opendocument_templates; + + my $menu; + if (-f $self->{"login"} . "_menu.ini") { + $menu = Menu->new($self->{"login"} . "_menu.ini"); + } else { + $menu = Menu->new("menu.ini"); + } + $menu->generate_acl("", $additional_params); + + my @additional_param_names = keys(%{$additional_params}); + + foreach my $key ($template->param()) { + if (grep(/^${key}$/, @additional_param_names)) { + $template->param($key => $additional_params->{$key}); + } else { + $template->param($key => $self->{$key}); + } + } + + my $output = $template->output(); + + $main::lxdebug->leave_sub(); + + return $output; +} + +sub show_generic_error { + my ($self, $error, $title) = @_; + + my $add_params = {}; + $add_params->{"title"} = $title if ($title); + $self->{"label_error"} = $error; + + $self->header(); + print($self->parse_html_template("generic/error", $add_params)); + + die("Error: $error\n"); +} + +sub show_generic_information { + my ($self, $error, $title) = @_; + + my $add_params = {}; + $add_params->{"title"} = $title if ($title); + $self->{"label_information"} = $error; + + $self->header(); + print($self->parse_html_template("generic/information", $add_params)); + + die("Information: $error\n"); +} + +# write Trigger JavaScript-Code ($qty = quantity of Triggers) +# changed it to accept an arbitrary number of triggers - sschoeling sub write_trigger { $main::lxdebug->enter_sub(); - my ($self, $myconfig, $qty, - $inputField_1, $align_1, $button_1, - $inputField_2, $align_2, $button_2) - = @_; + my $self = shift; + my $myconfig = shift; + my $qty = shift; # set dateform for jsscript # default @@ -448,35 +558,21 @@ sub write_trigger { } } - $trigger_1 = qq| + while ($#_ >= 2) { + push @triggers, qq| Calendar.setup( { - inputField : "$inputField_1", + inputField : "| . (shift) . qq|", ifFormat :"$ifFormat", - align : "$align_1", - button : "$button_1" + align : "| . (shift) . qq|", + button : "| . (shift) . qq|" } ); |; - - if ($qty == 2) { - $trigger_2 = qq| - Calendar.setup( - { - inputField : "$inputField_2", - ifFormat :"$ifFormat", - align : "$align_2", - button : "$button_2" - } - ); - |; } - $jsscript = qq| + my $jsscript = qq| |; @@ -514,105 +610,49 @@ sub sort_columns { return @columns; } - +# sub format_amount { - $main::lxdebug->enter_sub(); + $main::lxdebug->enter_sub(2); my ($self, $myconfig, $amount, $places, $dash) = @_; - - #Workaround for $format_amount calls without $places - if (!defined $places){ - (my $dec) = ($amount =~ /\.(\d+)/); - $places = length $dec; - } - - if ($places =~ /\d/) { - $amount = $self->round_amount($amount, $places); - } - - # is the amount negative - my $negative = ($amount < 0); - my $fillup = ""; - - if ($amount != 0) { - if ($myconfig->{numberformat} && ($myconfig->{numberformat} ne '1000.00')) - { - my ($whole, $dec) = split /\./, "$amount"; - $whole =~ s/-//; - $amount = join '', reverse split //, $whole; - $fillup = "0" x ($places - length($dec)); - - if ($myconfig->{numberformat} eq '1,000.00') { - $amount =~ s/\d{3,}?/$&,/g; - $amount =~ s/,$//; - $amount = join '', reverse split //, $amount; - $amount .= "\.$dec".$fillup if ($places ne '' && $places*1 != 0); - } + my $neg = ($amount =~ s/-//); - if ($myconfig->{numberformat} eq '1.000,00') { - $amount =~ s/\d{3,}?/$&./g; - $amount =~ s/\.$//; - $amount = join '', reverse split //, $amount; - $amount .= ",$dec".$fillup if ($places ne '' && $places*1 != 0); - } + $amount = $self->round_amount($amount, $places) if ($places =~ /\d/); - if ($myconfig->{numberformat} eq '1000,00') { - $amount = "$whole"; - $amount .= ",$dec" .$fillup if ($places ne '' && $places*1 != 0); - } + my @d = map { s/\d//g; reverse split // } my $tmp = $myconfig->{numberformat}; # get delim chars + my @p = split /\./, $amount ; # split amount at decimal point - if ($dash =~ /-/) { - $amount = ($negative) ? "($amount)" : "$amount"; - } elsif ($dash =~ /DRCR/) { - $amount = ($negative) ? "$amount DR" : "$amount CR"; - } else { - $amount = ($negative) ? "-$amount" : "$amount"; - } - } - } else { - if ($dash eq "0" && $places) { - if ($myconfig->{numberformat} eq '1.000,00') { - $amount = "0" . "," . "0" x $places; - } else { - $amount = "0" . "." . "0" x $places; - } - } else { - $amount = ($dash ne "") ? "$dash" : "0"; - } - } - - $main::lxdebug->leave_sub(); + $p[0] =~ s/\B(?=(...)*$)/$d[1]/g if $d[1]; # add 1,000 delimiters + $amount = $p[0]; + $amount .= $d[0].$p[1].(0 x ($places - length $p[1])) if ($places || $p[1] ne ''); + + $amount = ($neg) ? "($amount)" : "$amount" if $dash =~ ?-?; + $amount = ($neg) ? "$amount DR" : "$amount CR" if $dash =~ ?DRCR?; + $amount = ($neg) ? "-$amount" : "$amount" if $dash =~ ??; + reset; + + $main::lxdebug->leave_sub(2); return $amount; } - +# sub parse_amount { - $main::lxdebug->enter_sub(); + $main::lxdebug->enter_sub(2); my ($self, $myconfig, $amount) = @_; - $main::lxdebug->message(LXDebug::DEBUG2, "Start amount: $amount"); - - if ($myconfig->{in_numberformat} == 1){ + + if ($myconfig->{in_numberformat} == 1) { # Extra input number format 1000.00 or 1000,00 - $main::lxdebug->message(LXDebug::DEBUG2, "in_numberformat: " . $main::locale->text('1000,00 or 1000.00')); $amount =~ s/,/\./g; - #$main::lxdebug->message(LXDebug::DEBUG2, "1.Parsed Number: $amount") if ($amount); $amount = scalar reverse $amount; - #$main::lxdebug->message(LXDebug::DEBUG2, "2.Parsed Number: $amount") if ($amount); $amount =~ s/\./DOT/; - #$main::lxdebug->message(LXDebug::DEBUG2, "3.Parsed Number: $amount") if ($amount); $amount =~ s/\.//g; - #$main::lxdebug->message(LXDebug::DEBUG2, "4.Parsed Number: $amount") if ($amount); $amount =~ s/DOT/\./; - #$main::lxdebug->message(LXDebug::DEBUG2, "5.Parsed Number:" . $amount) if ($amount); - $amount = scalar reverse $amount ; - $main::lxdebug->message(LXDebug::DEBUG2, "Parsed amount:" . $amount . "\n"); - + $amount = scalar reverse $amount; + $main::lxdebug->leave_sub(2); return ($amount * 1); - } - $main::lxdebug->message(LXDebug::DEBUG2, "in_numberformat: " . $main::locale->text('equal Outputformat')); - $main::lxdebug->message(LXDebug::DEBUG2, " = numberformat: $myconfig->{numberformat}"); + if ( ($myconfig->{numberformat} eq '1.000,00') || ($myconfig->{numberformat} eq '1000,00')) { $amount =~ s/\.//g; @@ -620,39 +660,36 @@ sub parse_amount { } if ($myconfig->{numberformat} eq "1'000.00") { - $amount =~ s/'//g; + $amount =~ s/\'//g; } $amount =~ s/,//g; - - $main::lxdebug->message(LXDebug::DEBUG2, "Parsed amount:" . $amount. "\n") if ($amount); - $main::lxdebug->leave_sub(); - + + $main::lxdebug->leave_sub(2); + return ($amount * 1); } sub round_amount { - $main::lxdebug->enter_sub(); + $main::lxdebug->enter_sub(2); my ($self, $amount, $places) = @_; my $round_amount; # Rounding like "Kaufmannsrunden" # Descr. http://de.wikipedia.org/wiki/Rundung - # Inspired by + # Inspired by # http://www.perl.com/doc/FAQs/FAQ/oldfaq-html/Q4.13.html # Solves Bug: 189 # Udo Spallek - $amount = $amount * (10 ** ($places)); - $round_amount = int($amount + .5 * ($amount <=> 0))/(10**($places)); + $amount = $amount * (10**($places)); + $round_amount = int($amount + .5 * ($amount <=> 0)) / (10**($places)); - $main::lxdebug->leave_sub(); + $main::lxdebug->leave_sub(2); return $round_amount; - -} - +} sub parse_template { $main::lxdebug->enter_sub(); @@ -666,9 +703,13 @@ sub parse_template { my ($current_page, $current_line, $current_row) = (1, 1, 0); my $pagebreak = ""; my $sum = 0; - # } Moritz Bunkus + # The old fixed notation of <%variable%> is changed to a new dynamic one. + my ${pre} = '<%'; # Variable Prefix, must be regex save! + my ${suf} = '%>'; # Variable Suffix, must be regex save! + + # Make sure that all *notes* (intnotes, partnotes_*, notes etc) are converted to markup correctly. $self->format_string(grep(/notes/, keys(%{$self}))); @@ -676,7 +717,7 @@ sub parse_template { $self->{"notes"} = $self->{ $self->{"formname"} . "notes" }; map({ $self->{"employee_${_}"} = $myconfig->{$_}; } - qw(email tel fax name signature)); + qw(email tel fax name signature company address businessnumber)); open(IN, "$self->{templates}/$self->{IN}") or $self->error("$self->{IN} : $!"); @@ -707,36 +748,45 @@ sub parse_template { $two_passes = 0; # first we generate a tmpfile - # read file and replace <%variable%> + # read file and replace ${pre}variable${suf} while ($_ = shift) { $par = ""; $var = $_; - + + # Switch ${pre}analyse${suf} for template checking + # If ${pre}analyse${suf} is set in the template, you'll find the + # parsed output in the user Directory for analysing + # Latex errors + # ${pre}analyse${suf} is a switch (allways off, on if set), not a Variable + # Set $form->{analysing}="" for system state: never analyse. + # Set $form->{analysing}="1" for system state: ever analyse. + $self->{analysing} = "1" if (/${pre}analyse${suf}/ && !defined $self->{analysing}); + $two_passes = 1 if (/\\pageref/); # { Moritz Bunkus # detect pagebreak block and its parameters - if (/\s*<%pagebreak ([0-9]+) ([0-9]+) ([0-9]+)%>/) { + if (/\s*${pre}pagebreak ([0-9]+) ([0-9]+) ([0-9]+)${suf}/) { $chars_per_line = $1; $lines_on_first_page = $2; $lines_on_second_page = $3; while ($_ = shift) { - last if (/\s*<%end pagebreak%>/); + last if (/\s*${pre}end pagebreak${suf}/); $pagebreak .= $_; } } # } Moritz Bunkus - - if (/\s*<%foreach /) { + + if (/\s*${pre}foreach /) { # this one we need for the count chomp $var; - $var =~ s/\s*<%foreach (.+?)%>/$1/; + $var =~ s/\s*${pre}foreach (.+?)${suf}/$1/; while ($_ = shift) { - last if (/\s*<%end /); + last if (/\s*${pre}end /); # store line in $par $par .= $_; @@ -747,7 +797,7 @@ sub parse_template { # { Moritz Bunkus # Try to detect whether a manual page break is necessary - # but only if there was a <%pagebreak ...%> block before + # but only if there was a ${pre}pagebreak ...${suf} block before if ($chars_per_line) { my $lines = @@ -768,21 +818,24 @@ sub parse_template { } # Yes we need a manual page break -- or the user has forced one - if ((($current_line + $lines) > $lpp) || - ($self->{"_forced_pagebreaks"} && grep(/^${current_row}$/, @{$self->{"_forced_pagebreaks"}}))) { + if ( + (($current_line + $lines) > $lpp) + || ($self->{"_forced_pagebreaks"} + && grep(/^${current_row}$/, @{ $self->{"_forced_pagebreaks"} })) + ) { my $pb = $pagebreak; - # replace the special variables <%sumcarriedforward%> - # and <%lastpage%> + # replace the special variables ${pre}sumcarriedforward${suf} + # and ${pre}lastpage${suf} my $psum = $self->format_amount($myconfig, $sum, 2); - $pb =~ s/<%sumcarriedforward%>/$psum/g; - $pb =~ s/<%lastpage%>/$current_page/g; + $pb =~ s/${pre}sumcarriedforward${suf}/$psum/g; + $pb =~ s/${pre}lastpage${suf}/$current_page/g; # only "normal" variables are supported here - # (no <%if, no <%foreach, no <%include) + # (no ${pre}if, no ${pre}foreach, no ${pre}include) - $pb =~ s/<%(.+?)%>/$self->{$1}/g; + $pb =~ s/${pre}(.+?)${suf}/$self->{$1}/g; # page break block is ready to rock print(OUT $pb); @@ -798,22 +851,22 @@ sub parse_template { # don't parse par, we need it for each line $_ = $par; - s/<%(.+?)%>/$self->{$1}[$i]/mg; + s/${pre}(.+?)${suf}/$self->{$1}[$i]/mg; print OUT; } next; } # if not comes before if! - if (/\s*<%if not /) { + if (/\s*${pre}if not /) { # check if it is not set and display chop; - s/\s*<%if not (.+?)%>/$1/; + s/\s*${pre}if not (.+?)${suf}/$1/; unless ($self->{$_}) { while ($_ = shift) { - last if (/\s*<%end /); + last if (/\s*${pre}end /); # store line in $par $par .= $_; @@ -823,21 +876,21 @@ sub parse_template { } else { while ($_ = shift) { - last if (/\s*<%end /); + last if (/\s*${pre}end /); } next; } } - if (/\s*<%if /) { + if (/\s*${pre}if /) { # check if it is set and display chop; - s/\s*<%if (.+?)%>/$1/; + s/\s*${pre}if (.+?)${suf}/$1/; if ($self->{$_}) { while ($_ = shift) { - last if (/\s*<%end /); + last if (/\s*${pre}end /); # store line in $par $par .= $_; @@ -847,21 +900,21 @@ sub parse_template { } else { while ($_ = shift) { - last if (/\s*<%end /); + last if (/\s*${pre}end /); } next; } } - # check for <%include filename%> - if (/\s*<%include /) { + # check for ${pre}include filename${suf} + if (/\s*${pre}include /) { - # get the filename + # get the directory/filename chomp $var; - $var =~ s/\s*<%include (.+?)%>/$1/; + $var =~ s/\s*${pre}include (.+?)${suf}/$1/; - # mangle filename - $var =~ s/(\/|\.\.)//g; + # mangle filename on basedir + $var =~ s/^(\/|\.\.)//g; # prevent the infinite loop! next if ($self->{"$var"}); @@ -876,7 +929,8 @@ sub parse_template { next; } - s/<%(.+?)%>/$self->{$1}/g; + s/${pre}(.+?)${suf}/$self->{$1}/g; + s/<\/nobr>/ /g; print OUT; } @@ -1011,10 +1065,10 @@ Content-Length: $numbytes close(IN); } - $self->cleanup; - } + $self->cleanup; + chdir("$self->{cwd}"); $main::lxdebug->leave_sub(); } @@ -1033,12 +1087,14 @@ sub cleanup { close(FH); } - if ($self->{tmpfile}) { + if ($self->{analysing} eq "") { + if ($self->{tmpfile}) { - # strip extension - $self->{tmpfile} =~ s/\.\w+$//g; - my $tmpfile = $self->{tmpfile}; - unlink(<$tmpfile.*>); + # strip extension + $self->{tmpfile} =~ s/\.\w+$//g; + my $tmpfile = $self->{tmpfile}; + unlink(<$tmpfile.*>); + } } chdir("$self->{cwd}"); @@ -1055,7 +1111,7 @@ sub format_string { my %unique_fields; %unique_fields = map({ $_ => 1 } @fields); - @fields = keys(%unique_fields); + @fields = keys(%unique_fields); foreach my $field (@fields) { next unless ($self->{$field} =~ /\/); @@ -1083,7 +1139,7 @@ sub format_string { '&', quotemeta('\n'), ' ', '"', '\$', '%', '_', '#', quotemeta('^'), - '{', '}', '<', '>', '£', "\r" + '{', '}', '<', '>', '£', "\r", '²' ] }, 'html' => { @@ -1109,6 +1165,7 @@ sub format_string { ' ' => '\newline ', '£' => '\pounds ', + '²' => '$^2$', "\r" => "" }); @@ -1308,7 +1365,7 @@ sub get_exchangerate { $main::lxdebug->enter_sub(); my ($self, $dbh, $curr, $transdate, $fld) = @_; - + unless ($transdate) { $main::lxdebug->leave_sub(); return ""; @@ -1361,8 +1418,9 @@ sub add_shipto { my ($self, $dbh, $id) = @_; ##LINET my $shipto; - foreach - my $item (qw(name department_1 department_2 street zipcode city country contact phone fax email)) { + foreach my $item ( + qw(name department_1 department_2 street zipcode city country contact phone fax email) + ) { if ($self->{"shipto$item"}) { $shipto = 1 if ($self->{$item} ne $self->{"shipto$item"}); } @@ -1370,7 +1428,8 @@ sub add_shipto { } if ($shipto) { - my $query = qq|INSERT INTO shipto (trans_id, shiptoname, shiptodepartment_1, shiptodepartment_2, shiptostreet, + my $query = + qq|INSERT INTO shipto (trans_id, shiptoname, shiptodepartment_1, shiptodepartment_2, shiptostreet, shiptozipcode, shiptocity, shiptocountry, shiptocontact, shiptophone, shiptofax, shiptoemail) VALUES ($id, '$self->{shiptoname}', '$self->{shiptodepartment_1}', '$self->{shiptodepartment_2}', '$self->{shiptostreet}', @@ -1629,8 +1688,7 @@ sub create_links { my %xkeyref = (); # now get the account numbers - $query = - qq|SELECT c.accno, SUBSTRING(c.description,1,50) as description, c.link, c.taxkey_id + $query = qq|SELECT c.accno, c.description, c.link, c.taxkey_id FROM chart c WHERE c.link LIKE '%$module%' ORDER BY c.accno|; @@ -1664,7 +1722,7 @@ sub create_links { $query = qq| SELECT * FROM tax t|; $sth = $dbh->prepare($query); $sth->execute || $self->dberror($query); - $form->{TAX} = (); + $self->{TAX} = (); while (my $ref = $sth->fetchrow_hashref(NAME_lc)) { push @{ $self->{TAX} }, $ref; } @@ -1703,7 +1761,7 @@ sub create_links { LEFT Join tax t ON (a.taxkey = t.taxkey) WHERE a.trans_id = $self->{id} AND a.fx_transaction = '0' - ORDER BY a.transdate|; + ORDER BY a.oid,a.transdate|; $sth = $dbh->prepare($query); $sth->execute || $self->dberror($query); @@ -1713,12 +1771,17 @@ sub create_links { $self->{exchangerate} = $self->get_exchangerate($dbh, $self->{currency}, $self->{transdate}, $fld); + my $index = 0; # store amounts in {acc_trans}{$key} for multiple accounts while (my $ref = $sth->fetchrow_hashref(NAME_lc)) { $ref->{exchangerate} = $self->get_exchangerate($dbh, $self->{currency}, $ref->{transdate}, $fld); + if (!($xkeyref{ $ref->{accno} } =~ /tax/)) { + $index++; + } + $ref->{index} = $index; push @{ $self->{acc_trans}{ $xkeyref{ $ref->{accno} } } }, $ref; } @@ -2034,7 +2097,7 @@ sub update_defaults { $query = qq|UPDATE defaults SET $fld = '$var'|; - $dbh->do($query) || $form->dberror($query); + $dbh->do($query) || $self->dberror($query); $dbh->commit; $dbh->disconnect; @@ -2062,7 +2125,7 @@ sub update_business { } $query = qq|UPDATE business SET customernumberinit = '$var' WHERE id=$business_id|; - $dbh->do($query) || $form->dberror($query); + $dbh->do($query) || $self->dberror($query); $dbh->commit; $dbh->disconnect; @@ -2151,7 +2214,6 @@ sub get_partsgroup { $main::lxdebug->leave_sub(); } - sub get_pricegroup { $main::lxdebug->enter_sub(); @@ -2183,92 +2245,95 @@ sub get_pricegroup { $main::lxdebug->leave_sub(); } - sub audittrail { my ($self, $dbh, $myconfig, $audittrail) = @_; - -# table, $reference, $formname, $action, $id, $transdate) = @_; + + # table, $reference, $formname, $action, $id, $transdate) = @_; my $query; my $rv; my $disconnect; - if (! $dbh) { - $dbh = $self->dbconnect($myconfig); + if (!$dbh) { + $dbh = $self->dbconnect($myconfig); $disconnect = 1; } - + # if we have an id add audittrail, otherwise get a new timestamp - + if ($audittrail->{id}) { - + $query = qq|SELECT audittrail FROM defaults|; - + if ($dbh->selectrow_array($query)) { my ($null, $employee_id) = $self->get_employee($dbh); if ($self->{audittrail} && !$myconfig) { - chop $self->{audittrail}; - - my @a = split /\|/, $self->{audittrail}; - my %newtrail = (); - my $key; - my $i; - my @flds = qw(tablename reference formname action transdate); - - # put into hash and remove dups - while (@a) { - $key = "$a[2]$a[3]"; - $i = 0; - $newtrail{$key} = { map { $_ => $a[$i++] } @flds }; - splice @a, 0, 5; - } - - $query = qq|INSERT INTO audittrail (trans_id, tablename, reference, + chop $self->{audittrail}; + + my @a = split /\|/, $self->{audittrail}; + my %newtrail = (); + my $key; + my $i; + my @flds = qw(tablename reference formname action transdate); + + # put into hash and remove dups + while (@a) { + $key = "$a[2]$a[3]"; + $i = 0; + $newtrail{$key} = { map { $_ => $a[$i++] } @flds }; + splice @a, 0, 5; + } + + $query = qq|INSERT INTO audittrail (trans_id, tablename, reference, formname, action, employee_id, transdate) VALUES ($audittrail->{id}, ?, ?, ?, ?, $employee_id, ?)|; - my $sth = $dbh->prepare($query) || $self->dberror($query); - - foreach $key (sort { $newtrail{$a}{transdate} cmp $newtrail{$b}{transdate} } keys %newtrail) { - $i = 1; - for (@flds) { $sth->bind_param($i++, $newtrail{$key}{$_}) } - - $sth->execute || $self->dberror; - $sth->finish; - } + my $sth = $dbh->prepare($query) || $self->dberror($query); + + foreach $key ( + sort { + $newtrail{$a}{transdate} cmp $newtrail{$b}{transdate} + } keys %newtrail + ) { + $i = 1; + for (@flds) { $sth->bind_param($i++, $newtrail{$key}{$_}) } + + $sth->execute || $self->dberror; + $sth->finish; + } } - if ($audittrail->{transdate}) { - $query = qq|INSERT INTO audittrail (trans_id, tablename, reference, + $query = qq|INSERT INTO audittrail (trans_id, tablename, reference, formname, action, employee_id, transdate) VALUES ( $audittrail->{id}, '$audittrail->{tablename}', | - .$dbh->quote($audittrail->{reference}).qq|, + . $dbh->quote($audittrail->{reference}) . qq|, '$audittrail->{formname}', '$audittrail->{action}', $employee_id, '$audittrail->{transdate}')|; } else { - $query = qq|INSERT INTO audittrail (trans_id, tablename, reference, + $query = qq|INSERT INTO audittrail (trans_id, tablename, reference, formname, action, employee_id) VALUES ($audittrail->{id}, '$audittrail->{tablename}', | - .$dbh->quote($audittrail->{reference}).qq|, + . $dbh->quote($audittrail->{reference}) . qq|, '$audittrail->{formname}', '$audittrail->{action}', $employee_id)|; } $dbh->do($query); } } else { - + $query = qq|SELECT current_timestamp FROM defaults|; my ($timestamp) = $dbh->selectrow_array($query); - $rv = "$audittrail->{tablename}|$audittrail->{reference}|$audittrail->{formname}|$audittrail->{action}|$timestamp|"; + $rv = + "$audittrail->{tablename}|$audittrail->{reference}|$audittrail->{formname}|$audittrail->{action}|$timestamp|"; } $dbh->disconnect if $disconnect; - + $rv; - + } package Locale;