Warensuche: überlagerte custom variables werden nun korrekt auch in der Warensuche...

[kivitendo-erp.git] / bin / mozilla / arap.pl

diff --git a/bin/mozilla/arap.pl b/bin/mozilla/arap.pl
index 38308a9..1ed40a7 100644 (file)
--- a/bin/mozilla/arap.pl
+++ b/bin/mozilla/arap.pl
@@ -30,6 +30,8 @@
 # common routines for gl, ar, ap, is, ir, oe
 #
 
+use SL::Projects;
+
 # any custom scripts for this one
 if (-f "bin/mozilla/custom_arap.pl") {
   eval { require "bin/mozilla/custom_arap.pl"; };
@@ -47,8 +49,9 @@ require "bin/mozilla/common.pl";
 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');
+  $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) = @_;
 
@@ -272,6 +275,8 @@ sub check_project {
   $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 $i (1 .. $form->{rowcount}) {
     my $suffix = $i ? "_$i" : "";
     my $prefix = $i ? "" : "global";
@@ -281,11 +286,12 @@ sub check_project {
 
         # get new project
         $form->{projectnumber} = $form->{"${prefix}projectnumber${suffix}"};
-        if (($rows = PE->projects(\%myconfig, $form)) > 1) {
+        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($i ? undef : 1);
+          &select_project($i ? undef : 1, $nextsub);
           exit;
         }
 
@@ -313,7 +319,7 @@ sub select_project {
   $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);
 
@@ -401,9 +407,10 @@ sub select_project {
     print qq|<input name=$key type=hidden value="$form->{$key}">\n|;
   }
 
-  print qq|
-<input type="hidden" name="is_global" value="$is_global">
-<input type=hidden name=nextsub value=project_selected>
+  print
+      $cgi->hidden('-name' => 'is_global',                '-default' => [$is_global])
+    . $cgi->hidden('-name' => 'project_selected_nextsub', '-default' => [$nextsub])
+    . qq|<input type=hidden name=nextsub value=project_selected>
 
 <br>
 <input class=submit type=submit name=action value="|
@@ -442,13 +449,11 @@ sub project_selected {
     map { delete $form->{"new_${_}_$i"} } qw(id projectnumber description);
   }
 
-  map { delete $form->{$_} } qw(ndx lastndx nextsub is_global);
+  my $nextsub = $form->{project_selected_nextsub} || 'update';
 
-  if ($form->{update}) {
-    call_sub($form->{"update"});
-  } else {
-    &update;
-  }
+  map { delete $form->{$_} } qw(ndx lastndx nextsub is_global project_selected_nextsub);
+
+  call_sub($nextsub);
 
   $lxdebug->leave_sub();
 }