X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Farap.pl;h=a4e04c0015324924271139bbd31d1aea406c0e9d;hb=863eb4303398caba2ab429475a69e09601919150;hp=fe5fa2d27634a6a4293f916c9bcab2912b627e07;hpb=57ac7b3c45f98e44a8bd8452da70ac7fba182ca4;p=kivitendo-erp.git

diff --git a/bin/mozilla/arap.pl b/bin/mozilla/arap.pl
index fe5fa2d27..a4e04c001 100644
--- a/bin/mozilla/arap.pl
+++ b/bin/mozilla/arap.pl
@@ -24,22 +24,21 @@
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
 #======================================================================
 #
 # 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;
@@ -55,7 +54,7 @@ sub check_name {
   my %myconfig = %main::myconfig;
   my $locale   = $main::locale;
 
-  $main::auth->assert('general_ledger               | vendor_invoice_edit       | sales_order_edit    | invoice_edit |' .
+  $main::auth->assert('ar_transactions | ap_transactions | 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');
 
@@ -63,7 +62,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"}) {
@@ -79,6 +78,8 @@ 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');
 
@@ -109,7 +110,7 @@ sub check_name {
           $form->error($locale->text("More than one #1 found matching, please be more specific.", $locale->text(ucfirst $name)));
         } else {
           &select_name($name);
-          ::end_of_request();
+          $::dispatcher->end_request;
         }
       }
 
@@ -121,6 +122,8 @@ sub check_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');
 
@@ -150,7 +153,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('ar_transactions| ap_transactions | vendor_invoice_edit  | sales_order_edit    | invoice_edit | sales_delivery_order_edit |' .
                 'request_quotation_edit | sales_quotation_edit | purchase_order_edit | cash');
 
   my ($table) = @_;
@@ -171,13 +174,11 @@ sub select_name {
   my $title = $locale->text('Select from one of the names below');
 
   print qq|
+    <h1>$title</h1>
+
 <form method=post action=$form->{script}>
 
 <table width=100%>
-  <tr>
-    <th class=listtop>$title</th>
-  </tr>
-  <tr space=5></tr>
   <tr>
     <td>
       <table width=100%>
@@ -260,7 +261,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('ar_transactions | ap_transactions | 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
@@ -269,6 +270,7 @@ sub name_selected {
   my $i = $form->{ndx};
 
   _reset_salesman_id();
+  delete @{ $form }{qw(payment_id)};
 
   $form->{ $form->{vc} }    = $form->{"new_name_$i"};
   $form->{"$form->{vc}_id"} = $form->{"new_id_$i"};
@@ -298,58 +300,10 @@ sub _reset_salesman_id {
   $::form->{salesman_id} = $current_employee->id if $current_employee && exists $::form->{salesman_id};
 }
 
-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();
-}
-
 sub select_project {
   $::lxdebug->enter_sub;
 
-  $::auth->assert('general_ledger         | vendor_invoice_edit  | sales_order_edit    | invoice_edit |' .
+  $::auth->assert('ar_transactions | ap_transactions | vendor_invoice_edit  | sales_order_edit    | invoice_edit |' .
                   'request_quotation_edit | sales_quotation_edit | purchase_order_edit | cash         | report');
 
   my ($is_global, $nextsub) = @_;
@@ -376,7 +330,7 @@ sub project_selected {
 
   my $form     = $main::form;
 
-  $main::auth->assert('general_ledger         | vendor_invoice_edit  | sales_order_edit    | invoice_edit |' .
+  $main::auth->assert('ar_transactions  | ap_transactions    | vendor_invoice_edit  | sales_order_edit    | invoice_edit |' .
                 'request_quotation_edit | sales_quotation_edit | purchase_order_edit | cash         | report');
 
   # replace the variable with the one checked
@@ -420,7 +374,6 @@ arap.pl - helper functions or customer/vendor retrieval
 =head1 SYNOPSIS
 
  check_name('vendor')
- check_project();
 
 =head1 DESCRIPTION