X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Farap.pl;h=7952922f62735ea361d64c90fd841e61d59f1add;hb=bd23cc3e64900f14317c147aa52a8b1a7633e2a4;hp=52057ebbab56f225ae2d6a6aa0f54fd83c240971;hpb=4dbb09950c9f5596646537c12d991c99086fe7c1;p=kivitendo-erp.git diff --git a/bin/mozilla/arap.pl b/bin/mozilla/arap.pl index 52057ebba..7952922f6 100644 --- a/bin/mozilla/arap.pl +++ b/bin/mozilla/arap.pl @@ -31,36 +31,39 @@ # # 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; -# end of main +require "bin/mozilla/common.pl"; + +# end of main sub check_name { $lxdebug->enter_sub(); my ($name) = @_; + $name = $name eq "customer" ? "customer" : "vendor"; + my ($new_name, $new_id) = split /--/, $form->{$name}; my $i = 0; - # if we use a selection if ($form->{"select$name"}) { if ($form->{"old$name"} ne $form->{$name}) { - # this is needed for is, ir and oe + # this is needed for is, ir and oe + $form->{update} = 0; # for credit calculations - $form->{oldinvtotal} = 0; + $form->{oldinvtotal} = 0; $form->{oldtotalpaid} = 0; - $form->{calctax} = 1; - + $form->{calctax} = 1; + $form->{"${name}_id"} = $new_id; IS->get_customer(\%myconfig, \%$form) if ($name eq 'customer'); @@ -74,35 +77,42 @@ sub check_name { # check name, combine name and id if ($form->{"old$name"} ne qq|$form->{$name}--$form->{"${name}_id"}|) { + # this is needed for is, ir and oe - + $form->{update} = 0; + # for credit calculations - $form->{oldinvtotal} = 0; + $form->{oldinvtotal} = 0; $form->{oldtotalpaid} = 0; - $form->{calctax} = 1; + $form->{calctax} = 1; # return one name or a list of names in $form->{name_list} if (($i = $form->get_name(\%myconfig, $name)) > 1) { - &select_name($name); - exit; + &select_name($name); + exit; } if ($i == 1) { - # we got one name - $form->{"${name}_id"} = $form->{name_list}[0]->{id}; - $form->{$name} = $form->{name_list}[0]->{name}; - $form->{"old$name"} = qq|$form->{$name}--$form->{"${name}_id"}|; - - IS->get_customer(\%myconfig, \%$form) if ($name eq 'customer'); - IR->get_vendor(\%myconfig, \%$form) if ($name eq 'vendor'); - + + # we got one name + $form->{"${name}_id"} = $form->{name_list}[0]->{id}; + $form->{$name} = $form->{name_list}[0]->{name}; + $form->{"old$name"} = qq|$form->{$name}--$form->{"${name}_id"}|; + + IS->get_customer(\%myconfig, \%$form) if ($name eq 'customer'); + IR->get_vendor(\%myconfig, \%$form) if ($name eq 'vendor'); + } else { - # name is not on file - $msg = ucfirst $name . " not on file or locked!"; - $form->error($locale->text($msg)); + + # 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)); } } } + $form->language_payment(\%myconfig); $lxdebug->leave_sub(); @@ -112,20 +122,20 @@ sub check_name { # $locale->text('Customer not on file!') # $locale->text('Vendor not on file!') - - sub select_name { $lxdebug->enter_sub(); my ($table) = @_; - + @column_index = qw(ndx name address); - $label = ucfirst $table; - $column_data{ndx} = qq|