X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fpe.pl;h=ef3a5a06471cf947a36ee8049d6459ef1c795205;hb=e9e216f571e214e1d19c43a2b47f04525f4aaddf;hp=660e37a9bfcf0e4a632de9bf1e6073a01310cedf;hpb=8ec0d29a33e23ce962b807e87cc8b577c8c98ec2;p=kivitendo-erp.git
diff --git a/bin/mozilla/pe.pl b/bin/mozilla/pe.pl
index 660e37a9b..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') {
@@ -68,8 +72,8 @@ sub edit {
if ($form->{type} eq 'pricegroup') {
PE->get_pricegroup(\%myconfig, \%$form);
}
- &{"form_$form->{type}_header"};
- &{"form_$form->{type}_footer"};
+ call_sub("form_$form->{type}_header");
+ call_sub("form_$form->{type}_footer");
$lxdebug->leave_sub();
}
@@ -85,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| |
+
|;
}
@@ -159,7 +173,6 @@ sub search {
-{path}>
{login}>
{password}>
@@ -183,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') {
@@ -205,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||
@@ -215,6 +231,8 @@ sub project_report {
qq| | |
. $locale->text('Description')
. qq| | |;
+ $column_header{active} =
+ qq|| . $locale->text('Active') . qq| | |;
$form->{title} = $locale->text('Projects');
@@ -259,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;
@@ -285,7 +307,6 @@ sub project_report {
{type}>
-{path}>
{login}>
{password}>
@@ -311,12 +332,37 @@ sub form_project_header {
$form->{description} =~ s/\"/"/g;
+ my $projectnumber =
+ $cgi->textfield('-name' => 'projectnumber', '-size' => 20,
+ '-default' => $form->{projectnumber});
+
+ my $description;
if (($rows = $form->numtextrows($form->{description}, 60)) > 1) {
$description =
- qq||;
+ $cgi->textarea('-name' => 'description', '-rows' => $rows, '-cols' => 60,
+ '-style' => 'width: 100%', '-wrap' => 'soft',
+ '-default' => $form->{description});
} else {
$description =
- qq||;
+ $cgi->textfield('-name' => 'description', '-size' => 60,
+ '-default' => $form->{description});
+ }
+
+ my $active;
+ if ($form->{id}) {
+ $active =
+ qq|
+
+ |
+ | .
+ $cgi->radio_group('-name' => 'active',
+ '-values' => [1, 0],
+ '-default' => $form->{active} * 1,
+ '-labels' => { 1 => $locale->text("Active"),
+ 0 => $locale->text("Inactive") })
+ . qq| |
+
+|;
}
$form->header;
@@ -339,12 +385,13 @@ sub form_project_header {
@@ -364,7 +411,6 @@ sub form_project_footer {
-{path}>
{login}>
{password}>
@@ -378,6 +424,14 @@ sub form_project_footer {
. $locale->text('Delete') . qq|">|;
}
+# button for saving history
+print qq|
+ {id}
+ . qq|); name=history id=history value=|
+ . $locale->text('history')
+ . qq|>|;
+# /button for saving history
print qq|
@@ -408,6 +462,13 @@ sub save {
PE->save_pricegroup(\%myconfig, \%$form);
$form->redirect($locale->text('Pricegroup saved!'));
}
+ # saving the history
+ if(!exists $form->{addition} && $form->{id} ne "") {
+ $form->{snumbers} = qq|projectnumber_| . $form->{projectnumber};
+ $form->{addition} = "SAVED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
$lxdebug->leave_sub();
}
@@ -426,11 +487,17 @@ sub delete {
if ($form->{type} eq 'pricegroup') {
$form->redirect($locale->text('Pricegroup deleted!'));
}
-
+ # saving the history
+ if(!exists $form->{addition}) {
+ $form->{snumbers} = qq|projectnumber_| . $form->{projectnumber};
+ $form->{addition} = "DELETED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
$lxdebug->leave_sub();
}
-sub continue { &{ $form->{nextsub} } }
+sub continue { call_sub($form->{"nextsub"}); }
sub partsgroup_report {
$lxdebug->enter_sub();
@@ -439,7 +506,7 @@ sub partsgroup_report {
PE->partsgroups(\%myconfig, \%$form);
$callback =
- "$form->{script}?action=partsgroup_report&type=$form->{type}&path=$form->{path}&login=$form->{login}&password=$form->{password}&status=$form->{status}";
+ "$form->{script}?action=partsgroup_report&type=$form->{type}&login=$form->{login}&password=$form->{password}&status=$form->{status}";
if ($form->{status} eq 'all') {
$option = $locale->text('All');
@@ -500,7 +567,7 @@ sub partsgroup_report {
|;
$column_data{partsgroup} =
- 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->{partsgroup} | |;
+ qq|{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{partsgroup} | |;
map { print "$column_data{$_}\n" } @column_index;
print "
@@ -524,7 +591,6 @@ sub partsgroup_report {
{type}>
-{path}>
{login}>
{password}>
@@ -592,7 +658,6 @@ sub form_partsgroup_footer {
-{path}>
{login}>
{password}>
@@ -606,6 +671,14 @@ sub form_partsgroup_footer {
. $locale->text('Delete') . qq|">|;
}
+# button for saving history
+print qq|
+ {id}
+ . qq|); name=history id=history value=|
+ . $locale->text('history')
+ . qq|>|;
+# /button for saving history
print qq|
@@ -626,7 +699,7 @@ sub pricegroup_report {
PE->pricegroups(\%myconfig, \%$form);
$callback =
- "$form->{script}?action=pricegroup_report&type=$form->{type}&path=$form->{path}&login=$form->{login}&password=$form->{password}&status=$form->{status}";
+ "$form->{script}?action=pricegroup_report&type=$form->{type}&login=$form->{login}&password=$form->{password}&status=$form->{status}";
if ($form->{status} eq 'all') {
$option = $locale->text('All');
@@ -689,7 +762,7 @@ sub pricegroup_report {
|;
$column_data{pricegroup} =
- 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->{pricegroup} | |;
+ qq|{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{pricegroup} | |;
map { print "$column_data{$_}\n" } @column_index;
@@ -714,7 +787,6 @@ sub pricegroup_report {
{type}>
-{path}>
{login}>
{password}>
@@ -786,7 +858,6 @@ sub form_pricegroup_footer {
-{path}>
{login}>
{password}>
@@ -800,6 +871,14 @@ sub form_pricegroup_footer {
. $locale->text('Delete') . qq|">|;
}
+# button for saving history
+print qq|
+ {id}
+ . qq|); name=history id=history value=|
+ . $locale->text('history')
+ . qq|>|;
+# /button for saving history
print qq|