X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fcommon.pl;h=3bc458a8d642dec18af65e2427685d1a9fd9fbb5;hb=c2d72edadd2639c4dd854a3ad4daf29ebd4c4f2b;hp=d2ac1fa694d96b2c2ecf7749d6dd3d29773b851a;hpb=c9f49c186dd515927f964902ff736090f4a967e9;p=kivitendo-erp.git

diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl
index d2ac1fa69..3bc458a8d 100644
--- a/bin/mozilla/common.pl
+++ b/bin/mozilla/common.pl
@@ -14,8 +14,12 @@ use SL::DBUtils;
 use SL::Form;
 use SL::MoreCommon;
 
+use strict;
+
 sub build_std_url {
-  $lxdebug->enter_sub(2);
+  $main::lxdebug->enter_sub(2);
+
+  my $form     = $main::form;
 
   my $script = $form->{script};
 
@@ -40,7 +44,7 @@ sub build_std_url {
 
   my $url = "${script}?" . join('&', @parts);
 
-  $lxdebug->leave_sub(2);
+  $main::lxdebug->leave_sub(2);
 
   return $url;
 }
@@ -48,10 +52,13 @@ sub build_std_url {
 # -------------------------------------------------------------------------
 
 sub select_part {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
   my ($callback_sub, @parts) = @_;
 
+  my $form     = $main::form;
+  my $locale   = $main::locale;
+
   my $remap_parts_id = 0;
   if (defined($parts[0]->{parts_id}) && !defined($parts[0]->{id})) {
     $remap_parts_id = 1;
@@ -69,6 +76,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,18 +92,21 @@ 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 });
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub select_part_internal {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
 
   my ($new_item, $callback_sub);
 
-  my $re = "^new_.*_" . $form->{selection};
+  my $re = "^new_.*_$form->{selection}\$";
 
   foreach (grep /$re/, keys %{ $form }) {
     my $new_key           =  $_;
@@ -110,28 +125,43 @@ sub select_part_internal {
     delete $new_item->{number};
   }
 
-  my $callback_sub = $form->{callback_sub};
+  $callback_sub = $form->{callback_sub};
 
   restore_form($form->{old_form});
 
   call_sub($callback_sub, $new_item);
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub part_selection_internal {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  $order_by  = "description";
+  my $order_by  = "description";
   $order_by  = $form->{"order_by"} if (defined($form->{"order_by"}));
-  $order_dir = 1;
+  my $order_dir = 1;
   $order_dir = $form->{"order_dir"} if (defined($form->{"order_dir"}));
 
-  %options   = map { $_ => 1 } split m/:/, $form->{options};
+  my %options;
+
+  foreach my $opt (split m/:/, $form->{options}) {
+    if ($opt =~ /=/) {
+      my ($key, $value) = split m/=/, $opt, 2;
+      $options{$key} = $value;
+
+    } else {
+      $options{$opt} = 1;
+    }
+  }
 
-  map { $form->{$_} = 1 if ($options{$_}) } qw(no_services no_assemblies);
+  map { $form->{$_} = $options{$_} if ($options{$_}) } qw(no_services no_assemblies assemblies click_button);
 
-  $parts = Common->retrieve_parts(\%myconfig, $form, $order_by, $order_dir);
+  my $parts = Common->retrieve_parts(\%myconfig, $form, $order_by, $order_dir);
+  my $onload;
 
   if (0 == scalar(@{$parts})) {
     $form->show_generic_information($locale->text("No part was found matching the search parameters."));
@@ -156,27 +186,35 @@ sub part_selection_internal {
          },
         @header_sort);
 
+  $form->{formname} ||= 'Form';
+
   $form->{title} = $locale->text("Select a part");
   $form->header();
   print $form->parse_html_template("generic/part_selection", { "HEADER" => \@header,
                                                                "PARTS"  => $parts,
                                                                "onload" => $onload });
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 # -------------------------------------------------------------------------
 
 sub delivery_customer_selection {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  $order_by = "name";
+  my $order_by = "name";
   $order_by = $form->{"order_by"} if (defined($form->{"order_by"}));
-  $order_dir = 1;
+  my $order_dir = 1;
   $order_dir = $form->{"order_dir"} if (defined($form->{"order_dir"}));
 
-  $delivery = Common->retrieve_delivery_customer(\%myconfig, $form, $order_by, $order_dir);
+  my $delivery = Common->retrieve_delivery_customer(\%myconfig, $form, $order_by, $order_dir);
   map({ $delivery->[$_]->{"selected"} = $_ ? 0 : 1; } (0..$#{$delivery}));
+
+  my $onload;
   if (0 == scalar(@{$delivery})) {
     $form->show_generic_information($locale->text("No Customer was found matching the search parameters."));
   } elsif (1 == scalar(@{$delivery})) {
@@ -206,21 +244,27 @@ sub delivery_customer_selection {
                                                                          "DELIVERY" => $delivery,
                                                                          "onload"   => $onload });
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 # -------------------------------------------------------------------------
 
 sub vendor_selection {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  $order_by = "name";
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  my $order_by = "name";
   $order_by = $form->{"order_by"} if (defined($form->{"order_by"}));
-  $order_dir = 1;
+  my $order_dir = 1;
   $order_dir = $form->{"order_dir"} if (defined($form->{"order_dir"}));
 
-  $vendor = Common->retrieve_vendor(\%myconfig, $form, $order_by, $order_dir);
+  my $vendor = Common->retrieve_vendor(\%myconfig, $form, $order_by, $order_dir);
   map({ $vendor->[$_]->{"selected"} = $_ ? 0 : 1; } (0..$#{$vendor}));
+
+  my $onload;
   if (0 == scalar(@{$vendor})) {
     $form->show_generic_information($locale->text("No Vendor was found matching the search parameters."));
   } elsif (1 == scalar(@{$vendor})) {
@@ -250,81 +294,80 @@ sub vendor_selection {
                                                               "VENDOR" => $vendor,
                                                               "onload" => $onload });
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 # -------------------------------------------------------------------------
 
 sub calculate_qty {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my $locale   = $main::locale;
 
-  my @variable_sort = ();
-  my %variable_list = ();
-  my $unit_list = ();
   $form->{formel} =~ s/\r\n//g;
 
   my ($variable_string, $formel) = split /###/,$form->{formel};
-
-
-  split m/;/, $variable_string;
-  foreach $item (@_) {
-    my($name, $valueunit) = split /=/,$item;
-    my($value, $unit) = split / /, $valueunit;
-
-    push(@variable_sort, $value);
-    $variable_list{$value} = $name;
-    $unit_list{$value} = $unit;
+  my @variable;
+  my $onload; # note! this sub is mostly called over a javascript invocation, and it's unlikey that onload is set.
+
+  foreach my $item (split m/;/, $variable_string) {
+    next unless $item =~ m/^ \s* (\w+) \s* = \s* (\w+) \s* (\w+) \s* $/x;
+    push @variable, {
+      description => $1,
+      name        => $2,
+      unit        => $3,
+    };
   }
 
   my @header_sort = qw(variable value unit);
-  my %header_title = ( "variable" => $locale->text("Variable"),
-                       "value" => $locale->text("Value"),
-                       "unit" => $locale->text("Unit"),
-                     );
-
-  my @variable = map(+{ "description" => $variable_list{$_},
-                        "name" => $_,
-                        "unit" => $unit_list{$_} }, @variable_sort);
+  my %header_title = (
+    variable => $locale->text("Variable"),
+    value    => $locale->text("Value"),
+    unit     => $locale->text("Unit"),
+  );
+  my @header = map +{
+    column_title => $header_title{$_},
+    column       => $_,
+  }, @header_sort;
 
-  my @header =
-    map(+{ "column_title" => $header_title{$_},
-           "column" => $_,
-         },
-        @header_sort);
   $form->{formel} = $formel;
-  $form->{"title"} = $locale->text("Please enter values");
+  $form->{title}  = $locale->text("Please enter values");
   $form->header();
-  print($form->parse_html_template("generic/calculate_qty", { "HEADER"    => \@header,
+  print $form->parse_html_template("generic/calculate_qty", { "HEADER"    => \@header,
                                                               "VARIABLES" => \@variable,
-                                                              "onload"    => $onload }));
+                                                              "onload"    => $onload });
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 # -------------------------------------------------------------------------
 
 sub set_longdescription {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my $locale   = $main::locale;
 
   $form->{title} = $locale->text("Enter longdescription");
   $form->header();
   print $form->parse_html_template("generic/set_longdescription");
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 # -------------------------------------------------------------------------
 
 sub H {
-  return $form->quote_html($_[0]);
+  return $main::locale->quote_special_chars('HTML', $_[0]);
 }
 
 sub Q {
-  return $form->quote($_[0]);
+  return $main::locale->quote_special_chars('URL@HTML', $_[0]);
 }
 
 sub E {
-  return $form->escape($_[0]);
+  return $main::form->escape($_[0]);
 }
 
 sub NTI {
@@ -335,13 +378,25 @@ sub NTI {
 }
 
 sub format_dates {
-  $lxdebug->enter_sub();
+  $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})) {
@@ -357,18 +412,27 @@ sub format_dates {
     }
   }
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub reformat_numbers {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
   my ($numberformat, $places, @indices) = @_;
 
-  return $lxdebug->leave_sub()
+  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})) {
@@ -386,6 +450,12 @@ sub reformat_numbers {
   $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})) {
@@ -401,13 +471,18 @@ sub reformat_numbers {
 
   $myconfig{"numberformat"} = $saved_numberformat;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 # -------------------------------------------------------------------------
 
 sub show_history {
-	$lxdebug->enter_sub();
+	$main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
 	my $dbh = $form->dbconnect(\%myconfig);
 	my ($sort, $sortby) = split(/\-\-/, $form->{order});
   $sort =~ s/.*\.(.*)/$1/;
@@ -422,16 +497,19 @@ sub show_history {
     	} );
 
 	$dbh->disconnect();
-	$lxdebug->leave_sub();
+	$main::lxdebug->leave_sub();
 }
 
 # -------------------------------------------------------------------------
 
 sub call_sub {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
   my $name = shift;
 
+  my $form     = $main::form;
+  my $locale   = $main::locale;
+
   if (!$name) {
     $form->error($locale->text("Trying to call a sub without a name"));
   }
@@ -442,15 +520,22 @@ sub call_sub {
     $form->error(sprintf($locale->text("Attempt to call an undefined sub named '%s'"), $name));
   }
 
-  &{ $name }(@_);
+  {
+    no strict "refs";
+    &{ $name }(@_);
+  }
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 # -------------------------------------------------------------------------
 
 sub show_vc_details {
-	$lxdebug->enter_sub();
+	$main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
   $form->{vc} = $form->{vc} eq "customer" ? "customer" : "vendor";
   $form->isblank("vc_id",
@@ -465,13 +550,15 @@ sub show_vc_details {
   $form->header();
   print $form->parse_html_template("common/show_vc_details", { "is_customer" => $form->{vc} eq "customer" });
 
-	$lxdebug->leave_sub();
+	$main::lxdebug->leave_sub();
 }
 
 # -------------------------------------------------------------------------
 
 sub retrieve_partunits {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
 
   my @part_ids = grep { $_ } map { $form->{"id_${_}"} } (1..$form->{rowcount});
 
@@ -484,16 +571,19 @@ sub retrieve_partunits {
     }
   }
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 # -------------------------------------------------------------------------
 
 sub mark_as_paid_common {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
   my ($myconfig, $db_name) = @_;
 
+  my $form     = $main::form;
+  my $locale   = $main::locale;
+
   if($form->{mark_as_paid}) {
     my $dbh ||= $form->get_standard_dbh($myconfig);
     my $query = qq|UPDATE $db_name SET paid = amount WHERE id = ?|;
@@ -503,7 +593,17 @@ sub mark_as_paid_common {
 
   } else {
     my $referer = $ENV{HTTP_REFERER};
-    $referer =~ s/^(.*)action\=.*\&(.*)$/$1action\=mark_as_paid\&mark_as_paid\=1\&id\=$form->{id}\&$2/;
+    my $script;
+    my $callback;
+    if ($referer =~ /action/) {
+      $referer =~ /^(.*)\?action\=[^\&]*(\&.*)$/;
+      $script = $1;
+      $callback = $2;
+    } else {
+      $script = $referer;
+      $callback = "";
+    }
+    $referer = $script . "?action=mark_as_paid&mark_as_paid=1&id=$form->{id}" . $callback;
     $form->header();
     print qq|<body>|;
     print qq|<p><b>|.$locale->text('Mark as paid?').qq|</b></p>|;
@@ -512,21 +612,27 @@ sub mark_as_paid_common {
     print qq|</body></html>|;
   }
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub cov_selection_internal {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  $order_by = "name";
+  my $order_by = "name";
   $order_by = $form->{"order_by"} if (defined($form->{"order_by"}));
-  $order_dir = 1;
+  my $order_dir = 1;
   $order_dir = $form->{"order_dir"} if (defined($form->{"order_dir"}));
 
   my $type = $form->{"is_vendor"} ? $locale->text("vendor") : $locale->text("customer");
 
-  $covs = Common->retrieve_customers_or_vendors(\%myconfig, $form, $order_by, $order_dir, $form->{"is_vendor"}, $form->{"allow_both"});
+  my $covs = Common->retrieve_customers_or_vendors(\%myconfig, $form, $order_by, $order_dir, $form->{"is_vendor"}, $form->{"allow_both"});
   map({ $covs->[$_]->{"selected"} = $_ ? 0 : 1; } (0..$#{$covs}));
+
+  my $onload;
   if (0 == scalar(@{$covs})) {
     $form->show_generic_information(sprintf($locale->text("No %s was found matching the search parameters."), $type));
   } elsif (1 == scalar(@{$covs})) {
@@ -555,7 +661,7 @@ sub cov_selection_internal {
     $cov->{address} =~ s{^,}{}x;
     $cov->{address} =~ s{\ +}{\ }gx;
 
-    $cov->{contact} = join " ", map { $cov->{$_} } qw(cp_greeting cp_title cp_givenname cp_name);
+    $cov->{contact} = join " ", map { $cov->{$_} } qw(cp_gender cp_title cp_givenname cp_name);
     $cov->{contact} =~ s{\ +}{\ }gx;
   }
 
@@ -565,7 +671,107 @@ sub cov_selection_internal {
                                                               "COVS" => $covs,
                                                               "onload" => $onload }));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
+}
+
+
+# Functions to call add routines beneath different reports
+
+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;
+
+  $main::lxdebug->leave_sub();
+}
+
+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;
+
+  $main::lxdebug->leave_sub();
+}
+
+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;
+
+  $main::lxdebug->leave_sub();
+}
+
+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;
+
+  $main::lxdebug->leave_sub();
+}
+
+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;
+
+  $main::lxdebug->leave_sub();
 }
 
 1;