X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Frp.pl;h=34b12848f12a1435e6f8cb69be581b95bb7d8996;hb=06b678305ce21a082d5c76d43cd9275969931156;hp=5772e1697e0a49fade7a48efbe06f107b77f82a1;hpb=d319704a66e9be64da837ccea10af6774c2b0838;p=kivitendo-erp.git diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index 5772e1697..34b12848f 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('Heading') . qq|  | - . $locale->text('Subtotal') - . qq| + . $locale->text('Subtotal') . qq| $jsscript @@ -289,14 +287,12 @@ $jsscript + . $locale->text('Customized Report') . qq| + . $locale->text('YYYY') . qq|" value="$year"> |; @@ -311,70 +307,54 @@ $jsscript + . $locale->text('Quarter') . qq| |; $checked = ""; print qq| + . $locale->text('January') . qq| |; $checked = ""; print qq| + . $locale->text('May') . qq| + . $locale->text('September') . qq| + . $locale->text('Quarter') . qq| + . $locale->text('February') . qq| + . $locale->text('June') . qq| + . $locale->text('October') . qq| + . $locale->text('Quarter') . qq| + . $locale->text('March') . qq| + . $locale->text('July') . qq| + . $locale->text('November') . qq| + . $locale->text('Quarter') . qq|  + . $locale->text('April') . qq| + . $locale->text('August') . qq| + . $locale->text('December') . qq| @@ -382,8 +362,7 @@ $jsscript + . $locale->text('Free report period') . qq| - + + . $locale->text('EUR') . qq| $jsscript @@ -419,14 +397,12 @@ $jsscript
| - . $locale->text('Customized Report') - . qq|
| . $locale->text('Year') . qq|
   1. | - . $locale->text('Quarter') - . qq| | - . $locale->text('January') - . qq| | - . $locale->text('May') - . qq|  | - . $locale->text('September') - . qq|
   2. | - . $locale->text('Quarter') - . qq|  | - . $locale->text('February') - . qq|  | - . $locale->text('June') - . qq|  | - . $locale->text('October') - . qq|
   3. | - . $locale->text('Quarter') - . qq|  | - . $locale->text('March') - . qq|  | - . $locale->text('July') - . qq|  | - . $locale->text('November') - . qq|
   4. | - . $locale->text('Quarter') - . qq|   | - . $locale->text('April') - . qq|  | - . $locale->text('August') - . qq|  | - . $locale->text('December') - . 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('Customized Report') . qq| + . $locale->text('YYYY') . qq|" value="$year"> |; @@ -441,70 +417,54 @@ $jsscript + . $locale->text('Quarter') . qq| |; $checked = "checked"; print qq| + . $locale->text('January') . qq| |; $checked = ""; print qq| + . $locale->text('May') . qq| + . $locale->text('September') . qq| + . $locale->text('Quarter') . qq| + . $locale->text('February') . qq| + . $locale->text('June') . qq| + . $locale->text('October') . qq| + . $locale->text('Quarter') . qq| + . $locale->text('March') . qq| + . $locale->text('July') . qq| + . $locale->text('November') . qq| + . $locale->text('Quarter') . qq|  + . $locale->text('April') . qq| + . $locale->text('August') . qq| + . $locale->text('December') . qq| @@ -512,8 +472,7 @@ $checked> + . $locale->text('Free report period') . qq| - + + . $locale->text('EUR') . qq| - -$jsscript + + + + + +$jsscript |; } if ($form->{report} eq "ustva") { print qq| - +
| - . $locale->text('Customized Report') - . qq|
| . $locale->text('Year') . qq|
   1. | - . $locale->text('Quarter') - . qq| | - . $locale->text('January') - . qq| | - . $locale->text('May') - . qq|  | - . $locale->text('September') - . qq|
   2. | - . $locale->text('Quarter') - . qq|  | - . $locale->text('February') - . qq|  | - . $locale->text('June') - . qq|  | - . $locale->text('October') - . qq|
   3. | - . $locale->text('Quarter') - . qq|  | - . $locale->text('March') - . qq|  | - . $locale->text('July') - . qq|  | - . $locale->text('November') - . qq|
   4. | - . $locale->text('Quarter') - . qq|   | - . $locale->text('April') - . qq|  | - . $locale->text('August') - . qq|  | - . $locale->text('December') - . qq|
