X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/a5f30bf0b12c7e02f545f06215b4b10f01fa12d0..0dfd8e90aa330f6b4b53f89f0eadf6f1e018a662:/SL/Form.pm diff --git a/SL/Form.pm b/SL/Form.pm index a0fa96a2c..b6f62fb91 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -37,6 +37,8 @@ package Form; +use HTML::Template; + sub _input_to_hash { $main::lxdebug->enter_sub(); @@ -140,8 +142,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.2.0"; $main::lxdebug->leave_sub(); @@ -195,7 +196,7 @@ sub unescape { sub quote { my ($self, $str) = @_; - if ($str && ! ref($str)) { + if ($str && !ref($str)) { $str =~ s/"/"/g; } @@ -203,11 +204,10 @@ sub quote { } - sub unquote { my ($self, $str) = @_; - if ($str && ! ref($str)) { + if ($str && !ref($str)) { $str =~ s/"/"/g; } @@ -215,17 +215,24 @@ sub unquote { } - 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 { @@ -237,17 +244,7 @@ sub error { $msg =~ s/\n/
/g; $self->header; - - print qq| - - -

Error!

- -

$msg - - - - |; + $self->show_generic_error($msg); die "Error: $msg\n"; @@ -395,6 +392,7 @@ function fokus(){document.$self->{fokus}.focus();} print qq|Content-Type: text/html + $self->{titlebar} $stylesheet @@ -412,14 +410,88 @@ function fokus(){document.$self->{fokus}.focus();} $main::lxdebug->leave_sub(); } -# write Trigger JavaScript-Code ($qty = 1 - only one Trigger) +use Data::Dumper; +sub parse_html_template { + $main::lxdebug->enter_sub(); + + my ($self, $file, $additional_params) = @_; + + if (-f "templates/webpages/${file}_" . $main::myconfig{"countrycode"} . + ".html") { + if ((-f ".developer") && + (-f "templates/webpages/${file}_master.html") && + ((stat("templates/webpages/${file}_master.html"))[9] > + (stat("templates/webpages/${file}_" . $main::myconfig{"countrycode"} . + ".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/" . $main::myconfig{"countrycode"} . "'."; + print(qq|

$info
|); + die($info); + } + + $file = "templates/webpages/${file}_" . $main::myconfig{"countrycode"} . + ".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/" . $main::myconfig{"countrycode"} . "'."; + 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"} . "
"; + } + + 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; + + print($self->parse_html_template("generic/error", $add_params)); +} + +# 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 +520,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| |; @@ -520,13 +578,19 @@ sub format_amount { 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 = ""; + my $fillup = ""; if ($amount != 0) { if ($myconfig->{numberformat} && ($myconfig->{numberformat} ne '1000.00')) @@ -540,19 +604,19 @@ sub format_amount { $amount =~ s/\d{3,}?/$&,/g; $amount =~ s/,$//; $amount = join '', reverse split //, $amount; - $amount .= "\.$dec".$fillup if ($places ne '' && $places*1 != 0); + $amount .= "\.$dec" . $fillup if ($places ne '' && $places * 1 != 0); } 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 .= ",$dec" . $fillup if ($places ne '' && $places * 1 != 0); } if ($myconfig->{numberformat} eq '1000,00') { $amount = "$whole"; - $amount .= ",$dec" .$fillup if ($places ne '' && $places*1 != 0); + $amount .= ",$dec" . $fillup if ($places ne '' && $places * 1 != 0); } if ($dash =~ /-/) { @@ -584,17 +648,53 @@ sub parse_amount { $main::lxdebug->enter_sub(); my ($self, $myconfig, $amount) = @_; + $main::lxdebug->message(LXDebug::DEBUG2, "Start amount: $amount"); - if (!(substr($amount, -3, 1) eq ".")) { - if ( ($myconfig->{numberformat} eq '1.000,00') - || ($myconfig->{numberformat} eq '1000,00')) { - $amount =~ s/\.//g; - $amount =~ s/,/\./; - } + 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"); + + return ($amount * 1); - $amount =~ s/,//g; + } + $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; + $amount =~ s/,/\./; + } + + if ($myconfig->{numberformat} eq "1'000.00") { + $amount =~ s/'//g; } + $amount =~ s/,//g; + + $main::lxdebug->message(LXDebug::DEBUG2, "Parsed amount:" . $amount . "\n") + if ($amount); $main::lxdebug->leave_sub(); return ($amount * 1); @@ -608,20 +708,18 @@ sub 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(); return $round_amount; - -} - +} sub parse_template { $main::lxdebug->enter_sub(); @@ -737,8 +835,11 @@ 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%> @@ -846,6 +947,7 @@ sub parse_template { } s/<%(.+?)%>/$self->{$1}/g; + s/<\/nobr>/ /g; print OUT; } @@ -1024,7 +1126,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} =~ /\/); @@ -1277,7 +1379,7 @@ sub get_exchangerate { $main::lxdebug->enter_sub(); my ($self, $dbh, $curr, $transdate, $fld) = @_; - + unless ($transdate) { $main::lxdebug->leave_sub(); return ""; @@ -1330,8 +1432,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"}); } @@ -1339,7 +1442,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}', @@ -1598,8 +1702,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|; @@ -1672,7 +1775,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); @@ -1682,12 +1785,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; } @@ -2120,7 +2228,6 @@ sub get_partsgroup { $main::lxdebug->leave_sub(); } - sub get_pricegroup { $main::lxdebug->enter_sub(); @@ -2152,92 +2259,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;