X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fcommon.pl;h=f03911c32c153bea5f2358c65a2381b231784181;hb=b3bde077a6df1550915b1433b2cabb4cf74ab681;hp=f3fc1e80a21c274fb6dced039cbf542ec8bb4e34;hpb=94f3406dd6f85ad4c5ac33d6995c438630c2c028;p=kivitendo-erp.git diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl index f3fc1e80a..f03911c32 100644 --- a/bin/mozilla/common.pl +++ b/bin/mozilla/common.pl @@ -69,6 +69,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,6 +85,7 @@ 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 }); @@ -91,7 +97,7 @@ sub select_part_internal { my ($new_item, $callback_sub); - my $re = "^new_.*_" . $form->{selection}; + my $re = "^new_.*_$form->{selection}\$"; foreach (grep /$re/, keys %{ $form }) { my $new_key = $_; @@ -139,7 +145,7 @@ sub part_selection_internal { } } - map { $form->{$_} = $options{$_} if ($options{$_}) } qw(no_services no_assemblies click_button); + map { $form->{$_} = $options{$_} if ($options{$_}) } qw(no_services no_assemblies assemblies click_button); $parts = Common->retrieve_parts(\%myconfig, $form, $order_by, $order_dir); @@ -270,45 +276,36 @@ sub vendor_selection { sub calculate_qty { $lxdebug->enter_sub(); - 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; + foreach $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(); } @@ -328,11 +325,11 @@ sub set_longdescription { # ------------------------------------------------------------------------- sub H { - return $form->quote_html($_[0]); + return $locale->quote_special_chars('HTML', $_[0]); } sub Q { - return $form->quote($_[0]); + return $locale->quote_special_chars('URL@HTML', $_[0]); } sub E { @@ -354,6 +351,14 @@ sub format_dates { $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})) { @@ -381,6 +386,12 @@ sub reformat_numbers { 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})) { @@ -398,6 +409,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})) { @@ -515,7 +532,15 @@ 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/; + 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|

|; @@ -567,7 +592,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; } @@ -580,4 +605,89 @@ sub cov_selection_internal { $lxdebug->leave_sub(); } + +# Functions to call add routines beneath different reports + +sub sales_invoice { + $lxdebug->enter_sub(); + + $auth->assert('invoice_edit'); + + + $form->{script} = 'is.pl'; + $script = "is"; + $form->{type} = "invoice"; + $locale = new Locale "$myconfig{countrycode}", "$script"; + + require "bin/mozilla/$form->{script}"; + &add; + + $lxdebug->leave_sub(); +} + +sub ar_transaction { + $lxdebug->enter_sub(); + + $auth->assert('general_ledger'); + + + $form->{script} = 'ar.pl'; + $script = "ar"; + $locale = new Locale "$myconfig{countrycode}", "$script"; + + require "bin/mozilla/$form->{script}"; + &add; + + $lxdebug->leave_sub(); +} + +sub vendor_invoice { + $lxdebug->enter_sub(); + + $auth->assert('invoice_edit'); + + + $form->{script} = 'ir.pl'; + $script = "ir"; + $form->{type} = "invoice"; + $locale = new Locale "$myconfig{countrycode}", "$script"; + + require "bin/mozilla/$form->{script}"; + &add; + + $lxdebug->leave_sub(); +} + +sub ap_transaction { + $lxdebug->enter_sub(); + + $auth->assert('general_ledger'); + + + $form->{script} = 'ap.pl'; + $script = "ap"; + $locale = new Locale "$myconfig{countrycode}", "$script"; + + require "bin/mozilla/$form->{script}"; + &add; + + $lxdebug->leave_sub(); +} + +sub gl_transaction { + $lxdebug->enter_sub(); + + $auth->assert('general_ledger'); + + + $form->{script} = 'gl.pl'; + $script = "gl"; + $locale = new Locale "$myconfig{countrycode}", "$script"; + + require "bin/mozilla/$form->{script}"; + &add; + + $lxdebug->leave_sub(); +} + 1;