X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/5562f8b447547b20e988d07f97e9633c5f12c03e..17a8e2bbdba1c715abdb106a0819cf913cdf6fb6:/bin/mozilla/common.pl

diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl
index 7b64f7344..0d7862b30 100644
--- a/bin/mozilla/common.pl
+++ b/bin/mozilla/common.pl
@@ -69,6 +69,11 @@ sub select_part {
     $has_charge = 1;
     map { $_->{has_charge} = 1; } @parts;
   }
+  my $has_ean = 0;
+  if (defined($parts[0]->{ean})) {
+    $has_ean = 1;
+    map { $_->{has_ean} = 1; } @parts;
+  }
 
   my $old_form = save_form();
 
@@ -80,6 +85,7 @@ sub select_part {
                                      "nextsub"          => "select_part_internal",
                                      "callback_sub"     => $callback_sub,
                                      "has_charge"       => $has_charge,
+                                     "has_ean"       	=> $has_ean,
                                      "remap_parts_id"   => $remap_parts_id,
                                      "remap_partnumber" => $remap_partnumber });
 
@@ -515,8 +521,8 @@ sub mark_as_paid_common {
 
   } else {
     my $referer = $ENV{HTTP_REFERER};
-    if ($referer =~ /.*action.*/) {
-      $referer =~ /^(.*)\?action\=.*(\&.*)$/;
+    if ($referer =~ /action/) {
+      $referer =~ /^(.*)\?action\=[^\&]*(\&.*)$/;
       $script = $1;
       $callback = $2;
     } else {
@@ -588,4 +594,89 @@ sub cov_selection_internal {
   $lxdebug->leave_sub();
 }
 
+
+# Functions to call add routines beneath different reports
+
+sub sales_invoice {
+  $lxdebug->enter_sub();
+
+  $auth->assert('invoice_edit');
+
+
+  $form->{script} = 'is.pl';
+  $script         = "is";
+  $form->{type} = "invoice";
+  $locale = new Locale "$myconfig{countrycode}", "$script";
+
+  require "bin/mozilla/$form->{script}";
+  &add;
+
+  $lxdebug->leave_sub();
+}
+
+sub ar_transaction {
+  $lxdebug->enter_sub();
+
+  $auth->assert('general_ledger');
+
+
+  $form->{script} = 'ar.pl';
+  $script         = "ar";
+  $locale = new Locale "$myconfig{countrycode}", "$script";
+
+  require "bin/mozilla/$form->{script}";
+  &add;
+
+  $lxdebug->leave_sub();
+}
+
+sub vendor_invoice {
+  $lxdebug->enter_sub();
+
+  $auth->assert('invoice_edit');
+
+
+  $form->{script} = 'ir.pl';
+  $script         = "ir";
+  $form->{type} = "invoice";
+  $locale = new Locale "$myconfig{countrycode}", "$script";
+
+  require "bin/mozilla/$form->{script}";
+  &add;
+
+  $lxdebug->leave_sub();
+}
+
+sub ap_transaction {
+  $lxdebug->enter_sub();
+
+  $auth->assert('general_ledger');
+
+
+  $form->{script} = 'ap.pl';
+  $script         = "ap";
+  $locale = new Locale "$myconfig{countrycode}", "$script";
+
+  require "bin/mozilla/$form->{script}";
+  &add;
+
+  $lxdebug->leave_sub();
+}
+
+sub gl_transaction {
+  $lxdebug->enter_sub();
+
+  $auth->assert('general_ledger');
+
+
+  $form->{script} = 'gl.pl';
+  $script         = "gl";
+  $locale = new Locale "$myconfig{countrycode}", "$script";
+
+  require "bin/mozilla/$form->{script}";
+  &add;
+
+  $lxdebug->leave_sub();
+}
+
 1;