X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Frp.pl;h=9e3bc9fc9a670d9f9da524a562a7724b48bf1e67;hb=3db7bbb21243d2f9de903b41f590f82dae64c161;hp=34b12848f12a1435e6f8cb69be581b95bb7d8996;hpb=72539cb39a3d19f930a8e0e41e46bf41afe9a8f1;p=kivitendo-erp.git diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index 34b12848f..9e3bc9fc9 100644 --- a/bin/mozilla/rp.pl +++ b/bin/mozilla/rp.pl @@ -1188,10 +1188,10 @@ sub generate_income_statement { $longfromdate = $locale->date(\%myconfig, $form->{fromdate}, 1); $shortfromdate = $locale->date(\%myconfig, $form->{fromdate}, 0); - $form->{this_period} = "$shortfromdate\n$shorttodate"; + $form->{this_period} = "$shortfromdate\n$shorttodate"; $form->{period} = $locale->text('for Period') - . qq|\n$longfromdate | + . qq|\n$longfromdate | . $locale->text('Bis') . qq| $longtodate|; } @@ -1205,9 +1205,9 @@ sub generate_income_statement { $longcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 1); $shortcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 0); - $form->{last_period} = "$shortcomparefromdate\n$shortcomparetodate"; + $form->{last_period} = "$shortcomparefromdate\n$shortcomparetodate"; $form->{period} .= - "\n$longcomparefromdate " + "\n$longcomparefromdate " . $locale->text('Bis') . qq| $longcomparetodate|; } @@ -1215,7 +1215,6 @@ sub generate_income_statement { # setup variables for the form @a = qw(company address businessnumber); map { $form->{$_} = $myconfig{$_} } @a; - $form->{address} =~ s/\\n//g; $form->{templates} = $myconfig{templates}; @@ -1256,7 +1255,6 @@ sub generate_balance_sheet { # setup company variables for the form map { $form->{$_} = $myconfig{$_} } (qw(company address businessnumber nativecurr)); - $form->{address} =~ s/\\n//g; $form->{templates} = $myconfig{templates}; @@ -1883,66 +1881,6 @@ sub select_all { $lxdebug->leave_sub(); } -sub print_options { - $lxdebug->enter_sub(); - - $form->{sendmode} = "attachment"; - $form->{copies} = 2 unless $form->{copies}; - - $form->{PD}{ $form->{type} } = "selected"; - $form->{DF}{ $form->{format} } = "selected"; - $form->{OP}{ $form->{media} } = "selected"; - $form->{SM}{ $form->{sendmode} } = "selected"; - - $type = qq| - {PD}{statement}>| - . $locale->text('Statement'); - - if ($form->{media} eq 'email') { - $media = qq| - {SM}{attachment}>| - . $locale->text('Attachment') . qq| - {SM}{inline}>| . $locale->text('In-line'); - } else { - $media = qq| - {OP}{screen}>| . $locale->text('Screen'); - if ($myconfig{printer} && $latex) { - $media .= qq| - {OP}{printer}>| - . $locale->text('Printer'); - } - } - - if ($latex) { - $format .= qq| - {DF}{postscript}>| - . $locale->text('Postscript') . qq| - {DF}{pdf}>| . $locale->text('PDF'); - } - - print qq| - - - $type - $format - $media -|; - - if ($myconfig{printer} && $latex && $form->{media} ne 'email') { - print qq| - | . $locale->text('Copies') . qq| - {copies}> -|; - } - - print qq| - - -|; - - $lxdebug->leave_sub(); -} - sub e_mail { $lxdebug->enter_sub(); @@ -2109,11 +2047,6 @@ sub print_form { $form->{templates} = "$myconfig{templates}"; - # setup variables for the form - @a = qw(company address businessnumber tel fax); - map { $form->{$_} = $myconfig{$_} } @a; - $form->format_string(@a); - $form->{IN} = "$form->{type}.html"; if ($form->{format} eq 'postscript') { @@ -2141,7 +2074,6 @@ sub print_form { (name, street, zipcode, city, country, contact, email, "$form->{ct}phone", "$form->{ct}fax"); map { $form->{$_} = $ref->{$_} } @a; - $form->format_string(@a); $form->{ $form->{ct} } = $form->{name}; $form->{"$form->{ct}_id"} = $ref->{ctid}; @@ -2729,14 +2661,14 @@ sub print_options { } else { $media = qq| {OP}{screen}>| . $locale->text('Screen'); - if ($myconfig{printer} && $latex) { + if ($myconfig{printer} && $latex_templates) { $media .= qq| {OP}{printer}>| . $locale->text('Printer'); } } - if ($latex) { + if ($latex_templates) { $format .= qq| {DF}{html}>| . $locale->text('HTML') . qq| @@ -2756,7 +2688,7 @@ sub print_options { $media |; - if ($myconfig{printer} && $latex && $form->{media} ne 'email') { + if ($myconfig{printer} && $latex_templates && $form->{media} ne 'email') { print qq| | . $locale->text('Copies') . qq| {copies}> @@ -2945,10 +2877,10 @@ sub generate_bwa { $longfromdate = $locale->date(\%germandate, $form->{fromdate}, 1); $shortfromdate = $locale->date(\%germandate, $form->{fromdate}, 0); - $form->{this_period} = "$shortfromdate\n$shorttodate"; + $form->{this_period} = "$shortfromdate\n$shorttodate"; $form->{period} = $locale->text('for Period') - . qq|\n$longfromdate | + . qq|\n$longfromdate | . $locale->text('bis') . qq| $longtodate|; } @@ -2956,7 +2888,6 @@ sub generate_bwa { # setup variables for the form @a = qw(company address businessnumber); map { $form->{$_} = $myconfig{$_} } @a; - $form->{address} =~ s/\\n//g; $form->{templates} = $myconfig{templates}; $form->{IN} = "bwa.html"; @@ -3125,7 +3056,7 @@ sub generate_ustva { $longfromdate = $locale->date(\%myconfig, $form->{fromdate}, 1); $shortfromdate = $locale->date(\%myconfig, $form->{fromdate}, 0); - $form->{this_period} = "$shortfromdate\n$shorttodate"; + $form->{this_period} = "$shortfromdate\n$shorttodate"; $form->{period} = $locale->text('for Period') . qq|\n$longfromdate | @@ -3142,9 +3073,9 @@ sub generate_ustva { $longcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 1); $shortcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 0); - $form->{last_period} = "$shortcomparefromdate\n$shortcomparetodate"; + $form->{last_period} = "$shortcomparefromdate\n$shortcomparetodate"; $form->{period} .= - "\n$longcomparefromdate " + "\n$longcomparefromdate " . $locale->text('bis') . qq| $longcomparetodate|; }