X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Frp.pl;h=47d6d4b645f1c8621fa08892bb09412420b0a67f;hb=11e6f144c6af375d7b061bde6484266884d6f636;hp=5772e1697e0a49fade7a48efbe06f107b77f82a1;hpb=d319704a66e9be64da837ccea10af6774c2b0838;p=kivitendo-erp.git
diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index 5772e1697..47d6d4b64 100644
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -137,13 +137,13 @@ sub report {
$department = "";
} else {
if ($form->{report} eq "balance_sheet") {
- $name_1 = "compareasofdate";
- $id_1 = "compareasofdate";
- $value_1 = "";
+ $name_1 = "asofdate";
+ $id_1 = "asofdate";
+ $value_1 = "$form->{asofdate}";
$trigger_1 = "trigger1";
- $name_2 = "asofdate";
- $id_2 = "asofdate";
- $value_2 = "$form->{asofdate}";
+ $name_2 = "compareasofdate";
+ $id_2 = "compareasofdate";
+ $value_2 = "$form->{compareasofdate}";
$trigger_2 = "trigger2";
} elsif ($form->{report} =~ /(receipts|payments)$/) {
$name_1 = "fromdate";
@@ -190,8 +190,7 @@ sub report {
#write Trigger
$jsscript =
- Form->write_trigger(\%myconfig, "1", "$name_2", "BR", "$trigger_2", "",
- "", "");
+ Form->write_trigger(\%myconfig, "1", "$name_2", "BR", "$trigger_2");
} else {
$button1 = qq|
|;
@@ -200,7 +199,7 @@ sub report {
. $locale->text('button') . qq|>|;
$button2 = qq|
|;
- $button2_2 = qq|
+ $button2_2 = qq|
text('button') . qq|>
|;
@@ -270,8 +269,7 @@ sub report {
|
- . $locale->text('Customized Report')
- . qq| |
+ . $locale->text('Customized Report') . qq|
| . $locale->text('Year') . qq| |
|
+ . $locale->text('YYYY') . qq|" value="$year">
|;
@@ -311,70 +307,54 @@ $jsscript
|
1. |
- . $locale->text('Quarter')
- . qq| |
+ . $locale->text('Quarter') . qq|
|;
$checked = "";
print qq|
|
- . $locale->text('January')
- . qq| |
+ . $locale->text('January') . qq|
|;
$checked = "";
print qq|
|
- . $locale->text('May')
- . qq| |
+ . $locale->text('May') . qq|
|
- . $locale->text('September')
- . qq| |
+ . $locale->text('September') . qq|
|
2. |
- . $locale->text('Quarter')
- . qq| |
+ . $locale->text('Quarter') . qq|
|
- . $locale->text('February')
- . qq| |
+ . $locale->text('February') . qq|
|
- . $locale->text('June')
- . qq| |
+ . $locale->text('June') . qq|
|
- . $locale->text('October')
- . qq| |
+ . $locale->text('October') . qq|
|
3. |
- . $locale->text('Quarter')
- . qq| |
+ . $locale->text('Quarter') . qq|
|
- . $locale->text('March')
- . qq| |
+ . $locale->text('March') . qq|
|
- . $locale->text('July')
- . qq| |
+ . $locale->text('July') . qq|
|
- . $locale->text('November')
- . qq| |
+ . $locale->text('November') . qq|
|
4. |
- . $locale->text('Quarter')
- . qq| |
+ . $locale->text('Quarter') . qq|
|
- . $locale->text('April')
- . qq| |
+ . $locale->text('April') . qq|
|
- . $locale->text('August')
- . qq| |
+ . $locale->text('August') . qq|
|
- . $locale->text('December')
- . qq| |
+ . $locale->text('December') . qq|
@@ -382,8 +362,7 @@ $jsscript
|
- . $locale->text('Free report period')
- . qq| |
+ . $locale->text('Free report period') . qq|
| . $locale->text('From') . qq|
$button1
$button1_2
@@ -394,14 +373,13 @@ $jsscript
|
|
-
+
| . $locale->text('Method') . qq| |
|
. $locale->text('Accrual') . qq|
|
- . $locale->text('EUR')
- . qq| |
+ . $locale->text('EUR') . qq|
$jsscript
@@ -419,14 +397,12 @@ $jsscript
@@ -688,8 +633,7 @@ $checked>
|
. $locale->text('Accrual') . qq|
|
- . $locale->text('EUR')
- . qq| |
+ . $locale->text('EUR') . qq|
@@ -699,10 +643,9 @@ $checked>
|
. $locale->text('Subtotal') . qq|
|
- . $locale->text('Account Number')
- . qq|
+ . $locale->text('Account Number') . qq|
-
+
$jsscript
|;
}
@@ -736,10 +679,9 @@ $jsscript
|
. $locale->text('Subtotal') . qq|
|
- . $locale->text('All Accounts')
- . qq|
+ . $locale->text('All Accounts') . qq|
-
+
$jsscript
|;
}
@@ -814,8 +756,7 @@ $jsscript
|
. $locale->text('Accrual') . qq|
|
- . $locale->text('EUR')
- . qq| |
+ . $locale->text('EUR') . qq|
@@ -888,8 +829,7 @@ $jsscript