X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Farap.pl;h=7612166a52b121c09703521d70abe018f0a2f841;hb=a2777d1ab70c9789131e9ad966f94a4ddf301bd2;hp=38308a97b29b539521fce216f8706f9f7cc19343;hpb=8c7e44938a661e035f62840e1e177353240ace5d;p=kivitendo-erp.git
diff --git a/bin/mozilla/arap.pl b/bin/mozilla/arap.pl
index 38308a97b..7612166a5 100644
--- a/bin/mozilla/arap.pl
+++ b/bin/mozilla/arap.pl
@@ -30,12 +30,16 @@
# common routines for gl, ar, ap, is, ir, oe
#
+use SL::Projects;
+
+use strict;
+
# any custom scripts for this one
if (-f "bin/mozilla/custom_arap.pl") {
eval { require "bin/mozilla/custom_arap.pl"; };
}
-if (-f "bin/mozilla/$form->{login}_arap.pl") {
- eval { require "bin/mozilla/$form->{login}_arap.pl"; };
+if (-f "bin/mozilla/$main::form->{login}_arap.pl") {
+ eval { require "bin/mozilla/$main::form->{login}_arap.pl"; };
}
1;
@@ -45,10 +49,15 @@ require "bin/mozilla/common.pl";
# end of main
sub check_name {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
- $auth->assert('general_ledger | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
- 'request_quotation_edit | sales_quotation_edit | purchase_order_edit | cash');
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
+ $main::auth->assert('general_ledger | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ 'request_quotation_edit | sales_quotation_edit | purchase_order_edit | cash |' .
+ 'purchase_delivery_order_edit | sales_delivery_order_edit');
my ($name) = @_;
@@ -110,14 +119,14 @@ sub check_name {
# name is not on file
# $locale->text('Customer not on file or locked!')
# $locale->text('Vendor not on file or locked!')
- $msg = ucfirst $name . " not on file or locked!";
+ my $msg = ucfirst $name . " not on file or locked!";
$form->error($locale->text($msg));
}
}
}
$form->language_payment(\%myconfig);
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
return $i;
}
@@ -126,16 +135,20 @@ sub check_name {
# $locale->text('Vendor not on file!')
sub select_name {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my $locale = $main::locale;
- $auth->assert('general_ledger | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ $main::auth->assert('general_ledger | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
'request_quotation_edit | sales_quotation_edit | purchase_order_edit | cash');
my ($table) = @_;
- @column_index = qw(ndx name address);
+ my @column_index = qw(ndx name address);
- $label = ucfirst $table;
+ my $label = ucfirst $table;
+ my %column_data;
$column_data{ndx} = qq|
| |;
$column_data{name} =
qq|| . $locale->text($label) . qq| | |;
@@ -145,7 +158,7 @@ sub select_name {
# list items with radio button on a form
$form->header;
- $title = $locale->text('Select from one of the names below');
+ my $title = $locale->text('Select from one of the names below');
print qq|
@@ -169,8 +182,9 @@ sub select_name {
|;
my $i = 0;
- foreach $ref (@{ $form->{name_list} }) {
- $checked = ($i++) ? "" : "checked";
+ my $j;
+ foreach my $ref (@{ $form->{name_list} }) {
+ my $checked = ($i++) ? "" : "checked";
$ref->{name} =~ s/\"/"/g;
@@ -213,7 +227,7 @@ sub select_name {
map { delete $form->{$_} } qw(action name_list header);
# save all other form variables
- foreach $key (keys %${form}) {
+ foreach my $key (keys %${form}) {
next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
$form->{$key} =~ s/\"/"/g;
print qq|\n|;
@@ -232,19 +246,22 @@ sub select_name {
|;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub name_selected {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
- $auth->assert('general_ledger | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+
+ $main::auth->assert('general_ledger | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
'request_quotation_edit | sales_quotation_edit | purchase_order_edit | cash');
# replace the variable with the one checked
# index for new item
- $i = $form->{ndx};
+ my $i = $form->{ndx};
$form->{ $form->{vc} } = $form->{"new_name_$i"};
$form->{"$form->{vc}_id"} = $form->{"new_id_$i"};
@@ -263,16 +280,21 @@ sub name_selected {
&update(1);
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub check_project {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my $locale = $main::locale;
- $auth->assert('general_ledger | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ $main::auth->assert('general_ledger | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
'request_quotation_edit | sales_quotation_edit | purchase_order_edit | cash | report');
- for $i (1 .. $form->{rowcount}) {
+ my $nextsub = shift || 'update';
+
+ for my $i (1 .. $form->{rowcount}) {
my $suffix = $i ? "_$i" : "";
my $prefix = $i ? "" : "global";
$form->{"${prefix}project_id${suffix}"} = "" unless $form->{"${prefix}projectnumber$suffix"};
@@ -281,11 +303,13 @@ sub check_project {
# get new project
$form->{projectnumber} = $form->{"${prefix}projectnumber${suffix}"};
- if (($rows = PE->projects(\%myconfig, $form)) > 1) {
+ my %params = map { $_ => $form->{$_} } qw(projectnumber description active);
+ my $rows;
+ if (($rows = Projects->search_projects(%params)) > 1) {
# check form->{project_list} how many there are
$form->{rownumber} = $i;
- &select_project($i ? undef : 1);
+ &select_project($i ? undef : 1, $nextsub);
exit;
}
@@ -304,19 +328,24 @@ sub check_project {
}
}
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub select_project {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
- $auth->assert('general_ledger | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ my $form = $main::form;
+ my $locale = $main::locale;
+ my $cgi = $main::cgi;
+
+ $main::auth->assert('general_ledger | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
'request_quotation_edit | sales_quotation_edit | purchase_order_edit | cash | report');
- my ($is_global) = @_;
+ my ($is_global, $nextsub) = @_;
- @column_index = qw(ndx projectnumber description);
+ my @column_index = qw(ndx projectnumber description);
+ my %column_data;
$column_data{ndx} = qq| | |;
$column_data{projectnumber} = qq|| . $locale->text('Number') . qq| | |;
$column_data{description} =
@@ -325,7 +354,7 @@ sub select_project {
# list items with radio button on a form
$form->header;
- $title = $locale->text('Select from one of the projects below');
+ my $title = $locale->text('Select from one of the projects below');
print qq|
@@ -351,8 +380,9 @@ sub select_project {
|;
my $i = 0;
- foreach $ref (@{ $form->{project_list} }) {
- $checked = ($i++) ? "" : "checked";
+ my $j;
+ foreach my $ref (@{ $form->{project_list} }) {
+ my $checked = ($i++) ? "" : "checked";
$ref->{name} =~ s/\"/"/g;
@@ -395,15 +425,16 @@ sub select_project {
map { delete $form->{$_} } qw(action project_list header update);
# save all other form variables
- foreach $key (keys %${form}) {
+ foreach my $key (keys %${form}) {
next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
$form->{$key} =~ s/\"/"/g;
print qq|\n|;
}
- print qq|
-
-
+ print
+ $cgi->hidden('-name' => 'is_global', '-default' => [$is_global])
+ . $cgi->hidden('-name' => 'project_selected_nextsub', '-default' => [$nextsub])
+ . qq|
{"is_global"} ? "" : "_$form->{rownumber}";
@@ -442,16 +475,14 @@ sub project_selected {
map { delete $form->{"new_${_}_$i"} } qw(id projectnumber description);
}
- map { delete $form->{$_} } qw(ndx lastndx nextsub is_global);
+ my $nextsub = $form->{project_selected_nextsub} || 'update';
- if ($form->{update}) {
- call_sub($form->{"update"});
- } else {
- &update;
- }
+ map { delete $form->{$_} } qw(ndx lastndx nextsub is_global project_selected_nextsub);
+
+ call_sub($nextsub);
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
-sub continue { call_sub($form->{"nextsub"}); }
+sub continue { call_sub($main::form->{"nextsub"}); }