X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Farap.pl;h=7952922f62735ea361d64c90fd841e61d59f1add;hb=5928c14319d76d50522128f1cb98864679f961a9;hp=e7e2378a9e80eb4158d554fc4ccdc3461dd88676;hpb=d319704a66e9be64da837ccea10af6774c2b0838;p=kivitendo-erp.git

diff --git a/bin/mozilla/arap.pl b/bin/mozilla/arap.pl
index e7e2378a9..7952922f6 100644
--- a/bin/mozilla/arap.pl
+++ b/bin/mozilla/arap.pl
@@ -31,15 +31,17 @@
 #
 
 # 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 {
@@ -47,15 +49,16 @@ sub check_name {
 
   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 +79,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 +105,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();
 
@@ -236,7 +243,7 @@ sub name_selected {
 
   # delete all the new_ variables
   for $i (1 .. $form->{lastndx}) {
-    map { delete $form->{"new_${_}_$i"} } (id, name);
+    map { delete $form->{"new_${_}_$i"} } qw(id name);
   }
 
   map { delete $form->{$_} } qw(ndx lastndx nextsub);
@@ -272,25 +279,28 @@ sub check_project {
   $lxdebug->enter_sub();
 
   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"};
+        $form->{projectnumber} = $form->{"${prefix}projectnumber${suffix}"};
         if (($rows = PE->projects(\%myconfig, $form)) > 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->{"${prefix}project_id${suffix}"} =
+            $form->{project_list}->[0]->{id};
+          $form->{"${prefix}projectnumber${suffix}"} =
             $form->{project_list}->[0]->{projectnumber};
-          $form->{"oldprojectnumber_$i"} =
+          $form->{"old${prefix}projectnumber${suffix}"} =
             $form->{project_list}->[0]->{projectnumber};
         } else {
 
@@ -298,7 +308,7 @@ sub check_project {
           $form->error($locale->text('Project not on file!'));
         }
       } else {
-        $form->{"oldprojectnumber_$i"} = "";
+        $form->{"old${prefix}projectnumber${suffix}"} = "";
       }
     }
   }
@@ -309,6 +319,8 @@ sub check_project {
 sub select_project {
   $lxdebug->enter_sub();
 
+  my ($is_global) = @_;
+
   @column_index = qw(ndx projectnumber description);
 
   $column_data{ndx}           = qq|<th>&nbsp;</th>|;
@@ -386,7 +398,7 @@ sub select_project {
 |;
 
   # delete action variable
-  map { delete $form->{$_} } qw(action project_list header);
+  map { delete $form->{$_} } qw(action project_list header update);
 
   # save all other form variables
   foreach $key (keys %${form}) {
@@ -395,6 +407,7 @@ sub select_project {
   }
 
   print qq|
+<input type="hidden" name="is_global" value="$is_global">
 <input type=hidden name=nextsub value=project_selected>
 
 <br>
@@ -417,21 +430,24 @@ sub project_selected {
   # index for new item
   $i = $form->{ndx};
 
-  $form->{"projectnumber_$form->{rownumber}"} =
+  my $prefix = $form->{"is_global"} ? "global" : "";
+  my $suffix = $form->{"is_global"} ? "" : "_$form->{rownumber}";
+
+  $form->{"${prefix}projectnumber${suffix}"} =
     $form->{"new_projectnumber_$i"};
-  $form->{"oldprojectnumber_$form->{rownumber}"} =
+  $form->{"old${prefix}projectnumber${suffix}"} =
     $form->{"new_projectnumber_$i"};
-  $form->{"project_id_$form->{rownumber}"} = $form->{"new_id_$i"};
+  $form->{"${prefix}project_id${suffix}"} = $form->{"new_id_$i"};
 
   # delete all the new_ variables
   for $i (1 .. $form->{lastndx}) {
     map { delete $form->{"new_${_}_$i"} } qw(id projectnumber description);
   }
 
-  map { delete $form->{$_} } qw(ndx lastndx nextsub);
+  map { delete $form->{$_} } qw(ndx lastndx nextsub is_global);
 
   if ($form->{update}) {
-    &{ $form->{update} };
+    call_sub($form->{"update"});
   } else {
     &update;
   }
@@ -439,10 +455,10 @@ sub project_selected {
   $lxdebug->leave_sub();
 }
 
-sub continue       { &{ $form->{nextsub} } }
+sub continue       { call_sub($form->{"nextsub"}); }
 sub gl_transaction { &add }
-sub ar_transaction { &add_transaction(ar) }
-sub ap_transaction { &add_transaction(ap) }
-sub sales_invoice  { &add_transaction(is) }
-sub vendor_invoice { &add_transaction(ir) }
+sub ar_transaction { &add_transaction('ar') }
+sub ap_transaction { &add_transaction('ap') }
+sub sales_invoice  { &add_transaction('is') }
+sub vendor_invoice { &add_transaction('ir') }