X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Farap.pl;h=75764a4348f44d71ae0f45b771a2c7663ae861af;hb=deb4d2dbb676d7d6f69dfe7815d6e0cb09bd4a44;hp=fa2dd42399a5bf03c94aecbe3bdbde8b6108b628;hpb=d18df453f55190d4807af324725ea82a8835d7fc;p=kivitendo-erp.git diff --git a/bin/mozilla/arap.pl b/bin/mozilla/arap.pl index fa2dd4239..75764a434 100644 --- a/bin/mozilla/arap.pl +++ b/bin/mozilla/arap.pl @@ -30,16 +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/$main::form->{login}_arap.pl") { - eval { require "bin/mozilla/$main::form->{login}_arap.pl"; }; +if (-f "bin/mozilla/$::myconfig{login}_arap.pl") { + eval { require "bin/mozilla/$::myconfig{login}_arap.pl"; }; } 1; @@ -63,7 +61,7 @@ sub check_name { $name = $name eq "customer" ? "customer" : "vendor"; - my ($new_name, $new_id) = split /--/, $form->{$name}; + my ($new_name,$new_id) = $form->{$name} =~ /^(.*?)--(\d+)$/; my $i = 0; # if we use a selection if ($form->{"select$name"}) { @@ -78,6 +76,9 @@ sub check_name { $form->{"${name}_id"} = $new_id; + _reset_salesman_id(); + delete @{ $form }{qw(payment_id)}; + IS->get_customer(\%myconfig, \%$form) if ($name eq 'customer'); IR->get_vendor(\%myconfig, \%$form) if ($name eq 'vendor'); @@ -119,6 +120,9 @@ sub check_name { $form->{$name} = $form->{name_list}[0]->{name}; $form->{"old$name"} = qq|$form->{$name}--$form->{"${name}_id"}|; + _reset_salesman_id(); + delete @{ $form }{qw(payment_id)}; + IS->get_customer(\%myconfig, \%$form) if ($name eq 'customer'); IR->get_vendor(\%myconfig, \%$form) if ($name eq 'vendor'); @@ -148,7 +152,7 @@ sub select_name { my $form = $main::form; my $locale = $main::locale; - $main::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 | sales_delivery_order_edit |' . 'request_quotation_edit | sales_quotation_edit | purchase_order_edit | cash'); my ($table) = @_; @@ -169,15 +173,11 @@ sub select_name { my $title = $locale->text('Select from one of the names below'); print qq| - +

$title

{script}> - - - -

$title

@@ -249,9 +249,6 @@ sub select_name { - - - |; $main::lxdebug->leave_sub(); @@ -263,7 +260,7 @@ sub name_selected { my $form = $main::form; my %myconfig = %main::myconfig; - $main::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 | sales_delivery_order_edit | ' . 'request_quotation_edit | sales_quotation_edit | purchase_order_edit | cash'); # replace the variable with the one checked @@ -271,6 +268,8 @@ sub name_selected { # index for new item my $i = $form->{ndx}; + _reset_salesman_id(); + $form->{ $form->{vc} } = $form->{"new_name_$i"}; $form->{"$form->{vc}_id"} = $form->{"new_id_$i"}; $form->{"old$form->{vc}"} = @@ -291,169 +290,37 @@ sub name_selected { $main::lxdebug->leave_sub(); } -sub check_project { - $main::lxdebug->enter_sub(); - - 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 | report'); - - 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"}; - if ($form->{"${prefix}projectnumber${suffix}"} ne $form->{"old${prefix}projectnumber${suffix}"}) { - if ($form->{"${prefix}projectnumber${suffix}"}) { - - # get new project - $form->{projectnumber} = $form->{"${prefix}projectnumber${suffix}"}; - 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, $nextsub); - ::end_of_request(); - } - - if ($rows == 1) { - $form->{"${prefix}project_id${suffix}"} = $form->{project_list}->[0]->{id}; - $form->{"${prefix}projectnumber${suffix}"} = $form->{project_list}->[0]->{projectnumber}; - $form->{"old${prefix}projectnumber${suffix}"} = $form->{project_list}->[0]->{projectnumber}; - } else { - - # not on file - $form->error($locale->text('Project not on file!')); - } - } else { - $form->{"old${prefix}projectnumber${suffix}"} = ""; - } - } - } - - $main::lxdebug->leave_sub(); +# Reset the $::form field 'salesman_id' to the ID of the currently +# logged in user. Useful when changing to a customer/vendor that has +# no salesman listed in their master data. +sub _reset_salesman_id { + my $current_employee = SL::DB::Manager::Employee->current; + $::form->{salesman_id} = $current_employee->id if $current_employee && exists $::form->{salesman_id}; } sub select_project { - $main::lxdebug->enter_sub(); + $::lxdebug->enter_sub; - 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'); + $::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, $nextsub) = @_; + my $project_list = delete $::form->{project_list}; - my @column_index = qw(ndx projectnumber description); - - my %column_data; - $column_data{ndx} = qq||; - $column_data{projectnumber} = qq||; - $column_data{description} = - qq||; - - # list items with radio button on a form - $form->header; - - my $title = $locale->text('Select from one of the projects below'); - - print qq| - - -{script}> - -{rownumber}> - -

	\| . $locale->text('Number') . qq\|	\| . $locale->text('Description') . qq\|

- - - - - - - - - - -

$title

- - |; - - map { print "\n$column_data{$_}" } @column_index; - - print qq| - -|; - - my $i = 0; - my $j; - foreach my $ref (@{ $form->{project_list} }) { - my $checked = ($i++) ? "" : "checked"; - - $ref->{name} =~ s/\"/"/g; - - $column_data{ndx} = - qq||; - $column_data{projectnumber} = - qq||; - $column_data{description} = qq||; - - $j++; - $j %= 2; - print qq| - |; - - map { print "\n$column_data{$_}" } @column_index; - - print qq| - - -{id}> - -|; + map { delete $::form->{$_} } qw(action header update); + 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 }; - print qq| -

$ref->{projectnumber}

$ref->{description}

- - - -|; - - # delete action variable - map { delete $form->{$_} } qw(action project_list header update); - - # save all other form variables - 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 - $cgi->hidden('-name' => 'is_global', '-default' => [$is_global]) - . $cgi->hidden('-name' => 'project_selected_nextsub', '-default' => [$nextsub]) - . qq| - -
- - + $::form->header; + print $::form->parse_html_template('arap/select_project', { hiddens => \@hiddens, project_list => $project_list }); - - -|; - - $main::lxdebug->leave_sub(); + $::lxdebug->leave_sub; } sub project_selected { @@ -505,7 +372,6 @@ arap.pl - helper functions or customer/vendor retrieval =head1 SYNOPSIS check_name('vendor') - check_project(); =head1 DESCRIPTION