X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Frp.pl;h=47d6d4b645f1c8621fa08892bb09412420b0a67f;hb=eaf4d4830c5b449170dbef0d0ad5f88863f1e8bd;hp=7989d863505acdc61fcafc338c6b4b5fff4ca117;hpb=0576299f2aa98125991c4ffcd2f75073ea583d7d;p=kivitendo-erp.git diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index 7989d8635..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| |; @@ -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"> | 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|||||
| - . $locale->text('Free report period') - . qq| | + . $locale->text('Free report period') . qq|| . $locale->text('From') . qq| $button1 $button1_2 @@ -400,8 +379,7 @@ $jsscript | | . $locale->text('Accrual') . qq| | - . $locale->text('EUR') - . qq| | + . $locale->text('EUR') . qq|
| - . $locale->text('Customized Report') - . qq| | + . $locale->text('Customized Report') . qq||||||||
---|---|---|---|---|---|---|---|
| . $locale->text('Year') . qq| | + . $locale->text('YYYY') . qq|" value="$year"> | 1. | - . $locale->text('Quarter') - . qq| | + . $locale->text('Quarter') . qq| |; $checked = "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|||||
| - . $locale->text('Free report period') - . qq| | + . $locale->text('Free report period') . qq|| . $locale->text('From') . qq| $button1 $button1_2 @@ -530,10 +489,15 @@ $checked> | | . $locale->text('Accrual') . qq| | - . $locale->text('EUR') - . qq| | + . $locale->text('EUR') . qq||||||
| + . $locale->text('Decimalplaces') + . qq| | ++ |
| - . $locale->text('Zeitraum') - . qq| | + . $locale->text('Zeitraum') . qq|||||
---|---|---|---|---|
| . $locale->text('Year') . qq| | + . $locale->text('YYYY') . qq|" value="$year"> | 1. | - . $locale->text('Quarter') - . qq| | + . $locale->text('Quarter') . qq| |; $checked = "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||
| . $locale->text('Accrual') . qq| | - . $locale->text('EUR') - . qq| | + . $locale->text('EUR') . qq|||||
|; @@ -675,7 +620,7 @@ $checked> | ||||
| . $locale->text('Decimalplaces') . qq| | -+ |