X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fpe.pl;h=8c6132ecb61adb2acd38cedd606cc9ad42d7500d;hb=7fb467ccf1e1db80a86482b95c6c5c99269a0d16;hp=0fd351dbe409545ab85fad472b27a769e0a3368a;hpb=45d0d9dec4f4c81bcb310e71ceb588277473daf2;p=kivitendo-erp.git diff --git a/bin/mozilla/pe.pl b/bin/mozilla/pe.pl index 0fd351dbe..8c6132ecb 100644 --- a/bin/mozilla/pe.pl +++ b/bin/mozilla/pe.pl @@ -27,13 +27,14 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #====================================================================== # -# project administration -# partsgroup administration +# partsgroup, pricegroup administration # #====================================================================== use SL::PE; +require "bin/mozilla/common.pl"; + 1; # end of main @@ -41,15 +42,17 @@ use SL::PE; sub add { $lxdebug->enter_sub(); + $auth->assert('config'); + $form->{title} = "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}" 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(); } @@ -57,19 +60,21 @@ sub add { sub edit { $lxdebug->enter_sub(); + $auth->assert('config'); + + # show history button + $form->{javascript} = qq||; + #/show hhistory button $form->{title} = "Edit"; - if ($form->{type} eq 'project') { - PE->get_project(\%myconfig, \%$form); - } if ($form->{type} eq 'partsgroup') { PE->get_partsgroup(\%myconfig, \%$form); } 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(); } @@ -77,23 +82,8 @@ sub edit { sub search { $lxdebug->enter_sub(); - if ($form->{type} eq 'project') { - $report = "project_report"; - $sort = 'projectnumber'; - $form->{title} = $locale->text('Projects'); + $auth->assert('config'); - $number = qq| - - | . $locale->text('Number') . qq| - - - - | . $locale->text('Description') . qq| - - -|; - - } if ($form->{type} eq 'partsgroup') { $report = "partsgroup_report"; $sort = 'partsgroup'; @@ -159,10 +149,6 @@ sub search { -{path}> -{login}> -{password}> -
@@ -175,238 +161,11 @@ sub search { $lxdebug->leave_sub(); } -sub project_report { - $lxdebug->enter_sub(); - - map { $form->{$_} = $form->unescape($form->{$_}) } - (projectnumber, description); - 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}"; - $href = $callback; - - if ($form->{status} eq 'all') { - $option = $locale->text('All'); - } - if ($form->{status} eq 'orphaned') { - $option .= $locale->text('Orphaned'); - } - if ($form->{projectnumber}) { - $href .= "&projectnumber=" . $form->escape($form->{projectnumber}); - $callback .= "&projectnumber=$form->{projectnumber}"; - $option .= - "\n
" . $locale->text('Project') . " : $form->{projectnumber}"; - } - if ($form->{description}) { - $href .= "&description=" . $form->escape($form->{description}); - $callback .= "&description=$form->{description}"; - $option .= - "\n
" . $locale->text('Description') . " : $form->{description}"; - } - - @column_index = $form->sort_columns(qw(projectnumber description)); - - $column_header{projectnumber} = - qq|| - . $locale->text('Number') - . qq||; - $column_header{description} = - qq|| - . $locale->text('Description') - . qq||; - - $form->{title} = $locale->text('Projects'); - - $form->header; - - print qq| - - - - - - - - - - - - - - - - -
$form->{title}
$option
- - -|; - - map { print "$column_header{$_}\n" } @column_index; - - print qq| - -|; - - # escape callback - $form->{callback} = $callback .= "&sort=$form->{sort}"; - - # escape callback for href - $callback = $form->escape($callback); - - foreach $ref (@{ $form->{project_list} }) { - - $i++; - $i %= 2; - - print qq| - -|; - - $column_data{projectnumber} = - qq||; - $column_data{description} = qq||; - - map { print "$column_data{$_}\n" } @column_index; - - print " - -"; - } - - print 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}$ref->{description} 
-

