X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Farap.pl;h=347c152c700b5a37aeca44c7dedf788b84cc1881;hb=8bde65163db8c36ffa5e83bed7ee68ab859c106d;hp=8971da532fe5206140abd5b98390217f9bc82caa;hpb=0884406403ce36af3484924086527ba689807329;p=kivitendo-erp.git diff --git a/bin/mozilla/arap.pl b/bin/mozilla/arap.pl index 8971da532..347c152c7 100644 --- a/bin/mozilla/arap.pl +++ b/bin/mozilla/arap.pl @@ -30,14 +30,14 @@ # 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; @@ -47,12 +47,17 @@ 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; - my ($name) = @_; + $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, %params) = @_; $name = $name eq "customer" ? "customer" : "vendor"; @@ -71,6 +76,7 @@ sub check_name { $form->{"${name}_id"} = $new_id; + _reset_salesman_id(); IS->get_customer(\%myconfig, \%$form) if ($name eq 'customer'); IR->get_vendor(\%myconfig, \%$form) if ($name eq 'vendor'); @@ -92,9 +98,17 @@ sub check_name { $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; + $i = $form->get_name(\%myconfig, $name); + + if ($i > 1) { + if ($params{no_select}) { + # $locale->text('Customer') + # $locale->text('Vendor') + $form->error($locale->text("More than one #1 found matching, please be more specific.", $locale->text(ucfirst $name))); + } else { + &select_name($name); + ::end_of_request(); + } } if ($i == 1) { @@ -104,6 +118,7 @@ sub check_name { $form->{$name} = $form->{name_list}[0]->{name}; $form->{"old$name"} = qq|$form->{$name}--$form->{"${name}_id"}|; + _reset_salesman_id(); IS->get_customer(\%myconfig, \%$form) if ($name eq 'customer'); IR->get_vendor(\%myconfig, \%$form) if ($name eq 'vendor'); @@ -112,14 +127,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; } @@ -128,16 +143,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|