X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fcommon.pl;h=1b054cf22ab4858d2ba94408da07566850d6b743;hb=72be9c763f3b7f7df1fae4fe10011e45f9e2ad1d;hp=defa5f1b024c310eb8fb3d76bed00843ad0baa57;hpb=096f9e3e06dc378bcc2f97df58c74cec02b9f7ff;p=kivitendo-erp.git

diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl
index defa5f1b0..1b054cf22 100644
--- a/bin/mozilla/common.pl
+++ b/bin/mozilla/common.pl
@@ -10,9 +10,11 @@
 ######################################################################
 
 use SL::Common;
+use SL::DB::Helper::Mappings;
 use SL::DBUtils;
 use SL::Form;
 use SL::MoreCommon;
+use SL::Helper::Flash;
 
 use strict;
 
@@ -182,7 +184,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 =
@@ -384,100 +386,11 @@ sub NTI {
 }
 
 sub format_dates {
-  $main::lxdebug->enter_sub();
-
-  my ($dateformat, $longformat, @indices) = @_;
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $dateformat = $myconfig{"dateformat"} unless ($dateformat);
-
-  foreach my $idx (@indices) {
-    if ($form->{TEMPLATE_ARRAYS} && (ref($form->{TEMPLATE_ARRAYS}->{$idx}) eq "ARRAY")) {
-      for (my $i = 0; $i < scalar(@{$form->{TEMPLATE_ARRAYS}->{$idx}}); $i++) {
-        $form->{TEMPLATE_ARRAYS}->{$idx}->[$i] =
-          $locale->reformat_date(\%myconfig, $form->{TEMPLATE_ARRAYS}->{$idx}->[$i],
-                                 $dateformat, $longformat);
-      }
-    }
-
-    next unless (defined($form->{$idx}));
-
-    if (!ref($form->{$idx})) {
-      $form->{$idx} = $locale->reformat_date(\%myconfig, $form->{$idx},
-                                             $dateformat, $longformat);
-
-    } elsif (ref($form->{$idx}) eq "ARRAY") {
-      for (my $i = 0; $i < scalar(@{$form->{$idx}}); $i++) {
-        $form->{$idx}->[$i] =
-          $locale->reformat_date(\%myconfig, $form->{$idx}->[$i],
-                                 $dateformat, $longformat);
-      }
-    }
-  }
-
-  $main::lxdebug->leave_sub();
+  return $::form->format_dates(@_);
 }
 
 sub reformat_numbers {
-  $main::lxdebug->enter_sub();
-
-  my ($numberformat, $places, @indices) = @_;
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  return $main::lxdebug->leave_sub()
-    if (!$numberformat || ($numberformat eq $myconfig{"numberformat"}));
-
-  foreach my $idx (@indices) {
-    if ($form->{TEMPLATE_ARRAYS} && (ref($form->{TEMPLATE_ARRAYS}->{$idx}) eq "ARRAY")) {
-      for (my $i = 0; $i < scalar(@{$form->{TEMPLATE_ARRAYS}->{$idx}}); $i++) {
-        $form->{TEMPLATE_ARRAYS}->{$idx}->[$i] = $form->parse_amount(\%myconfig, $form->{TEMPLATE_ARRAYS}->{$idx}->[$i]);
-      }
-    }
-
-    next unless (defined($form->{$idx}));
-
-    if (!ref($form->{$idx})) {
-      $form->{$idx} = $form->parse_amount(\%myconfig, $form->{$idx});
-
-    } elsif (ref($form->{$idx}) eq "ARRAY") {
-      for (my $i = 0; $i < scalar(@{$form->{$idx}}); $i++) {
-        $form->{$idx}->[$i] =
-          $form->parse_amount(\%myconfig, $form->{$idx}->[$i]);
-      }
-    }
-  }
-
-  my $saved_numberformat = $myconfig{"numberformat"};
-  $myconfig{"numberformat"} = $numberformat;
-
-  foreach my $idx (@indices) {
-    if ($form->{TEMPLATE_ARRAYS} && (ref($form->{TEMPLATE_ARRAYS}->{$idx}) eq "ARRAY")) {
-      for (my $i = 0; $i < scalar(@{$form->{TEMPLATE_ARRAYS}->{$idx}}); $i++) {
-        $form->{TEMPLATE_ARRAYS}->{$idx}->[$i] = $form->format_amount(\%myconfig, $form->{TEMPLATE_ARRAYS}->{$idx}->[$i], $places);
-      }
-    }
-
-    next unless (defined($form->{$idx}));
-
-    if (!ref($form->{$idx})) {
-      $form->{$idx} = $form->format_amount(\%myconfig, $form->{$idx}, $places);
-
-    } elsif (ref($form->{$idx}) eq "ARRAY") {
-      for (my $i = 0; $i < scalar(@{$form->{$idx}}); $i++) {
-        $form->{$idx}->[$i] =
-          $form->format_amount(\%myconfig, $form->{$idx}->[$i], $places);
-      }
-    }
-  }
-
-  $myconfig{"numberformat"} = $saved_numberformat;
-
-  $main::lxdebug->leave_sub();
+  return $::form->reformat_numbers(@_);
 }
 
 # -------------------------------------------------------------------------
@@ -686,19 +599,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 +607,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 +615,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 +623,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 +631,13 @@ 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();
 }
 
+sub db {
+  goto &SL::DB::Helper::Mappings::db;
+}
+
 1;