X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Frp.pl;h=da1a265acbd80c2ac2ca30d80345e0cb1b874b54;hb=f36eb9fca78c4940b486b7dafa4ab636cdaf99cd;hp=a66a629daf5c4857659053d4fd8ef18c0db7fff3;hpb=d0198c4241600ece0edbd4ae2efa3d71e8e148ec;p=kivitendo-erp.git
diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index a66a629da..da1a265ac 100644
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -35,10 +35,13 @@
#
#======================================================================
-require "$form->{path}/arap.pl";
+require "bin/mozilla/arap.pl";
+require "bin/mozilla/common.pl";
use SL::PE;
use SL::RP;
+use SL::USTVA;
+use SL::Iconv;
1;
@@ -108,9 +111,7 @@ sub report {
$accrual = ($eur) ? "" : "checked";
$cash = ($eur) ? "checked" : "";
- ($null, $null, $null, $null, $null, $year, $null, $null, $null) =
- localtime();
- $year += 1900;
+ $year = (localtime)[5] + 1900;
# get departments
$form->all_departments(\%myconfig);
@@ -130,20 +131,35 @@ 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;
+ $form->{jsscript} = 1;
$jsscript = "";
if ($form->{report} eq "ustva") {
$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";
@@ -183,23 +199,22 @@ sub report {
if ($name_1 eq "") {
$button1 = qq|
- |;
+ |;
$button1_2 = qq|
text('button') . qq|>|;
#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|
- |;
+ |;
$button1_2 = qq|
text('button') . qq|>|;
$button2 = qq|
- |;
+ |;
$button2_2 = qq|
text('button') . qq|>
@@ -215,19 +230,21 @@ sub report {
# without JavaScript Calendar
if ($name_1 eq "") {
$button1 =
- qq||;
+ qq||;
} else {
$button1 =
- qq||;
+ qq||;
$button2 =
- qq||;
+ qq||;
}
}
-
+ $form->{javascript} .= qq||;
$form->header;
-
+ $onload = qq|focus()|;
+ $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
+ $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|;
print qq|
-
+
@@ -1948,66 +1840,6 @@ sub select_all {
$lxdebug->leave_sub();
}
-sub print_options {
- $lxdebug->enter_sub();
-
- $form->{sendmode} = "attachment";
- $form->{copies} = 2 unless $form->{copies};
-
- $form->{PD}{ $form->{type} } = "selected";
- $form->{DF}{ $form->{format} } = "selected";
- $form->{OP}{ $form->{media} } = "selected";
- $form->{SM}{ $form->{sendmode} } = "selected";
-
- $type = qq|
-