X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fcommon.pl;h=59c2f9481671e2090b4b05617a31b2a9f109eb21;hb=fc41222c61dbee590005f04c50e8603581462543;hp=f54ffefec646babff01c922a3721bdcc2bc054fc;hpb=83914eeb2e95cdf587565952eef54be59dd58693;p=kivitendo-erp.git
diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl
index f54ffefec..59c2f9481 100644
--- a/bin/mozilla/common.pl
+++ b/bin/mozilla/common.pl
@@ -10,12 +10,18 @@
######################################################################
use SL::Common;
+use SL::DB::Helper::Mappings;
use SL::DBUtils;
use SL::Form;
use SL::MoreCommon;
+use SL::Helper::Flash;
+
+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 +46,7 @@ sub build_std_url {
my $url = "${script}?" . join('&', @parts);
- $lxdebug->leave_sub(2);
+ $main::lxdebug->leave_sub(2);
return $url;
}
@@ -48,10 +54,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 +78,16 @@ sub select_part {
$has_charge = 1;
map { $_->{has_charge} = 1; } @parts;
}
+ my $has_bestbefore = 0;
+ if (defined($parts[0]->{bestbefore})) {
+ $has_bestbefore = 1;
+ map { $_->{has_bestbefore} = 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 +99,22 @@ sub select_part {
"nextsub" => "select_part_internal",
"callback_sub" => $callback_sub,
"has_charge" => $has_charge,
+ "has_bestbefore" => $has_bestbefore,
+ "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,33 +133,47 @@ 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;
- map { $form->{$_} = 1 if ($options{$_}) } qw(no_services no_assemblies stockable);
+ foreach my $opt (split m/:/, $form->{options}) {
+ if ($opt =~ /=/) {
+ my ($key, $value) = split m/=/, $opt, 2;
+ $options{$key} = $value;
- $parts = Common->retrieve_parts(\%myconfig, $form, $order_by, $order_dir);
+ } else {
+ $options{$opt} = 1;
+ }
+ }
+
+ map { $form->{$_} = $options{$_} if ($options{$_}) } qw(no_services no_assemblies assemblies click_button);
+
+ my $parts = Common->retrieve_parts(\%myconfig, $form, $order_by, $order_dir);
if (0 == scalar(@{$parts})) {
$form->show_generic_information($locale->text("No part was found matching the search parameters."));
} elsif (1 == scalar(@{$parts})) {
- $onload = "part_selected('1')";
+ $::request->{layout}->add_javascripts_inline("part_selected('1')");
}
map { $parts->[$_]->{selected} = $_ ? 0 : 1; } (0..$#{$parts});
@@ -146,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 =
@@ -156,31 +193,37 @@ sub part_selection_internal {
},
@header_sort);
+ $form->{formname} ||= 'Form';
+
$form->{title} = $locale->text("Select a part");
- $form->header();
+ $form->header(no_layout => 1);
print $form->parse_html_template("generic/part_selection", { "HEADER" => \@header,
- "PARTS" => $parts,
- "onload" => $onload });
+ "PARTS" => $parts, });
- $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}));
+
if (0 == scalar(@{$delivery})) {
$form->show_generic_information($locale->text("No Customer was found matching the search parameters."));
} elsif (1 == scalar(@{$delivery})) {
- $onload = "customer_selected('1')";
+ $::request->{layout}->add_javascripts_inline("customer_selected('1')");
}
my $callback = "$form->{script}?action=delivery_customer_selection&";
@@ -201,30 +244,34 @@ sub delivery_customer_selection {
@header_sort);
$form->{"title"} = $locale->text("Select a Customer");
- $form->header();
+ $form->header(no_layout => 1);
print $form->parse_html_template("generic/select_delivery_customer", { "HEADER" => \@header,
- "DELIVERY" => $delivery,
- "onload" => $onload });
+ "DELIVERY" => $delivery, });
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
# -------------------------------------------------------------------------
sub vendor_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"}));
- $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}));
+
if (0 == scalar(@{$vendor})) {
$form->show_generic_information($locale->text("No Vendor was found matching the search parameters."));
} elsif (1 == scalar(@{$vendor})) {
- $onload = "vendor_selected('1')";
+ $::request->{layout}->add_javascripts_inline("vendor_selected('1')");
}
my $callback = "$form->{script}?action=vendor_selection&";
@@ -245,86 +292,82 @@ sub vendor_selection {
@header_sort);
$form->{"title"} = $locale->text("Select a Customer");
- $form->header();
+ $form->header(no_layout => 1);
print $form->parse_html_template("generic/select_vendor", { "HEADER" => \@header,
- "VENDOR" => $vendor,
- "onload" => $onload });
+ "VENDOR" => $vendor, });
- $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;
+
+ 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 %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 @variable = map(+{ "description" => $variable_list{$_},
- "name" => $_,
- "unit" => $unit_list{$_} }, @variable_sort);
-
- my @header =
- map(+{ "column_title" => $header_title{$_},
- "column" => $_,
- },
- @header_sort);
$form->{formel} = $formel;
- $form->{"title"} = $locale->text("Please enter values");
- $form->header();
- print($form->parse_html_template("generic/calculate_qty", { "HEADER" => \@header,
- "VARIABLES" => \@variable,
- "onload" => $onload }));
+ $form->{title} = $locale->text("Please enter values");
+ $form->header(no_layout => 1);
+ print $form->parse_html_template("generic/calculate_qty", { "HEADER" => \@header,
+ "VARIABLES" => \@variable, });
- $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();
+ $form->header(no_layout => 1);
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,103 +378,49 @@ sub NTI {
}
sub format_dates {
- $lxdebug->enter_sub();
-
- my ($dateformat, $longformat, @indices) = @_;
-
- $dateformat = $myconfig{"dateformat"} unless ($dateformat);
-
- foreach my $idx (@indices) {
- 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);
- }
- }
- }
-
- $lxdebug->leave_sub();
+ return $::form->format_dates(@_);
}
sub reformat_numbers {
- $lxdebug->enter_sub();
-
- my ($numberformat, $places, @indices) = @_;
-
- return $lxdebug->leave_sub()
- if (!$numberformat || ($numberformat eq $myconfig{"numberformat"}));
-
- foreach my $idx (@indices) {
- 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) {
- 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;
-
- $lxdebug->leave_sub();
+ return $::form->reformat_numbers(@_);
}
# -------------------------------------------------------------------------
sub show_history {
- $lxdebug->enter_sub();
- my $dbh = $form->dbconnect(\%myconfig);
- my ($sort, $sortby) = split(/\-\-/, $form->{order});
+ $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/;
- $form->{title} = $locale->text("History");
- $form->header();
- print $form->parse_html_template( "common/show_history", {
- "DATEN" => $form->get_history($dbh,$form->{input_name},"",$form->{order}),
- "SUCCESS" => ($form->get_history($dbh,$form->{input_name}) ne "0"),
- uc($sort) => 1,
- uc($sort)."BY" => $sortby
- } );
-
- $dbh->disconnect();
- $lxdebug->leave_sub();
+ $form->{title} = $locale->text("History");
+ $form->header(no_layout => 1);
+ print $form->parse_html_template( "common/show_history", {
+ "DATEN" => $form->get_history($dbh,$form->{input_name},"",$form->{order}),
+ "SUCCESS" => ($form->get_history($dbh,$form->{input_name}) ne "0"),
+ uc($sort) => 1,
+ uc($sort)."BY" => $sortby,
+ } );
+
+ $dbh->disconnect();
+ $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 +431,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",
@@ -462,16 +458,18 @@ sub show_vc_details {
$form->{title} = $form->{vc} eq "customer" ?
$locale->text("Customer details") : $locale->text("Vendor details");
- $form->header();
+ $form->header(no_layout => 1);
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,53 +482,69 @@ 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 = ?|;
+ my $query = qq|UPDATE $db_name SET paid = amount, datepaid = current_date WHERE id = ?|;
do_query($form, $dbh, $query, $form->{id});
$dbh->commit();
$form->redirect($locale->text("Marked as paid"));
} 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||;
print qq||.$locale->text('Mark as paid?').qq|
|;
print qq| |;
print qq||;
- print qq|