X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Frp.pl;h=7e931d46803b508869ae835776b7eec1eef0fe0f;hb=c1bf4079c7a2bc8ce7883e39838c88912d58301b;hp=f6dc985ef86a7a47136a99526c0dbada9a8faa7d;hpb=d357e8f9832f8425821f4647b1792ddd3f4f483a;p=kivitendo-erp.git
diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index f6dc985ef..7e931d468 100644
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -495,7 +495,7 @@ $checked>
|
. $locale->text('Decimalplaces')
. qq| |
- |
+ |
$jsscript
@@ -620,7 +620,7 @@ $checked>
| . $locale->text('Decimalplaces') . qq| |
- |
+ |
@@ -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};
@@ -1254,9 +1253,9 @@ sub generate_balance_sheet {
$form->{IN} = "balance_sheet.html";
# setup company variables for the form
- map { $form->{$_} = $myconfig{$_} }
+ map { $form->{$_} = $myconfig{$_};
+ $form->{$_} =~ s/\\n/\n/g; }
(qw(company address businessnumber nativecurr));
- $form->{address} =~ s/\\n/
/g;
$form->{templates} = $myconfig{templates};
@@ -1394,8 +1393,8 @@ sub list_accounts {
$ml = ($ref->{category} =~ /(A|C|E)/) ? -1 : 1;
- $debit = $form->format_amount(\%myconfig, $ref->{debit}, 2, " ");
- $credit = $form->format_amount(\%myconfig, $ref->{credit}, 2, " ");
+ $debit = ($ref->{debit} != 0) ? $form->format_amount(\%myconfig, $ref->{debit}, 2, " ") : " ";
+ $credit = ($ref->{credit} != 0) ? $form->format_amount(\%myconfig, $ref->{credit}, 2, " ") : " ";
$begbalance =
$form->format_amount(\%myconfig, $ref->{balance} * $ml, 2, " ");
$endbalance =
@@ -1674,14 +1673,14 @@ sub aging {
$i++;
if ($subtotal) {
- $c0subtotal =
- $form->format_amount(\%myconfig, $c0subtotal, 2, " ");
- $c30subtotal =
- $form->format_amount(\%myconfig, $c30subtotal, 2, " ");
- $c60subtotal =
- $form->format_amount(\%myconfig, $c60subtotal, 2, " ");
- $c90subtotal =
- $form->format_amount(\%myconfig, $c90subtotal, 2, " ");
+ $c0subtotal = ($c0subtotal != 0) ?
+ $form->format_amount(\%myconfig, $c0subtotal, 2, " ") : "";
+ $c30subtotal = ($c30subtotal != 0) ?
+ $form->format_amount(\%myconfig, $c30subtotal, 2, " ") : "";
+ $c60subtotal = ($c60subtotal != 0) ?
+ $form->format_amount(\%myconfig, $c60subtotal, 2, " ") : "";
+ $c90subtotal = ($c90subtotal != 0) ?
+ $form->format_amount(\%myconfig, $c90subtotal, 2, " ") : "";
}
$column_data{ct} = qq| | |;
@@ -1737,10 +1736,10 @@ sub aging {
$c60total += $ref->{c60};
$c90total += $ref->{c90};
- $ref->{c0} = $form->format_amount(\%myconfig, $ref->{c0}, 2, " ");
- $ref->{c30} = $form->format_amount(\%myconfig, $ref->{c30}, 2, " ");
- $ref->{c60} = $form->format_amount(\%myconfig, $ref->{c60}, 2, " ");
- $ref->{c90} = $form->format_amount(\%myconfig, $ref->{c90}, 2, " ");
+ $ref->{c0} = ($ref->{c0} != 0) ? $form->format_amount(\%myconfig, $ref->{c0}, 2, " ") : "";
+ $ref->{c30} = ($ref->{c30} != 0) ? $form->format_amount(\%myconfig, $ref->{c30}, 2, " ") : "";
+ $ref->{c60} = ($ref->{c60} != 0) ? $form->format_amount(\%myconfig, $ref->{c60}, 2, " ") : "";
+ $ref->{c90} = ($ref->{c90} != 0) ? $form->format_amount(\%myconfig, $ref->{c90}, 2, " ") : "";
$href =
qq|$ref->{module}.pl?path=$form->{path}&action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=|
@@ -2049,11 +2048,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') {
@@ -2081,7 +2075,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};
@@ -2645,7 +2638,16 @@ sub print_options {
$lxdebug->enter_sub();
$form->{sendmode} = "attachment";
- $form->{copies} = 2 unless $form->{copies};
+
+ $form->{"format"} =
+ $form->{"format"} ? $form->{"format"} :
+ $myconfig{"template_format"} ? $myconfig{"template_format"} :
+ "pdf";
+
+ $form->{"copies"} =
+ $form->{"copies"} ? $form->{"copies"} :
+ $myconfig{"copies"} ? $myconfig{"copies"} :
+ 2;
$form->{PD}{ $form->{type} } = "selected";
$form->{DF}{ $form->{format} } = "selected";
@@ -2885,10 +2887,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|;
}
@@ -2896,7 +2898,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";
@@ -3065,7 +3066,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 |
@@ -3082,9 +3083,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|;
}