X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Farap.pl;h=3b1a443113e2dcc28f59bfa6e715f49db5f24967;hb=0c2be9979d3c323a8f88ca372c0e1314774d7293;hp=1ed40a7f942b3b58c47961223edd1246fd3cd754;hpb=7148aad6ec1cb80332c9fba6232e3fc825807307;p=kivitendo-erp.git diff --git a/bin/mozilla/arap.pl b/bin/mozilla/arap.pl index 1ed40a7f9..3b1a44311 100644 --- a/bin/mozilla/arap.pl +++ b/bin/mozilla/arap.pl @@ -32,12 +32,14 @@ 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,13 +49,17 @@ require "bin/mozilla/common.pl"; # end of main sub check_name { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my %myconfig = %main::myconfig; + 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 |' . 'purchase_delivery_order_edit | sales_delivery_order_edit'); - my ($name) = @_; + my ($name, %params) = @_; $name = $name eq "customer" ? "customer" : "vendor"; @@ -93,9 +99,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) { @@ -113,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; } @@ -129,16 +143,20 @@ sub check_name { # $locale->text('Vendor not on file!') sub select_name { - $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; + + $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{projectnumber} = qq| | | . $locale->text('Number') . qq| | |; - $column_data{description} = - qq|| . $locale->text('Description') . qq| | |; + my @hiddens; + for my $key (keys %$::form) { + next if $key eq 'login' || $key eq 'password' || '' ne ref $::form->{$key}; + push @hiddens, { key => $key, value => $::form->{$key} }; + } + push @hiddens, { key => 'is_global', value => $is_global }, + { key => 'project_selected_nextsub', value => $nextsub }; - # list items with radio button on a form - $form->header; + $::form->header; + print $::form->parse_html_template('arap/select_project', { hiddens => \@hiddens, project_list => $project_list }); - $title = $locale->text('Select from one of the projects below'); + $::lxdebug->leave_sub; +} - print qq| - +sub project_selected { + $main::lxdebug->enter_sub(); - +It's a collection of helper routines that wrap the customer/vendor dropdown/textfield duality into something even complexer. - -
---|