X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Fpe.pl;h=18c90c30afe3947f3fef4f03d7f91420283d9781;hb=98662ad2b031a81c88ce6da0babf6f9d0b37059a;hp=660e37a9bfcf0e4a632de9bf1e6073a01310cedf;hpb=8ec0d29a33e23ce962b807e87cc8b577c8c98ec2;p=kivitendo-erp.git
diff --git a/bin/mozilla/pe.pl b/bin/mozilla/pe.pl
index 660e37a9b..18c90c30a 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
@@ -56,7 +58,9 @@ sub add {
sub edit {
$lxdebug->enter_sub();
-
+ # show history button
+ $form->{javascript} = qq||;
+ #/show hhistory button
$form->{title} = "Edit";
if ($form->{type} eq 'project') {
@@ -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| |
+
|;
}
@@ -183,7 +197,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}&path=$form->{path}&login=$form->{login}&password=$form->{password}&status=$form->{status}&active=" .
+ E($form->{active});
$href = $callback;
if ($form->{status} eq 'all') {
@@ -205,7 +220,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 +232,8 @@ sub project_report {
qq| | |
. $locale->text('Description')
. qq| | |;
+ $column_header{active} =
+ qq|| . $locale->text('Active') . qq| | |;
$form->{title} = $locale->text('Projects');
@@ -261,6 +280,10 @@ 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} | |;
$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;
@@ -311,12 +334,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 +387,13 @@ sub form_project_header {
@@ -378,6 +427,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 +465,12 @@ sub save {
PE->save_pricegroup(\%myconfig, \%$form);
$form->redirect($locale->text('Pricegroup saved!'));
}
+ # saving the history
+ if(!exists $form->{addition} && $form->{id} ne "") {
+ $form->{addition} = "SAVED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
$lxdebug->leave_sub();
}
@@ -426,7 +489,12 @@ sub delete {
if ($form->{type} eq 'pricegroup') {
$form->redirect($locale->text('Pricegroup deleted!'));
}
-
+ # saving the history
+ if(!exists $form->{addition}) {
+ $form->{addition} = "DELETED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
$lxdebug->leave_sub();
}
@@ -606,6 +674,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|
@@ -800,6 +876,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|