X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Frp.pl;h=848ec62baed3981fd79e80af34a8bc061c7ec8fc;hb=da10bf753ae49b8322e79fc1bb9276a092403b9a;hp=a66a629daf5c4857659053d4fd8ef18c0db7fff3;hpb=d0198c4241600ece0edbd4ae2efa3d71e8e148ec;p=kivitendo-erp.git
diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index a66a629da..848ec62ba 100644
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -36,9 +36,11 @@
#======================================================================
require "$form->{path}/arap.pl";
+require "bin/mozilla/common.pl";
use SL::PE;
use SL::RP;
+use SL::USTVA;
1;
@@ -130,6 +132,21 @@ sub report {
| if $form->{selectdepartment};
+ $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
+ "all" => 1 });
+
+ my %project_labels = ();
+ my @project_values = ("");
+ foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+ push(@project_values, $item->{"id"});
+ $project_labels{$item->{"id"}} = $item->{"projectnumber"};
+ }
+
+ my $projectnumber =
+ NTI($cgi->popup_menu('-name' => "project_id",
+ '-values' => \@project_values,
+ '-labels' => \%project_labels));
+
# use JavaScript Calendar or not
$form->{jsscript} = $jscalendar;
$jsscript = "";
@@ -137,13 +154,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 +207,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 +286,7 @@ sub report {
|
. $locale->text('Heading') . qq|
|
- . $locale->text('Subtotal')
- . qq| |
+ . $locale->text('Subtotal') . qq|
$jsscript
@@ -282,21 +297,19 @@ $jsscript
print qq|
| . $locale->text('Project') . qq| |
-
+ | $projectnumber |
|
- . $locale->text('Customized Report')
- . qq| |
+ . $locale->text('Customized Report') . qq|
| . $locale->text('Year') . qq| |
|
+ . $locale->text('YYYY') . qq|" value="$year">
|;
@@ -441,70 +434,54 @@ $jsscript
|
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|
@@ -512,8 +489,7 @@ $checked>
|
- . $locale->text('Free report period')
- . qq| |
+ . $locale->text('Free report period') . qq|
| . $locale->text('From') . qq|
$button1
$button1_2
@@ -530,12 +506,13 @@ $checked> |
|
. $locale->text('Accrual') . qq|
|
- . $locale->text('EUR')
- . qq| |
+ . $locale->text('EUR') . qq|
- | . $locale->text('Decimalplaces') . qq| |
- |
+ |
+ . $locale->text('Decimalplaces')
+ . qq| |
+ |
$jsscript
@@ -552,14 +529,12 @@ $jsscript
@@ -692,8 +650,7 @@ $checked>
|
. $locale->text('Accrual') . qq|
|
- . $locale->text('EUR')
- . qq| |
+ . $locale->text('EUR') . qq|
@@ -703,8 +660,7 @@ $checked>
|
. $locale->text('Subtotal') . qq|
|
- . $locale->text('Account Number')
- . qq|
+ . $locale->text('Account Number') . qq|
$jsscript
@@ -740,8 +696,7 @@ $jsscript
|
. $locale->text('Subtotal') . qq|
|
- . $locale->text('All Accounts')
- . qq|
+ . $locale->text('All Accounts') . qq|
$jsscript
@@ -749,8 +704,6 @@ $jsscript
}
if ($form->{report} =~ /^tax_/) {
- $gifi = "";
-
$form->{db} = ($form->{report} =~ /_collected/) ? "ar" : "ap";
RP->get_taxaccounts(\%myconfig, \%$form);
@@ -787,39 +740,12 @@ $jsscript
-|;
-
- if (@{ $form->{gifi_taxaccounts} }) {
- print qq|
-
- | . $locale->text('GIFI') . qq| |
-
-|;
-
- foreach $ref (@{ $form->{gifi_taxaccounts} }) {
-
- print
- qq| $ref->{description}
-
-
- |;
-
- }
-
- print qq|
- |
-
-|;
- }
-
- print qq|
| . $locale->text('Method') . qq| |
|
. $locale->text('Accrual') . qq|
|
- . $locale->text('EUR')
- . qq| |
+ . $locale->text('EUR') . qq|
@@ -870,8 +796,6 @@ $jsscript
}
if ($form->{report} =~ /^nontaxable_/) {
- $gifi = "";
-
$form->{db} = ($form->{report} =~ /_sales/) ? "ar" : "ap";
print qq|
@@ -892,8 +816,7 @@ $jsscript
|
. $locale->text('Accrual') . qq|
|
- . $locale->text('EUR')
- . qq| |
+ . $locale->text('EUR') . qq|
| . $locale->text('Include in Report') . qq| |
@@ -936,8 +859,6 @@ $jsscript
}
if (($form->{report} eq "ar_aging") || ($form->{report} eq "ap_aging")) {
- $gifi = "";
-
if ($form->{report} eq 'ar_aging') {
$label = $locale->text('Customer');
$form->{vc} = 'customer';
@@ -986,8 +907,6 @@ $jsscript
# above action can be removed if there is more than one input field
if ($form->{report} =~ /(receipts|payments)$/) {
- $gifi = "";
-
$form->{db} = ($form->{report} =~ /payments$/) ? "ap" : "ar";
RP->paymentaccounts(\%myconfig, \%$form);
@@ -1035,8 +954,7 @@ $jsscript
|
|
- . $locale->text('Include Exchangerate Difference')
- . qq|
+ . $locale->text('Include Exchangerate Difference') . qq|
|
$jsscript
@@ -1066,9 +984,8 @@ $jsscript
. $locale->text('Continue') . qq|">
|;
- # Hier Aufruf von get_config aus bin/mozilla/fa.pl zum
- # Einlesen der Finanzamtdaten
- get_config($userspath, 'finanzamt.ini');
+ # Hier Aufruf von get_config zum Einlesen der Finanzamtdaten
+ USTVA->get_config($userspath, 'finanzamt.ini');
$disabled = qq|disabled="disabled"|;
$disabled = '' if ($form->{elster} eq '1');
@@ -1127,10 +1044,6 @@ sub generate_income_statement {
$form->{endbold} = "";
$form->{br} = "
";
- &get_project(generate_income_statement);
-
- $form->{projectnumber} = $form->{projectnumber_1};
-
if ($form->{reporttype} eq "custom") {
#forgotten the year --> thisyear
@@ -1253,10 +1166,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|;
}
@@ -1270,9 +1183,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|;
}
@@ -1280,7 +1193,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};
@@ -1319,9 +1231,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};
@@ -1412,11 +1324,6 @@ sub list_accounts {
$column_header{endbalance} =
qq|| . $locale->text('Balance') . qq| | |;
- if ($form->{accounttype} eq 'gifi') {
- $column_header{accno} =
- qq|| . $locale->text('GIFI') . qq| | |;
- }
-
$form->header;
print qq|
@@ -1447,20 +1354,12 @@ sub list_accounts {
$description = $form->escape($ref->{description});
$href =
- qq|ca.pl?path=$form->{path}&action=list_transactions&accounttype=$form->{accounttype}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&sort=transdate&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&eur=$form->{eur}&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}|;
-
- if ($form->{accounttype} eq 'gifi') {
- $href .= "&gifi_accno=$ref->{accno}&gifi_description=$description";
- $na = $locale->text('N/A');
- map { $ref->{$_} = $na } qw(accno description) unless $ref->{accno};
- } else {
- $href .= "&accno=$ref->{accno}&description=$description";
- }
+ qq|ca.pl?path=$form->{path}&action=list_transactions&accounttype=$form->{accounttype}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&sort=transdate&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&eur=$form->{eur}&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}&accno=$ref->{accno}&description=$description|;
$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 =
@@ -1739,14 +1638,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| | |;
@@ -1802,10 +1701,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=|
@@ -1917,16 +1816,10 @@ sub aging {
-|;
- }
-
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
+ . $locale->text('E-mail') . qq|">|;
+}
- print qq|
+print qq|