Merge remote branch 'refs/remotes/origin/master'

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

diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl
index defa5f1..82a988e 100644 (file)
--- a/bin/mozilla/common.pl
+++ b/bin/mozilla/common.pl
@@ -9,6 +9,7 @@
 #
 ######################################################################
 
+use Carp;
 use SL::Common;
 use SL::DBUtils;
 use SL::Form;
@@ -182,7 +183,7 @@ sub part_selection_internal {
 
   my @header_sort  = qw(partnumber description);
   my %header_title = ( "partnumber"  => $locale->text("Part Number"),
-                       "description" => $locale->text("Part description"),
+                       "description" => $locale->text("Part Description"),
                        );
 
   my @header =
@@ -526,6 +527,9 @@ sub call_sub {
     $form->error(sprintf($locale->text("Attempt to call an undefined sub named '%s'"), $name));
   }
 
+  $::called_subs{$name}++;
+  confess "RECURSION DETECTION: call_sub($name) called " . $::called_subs{$name} . " time(s)" if $::called_subs{$name} > 10;
+
   {
     no strict "refs";
     &{ $name }(@_);
@@ -686,19 +690,7 @@ sub cov_selection_internal {
 sub sales_invoice {
   $main::lxdebug->enter_sub();
 
-  $main::auth->assert('invoice_edit');
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $form->{script} = 'is.pl';
-  my $script      = "is";
-  $form->{type} = "invoice";
-  $locale = new Locale "$myconfig{countrycode}", "$script";
-
-  require "bin/mozilla/$form->{script}";
-  &add;
+  print $::form->redirect_header('is.pl?action=add&type=invoice');
 
   $main::lxdebug->leave_sub();
 }
@@ -706,18 +698,7 @@ sub sales_invoice {
 sub ar_transaction {
   $main::lxdebug->enter_sub();
 
-  $main::auth->assert('general_ledger');
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $form->{script} = 'ar.pl';
-  my $script      = "ar";
-  $locale = new Locale "$myconfig{countrycode}", "$script";
-
-  require "bin/mozilla/$form->{script}";
-  &add;
+  print $::form->redirect_header('ar.pl?action=add');
 
   $main::lxdebug->leave_sub();
 }
@@ -725,19 +706,7 @@ sub ar_transaction {
 sub vendor_invoice {
   $main::lxdebug->enter_sub();
 
-  $main::auth->assert('invoice_edit');
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $form->{script} = 'ir.pl';
-  my $script      = "ir";
-  $form->{type} = "invoice";
-  $locale = new Locale "$myconfig{countrycode}", "$script";
-
-  require "bin/mozilla/$form->{script}";
-  &add;
+  print $::form->redirect_header('ir.pl?action=add&type=invoice');
 
   $main::lxdebug->leave_sub();
 }
@@ -745,18 +714,7 @@ sub vendor_invoice {
 sub ap_transaction {
   $main::lxdebug->enter_sub();
 
-  $main::auth->assert('general_ledger');
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $form->{script} = 'ap.pl';
-  my $script      = "ap";
-  $locale = new Locale "$myconfig{countrycode}", "$script";
-
-  require "bin/mozilla/$form->{script}";
-  &add;
+  print $::form->redirect_header('ap.pl?action=add');
 
   $main::lxdebug->leave_sub();
 }
@@ -764,20 +722,18 @@ sub ap_transaction {
 sub gl_transaction {
   $main::lxdebug->enter_sub();
 
-  $main::auth->assert('general_ledger');
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $form->{script} = 'gl.pl';
-  my $script      = "gl";
-  $locale = new Locale "$myconfig{countrycode}", "$script";
-
-  require "bin/mozilla/$form->{script}";
-  &add;
+  print $::form->redirect_header('gl.pl?action=add');
 
   $main::lxdebug->leave_sub();
 }
 
+if ($::use_rdbo) {
+  eval {
+    require SL::DB::Helpers::Mappings;
+    sub db {
+      goto &SL::DB::Helpers::Mappings::db;
+    }
+  } or die $@;
+}
+
 1;