| - . $locale->text('Free report period') - . qq| | . $locale->text('From') . qq|  $button1 $button1_2  @@ -524,38 +483,41 @@ $checked>

| . $locale->text('Method') . qq| | . $locale->text('Accrual') . qq|  | - . $locale->text('EUR') - . qq|
| + . $locale->text('Decimalplaces') + . qq|
+ . $locale->text('Zeitraum') . qq| + . $locale->text('YYYY') . qq|" value="$year"> |; @@ -570,82 +532,65 @@ $jsscript + . $locale->text('Quarter') . qq| |; $checked = "checked"; print qq| + . $locale->text('January') . qq| |; $checked = ""; print qq| + . $locale->text('May') . qq| + . $locale->text('September') . qq| + . $locale->text('Quarter') . qq| + . $locale->text('February') . qq| + . $locale->text('June') . qq| + . $locale->text('October') . qq| + . $locale->text('Quarter') . qq| + . $locale->text('March') . qq| + . $locale->text('July') . qq| + . $locale->text('November') . qq| + . $locale->text('Quarter') . qq|  + . $locale->text('April') . qq| + . $locale->text('August') . qq| + . $locale->text('December') . 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('EUR') . qq|
| - . $locale->text('Zeitraum') - . qq|
| . $locale->text('Year') . qq|
   1. | - . $locale->text('Quarter') - . qq| | - . $locale->text('January') - . qq| | - . $locale->text('May') - . qq|  | - . $locale->text('September') - . qq|
   2. | - . $locale->text('Quarter') - . qq|  | - . $locale->text('February') - . qq|  | - . $locale->text('June') - . qq|  | - . $locale->text('October') - . qq|
   3. | - . $locale->text('Quarter') - . qq|  | - . $locale->text('March') - . qq|  | - . $locale->text('July') - . qq|  | - . $locale->text('November') - . qq|
   4. | - . $locale->text('Quarter') - . qq|   | - . $locale->text('April') - . qq|  | - . $locale->text('August') - . qq|  | - . $locale->text('December') - . qq|

| . $locale->text('Method') . qq| | . $locale->text('Accrual') . qq|  | - . $locale->text('EUR') - . qq|
|; @@ -688,8 +633,7 @@ $checked> | . $locale->text('Accrual') . qq|  | - . $locale->text('EUR') - . qq|
| . $locale->text('Accrual') . qq|  | - . $locale->text('EUR') - . qq|
@@ -888,8 +829,7 @@ $jsscript | . $locale->text('Accrual') . qq|  | - . $locale->text('EUR') - . qq| + . $locale->text('EUR') . qq| | . $locale->text('Include in Report') . qq| @@ -974,7 +914,7 @@ $jsscript - + $jsscript |; } @@ -1031,12 +971,11 @@ $jsscript | - . $locale->text('Include Exchangerate Difference') - . qq| + . $locale->text('Include Exchangerate Difference') . qq| -$jsscript - +$jsscript + {db}> |; @@ -1906,7 +1845,7 @@ sub aging { {path}> {login}> {password}> - +
@@ -2755,7 +2694,6 @@ sub debug { sub winston_export { $lxdebug->enter_sub(); - print(STDERR "Winston Export1\n"); #create_winston(); $form->{winston} = 1; @@ -3033,7 +2971,6 @@ sub generate_ustva { # Hier Aufruf von get_config aus bin/mozilla/fa.pl zum # Einlesen der Finanzamtdaten - print(STDERR "Winston4\n"); get_config($userspath, 'finanzamt.ini'); # &get_project(generate_bwa); @@ -3043,7 +2980,6 @@ sub generate_ustva { foreach $item (@anmeldungszeitraum) { $form->{$item} = ""; } - print(STDERR "Winston2\n"); if ($form->{reporttype} eq "custom") { #forgotten the year --> thisyear @@ -3244,7 +3180,6 @@ sub generate_ustva { $form->{address} =~ s/\\n/$form->{br}/g; if ($form->{winston} eq '1') { - print(STDERR "fast bei winston\n"); create_winston(); } else { @@ -3261,4 +3196,3 @@ sub generate_ustva { } $lxdebug->leave_sub(); } -