X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fpe.pl;h=532dcfac5baf69ceae50091a3e9862ce86f45b71;hb=e24551e62433de8d5541c315502c63b81048c23f;hp=8c6132ecb61adb2acd38cedd606cc9ad42d7500d;hpb=0884406403ce36af3484924086527ba689807329;p=kivitendo-erp.git diff --git a/bin/mozilla/pe.pl b/bin/mozilla/pe.pl index 8c6132ecb..532dcfac5 100644 --- a/bin/mozilla/pe.pl +++ b/bin/mozilla/pe.pl @@ -35,14 +35,18 @@ use SL::PE; require "bin/mozilla/common.pl"; +use strict; + 1; # end of main sub add { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + $main::auth->assert('config'); - $auth->assert('config'); + my $form = $main::form; $form->{title} = "Add"; @@ -54,13 +58,16 @@ sub add { call_sub("form_$form->{type}_header"); call_sub("form_$form->{type}_footer"); - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub edit { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + $main::auth->assert('config'); - $auth->assert('config'); + my $form = $main::form; + my %myconfig = %main::myconfig; # show history button $form->{javascript} = qq||; @@ -76,24 +83,28 @@ sub edit { call_sub("form_$form->{type}_header"); call_sub("form_$form->{type}_footer"); - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub search { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); - $auth->assert('config'); + $main::auth->assert('config'); + my $form = $main::form; + my $locale = $main::locale; + + my ($report, $sort, $number); if ($form->{type} eq 'partsgroup') { $report = "partsgroup_report"; $sort = 'partsgroup'; $form->{title} = $locale->text('Groups'); $number = qq| - - | . $locale->text('Group') . qq| - - + + | . $locale->text('Group') . qq| + + |; } @@ -105,10 +116,10 @@ sub search { $form->{title} = $locale->text('Pricegroup'); $number = qq| - - | . $locale->text('Pricegroup') . qq| - - + + | . $locale->text('Pricegroup') . qq| + + |; } @@ -132,13 +143,11 @@ sub search { $number - - - - + + + +
 | - . $locale->text('All') . qq| -  | - . $locale->text('Orphaned') . qq|
 | . $locale->text('All') . qq| +  | . $locale->text('Orphaned') . qq|
