X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Farap.pl;h=0278aa5f7f88f80cd4636eb1e94f649936f3d5b0;hb=0459dded82ee2c88499f4e46a9f3facba519f4f6;hp=8971da532fe5206140abd5b98390217f9bc82caa;hpb=0884406403ce36af3484924086527ba689807329;p=kivitendo-erp.git
diff --git a/bin/mozilla/arap.pl b/bin/mozilla/arap.pl
index 8971da532..0278aa5f7 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,10 +49,15 @@ 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 |' .
- 'request_quotation_edit | sales_quotation_edit | purchase_order_edit | cash');
+ $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) = @_;
@@ -112,14 +119,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 +135,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{name} =
qq|
| . $locale->text($label) . qq|
|;
@@ -147,7 +158,7 @@ sub select_name {
# list items with radio button on a form
$form->header;
- $title = $locale->text('Select from one of the names below');
+ my $title = $locale->text('Select from one of the names below');
print qq|
@@ -162,17 +173,18 @@ sub select_name {
+
{id}>
@@ -215,7 +227,7 @@ sub select_name {
map { delete $form->{$_} } qw(action name_list header);
# save all other form variables
- foreach $key (keys %${form}) {
+ foreach my $key (keys %${form}) {
next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
$form->{$key} =~ s/\"/"/g;
print qq|\n|;
@@ -234,19 +246,22 @@ sub select_name {
|;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub name_selected {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
- $auth->assert('general_ledger | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+
+ $main::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
- $i = $form->{ndx};
+ my $i = $form->{ndx};
$form->{ $form->{vc} } = $form->{"new_name_$i"};
$form->{"$form->{vc}_id"} = $form->{"new_id_$i"};
@@ -265,16 +280,21 @@ sub name_selected {
&update(1);
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub check_project {
- $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 | report');
- for $i (1 .. $form->{rowcount}) {
+ 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"};
@@ -284,11 +304,12 @@ sub check_project {
# 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);
+ &select_project($i ? undef : 1, $nextsub);
exit;
}
@@ -307,19 +328,24 @@ sub check_project {
}
}
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub select_project {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my $locale = $main::locale;
+ my $cgi = $main::cgi;
- $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 | report');
- my ($is_global) = @_;
+ my ($is_global, $nextsub) = @_;
- @column_index = qw(ndx projectnumber description);
+ my @column_index = qw(ndx projectnumber description);
+ my %column_data;
$column_data{ndx} = qq|
|;
$column_data{projectnumber} = qq|
| . $locale->text('Number') . qq|
|;
$column_data{description} =
@@ -328,7 +354,7 @@ sub select_project {
# list items with radio button on a form
$form->header;
- $title = $locale->text('Select from one of the projects below');
+ my $title = $locale->text('Select from one of the projects below');
print qq|
@@ -345,7 +371,7 @@ sub select_project {