projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Geschlecht fuer Ansprechpartner bei abweichender Lieferadresse als Auswahlfeld in...
[kivitendo-erp.git]
/
bin
/
mozilla
/
fu.pl
diff --git
a/bin/mozilla/fu.pl
b/bin/mozilla/fu.pl
index
437d6bf
..
ac9e81f
100644
(file)
--- a/
bin/mozilla/fu.pl
+++ b/
bin/mozilla/fu.pl
@@
-5,11
+5,15
@@
use SL::ReportGenerator;
require "bin/mozilla/reportgenerator.pl";
require "bin/mozilla/reportgenerator.pl";
+use strict;
+
sub _collect_links {
sub _collect_links {
- $lxdebug->enter_sub();
+ $
main::
lxdebug->enter_sub();
my $dest = shift;
my $dest = shift;
+ my $form = $main::form;
+
$dest->{LINKS} = [];
foreach my $i (1 .. $form->{trans_rowcount}) {
$dest->{LINKS} = [];
foreach my $i (1 .. $form->{trans_rowcount}) {
@@
-18,11
+22,15
@@
sub _collect_links {
push @{ $dest->{LINKS} }, { map { +"trans_$_" => $form->{"trans_${_}_$i"} } qw(id type info) };
}
push @{ $dest->{LINKS} }, { map { +"trans_$_" => $form->{"trans_${_}_$i"} } qw(id type info) };
}
- $lxdebug->leave_sub();
+ $
main::
lxdebug->leave_sub();
}
sub add {
}
sub add {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
_collect_links($form);
_collect_links($form);
@@
-43,11
+51,14
@@
sub add {
display_form();
display_form();
- $lxdebug->leave_sub();
+ $
main::
lxdebug->leave_sub();
}
sub edit {
}
sub edit {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my $locale = $main::locale;
my $ref = FU->retrieve('id' => $form->{id});
my $ref = FU->retrieve('id' => $form->{id});
@@
-65,11
+76,13
@@
sub edit {
display_form();
display_form();
- $lxdebug->leave_sub();
+ $
main::
lxdebug->leave_sub();
}
sub display_form {
}
sub display_form {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
$form->get_lists("employees" => "EMPLOYEES");
$form->get_lists("employees" => "EMPLOYEES");
@@
-83,11
+96,14
@@
sub display_form {
$form->header();
print $form->parse_html_template('fu/add_edit');
$form->header();
print $form->parse_html_template('fu/add_edit');
- $lxdebug->leave_sub();
+ $
main::
lxdebug->leave_sub();
}
sub save_follow_up {
}
sub save_follow_up {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my $locale = $main::locale;
$form->isblank('created_for_user', $locale->text('You must chose a user.'));
$form->isblank('follow_up_date', $locale->text('The follow-up date is missing.'));
$form->isblank('created_for_user', $locale->text('You must chose a user.'));
$form->isblank('follow_up_date', $locale->text('The follow-up date is missing.'));
@@
-102,7
+118,7
@@
sub save_follow_up {
if ($form->{POPUP_MODE}) {
$form->header();
print $form->parse_html_template('fu/close_window');
if ($form->{POPUP_MODE}) {
$form->header();
print $form->parse_html_template('fu/close_window');
-
exit 0
;
+
::end_of_request()
;
}
$form->{SAVED_MESSAGE} = $locale->text('Follow-Up saved.');
}
$form->{SAVED_MESSAGE} = $locale->text('Follow-Up saved.');
@@
-117,11
+133,14
@@
sub save_follow_up {
report();
report();
- $lxdebug->leave_sub();
+ $
main::
lxdebug->leave_sub();
}
sub finish {
}
sub finish {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my $locale = $main::locale;
if ($form->{id}) {
my $ref = FU->retrieve('id' => $form->{id});
if ($form->{id}) {
my $ref = FU->retrieve('id' => $form->{id});
@@
-143,18
+162,21
@@
sub finish {
if ($form->{POPUP_MODE}) {
$form->header();
print $form->parse_html_template('fu/close_window');
if ($form->{POPUP_MODE}) {
$form->header();
print $form->parse_html_template('fu/close_window');
-
exit 0
;
+
::end_of_request()
;
}
$form->redirect() if ($form->{callback});
report();
}
$form->redirect() if ($form->{callback});
report();
- $lxdebug->leave_sub();
+ $
main::
lxdebug->leave_sub();
}
sub delete {
}
sub delete {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my $locale = $main::locale;
if ($form->{id}) {
my $ref = FU->retrieve('id' => $form->{id});
if ($form->{id}) {
my $ref = FU->retrieve('id' => $form->{id});
@@
-176,18
+198,21
@@
sub delete {
if ($form->{POPUP_MODE}) {
$form->header();
print $form->parse_html_template('fu/close_window');
if ($form->{POPUP_MODE}) {
$form->header();
print $form->parse_html_template('fu/close_window');
-
exit 0
;
+
::end_of_request()
;
}
$form->redirect() if ($form->{callback});
report();
}
$form->redirect() if ($form->{callback});
report();
- $lxdebug->leave_sub();
+ $
main::
lxdebug->leave_sub();
}
sub search {
}
sub search {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my $locale = $main::locale;
$form->get_lists("employees" => "EMPLOYEES");
$form->get_lists("employees" => "EMPLOYEES");
@@
-197,11
+222,16
@@
sub search {
$form->header();
print $form->parse_html_template('fu/search');
$form->header();
print $form->parse_html_template('fu/search');
- $lxdebug->leave_sub();
+ $
main::
lxdebug->leave_sub();
}
sub report {
}
sub report {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+ my $cgi = $main::cgi;
my @report_params = qw(created_for subject body reference follow_up_date_from follow_up_date_to itime_from itime_to due_only all_users done not_done);
my @report_params = qw(created_for subject body reference follow_up_date_from follow_up_date_to itime_from itime_to due_only all_users done not_done);
@@
-259,7
+289,7
@@
sub report {
$report->set_columns(%column_defs);
$report->set_column_order(@columns);
$report->set_columns(%column_defs);
$report->set_column_order(@columns);
- $report->set_export_options('report', @report_params);
+ $report->set_export_options('report', @report_params
, qw(sort sortdir)
);
$report->set_sort_indicator($form->{sort}, $form->{sortdir});
$report->set_sort_indicator($form->{sort}, $form->{sortdir});
@@
-303,11
+333,13
@@
sub report {
$report->generate_with_headers();
$report->generate_with_headers();
- $lxdebug->leave_sub();
+ $
main::
lxdebug->leave_sub();
}
sub report_for_todo_list {
}
sub report_for_todo_list {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
my @report_params = qw(created_for subject body reference follow_up_date_from follow_up_date_to itime_from itime_to due_only all_users done not_done);
my @report_params = qw(created_for subject body reference follow_up_date_from follow_up_date_to itime_from itime_to due_only all_users done not_done);
@@
-338,13
+370,16
@@
sub report_for_todo_list {
'edit_url' => $edit_url, });
}
'edit_url' => $edit_url, });
}
- $lxdebug->leave_sub();
+ $
main::
lxdebug->leave_sub();
return $content;
}
sub edit_access_rights {
return $content;
}
sub edit_access_rights {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my $locale = $main::locale;
my $access = FU->retrieve_access_rights();
my $access = FU->retrieve_access_rights();
@@
-357,11
+392,14
@@
sub edit_access_rights {
$form->header();
print $form->parse_html_template('fu/edit_access_rights');
$form->header();
print $form->parse_html_template('fu/edit_access_rights');
- $lxdebug->leave_sub();
+ $
main::
lxdebug->leave_sub();
}
sub save_access_rights {
}
sub save_access_rights {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my $locale = $main::locale;
my %access;
my %access;
@@
-376,26
+414,31
@@
sub save_access_rights {
$form->{SAVED_MESSAGE} = $locale->text('The access rights have been saved.');
edit_access_rights();
$form->{SAVED_MESSAGE} = $locale->text('The access rights have been saved.');
edit_access_rights();
- $lxdebug->leave_sub();
+ $
main::
lxdebug->leave_sub();
}
sub update {
}
sub update {
- call_sub($form->{nextsub});
+ call_sub($
main::
form->{nextsub});
}
sub continue {
}
sub continue {
- call_sub($form->{nextsub});
+ call_sub($
main::
form->{nextsub});
}
sub save {
}
sub save {
- if ($form->{save_nextsub}) {
- call_sub($form->{save_nextsub});
+ if ($
main::
form->{save_nextsub}) {
+ call_sub($
main::
form->{save_nextsub});
} else {
save_follow_up();
}
}
sub dispatcher {
} else {
save_follow_up();
}
}
sub dispatcher {
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my $locale = $main::locale;
+
foreach my $action (qw(finish save delete)) {
if ($form->{"action_${action}"}) {
call_sub($action);
foreach my $action (qw(finish save delete)) {
if ($form->{"action_${action}"}) {
call_sub($action);