X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Farap.pl;h=7952922f62735ea361d64c90fd841e61d59f1add;hb=3c5e4df9e938a8f2c9b045774bda00095b976e49;hp=534a702feffcf03c6e66971267eecb35b469f22c;hpb=54e4131e091831e00a861fe2c4f53e344b87ddca;p=kivitendo-erp.git diff --git a/bin/mozilla/arap.pl b/bin/mozilla/arap.pl index 534a702fe..7952922f6 100644 --- a/bin/mozilla/arap.pl +++ b/bin/mozilla/arap.pl @@ -31,15 +31,17 @@ # # any custom scripts for this one -if (-f "$form->{path}/custom_arap.pl") { - eval { require "$form->{path}/custom_arap.pl"; }; +if (-f "bin/mozilla/custom_arap.pl") { + eval { require "bin/mozilla/custom_arap.pl"; }; } -if (-f "$form->{path}/$form->{login}_arap.pl") { - eval { require "$form->{path}/$form->{login}_arap.pl"; }; +if (-f "bin/mozilla/$form->{login}_arap.pl") { + eval { require "bin/mozilla/$form->{login}_arap.pl"; }; } 1; +require "bin/mozilla/common.pl"; + # end of main sub check_name { @@ -47,6 +49,8 @@ sub check_name { my ($name) = @_; + $name = $name eq "customer" ? "customer" : "vendor"; + my ($new_name, $new_id) = split /--/, $form->{$name}; my $i = 0; # if we use a selection @@ -101,6 +105,8 @@ sub check_name { } else { # 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!"; $form->error($locale->text($msg)); } @@ -273,25 +279,28 @@ sub check_project { $lxdebug->enter_sub(); for $i (1 .. $form->{rowcount}) { - $form->{"project_id_$i"} = "" unless $form->{"projectnumber_$i"}; - if ($form->{"projectnumber_$i"} ne $form->{"oldprojectnumber_$i"}) { - if ($form->{"projectnumber_$i"}) { + my $suffix = $i ? "_$i" : ""; + my $prefix = $i ? "" : "global"; + $form->{"${prefix}project_id${suffix}"} = "" unless $form->{"${prefix}projectnumber$suffix"}; + if ($form->{"${prefix}projectnumber${suffix}"} ne $form->{"old${prefix}projectnumber${suffix}"}) { + if ($form->{"${prefix}projectnumber${suffix}"}) { # get new project - $form->{projectnumber} = $form->{"projectnumber_$i"}; + $form->{projectnumber} = $form->{"${prefix}projectnumber${suffix}"}; if (($rows = PE->projects(\%myconfig, $form)) > 1) { # check form->{project_list} how many there are $form->{rownumber} = $i; - &select_project; + &select_project($i ? undef : 1); exit; } if ($rows == 1) { - $form->{"project_id_$i"} = $form->{project_list}->[0]->{id}; - $form->{"projectnumber_$i"} = + $form->{"${prefix}project_id${suffix}"} = + $form->{project_list}->[0]->{id}; + $form->{"${prefix}projectnumber${suffix}"} = $form->{project_list}->[0]->{projectnumber}; - $form->{"oldprojectnumber_$i"} = + $form->{"old${prefix}projectnumber${suffix}"} = $form->{project_list}->[0]->{projectnumber}; } else { @@ -299,7 +308,7 @@ sub check_project { $form->error($locale->text('Project not on file!')); } } else { - $form->{"oldprojectnumber_$i"} = ""; + $form->{"old${prefix}projectnumber${suffix}"} = ""; } } } @@ -310,6 +319,8 @@ sub check_project { sub select_project { $lxdebug->enter_sub(); + my ($is_global) = @_; + @column_index = qw(ndx projectnumber description); $column_data{ndx} = qq|