X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Farap.pl;h=8971da532fe5206140abd5b98390217f9bc82caa;hb=eb8d3de878876804b0465ec7cde9adfff436a5a0;hp=8c495f74eb4e35259b59d67ec0f3381feda28193;hpb=0acabd54649b034ca83525776b3f1a511532802b;p=kivitendo-erp.git diff --git a/bin/mozilla/arap.pl b/bin/mozilla/arap.pl index 8c495f74e..8971da532 100644 --- a/bin/mozilla/arap.pl +++ b/bin/mozilla/arap.pl @@ -30,32 +30,40 @@ # common routines for gl, ar, ap, is, ir, oe # +use SL::Projects; + # 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 { $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 ($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 - + $form->{update} = 0; # for credit calculations $form->{oldinvtotal} = 0; $form->{oldtotalpaid} = 0; @@ -76,6 +84,7 @@ sub check_name { 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; @@ -101,11 +110,14 @@ 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)); } } } + $form->language_payment(\%myconfig); $lxdebug->leave_sub(); @@ -118,6 +130,9 @@ sub check_name { sub select_name { $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 ($table) = @_; @column_index = qw(ndx name address); @@ -201,6 +216,7 @@ sub select_name { # save all other form variables foreach $key (keys %${form}) { + next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key})); $form->{$key} =~ s/\"/"/g; print qq|\n|; } @@ -224,6 +240,9 @@ sub select_name { sub name_selected { $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'); + # replace the variable with the one checked # index for new item @@ -249,56 +268,41 @@ sub name_selected { $lxdebug->leave_sub(); } -sub add_transaction { - $lxdebug->enter_sub(); - - my ($module) = @_; - - delete $form->{script}; - $form->{action} = "add"; - $form->{type} = "invoice" if $module =~ /(is|ir)/; - - $form->{callback} = $form->escape($form->{callback}, 1); - map { $argv .= "$_=$form->{$_}&" } keys %$form; - - $form->{callback} = "$module.pl?$argv"; - - $form->redirect; - - $lxdebug->leave_sub(); -} - sub check_project { $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 | report'); + 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"}; - if (($rows = PE->projects(\%myconfig, $form)) > 1) { + $form->{projectnumber} = $form->{"${prefix}projectnumber${suffix}"}; + my %params = map { $_ => $form->{$_} } qw(projectnumber description active); + if (($rows = Projects->search_projects(%params)) > 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->{project_list}->[0]->{projectnumber}; - $form->{"oldprojectnumber_$i"} = - $form->{project_list}->[0]->{projectnumber}; + $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->{"oldprojectnumber_$i"} = ""; + $form->{"old${prefix}projectnumber${suffix}"} = ""; } } } @@ -309,6 +313,11 @@ sub check_project { sub select_project { $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 | report'); + + my ($is_global) = @_; + @column_index = qw(ndx projectnumber description); $column_data{ndx} = qq|