X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fpe.pl;h=ef3a5a06471cf947a36ee8049d6459ef1c795205;hb=7d03f2419db86592947fc2526a21c2bf34aa97d0;hp=0ee06213a76bedad7bdbd1f01669dee4b16c7e2f;hpb=d319704a66e9be64da837ccea10af6774c2b0838;p=kivitendo-erp.git
diff --git a/bin/mozilla/pe.pl b/bin/mozilla/pe.pl
index 0ee06213a..ef3a5a064 100644
--- a/bin/mozilla/pe.pl
+++ b/bin/mozilla/pe.pl
@@ -34,6 +34,8 @@
use SL::PE;
+require "bin/mozilla/common.pl";
+
1;
# end of main
@@ -45,18 +47,20 @@ sub add {
# construct callback
$form->{callback} =
- "$form->{script}?action=add&type=$form->{type}&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+ "$form->{script}?action=add&type=$form->{type}&login=$form->{login}&password=$form->{password}"
unless $form->{callback};
- &{"form_$form->{type}_header"};
- &{"form_$form->{type}_footer"};
+ call_sub("form_$form->{type}_header");
+ call_sub("form_$form->{type}_footer");
$lxdebug->leave_sub();
}
sub edit {
$lxdebug->enter_sub();
-
+ # show history button
+ $form->{javascript} = qq||;
+ #/show hhistory button
$form->{title} = "Edit";
if ($form->{type} eq 'project') {
@@ -65,9 +69,11 @@ sub edit {
if ($form->{type} eq 'partsgroup') {
PE->get_partsgroup(\%myconfig, \%$form);
}
-
- &{"form_$form->{type}_header"};
- &{"form_$form->{type}_footer"};
+ if ($form->{type} eq 'pricegroup') {
+ PE->get_pricegroup(\%myconfig, \%$form);
+ }
+ call_sub("form_$form->{type}_header");
+ call_sub("form_$form->{type}_footer");
$lxdebug->leave_sub();
}
@@ -83,12 +89,22 @@ sub search {
$number = qq|
| . $locale->text('Number') . qq| |
- |
+ | . $cgi->textfield('-name' => 'projectnumber', '-size' => 20) . qq| |
| . $locale->text('Description') . qq| |
- |
+ | . $cgi->textfield('-name' => 'description', '-size' => 60) . qq| |
+
+ |
+ | .
+ $cgi->radio_group('-name' => 'active', '-default' => 'active',
+ '-values' => ['active', 'inactive', 'both'],
+ '-labels' => { 'active' => ' ' . $locale->text("Active"),
+ 'inactive' => ' ' . $locale->text("Inactive"),
+ 'both' => ' ' . $locale->text("Both") })
+ . qq| |
+
|;
}
@@ -106,6 +122,21 @@ sub search {
}
+ # for pricesgroups
+ if ($form->{type} eq 'pricegroup') {
+ $report = "pricegroup_report";
+ $sort = 'pricegroup';
+ $form->{title} = $locale->text('Pricegroup');
+
+ $number = qq|
+
+ | . $locale->text('Pricegroup') . qq| |
+ |
+
+|;
+
+ }
+
$form->header;
print qq|
@@ -130,8 +161,7 @@ sub search {
|
. $locale->text('All') . qq|
|
- . $locale->text('Orphaned')
- . qq| |
+ . $locale->text('Orphaned') . qq|
@@ -143,7 +173,6 @@ sub search {
-{path}>
{login}>
{password}>
@@ -167,7 +196,8 @@ sub project_report {
PE->projects(\%myconfig, \%$form);
$callback =
- "$form->{script}?action=project_report&type=$form->{type}&path=$form->{path}&login=$form->{login}&password=$form->{password}&status=$form->{status}";
+ "$form->{script}?action=project_report&type=$form->{type}&login=$form->{login}&password=$form->{password}&status=$form->{status}&active=" .
+ E($form->{active});
$href = $callback;
if ($form->{status} eq 'all') {
@@ -189,7 +219,9 @@ sub project_report {
"\n
" . $locale->text('Description') . " : $form->{description}";
}
- @column_index = $form->sort_columns(qw(projectnumber description));
+ @column_index = qw(projectnumber description);
+
+ push(@column_index, "active") if ("both" eq $form->{active});
$column_header{projectnumber} =
qq||
@@ -199,6 +231,8 @@ sub project_report {
qq| | |
. $locale->text('Description')
. qq| | |;
+ $column_header{active} =
+ qq|| . $locale->text('Active') . qq| | |;
$form->{title} = $locale->text('Projects');
@@ -243,8 +277,12 @@ sub project_report {
|;
$column_data{projectnumber} =
- qq|{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{projectnumber} | |;
+ qq|{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{projectnumber} | |;
$column_data{description} = qq|$ref->{description} | |;
+ $column_data{active} =
+ qq|| .
+ ($ref->{active} ? $locale->text("Yes") : $locale->text("No")) .
+ qq| | |;
map { print "$column_data{$_}\n" } @column_index;
@@ -269,21 +307,14 @@ sub project_report {
{type}>
-{path}>
{login}>
{password}>
|;
-
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
+ . $locale->text('Add') . qq|">
- print qq|
-
+