X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Frp.pl;h=966df6e025f5132cf60b4d44561dd9d5a5892475;hb=9d0ebf2831c46d1be13fb79cb3627a05f6681376;hp=32ec6efb0073ab1bce035eff4fa29404bf93c067;hpb=6c12abf7e504250dcb0d43a91e7127edf8525b39;p=kivitendo-erp.git
diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index 32ec6efb0..966df6e02 100644
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -36,6 +36,7 @@
#======================================================================
require "$form->{path}/arap.pl";
+require "bin/mozilla/common.pl";
use SL::PE;
use SL::RP;
@@ -130,6 +131,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 = "";
@@ -269,8 +285,7 @@ sub report {
|
- . $locale->text('Customized Report')
- . qq| |
+ . $locale->text('Customized Report') . qq|
| . $locale->text('Year') . qq| |
|
+ . $locale->text('YYYY') . qq|" value="$year">
|;
@@ -440,70 +433,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|
@@ -511,8 +488,7 @@ $checked>
|
- . $locale->text('Free report period')
- . qq| |
+ . $locale->text('Free report period') . qq|
| . $locale->text('From') . qq|
$button1
$button1_2
@@ -529,12 +505,13 @@ $checked> |
|
. $locale->text('Accrual') . qq|
|
- . $locale->text('EUR')
- . qq| |
+ . $locale->text('EUR') . qq|
- | . $locale->text('Decimalplaces') . qq| |
- |
+ |
+ . $locale->text('Decimalplaces')
+ . qq| |
+ |
$jsscript
@@ -551,14 +528,12 @@ $jsscript
@@ -691,8 +649,7 @@ $checked>
|
. $locale->text('Accrual') . qq|
|
- . $locale->text('EUR')
- . qq| |
+ . $locale->text('EUR') . qq|
@@ -702,8 +659,7 @@ $checked>
|
. $locale->text('Subtotal') . qq|
|
- . $locale->text('Account Number')
- . qq|
+ . $locale->text('Account Number') . qq|
$jsscript
@@ -739,8 +695,7 @@ $jsscript
|
. $locale->text('Subtotal') . qq|
|
- . $locale->text('All Accounts')
- . qq|
+ . $locale->text('All Accounts') . qq|
$jsscript
@@ -817,8 +772,7 @@ $jsscript
|
. $locale->text('Accrual') . qq|
|
- . $locale->text('EUR')
- . qq| |
+ . $locale->text('EUR') . qq|
@@ -891,8 +845,7 @@ $jsscript