X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fcommon.pl;h=d006c5436e12ef8e36540b56744cebeb9c709315;hb=89dd4ca84494de24ac1ecc7bd3b84fdd35e28020;hp=fb98b70c0fce135943cfd575adf463f5b5b27383;hpb=595dc614f285c4ad859ab410e2c0e32026dd2dce;p=kivitendo-erp.git
diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl
index fb98b70c0..d006c5436 100644
--- a/bin/mozilla/common.pl
+++ b/bin/mozilla/common.pl
@@ -9,35 +9,37 @@
#
######################################################################
-use Data::Dumper;
-
+use SL::Form;
use SL::Common;
+use SL::MoreCommon;
-sub save_form {
+sub build_std_url {
$lxdebug->enter_sub();
- my $old_form = "";
- map({ $old_form .= "$_=" . $form->escape($form->{$_}) . '&'; } keys(%{$form}));
- chop($old_form);
-
- $lxdebug->leave_sub();
-
- return $old_form;
-}
+ my $script = $form->{script};
-sub restore_form {
- $lxdebug->enter_sub();
+ my @parts;
- my ($old_form) = @_;
+ foreach my $key ((qw(login password), @_)) {
+ next unless ($key);
- map({ delete($form->{$_}); } keys(%{$form}));
+ if ($key =~ /(.*?)=(.*)/) {
+ if ($1 eq 'script') {
+ $script = $2;
+ } else {
+ push @parts, $key;
+ }
- foreach my $pair (split('&', $old_form)) {
- my ($key, $value) = split('=', $form->unescape($pair), 2);
- $form->{$key} = $value;
+ } else {
+ push @parts, "${key}=" . E($form->{$key});
+ }
}
+ my $url = "${script}?" . join('&', @parts);
+
$lxdebug->leave_sub();
+
+ return $url;
}
sub select_employee {
@@ -73,7 +75,7 @@ sub select_employee_internal {
restore_form($form->{"old_form"});
- &{ $callback_sub }($new_id, $new_name);
+ call_sub($callback_sub, $new_id, $new_name);
$lxdebug->leave_sub();
}
@@ -143,7 +145,7 @@ sub select_part_internal {
restore_form($form->{"old_form"});
- &{ $callback_sub }($new_item);
+ call_sub($callback_sub, $new_item);
$lxdebug->leave_sub();
}
@@ -166,7 +168,7 @@ sub part_selection_internal {
my $callback = "$form->{script}?action=part_selection_internal&";
map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" }
- (qw(login path password partnumber description input_partnumber input_description input_partsid), grep({ /^[fl]_/ } keys %$form)));
+ (qw(login password partnumber description input_partnumber input_description input_partsid), grep({ /^[fl]_/ } keys %$form)));
my @header_sort = qw(partnumber description);
my %header_title = ( "partnumber" => $locale->text("Part Number"),
@@ -207,7 +209,7 @@ sub project_selection_internal {
my $callback = "$form->{script}?action=project_selection_internal&";
map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" }
- (qw(login path password projectnumber description input_projectnumber input_description input_project_id), grep({ /^[fl]_/ } keys %$form)));
+ (qw(login password projectnumber description input_projectnumber input_description input_project_id), grep({ /^[fl]_/ } keys %$form)));
my @header_sort = qw(projectnumber description);
my %header_title = ( "projectnumber" => $locale->text("Project Number"),
@@ -248,7 +250,7 @@ sub employee_selection_internal {
my $callback = "$form->{script}?action=employee_selection_internal&";
map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" }
- (qw(login path password name input_name input_id), grep({ /^[fl]_/ } keys %$form)));
+ (qw(login password name input_name input_id), grep({ /^[fl]_/ } keys %$form)));
my @header_sort = qw(name);
my %header_title = ( "name" => $locale->text("Name"),
@@ -288,7 +290,7 @@ sub delivery_customer_selection {
my $callback = "$form->{script}?action=delivery_customer_selection&";
map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" }
- (qw(login path password name input_name input_id), grep({ /^[fl]_/ } keys %$form)));
+ (qw(login password name input_name input_id), grep({ /^[fl]_/ } keys %$form)));
my @header_sort = qw(name customernumber address);
my %header_title = ( "name" => $locale->text("Name"),
@@ -330,7 +332,7 @@ sub vendor_selection {
my $callback = "$form->{script}?action=vendor_selection&";
map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" }
- (qw(login path password name input_name input_id), grep({ /^[fl]_/ } keys %$form)));
+ (qw(login password name input_name input_id), grep({ /^[fl]_/ } keys %$form)));
my @header_sort = qw(name customernumber address);
my %header_title = ( "name" => $locale->text("Name"),
@@ -400,67 +402,192 @@ sub calculate_qty {
$lxdebug->leave_sub();
}
-sub calculate_alu {
+sub set_longdescription {
+ $lxdebug->enter_sub();
+
+
+ my $callback = "$form->{script}?action=set_longdescription&";
+ map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" }
+ (qw(login password name input_name input_id), grep({ /^[fl]_/ } keys %$form)));
+
+ $form->{"title"} = $locale->text("Enter longdescription");
+ $form->header();
+ print($form->parse_html_template("generic/set_longdescription"));
+
+ $lxdebug->leave_sub();
+}
+
+sub H {
+ return $form->quote_html($_[0]);
+}
+
+sub Q {
+ return $form->quote($_[0]);
+}
+
+sub E {
+ return $form->escape($_[0]);
+}
+
+sub NTI {
+ my ($element) = @_;
+
+ $element =~ s/tabindex\s*=\s*"\d+"//;
+ return $element;
+}
+
+sub format_dates {
$lxdebug->enter_sub();
- my ($length, $weight) = split /\r\n/,$form->{formel};
+ my ($dateformat, $longformat, @indices) = @_;
+
+ $dateformat = $myconfig{"dateformat"} unless ($dateformat);
+
+ foreach my $idx (@indices) {
+ next unless (defined($form->{$idx}));
- map({ $form->{$_} = "" } (qw(qty_alu price_alu total_alu qty_eloxal price_eloxal total_eloxal total)));
+ if (!ref($form->{$idx})) {
+ $form->{$idx} = $locale->reformat_date(\%myconfig, $form->{$idx},
+ $dateformat, $longformat);
- if ($form->{description} =~ /.*Alupreisberechnung.*/) {
- $form->{description} =~ /.*Alupreisberechnung:\n(.*)kg Aluminiumprofil Einzelpreis: (.*) Gesamt: (.*)\n(.*)m Eloxal Einzelpreis: (.*) Gesamt: (.*)/;
- $form->{qty_alu} = $1;
- $form->{price_alu} = $2;
- $form->{total_alu} = $3;
- $form->{qty_eloxal} = $4;
- $form->{price_eloxal} = $5;
- $form->{total_eloxal} = $6;
- $form->{total} = $form->format_amount(\%myconfig, ($form->parse_amount(\%myconfig, $form->{total_alu}) + $form->parse_amount(\%myconfig, $form->{total_eloxal})));
+ } 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);
+ }
+ }
}
- ($form->{description}, $null) = split /\nAlupreisberechnung/, $form->{description};
- my $callback = "$form->{script}?action=vendor_selection&";
- map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" }
- (qw(login path password name input_name input_id), grep({ /^[fl]_/ } keys %$form)));
+ $lxdebug->leave_sub();
+}
- my @header_sort = qw(name customernumber address);
- my %header_title = ( "name" => $locale->text("Name"),
- "customernumber" => $locale->text("Customer Number"),
- "address" => $locale->text("Address"),
- );
- ($null, $form->{weight}) = split / /, $weight;
- ($null, $form->{length}) = split / /, $length;
+sub reformat_numbers {
+ $lxdebug->enter_sub();
- $form->{calc_weight} = $form->parse_amount(\%myconfig, $form->{weight});
- $form->{calc_length} = $form->parse_amount(\%myconfig, $form->{length});
+ my ($numberformat, $places, @indices) = @_;
+ return $lxdebug->leave_sub()
+ if (!$numberformat || ($numberformat eq $myconfig{"numberformat"}));
- my @header =
- map(+{ "column_title" => $header_title{$_},
- "column" => $_,
- },
- @header_sort);
+ foreach my $idx (@indices) {
+ next unless (defined($form->{$idx}));
- $form->{"title"} = $locale->text("Enter values for aluminium calculation");
- $form->header();
- print($form->parse_html_template("generic/calculate_alu"));
+ 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();
}
+sub show_history {
+ $lxdebug->enter_sub();
+ 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();
+}
-sub set_longdescription {
+sub call_sub {
$lxdebug->enter_sub();
+ my $name = shift;
- my $callback = "$form->{script}?action=set_longdescription&";
- map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" }
- (qw(login path password name input_name input_id), grep({ /^[fl]_/ } keys %$form)));
+ if (!$name) {
+ $form->error($locale->text("Trying to call a sub without a name"));
+ }
- $form->{"title"} = $locale->text("Enter longdescription");
+ $name =~ s/[^a-zA-Z0-9_]//g;
+
+ if (!defined(&{ $name })) {
+ $form->error(sprintf($locale->text("Attempt to call an undefined sub named '%s'"), $name));
+ }
+
+ &{ $name }(@_);
+
+ $lxdebug->leave_sub();
+}
+
+sub show_vc_details {
+ $lxdebug->enter_sub();
+
+ $form->{vc} = $form->{vc} eq "customer" ? "customer" : "vendor";
+ $form->isblank("vc_id",
+ $form->{vc} eq "customer" ?
+ $locale->text("No customer has been selected yet.") :
+ $locale->text("No vendor has been selected yet."));
+
+ Common->get_vc_details(\%myconfig, $form, $form->{vc}, $form->{vc_id});
+
+ $form->{title} = $form->{vc} eq "customer" ?
+ $locale->text("Customer details") : $locale->text("Vendor details");
$form->header();
- print($form->parse_html_template("generic/set_longdescription"));
+ print($form->parse_html_template("common/show_vc_details",
+ { "is_customer" => $form->{vc} eq "customer" }));
+ $lxdebug->leave_sub();
+}
+
+sub mark_as_paid_common {
+ $lxdebug->enter_sub();
+ use SL::DBUtils;
+ my ($myconfig, $db_name) = @_;
+
+ if($form->{mark_as_paid}) {
+ my $dbh ||= $form->get_standard_dbh($myconfig);
+ my $query = qq|UPDATE $db_name SET paid = amount 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\&login\=$form->{login}\&password\=$form->{password}\&id\=$form->{id}\&$2/;
+ $form->header();
+ print qq||;
+ print qq||.$locale->text('Mark as paid?').qq|
|;
+ print qq| |;
+ print qq||;
+ print qq|