- -
-
{script}> - - - -{type}> - -{path}> -{login}> -{password}> - -|; - - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } - - print qq| -
- - - -|; - - $lxdebug->leave_sub(); -} - -sub form_project_header { - $lxdebug->enter_sub(); - - $form->{title} = $locale->text("$form->{title} Project"); - - # $locale->text('Add Project') - # $locale->text('Edit Project') - - $form->{description} =~ s/\"/"/g; - - if (($rows = $form->numtextrows($form->{description}, 60)) > 1) { - $description = - qq||; - } else { - $description = - qq||; - } - - $form->header; - - print qq| - - -
{script}> - -{id}> - - - - - - - - - - - - - -
$form->{title}
- - - - - - - - - -
| . $locale->text('Number') . qq|
| . $locale->text('Description') . qq|$description
-

-|; - - $lxdebug->leave_sub(); -} - -sub form_project_footer { - $lxdebug->enter_sub(); - - print qq| - - - -{path}> -{login}> -{password}> - -
-|; - - if ($form->{id} && $form->{orphaned}) { - print qq| -|; - } - - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } - - print qq| -
- - - -|; - - $lxdebug->leave_sub(); -} - sub save { $lxdebug->enter_sub(); - if ($form->{type} eq 'project') { - $form->isblank("projectnumber", $locale->text('Project Number missing!')); - PE->save_project(\%myconfig, \%$form); - $form->redirect($locale->text('Project saved!')); - } + $auth->assert('config'); + if ($form->{type} eq 'partsgroup') { $form->isblank("partsgroup", $locale->text('Group missing!')); PE->save_partsgroup(\%myconfig, \%$form); @@ -419,6 +178,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,31 +192,38 @@ sub save { sub delete { $lxdebug->enter_sub(); + $auth->assert('config'); + PE->delete_tuple(\%myconfig, \%$form); - if ($form->{type} eq 'project') { - $form->redirect($locale->text('Project deleted!')); - } if ($form->{type} eq 'partsgroup') { $form->redirect($locale->text('Group deleted!')); } 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(); + $auth->assert('config'); + map { $form->{$_} = $form->unescape($form->{$_}) } (partsgroup); 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}&status=$form->{status}"; if ($form->{status} eq 'all') { $option = $locale->text('All'); @@ -511,7 +284,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}&callback=$callback>$ref->{partsgroup}|; map { print "$column_data{$_}\n" } @column_index; print " @@ -535,19 +308,9 @@ sub partsgroup_report { {type}> -{path}> -{login}> -{password}> - |; + . $locale->text('Add') . qq|"> - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } - - print qq| @@ -560,6 +323,8 @@ sub partsgroup_report { sub form_partsgroup_header { $lxdebug->enter_sub(); + $auth->assert('config'); + $form->{title} = $locale->text("$form->{title} Group"); # $locale->text('Add Group') @@ -605,14 +370,12 @@ sub form_partsgroup_header { sub form_partsgroup_footer { $lxdebug->enter_sub(); + $auth->assert('config'); + print qq| -{path}> -{login}> -{password}> -
|; @@ -623,11 +386,14 @@ sub form_partsgroup_footer { . $locale->text('Delete') . qq|">|; } - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } - +# button for saving history +print qq| + {id} + . qq|); name=history id=history value=| + . $locale->text('history') + . qq|>|; +# /button for saving history print qq| @@ -644,11 +410,13 @@ sub form_partsgroup_footer { sub pricegroup_report { $lxdebug->enter_sub(); + $auth->assert('config'); + map { $form->{$_} = $form->unescape($form->{$_}) } (pricegroup); 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}&status=$form->{status}"; if ($form->{status} eq 'all') { $option = $locale->text('All'); @@ -711,7 +479,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}&callback=$callback>$ref->{pricegroup}|; map { print "$column_data{$_}\n" } @column_index; @@ -736,19 +504,9 @@ sub pricegroup_report { {type}> -{path}> -{login}> -{password}> - |; - - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } + . $locale->text('Add') . qq|"> - print qq| @@ -764,6 +522,8 @@ sub pricegroup_report { sub form_pricegroup_header { $lxdebug->enter_sub(); + $auth->assert('config'); + # $locale->text('Add Pricegroup') # $locale->text('Edit Pricegroup') @@ -810,14 +570,12 @@ sub form_pricegroup_header { sub form_pricegroup_footer { $lxdebug->enter_sub(); + $auth->assert('config'); + print qq| -{path}> -{login}> -{password}> -
|; @@ -828,11 +586,14 @@ sub form_pricegroup_footer { . $locale->text('Delete') . qq|">|; } - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } - +# button for saving history +print qq| + {id} + . qq|); name=history id=history value=| + . $locale->text('history') + . qq|>|; +# /button for saving history print qq|