@@ -158,13 +167,17 @@ sub search { |; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub save { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); - $auth->assert('config'); + $main::auth->assert('config'); + + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; if ($form->{type} eq 'partsgroup') { $form->isblank("partsgroup", $locale->text('Group missing!')); @@ -181,18 +194,22 @@ sub save { # 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)); + $form->{addition} = "SAVED"; + $form->save_history; } - # /saving the history + # /saving the history - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub delete { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + $main::auth->assert('config'); - $auth->assert('config'); + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; PE->delete_tuple(\%myconfig, \%$form); @@ -205,26 +222,31 @@ sub delete { # saving the history if(!exists $form->{addition}) { $form->{snumbers} = qq|projectnumber_| . $form->{projectnumber}; - $form->{addition} = "DELETED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "DELETED"; + $form->save_history; } # /saving the history - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } -sub continue { call_sub($form->{"nextsub"}); } +sub continue { call_sub($main::form->{"nextsub"}); } sub partsgroup_report { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); - $auth->assert('config'); + $main::auth->assert('config'); - map { $form->{$_} = $form->unescape($form->{$_}) } (partsgroup); + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; + + map { $form->{$_} = $form->unescape($form->{$_}) } qw(partsgroup); PE->partsgroups(\%myconfig, \%$form); - $callback = + my $callback = "$form->{script}?action=partsgroup_report&type=$form->{type}&status=$form->{status}"; + my ($option); if ($form->{status} eq 'all') { $option = $locale->text('All'); } @@ -236,8 +258,8 @@ sub partsgroup_report { $option .= "\n
" . $locale->text('Group') . " : $form->{partsgroup}"; } - @column_index = $form->sort_columns(qw(partsgroup)); - + my @column_index = $form->sort_columns(qw(partsgroup)); + my %column_header; $column_header{partsgroup} = qq|| . $locale->text('Group') . qq||; @@ -259,7 +281,7 @@ sub partsgroup_report { - + |; map { print "$column_header{$_}\n" } @column_index; @@ -274,7 +296,8 @@ sub partsgroup_report { # escape callback for href $callback = $form->escape($callback); - foreach $ref (@{ $form->{item_list} }) { + my ($i, %column_data); + foreach my $ref (@{ $form->{item_list} }) { $i++; $i %= 2; @@ -317,13 +340,16 @@ sub partsgroup_report { |; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub form_partsgroup_header { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + $main::auth->assert('config'); - $auth->assert('config'); + my $form = $main::form; + my $locale = $main::locale; $form->{title} = $locale->text("$form->{title} Group"); @@ -350,11 +376,10 @@ sub form_partsgroup_header { @@ -364,13 +389,16 @@ sub form_partsgroup_header {
- - - + + - +
| . $locale->text('Group') . qq|
| . $locale->text('Group') . qq|
|; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub form_partsgroup_footer { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + $main::auth->assert('config'); - $auth->assert('config'); + my $form = $main::form; + my $locale = $main::locale; print qq| @@ -388,11 +416,11 @@ sub form_partsgroup_footer { # button for saving history print qq| - {id} - . qq|); name=history id=history value=| - . $locale->text('history') - . qq|>|; + {id} + . qq|); name=history id=history value=| + . $locale->text('history') + . qq|>|; # /button for saving history print qq| @@ -401,23 +429,28 @@ print qq| |; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } ################################# # get pricesgroups and build up html-code # sub pricegroup_report { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); - $auth->assert('config'); + $main::auth->assert('config'); - map { $form->{$_} = $form->unescape($form->{$_}) } (pricegroup); + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; + + map { $form->{$_} = $form->unescape($form->{$_}) } qw(pricegroup); PE->pricegroups(\%myconfig, \%$form); - $callback = + my $callback = "$form->{script}?action=pricegroup_report&type=$form->{type}&status=$form->{status}"; + my $option; if ($form->{status} eq 'all') { $option = $locale->text('All'); } @@ -430,8 +463,8 @@ sub pricegroup_report { "\n
" . $locale->text('Pricegroup') . " : $form->{pricegroup}"; } - @column_index = $form->sort_columns(qw(pricegroup)); - + my @column_index = $form->sort_columns(qw(pricegroup)); + my %column_header; $column_header{pricegroup} = qq|| . $locale->text('Pricegroup') @@ -455,7 +488,7 @@ sub pricegroup_report { - + |; map { print "$column_header{$_}\n" } @column_index; @@ -470,7 +503,8 @@ sub pricegroup_report { # escape callback for href $callback = $form->escape($callback); - foreach $ref (@{ $form->{item_list} }) { + my ($i, %column_data); + foreach my $ref (@{ $form->{item_list} }) { $i++; $i %= 2; @@ -513,16 +547,19 @@ sub pricegroup_report { |; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } ####################### #build up pricegroup_header # sub form_pricegroup_header { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + $main::auth->assert('config'); - $auth->assert('config'); + my $form = $main::form; + my $locale = $main::locale; # $locale->text('Add Pricegroup') # $locale->text('Edit Pricegroup') @@ -549,10 +586,10 @@ sub form_pricegroup_header { @@ -562,15 +599,18 @@ sub form_pricegroup_header {
- - + + - +
| . $locale->text('Preisgruppe') . qq|
| . $locale->text('Preisgruppe') . qq|
|; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } ###################### #build up pricegroup_footer # sub form_pricegroup_footer { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + $main::auth->assert('config'); - $auth->assert('config'); + my $form = $main::form; + my $locale = $main::locale; print qq| @@ -588,11 +628,11 @@ sub form_pricegroup_footer { # button for saving history print qq| - {id} - . qq|); name=history id=history value=| - . $locale->text('history') - . qq|>|; + {id} + . qq|); name=history id=history value=| + . $locale->text('history') + . qq|>|; # /button for saving history print qq| @@ -601,5 +641,5 @@ print qq| |; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); }