X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Frp.pl;h=56e7f49ad27e0738198186fcacdcb6724430a280;hb=aed92dbe7d4c3d21b3e410b1b02a2fc9d2b797f1;hp=a496faa9114ee88ffcfc69aa5d0d565a7fb5edc9;hpb=d333f237fcd8ef1d9145b7b51072f7088b857301;p=kivitendo-erp.git diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index a496faa91..56e7f49ad 100644 --- a/bin/mozilla/rp.pl +++ b/bin/mozilla/rp.pl @@ -40,6 +40,7 @@ require "bin/mozilla/common.pl"; use SL::PE; use SL::RP; +use SL::USTVA; 1; @@ -109,9 +110,7 @@ sub report { $accrual = ($eur) ? "" : "checked"; $cash = ($eur) ? "checked" : ""; - ($null, $null, $null, $null, $null, $year, $null, $null, $null) = - localtime(); - $year += 1900; + $year = (localtime)[5] + 1900; # get departments $form->all_departments(\%myconfig); @@ -199,7 +198,7 @@ sub report { if ($name_1 eq "") { $button1 = qq| - |; + |; $button1_2 = qq| text('button') . qq|>|; @@ -209,12 +208,12 @@ sub report { Form->write_trigger(\%myconfig, "1", "$name_2", "BR", "$trigger_2"); } else { $button1 = qq| - |; + |; $button1_2 = qq| text('button') . qq|>|; $button2 = qq| - |; + |; $button2_2 = qq| text('button') . qq|> @@ -230,19 +229,21 @@ sub report { # without JavaScript Calendar if ($name_1 eq "") { $button1 = - qq||; + qq||; } else { $button1 = - qq||; + qq||; $button2 = - qq||; + qq||; } } - + $form->{javascript} .= qq||; $form->header; - + $onload = qq|focus()|; + $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|; + $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|; print qq| - +

{script}> @@ -983,9 +984,8 @@ $jsscript . $locale->text('Continue') . qq|"> |; - # Hier Aufruf von get_config aus bin/mozilla/fa.pl zum - # Einlesen der Finanzamtdaten - get_config($userspath, 'finanzamt.ini'); + # Hier Aufruf von get_config zum Einlesen der Finanzamtdaten + USTVA->get_config($userspath, 'finanzamt.ini'); $disabled = qq|disabled="disabled"|; $disabled = '' if ($form->{elster} eq '1'); @@ -1012,7 +1012,7 @@ $jsscript $lxdebug->leave_sub(); } -sub continue { &{ $form->{nextsub} } } +sub continue { call_sub($form->{"nextsub"}); } sub get_project { $lxdebug->enter_sub(); @@ -1354,7 +1354,7 @@ sub list_accounts { $description = $form->escape($ref->{description}); $href = - qq|ca.pl?path=$form->{path}&action=list_transactions&accounttype=$form->{accounttype}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&sort=transdate&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&eur=$form->{eur}&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}&accno=$ref->{accno}&description=$description"; + qq|ca.pl?path=$form->{path}&action=list_transactions&accounttype=$form->{accounttype}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&sort=transdate&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&eur=$form->{eur}&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}&accno=$ref->{accno}&description=$description|; $ml = ($ref->{category} =~ /(A|C|E)/) ? -1 : 1; @@ -2003,21 +2003,36 @@ sub print { sub print_form { $lxdebug->enter_sub(); + my %replacements = + ( + "ä" => "ae", "ö" => "oe", "ü" => "ue", + "Ä" => "Ae", "Ö" => "Oe", "Ü" => "Ue", + "ß" => "ss", + " " => "_" + ); + $form->{statementdate} = $locale->date(\%myconfig, $form->{todate}, 1); $form->{templates} = "$myconfig{templates}"; - $form->{IN} = "$form->{type}.html"; - + my $suffix = "html"; + my $attachment_suffix = "html"; if ($form->{format} eq 'postscript') { $form->{postscript} = 1; - $form->{IN} =~ s/html$/tex/; - } - if ($form->{format} eq 'pdf') { + $suffix = "tex"; + $attachment_suffix = "ps"; + } elsif ($form->{format} eq 'pdf') { $form->{pdf} = 1; - $form->{IN} =~ s/html$/tex/; + $suffix = "tex"; + $attachment_suffix = "pdf"; } + $form->{IN} = "$form->{type}.$suffix"; + + + # Save $form->{email} because it will be overwritten. + $form->{EMAIL_RECIPIENT} = $form->{email}; + $i = 0; while (@{ $form->{AG} }) { @@ -2074,6 +2089,9 @@ sub print_form { $form->format_amount(\%myconfig, $form->{"${_}total"}, 2) } (c0, c30, c60, c90, ""); + $form->{attachment_filename} = $locale->text("Statement") . "_$form->{todate}.$attachment_suffix"; + map({ $form->{attachment_filename} =~ s/$_/$replacements{$_}/g; } keys(%replacements)); + $form->parse_template(\%myconfig, $userspath); } @@ -2081,6 +2099,7 @@ sub print_form { } # saving the history if(!exists $form->{addition} && $form->{id} ne "") { + $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; $form->{addition} = "PRINTED"; $form->{what_done} = $form->{type}; $form->save_history($form->dbconnect(\%myconfig)); @@ -2864,9 +2883,8 @@ sub generate_bwa { sub generate_ustva { $lxdebug->enter_sub(); - # Hier Aufruf von get_config aus bin/mozilla/fa.pl zum - # Einlesen der Finanzamtdaten - get_config($userspath, 'finanzamt.ini'); + # Hier Aufruf von get_config zum Einlesen der Finanzamtdaten + USTVA->get_config($userspath, 'finanzamt.ini'); # &get_project(generate_bwa); @anmeldungszeitraum =