X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=2d8169dbe39c811a7b5f7598ec331653bb6cfc6f;hb=2e7ea276960b1643001276199f6ce48cd6a5aca7;hp=a8a056fa43d4390cf04195b3d4009605502c596f;hpb=340f8780002037e8f75e32be8ea440f83082f619;p=kivitendo-erp.git diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index a8a056fa4..2d8169dbe 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -33,19 +33,22 @@ # ####################################################################### +use CGI; +use CGI::Ajax; +use List::Util qw(max); + +use SL::Common; use SL::CT; use SL::IC; -use CGI::Ajax; -use CGI; -require "$form->{path}/common.pl"; +require "bin/mozilla/common.pl"; # any custom scripts for this one -if (-f "$form->{path}/custom_io.pl") { - eval { require "$form->{path}/custom_io.pl"; }; +if (-f "bin/mozilla/custom_io.pl") { + eval { require "bin/mozilla/custom_io.pl"; }; } -if (-f "$form->{path}/$form->{login}_io.pl") { - eval { require "$form->{path}/$form->{login}_io.pl"; }; +if (-f "bin/mozilla/$form->{login}_io.pl") { + eval { require "bin/mozilla/$form->{login}_io.pl"; }; } 1; @@ -91,436 +94,227 @@ sub display_row { $lxdebug->enter_sub(); my $numrows = shift; - if ($lizenzen && $form->{vc} eq "customer") { - if ($form->{type} =~ /sales_order/) { - @column_index = (runningnumber, partnumber, description, ship, qty); - } elsif ($form->{type} =~ /sales_quotation/) { - @column_index = (runningnumber, partnumber, description, qty); - } else { - @column_index = (runningnumber, partnumber, description, qty); - } - } else { - if ( ($form->{type} =~ /purchase_order/) - || ($form->{type} =~ /sales_order/)) { - @column_index = (runningnumber, partnumber, description, ship, qty); - } else { - @column_index = (runningnumber, partnumber, description, qty); - } - } -############## ENDE Neueintrag ################## - + # column_index + my @header_sort = qw(runningnumber partnumber description ship qty unit sellprice_pg sellprice discount linetotal); + my @HEADER = ( + { id => 'runningnumber', width => 5, value => $locale->text('No.'), display => 1, }, + { id => 'partnumber', width => 12, value => $locale->text('Number'), display => 1, }, + { id => 'description', width => 30, value => $locale->text('Part Description'), display => 1, }, + { id => 'ship', width => 5, value => ($form->{type} eq 'purchase_order' ? $locale->text('Ship rcvd') : $locale->text('Ship')), + display => $form->{type} =~ /sales_order/ || ($form->{type} =~ /purchase_order/ && !($lizenzen && $form->{vc} eq "customer")) , }, + { id => 'qty', width => 5, value => $locale->text('Qty'), display => 1, }, + { id => 'unit', width => 5, value => $locale->text('Unit'), display => 1, }, + { id => 'license', width => 10, value => $locale->text('License'), display => 0, }, + { id => 'serialnr', width => 10, value => $locale->text('Serial No.'), display => 0, }, + { id => 'projectnr', width => 10, value => $locale->text('Project'), display => 0, }, + { id => 'sellprice', width => 15, value => $locale->text('Price'), display => 1, }, + { id => 'sellprice_pg', width => 15, value => $locale->text('Pricegroup'), display => $form->{type} =~ /^sales_/, }, + { id => 'discount', width => 5, value => $locale->text('Discount'), display => $form->{vc} eq 'customer', }, + { id => 'linetotal', width => 10, value => $locale->text('Extended'), display => 1, }, + { id => 'bin', width => 10, value => $locale->text('Bin'), display => 0, }, + ); + my @column_index = map { $_->{id} } grep { $_->{display} } @HEADER; + + # cache units my $dimension_units = AM->retrieve_units(\%myconfig, $form, "dimension"); - my $service_units = AM->retrieve_units(\%myconfig, $form, "service"); - my $all_units = AM->retrieve_units(\%myconfig, $form); + my $service_units = AM->retrieve_units(\%myconfig, $form, "service"); + my $all_units = AM->retrieve_units(\%myconfig, $form); - push @column_index, qw(unit); + my %price_factors = map { $_->{id} => $_->{factor} } @{ $form->{ALL_PRICE_FACTORS} }; - #for pricegroups column - if ( $form->{type} =~ (/sales_quotation/) - or (($form->{level} =~ /Sales/) and ($form->{type} =~ /invoice/)) - or (($form->{level} eq undef) and ($form->{type} =~ /invoice/)) - or ($form->{type} =~ /sales_order/)) { - push @column_index, qw(sellprice_pg); - } - - push @column_index, qw(sellprice); - - if ($form->{vc} eq 'customer') { - push @column_index, qw(discount); - } - - push @column_index, "linetotal"; - - my $colspan = $#column_index + 1; + my $colspan = scalar @column_index; $form->{invsubtotal} = 0; - map { $form->{"${_}_base"} = 0 } (split / /, $form->{taxaccounts}); + map { $form->{"${_}_base"} = 0 } (split(/ /, $form->{taxaccounts})); -######################################## - # Eintrag fuer Version 2.2.0 geaendert # - # neue Optik im Rechnungsformular # -######################################## - $column_data{runningnumber} = - qq|| - . $locale->text('No.') - . qq||; - $column_data{partnumber} = - qq|| - . $locale->text('Number') - . qq||; - $column_data{description} = - qq|| - . $locale->text('Part Description') - . qq||; - if ($form->{"type"} eq "purchase_order") { - $column_data{ship} = - qq|| - . $locale->text('Ship rcvd') - . qq||; - } else { - $column_data{ship} = - qq|| - . $locale->text('Ship') - . qq||; - } - $column_data{qty} = - qq|| - . $locale->text('Qty') - . qq||; - $column_data{unit} = - qq|| - . $locale->text('Unit') - . qq||; - $column_data{license} = - qq|| - . $locale->text('License') - . qq||; - $column_data{serialnr} = - qq|| - . $locale->text('Serial No.') - . qq||; - $column_data{projectnr} = - qq|| - . $locale->text('Project') - . qq||; - $column_data{sellprice} = - qq|| - . $locale->text('Price') - . qq||; - $column_data{sellprice_pg} = - qq|| - . $locale->text('Pricegroup') - . qq||; - $column_data{discount} = - qq|| - . $locale->text('Discount') - . qq||; - $column_data{linetotal} = - qq|| - . $locale->text('Extended') - . qq||; - $column_data{bin} = - qq|| - . $locale->text('Bin') - . qq||; -############## ENDE Neueintrag ################## - - $myconfig{"show_form_details"} = 1 - unless (defined($myconfig{"show_form_details"})); - $form->{"show_details"} = $myconfig{"show_form_details"} - unless (defined($form->{"show_details"})); - $form->{"show_details"} = $form->{"show_details"} ? 1 : 0; - my $show_details_new = 1 - $form->{"show_details"}; - my $show_details_checked = $form->{"show_details"} ? "checked" : ""; - - print qq| - - - - -
- - |; - - map { print "\n$column_data{$_}" } @column_index; + # about details + $myconfig{show_form_details} = 1 unless (defined($myconfig{show_form_details})); + $form->{show_details} = $myconfig{show_form_details} unless (defined($form->{show_details})); + # /about details - print qq| - -|; - - $runningnumber = $locale->text('No.'); + # translations, unused commented out +# $runningnumber = $locale->text('No.'); $deliverydate = $locale->text('Delivery Date'); $serialnumber = $locale->text('Serial No.'); $projectnumber = $locale->text('Project'); - $partsgroup = $locale->text('Group'); +# $partsgroup = $locale->text('Group'); $reqdate = $locale->text('Reqdate'); + $deliverydate = $locale->text('Required by'); - $delvar = 'deliverydate'; + # special alignings + my %align = map { $_ => 'right' } qw(qty ship right sellprice_pg discount linetotal); + my %nowrap = map { $_ => 1 } qw(description unit); - if ($form->{type} =~ /_order$/ || $form->{type} =~ /_quotation$/) { - $deliverydate = $locale->text('Required by'); - $delvar = 'reqdate'; + $form->{marge_total} = 0; + $form->{sellprice_total} = 0; + $form->{lastcost_total} = 0; + my %projectnumber_labels = (); + my @projectnumber_values = (""); + + foreach my $item (@{ $form->{"ALL_PROJECTS"} }) { + push(@projectnumber_values, $item->{"id"}); + $projectnumber_labels{$item->{"id"}} = $item->{"projectnumber"}; } + # rows for $i (1 .. $numrows) { # undo formatting - map { - $form->{"${_}_$i"} = - $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) - } qw(qty ship discount sellprice price_new price_old) unless ($form->{simple_save}); - - if (!$form->{"unit_old_$i"}) { - # Neue Ware aus der Datenbank. In diesem Fall ist unit_$i die - # Einheit, wie sie in den Stammdaten hinterlegt wurde. - # Es sollte also angenommen werden, dass diese ausgewaehlt war. - $form->{"unit_old_$i"} = $form->{"unit_$i"}; - } - - - - # Die zuletzt ausgewaehlte mit der aktuell ausgewaehlten Einheit - # vergleichen und bei Unterschied den Preis entsprechend umrechnen. - $form->{"selected_unit_$i"} = $form->{"unit_$i"} unless ($form->{"selected_unit_$i"}); - - my $check_units = $form->{"inventory_accno_$i"} ? $dimension_units : $service_units; - if (!$check_units->{$form->{"selected_unit_$i"}} || - ($check_units->{$form->{"selected_unit_$i"}}->{"base_unit"} ne - $all_units->{$form->{"unit_old_$i"}}->{"base_unit"})) { - # Die ausgewaehlte Einheit ist fuer diesen Artikel nicht gueltig - # (z.B. Dimensionseinheit war ausgewaehlt, es handelt sich aber - # um eine Dienstleistung). Dann keinerlei Umrechnung vornehmen. - $form->{"unit_old_$i"} = $form->{"selected_unit_$i"} = $form->{"unit_$i"}; + map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(qty ship discount sellprice price_new price_old) unless ($form->{simple_save}); + +# unit begin + $form->{"unit_old_$i"} ||= $form->{"unit_$i"}; + $form->{"selected_unit_$i"} ||= $form->{"unit_$i"}; + + my $local_units = $form->{"inventory_accno_$i"} || $form->{"assembly_$i"} ? $dimension_units + : $form->{"id_$i"} ? $service_units + : $all_units; + if ( !$local_units->{$form->{"selected_unit_$i"}} # Die ausgewaehlte Einheit ist fuer diesen Artikel nicht gueltig + || !AM->convert_unit($form->{"selected_unit_$i"}, $form->{"unit_old_$i"}, $all_units)) { # (z.B. Dimensionseinheit war ausgewaehlt, es handelt sich aber + $form->{"unit_old_$i"} = $form->{"selected_unit_$i"} = $form->{"unit_$i"}; # um eine Dienstleistung). Dann keinerlei Umrechnung vornehmen. } + # adjust prices by unit, ignore if pricegroup changed if ((!$form->{"prices_$i"}) || ($form->{"new_pricegroup_$i"} == $form->{"old_pricegroup_$i"})) { - if ($form->{"unit_old_$i"} ne $form->{"selected_unit_$i"}) { - my $basefactor = 1; - if (defined($all_units->{$form->{"unit_old_$i"}}->{"factor"}) && - $all_units->{$form->{"unit_old_$i"}}->{"factor"}) { - $basefactor = $all_units->{$form->{"selected_unit_$i"}}->{"factor"} / - $all_units->{$form->{"unit_old_$i"}}->{"factor"}; - } - $form->{"sellprice_$i"} *= $basefactor; - $form->{"unit_old_$i"} = $form->{"selected_unit_$i"}; - } + $form->{"sellprice_$i"} *= AM->convert_unit($form->{"selected_unit_$i"}, $form->{"unit_old_$i"}, $all_units) || 1; + $form->{"unit_old_$i"} = $form->{"selected_unit_$i"}; + } + my $this_unit = $form->{"unit_$i"}; + $this_unit = $form->{"selected_unit_$i"} if AM->convert_unit($this_unit, $form->{"selected_unit_$i"}, $all_units); + $this_unit ||= "kg"; + + my $price_factor_select; + if (0 < scalar @{ $form->{ALL_PRICE_FACTORS} }) { + my @values = ('', map { $_->{id} } @{ $form->{ALL_PRICE_FACTORS} }); + my %labels = map { $_->{id} => $_->{description} } @{ $form->{ALL_PRICE_FACTORS} }; + + $price_factor_select = + NTI($cgi->popup_menu('-name' => "price_factor_id_$i", + '-default' => $form->{"price_factor_id_$i"}, + '-values' => \@values, + '-labels' => \%labels, + '-style' => 'width:90px')) + . ' '; } - ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/); - $dec = length $dec; - $decimalplaces = ($dec > 2) ? $dec : 2; - - $discount = - $form->round_amount( - $form->{"sellprice_$i"} * $form->{"discount_$i"} / 100, - $decimalplaces); - $linetotal = - $form->round_amount($form->{"sellprice_$i"} - $discount, $decimalplaces); - $linetotal = $form->round_amount($linetotal * $form->{"qty_$i"}, 2); + $column_data{"unit"} = $price_factor_select . AM->unit_select_html($local_units, "unit_$i", $this_unit, $form->{"id_$i"} ? $form->{"unit_$i"} : undef); +# / unit ending - # convert " to " - map { $form->{"${_}_$i"} =~ s/\"/"/g } - qw(partnumber description unit unit_old); + $form->{"sellprice_$i"} =~ /\.(\d+)/; + $decimalplaces = max 2, length $1; -######################################## - # Eintrag fuer Version 2.2.0 geaendert # - # neue Optik im Rechnungsformular # -######################################## - $column_data{runningnumber} = - qq||; # HuT -############## ENDE Neueintrag ################## - - $column_data{partnumber} = - qq||; - - if (($rows = $form->numtextrows($form->{"description_$i"}, 30, 6)) > 1) { - $column_data{description} = - qq||; - } else { - $column_data{description} = - qq||; - } + $price_factor = $price_factors{$form->{"price_factor_id_$i"}} || 1; + $discount = $form->round_amount($form->{"sellprice_$i"} * $form->{"discount_$i"} / 100, $decimalplaces); + $linetotal = $form->round_amount(($form->{"sellprice_$i"} - $discount) / $price_factor, $decimalplaces); + $linetotal = $form->round_amount($linetotal * $form->{"qty_$i"}, 2); - (my $qty_dec) = ($form->{"qty_$i"} =~ /\.(\d+)/); - $qty_dec = length $qty_dec; + # convert " to " + map { $form->{"${_}_$i"} =~ s/\"/"/g } qw(partnumber description unit unit_old); - $column_data{qty} = - qq||; - } - $column_data{ship} = - qq||; + $column_data{runningnumber} = $cgi->textfield(-name => "runningnumber_$i", -size => 5, -value => $i); # HuT + $column_data{partnumber} = $cgi->textfield(-name => "partnumber_$i", -size => 12, -value => $form->{"partnumber_$i"}); + $column_data{description} = ((($rows = $form->numtextrows($form->{"description_$i"}, 30, 6)) > 1) # if description is too large, use a textbox instead + ? $cgi->textarea( -name => "description_$i", -default => H($form->{"description_$i"}), -rows => $rows, -columns => 30) + : $cgi->textfield(-name => "description_$i", -size => 30, -value => $form->quote($form->{"description_$i"}))) + . $cgi->button(-value => $locale->text('L'), -onClick => "set_longdescription_window('longdescription_$i')"); - my $is_part = $form->{"inventory_accno_$i"}; - my $is_assigned = $form->{"id_$i"}; - my $this_unit = $form->{"unit_$i"}; - if ($form->{"selected_unit_$i"} && $this_unit && - $all_units->{$form->{"selected_unit_$i"}} && $all_units->{$this_unit} && - ($all_units->{$form->{"selected_unit_$i"}}->{"base_unit"} eq $all_units->{$this_unit}->{"base_unit"})) { - $this_unit = $form->{"selected_unit_$i"}; - } elsif (!$is_assigned || - ($is_part && !$this_unit && ($all_units->{$this_unit} && ($all_units->{$this_unit}->{"base_unit"} eq $all_units->{"kg"}->{"base_unit"})))) { - $this_unit = "kg"; - } + $form->{"qty_$i"} =~ /\.(\d+)/; + my $qty_dec = length $1; - $column_data{"unit"} = ""; + $column_data{qty} = $cgi->textfield(-name => "qty_$i", -size => 5, -value => $form->format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec)); + $column_data{qty} .= $cgi->button(-onclick => "calculate_qty_selection_window('qty_$i','alu_$i', 'formel_$i', $i)", -value => $locale->text('*/')) + . $cgi->hidden(-name => "formel_$i", -value => $form->{"formel_$i"}) . $cgi->hidden("-name" => "alu_$i", "-value" => $form->{"alu_$i"}) + if $form->{"formel_$i"}; + $column_data{ship} = $cgi->textfield(-name => "ship_$i", -size => 5, -value => $form->format_amount(\%myconfig, $form->{"ship_$i"})); # build in drop down list for pricesgroups if ($form->{"prices_$i"}) { - if ($form->{"new_pricegroup_$i"} != $form->{"old_pricegroup_$i"}) { - $price_tmp = $form->format_amount(\%myconfig, $form->{"price_new_$i"}, $decimalplaces); - } else { - $price_tmp = $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces); - } - - $column_data{sellprice_pg} = - qq||; - $column_data{sellprice} = - qq||; + $column_data{sellprice_pg} = qq||; + $column_data{sellprice} = $cgi->textfield(-name => "sellprice_$i", -size => 10, -onBlur => 'check_right_number_format(this)', -value => + (($form->{"new_pricegroup_$i"} != $form->{"old_pricegroup_$i"}) + ? $form->format_amount(\%myconfig, $form->{"price_new_$i"}, $decimalplaces) + : $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces))); } else { - # for last row and report # set pricegroup drop down list from report menu if ($form->{"sellprice_$i"} != 0) { - $prices = - qq|\n|; - $form->{"pricegroup_old_$i"} = $form->{"pricegroup_id_$i"}; - - $column_data{sellprice_pg} = - qq||; - + my $default_option = $form->{"sellprice_$i"}.'--'.$form->{"pricegroup_id_$i"}; + $column_data{sellprice_pg} = NTI($cgi->popup_menu("sellpricepg_$i", [ $default_option ], $default_option, { $default_option => $form->{"pricegroup_$i"} || '' })); } else { - - # for last row - $column_data{sellprice_pg} = qq||; + $column_data{sellprice_pg} = qq| |; } - - $column_data{sellprice} = - qq||; - } - $column_data{discount} = - qq||; - $column_data{linetotal} = - qq||; - $column_data{bin} = qq||; - -######################################## - # Eintrag fuer Version 2.2.0 geaendert # - # neue Optik im Rechnungsformular # -######################################## - # if ($lizenzen && $form->{type} eq "invoice" && $form->{vc} eq "customer") { - # $column_data{license} = qq||; - # } - # - # if ($form->{type} !~ /_quotation/) { - # $column_data{serialnr} = qq||; - # } - # - # $column_data{projectnr} = qq||; -############## ENDE Neueintrag ################## - my $j = $i % 2; - print qq| - - |; - - map { print "\n$column_data{$_}" } @column_index; - - print qq| - - -{"orderitems_id_$i"}> -{"bo_$i"}> - -{"pricegroup_old_$i"}> -{"price_old_$i"}> - -format_amount(\%myconfig, $form->{"price_new_$i"}) . qq|> - -{"id_$i"}> -{"inventory_accno_$i"}> - - - -{"income_accno_$i"}> -{"expense_accno_$i"}> - - - - - - - - - -|; - -######################################## - # Eintrag fuer Version 2.2.0 geaendert # - # neue Optik im Rechnungsformular # -######################################## - - my $row_style_attr = - 'style="display:none;"' if (!$form->{"show_details"}); - - # print second row - print qq| - - - - -|; -############## ENDE Neueintrag ################## + my $marge_adjust_credit_note = $form->{type} eq 'credit_note' ? -1 : 1; + $form->{"marge_absolut_$i"} = ($real_sellprice - $form->{"lastcost_$i"} / $marge_price_factor) * $form->{"qty_$i"} * $marge_adjust_credit_note; + $form->{"marge_total"} += $form->{"marge_absolut_$i"}; + $form->{"lastcost_total"} += $form->{"lastcost_$i"} * $form->{"qty_$i"} / $marge_price_factor; + $form->{"sellprice_total"} += $real_sellprice * $form->{"qty_$i"}; + + map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, 2) } qw(marge_absolut marge_percent); + + push @ROW2, { value => sprintf qq|%s %s  %s%%  %s %s  %s %s|, + $marge_color, $locale->text('Ertrag'),$form->{"marge_absolut_$i"}, $form->{"marge_percent_$i"}, + $locale->text('LP'), $form->format_amount(\%myconfig, $form->{"listprice_$i"}, 2), + $locale->text('EK'), $form->format_amount(\%myconfig, $form->{"lastcost_$i"}, 2) } + if $form->{"id_$i"} && $form->{type} =~ /^sales_/; +# / marge calculations ending + + my @HIDDENS = map { value => $_}, ( + $cgi->hidden("-name" => "unit_old_$i", "-value" => $form->{"selected_unit_$i"}), + $cgi->hidden("-name" => "price_new_$i", "-value" => $form->format_amount(\%myconfig, $form->{"price_new_$i"})), + map { ($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } map { $_."_$i" } + qw(orderitems_id bo pricegroup_old price_old id inventory_accno bin partsgroup partnotes + income_accno expense_accno listprice assembly taxaccounts ordnumber transdate cusordnumber + longdescription basefactor marge_absolut marge_percent marge_price_factor lastcost) + ); - map { $form->{"${_}_base"} += $linetotal } - (split / /, $form->{"taxaccounts_$i"}); + map { $form->{"${_}_base"} += $linetotal } (split(/ /, $form->{"taxaccounts_$i"})); $form->{invsubtotal} += $linetotal; + + push @ROWS, { ROW1 => \@ROW1, ROW2 => \@ROW2, HIDDENS => \@HIDDENS, colspan => $colspan, }; } - print qq| -
format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec) .qq|>|; - if ($form->{"formel_$i"}) { - $column_data{qty} .= qq| - format_amount(\%myconfig, $form->{"ship_$i"}) - . qq|>" . - ($qty_readonly ? " " : - AM->unit_select_html($is_part ? $dimension_units : - $is_assigned ? $service_units : $all_units, - "unit_$i", $this_unit, - $is_assigned ? $form->{"unit_$i"} : undef)) - . " format_amount(\%myconfig, $form->{"sellprice_$i"}, - $decimalplaces) - . qq|>format_amount(\%myconfig, $form->{"discount_$i"}) - . qq|>| - . $form->format_amount(\%myconfig, $linetotal, 2) - . qq|$form->{"bin_$i"}
-|; - if ($lizenzen && $form->{type} eq "invoice" && $form->{vc} eq "customer") { - my $selected = $form->{"licensenumber_$i"}; - my $lizenzen_quoted; - $form->{"lizenzen_$i"} =~ s/ selected//g; - $form->{"lizenzen_$i"} =~ - s/value="${selected}"\>/value="${selected}" selected\>/; - $lizenzen_quoted = $form->{"lizenzen_$i"}; - $lizenzen_quoted =~ s/\"/"/g; - print qq| - Lizenz\#  - -|; - } - if ($form->{type} !~ /_quotation/) { - print qq| - $serialnumber |; + $column_data{sellprice} = $cgi->textfield(-name => "sellprice_$i", -size => 10, -onBlur => "check_right_number_format(this)", -value => + $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces)); } - - print qq| - $projectnumber  - - -|; - if ($form->{type} eq 'invoice' or $form->{type} =~ /order/) { - my $reqdate_term = - ($form->{type} eq 'invoice') - ? 'deliverydate' - : 'reqdate'; # invoice uses a different term for the same thing. - print qq| - ${$reqdate_term}  -|; + $column_data{discount} = $cgi->textfield(-name => "discount_$i", -size => 3, -value => $form->format_amount(\%myconfig, $form->{"discount_$i"})); + $column_data{linetotal} = $form->format_amount(\%myconfig, $linetotal, 2); + $column_data{bin} = $form->{"bin_$i"}; + + my @ROW1 = map { value => $column_data{$_}, align => $align{$_}, nowrap => $nowrap{$_} }, @column_index; + + # second row + my @ROW2 = (); + push @ROW2, { value => qq|$serialnumber | } + if $form->{type} !~ /_quotation/; + push @ROW2, { value => qq|$projectnumber | . NTI($cgi->popup_menu('-name' => "project_id_$i", '-values' => \@projectnumber_values, + '-labels' => \%projectnumber_labels, '-default' => $form->{"project_id_$i"})) }; + push @ROW2, { value => qq|$reqdate | } + if $form->{type} =~ /order/; + push @ROW2, { value => sprintf qq|%s |, + $locale->text('Subtotal'), $form->{"subtotal_$i"} ? 'checked' : '' }; + +# begin marge calculations + my $marge_color; + my $real_sellprice = ($form->{"sellprice_$i"} - $discount) / $price_factor; + my $marge_price_factor = $form->{"marge_price_factor_$i"} * 1 || 1; + + $form->{"lastcost_$i"} *= 1; + $form->{"marge_percent_$i"} = 0; + + if ($real_sellprice && ($form->{"qty_$i"} * 1)) { + $form->{"marge_percent_$i"} = ($real_sellprice - $form->{"lastcost_$i"} / $marge_price_factor) * 100 / $real_sellprice; + $myconfig{marge_percent_warn} ||= 15; + $marge_color = 'color="#ff0000"' if $form->{"id_$i"} && ($form->{"marge_percent_$i"} < (1 * $myconfig{marge_percent_warn})); } - my $subtotalchecked = ($form->{"subtotal_$i"}) ? "checked" : ""; - print qq| - |.$locale->text('Subtotal').qq|  -
- - -|; + print $form->parse_html_template('oe/sales_order', { ROWS => \@ROWS, + HEADER => \@HEADER, + }); + + if (0 != ($form->{sellprice_total} * 1)) { + $form->{marge_percent} = ($form->{sellprice_total} - $form->{lastcost_total}) / $form->{sellprice_total} * 100; + } $lxdebug->leave_sub(); } @@ -532,41 +326,17 @@ sub set_pricegroup { $lxdebug->enter_sub(); my $rowcount = shift; for $j (1 .. $rowcount) { - my $pricegroup_old = $form->{"pricegroup_old_$i"}; - if ($form->{PRICES}{$j}) { - $len = 0; - $prices = ''; - $price = 0; - foreach $item (@{ $form->{PRICES}{$j} }) { - - #$price = $form->round_amount($myconfig, $item->{price}, 5); - #$price = $form->format_amount($myconfig, $item->{price}, 2); - $price = $item->{price}; - $pricegroup_id = $item->{pricegroup_id}; - $pricegroup = $item->{pricegroup}; - - # build drop down list for pricegroups - $prices .= - qq|\n|; - - $len += 1; - - # map { - # $form->{"${_}_$j"} = - # $form->format_amount(\%myconfig, $form->{"${_}_$j"}) - # } qw(sellprice price_new price_old); - - # set new selectedpricegroup_id and prices for "Preis" - if ($item->{selected} && ($pricegroup_id != 0)) { - $form->{"pricegroup_old_$j"} = $pricegroup_id; - $form->{"price_new_$j"} = $price; - $form->{"sellprice_$j"} = $price; - } - if ($pricegroup_id == 0) { - $form->{"price_new_$j"} = $form->{"sellprice_$j"}; - } - } - $form->{"prices_$j"} = $prices; + next unless $form->{PRICES}{$j}; + # build drop down list for pricegroups + my $option_tmpl = qq||; + $form->{"prices_$j"} = join '', map { sprintf $option_tmpl, @$_{qw(price pricegroup_id selected pricegroup)} } + (+{ pricegroup => $locale->text("none (pricegroup)") }, @{ $form->{PRICES}{$j} }); + + foreach $item (@{ $form->{PRICES}{$j} }) { + # set new selectedpricegroup_id and prices for "Preis" + $form->{"pricegroup_old_$j"} = $item->{pricegroup_id} if $item->{selected} && $item->{pricegroup_id}; + $form->{"sellprice_$j"} = $item->{price} if $item->{selected} && $item->{pricegroup_id}; + $form->{"price_new_$j"} = $form->{"sellprice_$j"} if $item->{selected} || !$item->{pricegroup_id}; } } $lxdebug->leave_sub(); @@ -578,15 +348,15 @@ sub select_item { $column_data{ndx} = qq| |; $column_data{partnumber} = - qq|| . $locale->text('Number') . qq||; + qq|| . $locale->text('Number') . qq||; $column_data{description} = - qq|| . $locale->text('Part Description') . qq||; + qq|| . $locale->text('Part Description') . qq||; $column_data{sellprice} = - qq|| . $locale->text('Price') . qq||; + qq|| . $locale->text('Price') . qq||; $column_data{onhand} = - qq|| . $locale->text('Qty') . qq||; + qq|| . $locale->text('Qty') . qq||; $column_data{unit} = - qq|| . $locale->text('Unit') . qq||; + qq|| . $locale->text('Unit') . qq||; # list items with radio button on a form $form->header; @@ -594,16 +364,16 @@ sub select_item { $colspan = $#column_index + 1; print qq| - + -
{script}> + - +
- + - |; + |; map { print "\n$column_data{$_}" } @column_index; @@ -620,28 +390,29 @@ sub select_item { $ref->{"lizenzen"} .= qq||; } - $ref->{"lizenzen"} .= qq||; + $ref->{"lizenzen"} .= qq||; $ref->{"lizenzen"} =~ s/\"/"/g; } } map { $ref->{$_} =~ s/\"/"/g } qw(partnumber description unit); - #sk tradediscount - $ref->{sellprice} = - $form->round_amount($ref->{sellprice} * (1 - $form->{tradediscount}), 2); + my $display_sellprice = $ref->{sellprice} * (1 - $form->{tradediscount}); + $display_sellprice /= $ref->{price_factor} if ($ref->{price_factor}); + $display_sellprice = $form->format_amount(\%myconfig, $display_sellprice, 2); + $column_data{ndx} = - qq||; + qq||; $column_data{partnumber} = - qq||; + qq||; $column_data{description} = - qq||; + qq||; $column_data{sellprice} = - qq||; $column_data{onhand} = - qq||; $column_data{unit} = @@ -653,40 +424,23 @@ sub select_item { map { print "\n$column_data{$_}" } @column_index; - print qq| - - - -{listprice}> -{inventory_accno}> -{income_accno}> -{expense_accno}> - - - - - - - - - - -{id}> + print("\n"); -|; - if ($lizenzen) { - print qq| - -|; - } + my @new_fields = + qw(bin listprice inventory_accno income_accno expense_accno unit weight + assembly taxaccounts partsgroup formel longdescription not_discountable + part_payment_id partnotes id lastcost price_factor_id price_factor); + push(@new_fields, "lizenzen") if ($lizenzen); + print join "\n", map { $cgi->hidden("-name" => "new_${_}_$i", "-value" => $ref->{$_}) } @new_fields; + print "\n"; } print qq| - +
$title$title
$ref->{partnumber}$ref->{partnumber}$ref->{description}$ref->{description}{sellprice}>| - . $form->format_amount(\%myconfig, $ref->{sellprice}, 2, " ") + qq|| + . $display_sellprice . qq|{onhand}>| + qq|| . $form->format_amount(\%myconfig, $ref->{onhand}, '', " ") . qq|
- + |; @@ -696,14 +450,14 @@ sub select_item { # save all other form variables foreach $key (keys %${form}) { $form->{$key} =~ s/\"/"/g; - print qq|\n|; + print qq|\n|; } print qq| - +
-
@@ -731,8 +485,16 @@ sub item_selected { # if there was a price entered, override it $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"}); - map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} } - qw(id partnumber description sellprice listprice inventory_accno income_accno expense_accno bin unit weight assembly taxaccounts partsgroup formel longdescription not_discountable); + my @new_fields = + qw(id partnumber description sellprice listprice inventory_accno + income_accno expense_accno bin unit weight assembly taxaccounts + partsgroup formel longdescription not_discountable partnotes lastcost + price_factor_id price_factor); + + map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} } @new_fields; + + $form->{"marge_price_factor_$i"} = $form->{"new_price_factor_$j"}; + if ($form->{"part_payment_id_$i"} ne "") { $form->{payment_id} = $form->{"part_payment_id_$i"}; } @@ -782,8 +544,7 @@ sub item_selected { # delete all the new_ variables for $i (1 .. $form->{lastndx}) { - map { delete $form->{"new_${_}_$i"} } - qw(partnumber description sellprice bin listprice inventory_accno income_accno expense_accno unit assembly taxaccounts id); + map { delete $form->{"new_${_}_$i"} } @new_fields; } map { delete $form->{$_} } qw(ndx lastndx nextsub); @@ -810,159 +571,18 @@ sub new_item { # change callback $form->{old_callback} = $form->escape($form->{callback}, 1); - $form->{callback} = $form->escape("$form->{script}?action=display_form", 1); - - # delete action - delete $form->{action}; - - # save all other form variables in a previousform variable - foreach $key (keys %$form) { - - # escape ampersands - $form->{$key} =~ s/&/%26/g; - $previousform .= qq|$key=$form->{$key}&|; - } - chop $previousform; - $previousform = $form->escape($previousform, 1); - - $i = $form->{rowcount}; - map { $form->{"${_}_$i"} =~ s/\"/"/g } qw(partnumber description); - - $form->header; - - print qq| - - -

| . $locale->text('Item not on file!') . qq| - -

-| . $locale->text('What type of item is this?') . qq|

- -
- -

- -  | - . $locale->text('Part') . qq|
-  | - . $locale->text('Service') - - . qq| - - - -{rowcount}> -{taxaccounts}> -{vc}> - -{path}> -{login}> -{password}> - - - -

- -

- - - -|; - - $lxdebug->leave_sub(); -} - -sub display_form { - $lxdebug->enter_sub(); - - relink_accounts(); - - $form->language_payment(\%myconfig); - - # if we have a display_form - if ($form->{display_form}) { - &{"$form->{display_form}"}; - exit; - } - - # if ( $form->{print_and_post} - # && $form->{second_run} - # && ($form->{action} eq "display_form")) { - # for (keys %$form) { $old_form->{$_} = $form->{$_} } - # $old_form->{rowcount}++; - # - # #$form->{rowcount}--; - # #$form->{rowcount}--; - # - # $form->{print_and_post} = 0; - # - # &print_form($old_form); - # exit; - # } - # - # $form->{action} = ""; - # $form->{resubmit} = 0; - # - # if ($form->{print_and_post} && !$form->{second_run}) { - # $form->{second_run} = 1; - # $form->{action} = "display_form"; - # $form->{rowcount}--; - # my $rowcount = $form->{rowcount}; - # - # # get pricegroups for parts - # IS->get_pricegroups_for_parts(\%myconfig, \%$form); - # - # # build up html code for prices_$i - # set_pricegroup($rowcount); - # - # $form->{resubmit} = 1; - # - # } - &form_header; - - $numrows = ++$form->{rowcount}; - $subroutine = "display_row"; - - if ($form->{item} eq 'part') { - - #set preisgruppenanzahl - $numrows = $form->{price_rows}; - $subroutine = "price_row"; - - &{$subroutine}($numrows); - - $numrows = ++$form->{makemodel_rows}; - $subroutine = "makemodel_row"; - } - if ($form->{item} eq 'assembly') { - $numrows = $form->{price_rows}; - $subroutine = "price_row"; - - &{$subroutine}($numrows); - - $numrows = ++$form->{makemodel_rows}; - $subroutine = "makemodel_row"; - - # create makemodel rows - &{$subroutine}($numrows); + $form->{callback} = $form->escape("$form->{script}?action=display_form", 1); - $numrows = ++$form->{assembly_rows}; - $subroutine = "assembly_row"; - } - if ($form->{item} eq 'service') { - $numrows = $form->{price_rows}; - $subroutine = "price_row"; - - &{$subroutine}($numrows); - - $numrows = 0; - } + # save all form variables except action in a previousform variable + my $previousform = join '&', map { $form->{$_} =~ s/&/%26/; "$_=$form->{$_}" } grep { !/action/ } keys %$form; - # create rows - &{$subroutine}($numrows) if $numrows; + push @HIDDENS, { 'name' => 'previousform', 'value' => $form->escape($previousform, 1) }; + push @HIDDENS, map +{ 'name' => $_, 'value' => $form->{$_} }, qw(rowcount vc login password); + push @HIDDENS, map +{ 'name' => $_, 'value' => $form->{"${_}_$form->{rowcount}"} }, qw(partnumber description unit sellprice); + push @HIDDENS, { 'name' => 'taxaccount2', 'value' => $form->{taxaccounts} }; - &form_footer; + $form->header(); + print $form->parse_html_template("generic/new_item", { HIDDENS => [ sort { $a->{name} cmp $b->{name} } @HIDDENS ] } ); $lxdebug->leave_sub(); } @@ -971,10 +591,7 @@ sub check_form { $lxdebug->enter_sub(); my @a = (); my $count = 0; - my @flds = ( - qw(id partnumber description qty ship sellprice unit discount inventory_accno income_accno expense_accno listprice taxaccounts bin assembly weight projectnumber project_id oldprojectnumber runningnumber serialnumber partsgroup payment_id not_discountable shop ve gv buchungsgruppen_id language_values sellprice_pg pricegroup_old price_old price_new unit_old ordnumber transdate longdescription basefactor) - ); - + my @flds = (qw(id partnumber description qty ship sellprice unit discount inventory_accno income_accno expense_accno listprice taxaccounts bin assembly weight projectnumber project_id oldprojectnumber runningnumber serialnumber partsgroup payment_id not_discountable shop ve gv buchungsgruppen_id language_values sellprice_pg pricegroup_old price_old price_new unit_old ordnumber transdate longdescription basefactor marge_total marge_percent marge_price_factor lastcost price_factor_id)); # remove any makes or model rows if ($form->{item} eq 'part') { @@ -1044,6 +661,9 @@ sub check_form { $form->redo_rows(\@flds, \@a, $count, $form->{makemodel_rows}); $form->{makemodel_rows} = $count; + } elsif ($form->{item} eq 'service') { + map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(listprice sellprice lastcost); + } else { # this section applies to invoices and orders @@ -1112,12 +732,12 @@ sub invoicetotal { $amount = $sellprice * (1 - $discount / 100) * $qty; map { $form->{"${_}_base"} += $amount } - (split / /, $form->{"taxaccounts_$i"}); + (split (/ /, $form->{"taxaccounts_$i"})); $form->{oldinvtotal} += $amount; } map { $form->{oldinvtotal} += ($form->{"${_}_base"} * $form->{"${_}_rate"}) } - split / /, $form->{taxaccounts} + split(/ /, $form->{taxaccounts}) if !$form->{taxincluded}; $form->{oldtotalpaid} = 0; @@ -1155,6 +775,9 @@ sub order { } $form->{ordnumber} = $form->{invnumber}; + $form->{old_employee_id} = $form->{employee_id}; + $form->{old_salesman_id} = $form->{salesman_id}; + map { delete $form->{$_} } qw(id printed emailed queued); if ($form->{script} eq 'ir.pl' || $form->{type} eq 'request_quotation') { $form->{title} = $locale->text('Add Purchase Order'); @@ -1176,7 +799,11 @@ sub order { $form->{cp_id} *= 1; - require "$form->{path}/$form->{script}"; + require "bin/mozilla/$form->{script}"; + my $script = $form->{"script"}; + $script =~ s|.*/||; + $script =~ s|.pl$||; + $locale = new Locale($language, $script); map { $form->{"select$_"} = "" } ($form->{vc}, currency); @@ -1236,7 +863,7 @@ sub quotation { $form->{rowcount}--; - require "$form->{path}/$form->{script}"; + require "bin/mozilla/$form->{script}"; map { $form->{"select$_"} = "" } ($form->{vc}, currency); @@ -1272,172 +899,42 @@ sub request_for_quotation { quotation(); } -sub e_mail { +sub edit_e_mail { $lxdebug->enter_sub(); + if ($form->{second_run}) { $form->{print_and_post} = 0; $form->{resubmit} = 0; } - if ($myconfig{role} eq 'admin') { - $bcc = qq| - - | . $locale->text('Bcc') . qq| - - -|; - } - if ($form->{formname} =~ /(pick|packing|bin)_list/) { - $form->{email} = $form->{shiptoemail} if $form->{shiptoemail}; - } + $form->{email} = $form->{shiptoemail} if $form->{shiptoemail} && $form->{formname} =~ /(pick|packing|bin)_list/; if ($form->{"cp_id"} && !$form->{"email"}) { CT->get_contact(\%myconfig, $form); $form->{"email"} = $form->{"cp_email"}; } - $name = $form->{ $form->{vc} }; - $name =~ s/--.*//g; - $title = $locale->text('E-mail') . " $name"; + $title = $locale->text('E-mail') . " " . $form->get_formname_translation(); $form->{oldmedia} = $form->{media}; $form->{media} = "email"; - my %formname_translations = - ( - "bin_list" => $locale->text('Bin List'), - "credit_note" => $locale->text('Credit Note'), - "invoice" => $locale->text('Invoice'), - "packing_list" => $locale->text('Packing List'), - "pick_list" => $locale->text('Pick List'), - "proforma" => $locale->text('Proforma Invoice'), - "purchase_order" => $locale->text('Purchase Order'), - "request_quotation" => $locale->text('RFQ'), - "sales_order" => $locale->text('Confirmation'), - "sales_quotation" => $locale->text('Quotation'), - "storno_invoice" => $locale->text('Storno Invoice'), - "storno_packing_list" => $locale->text('Storno Packing List'), - ); - - my $attachment_filename = $formname_translations{$form->{"formname"}}; - my $prefix; - - if ($form->{"type"} =~ /invoice/) { - $prefix = "inv"; - } elsif ($form->{"type"} =~ /_quotation$/) { - $prefix = "quo"; - } else { - $prefix = "ord"; - } - - if ($attachment_filename && $form->{"${prefix}number"}) { - $attachment_filename .= "_" . $form->{"${prefix}number"} . - ($form->{"format"} =~ /pdf/i ? ".pdf" : - $form->{"format"} =~ /postscript/i ? ".ps" : - $form->{"format"} =~ /opendocument/i ? ".odt" : - $form->{"format"} =~ /html/i ? ".html" : ""); - $attachment_filename =~ s/ /_/g; - my %umlaute = - ( - "ä" => "ae", "ö" => "oe", "ü" => "ue", - "Ä" => "Ae", "Ö" => "Oe", "Ü" => "Ue", - "ß" => "ss" - ); - map({ $attachment_filename =~ s/$_/$umlaute{$_}/g; } keys(%umlaute)); - } else { - $attachment_filename = ""; - } + my $attachment_filename = $form->generate_attachment_filename(); - if ($form->{"email"}) { - $form->{"fokus"} = "Form.subject"; - } else { - $form->{"fokus"} = "Form.email"; - } + $form->{"fokus"} = $form->{"email"} ? "Form.subject" : "Form.email"; $form->header; - print qq| - + my (@dont_hide_key_list, %dont_hide_key, @hidden_keys); + @dont_hide_key_list = qw(action email cc bcc subject message sendmode format header override); + @dont_hide_key{@dont_hide_key_list} = (1) x @dont_hide_key_list; + @hidden_keys = sort grep { !$dont_hide_key{$_} } grep { !ref $form->{$_} } keys %$form; -
- - - - - - - - - - - - - - - - - - -
$title
- - - - - - - - - - $bcc - - - - - - - -
| . $locale->text('To') . qq|
| . $locale->text('Cc') . qq|
| . $locale->text('Subject') . qq|
| . $locale->text('Attachment name') . - qq|
-
- - - - - - - -
| . $locale->text('Message') . qq|
-
-|; - - &print_options; - - map { delete $form->{$_} } - qw(action email cc bcc subject message formname sendmode format header override); - - # save all other variables - foreach $key (keys %$form) { - $form->{$key} =~ s/\"/"/g; - print qq|\n|; - } - - print qq| -
- - - -
- -
- - - -|; + print $form->parse_html_template('generic/edit_email', + { title => $title, + a_filename => $attachment_filename, + _print_options_ => print_options('inline' => 1), + HIDDEN => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ], + SHOW_BCC => $myconfig{role} eq 'admin' }); $lxdebug->leave_sub(); } @@ -1445,249 +942,134 @@ sub e_mail { sub send_email { $lxdebug->enter_sub(); - $old_form = new Form; + my $callback = $form->{script} . "?action=edit"; + map({ $callback .= "\&${_}=" . E($form->{$_}); } + qw(login password type id)); - map { $old_form->{$_} = $form->{$_} } keys %$form; - $old_form->{media} = $form->{oldmedia}; + print_form("return"); - &print_form($old_form); + Common->save_email_status(\%myconfig, $form); + + $form->{callback} = $callback; + $form->redirect(); $lxdebug->leave_sub(); } +# generate the printing options displayed at the bottom of oe and is forms. +# this function will attempt to guess what type of form is displayed, and will generate according options +# +# about the coding: +# this version builds the arrays of options pretty directly. if you have trouble understanding how, +# the opthash function builds hashrefs which are then pieced together for the template arrays. +# unneeded options are "undef"ed out, and then grepped out. +# +# the inline options is untested, but intended to be used later in metatemplating sub print_options { $lxdebug->enter_sub(); - $form->{sendmode} = "attachment"; - - $form->{"format"} = - $form->{"format"} ? $form->{"format"} : - $myconfig{"template_format"} ? $myconfig{"template_format"} : - "pdf"; - $form->{"copies"} = - $form->{"copies"} ? $form->{"copies"} : - $myconfig{"copies"} ? $myconfig{"copies"} : - 3; + my %options = @_; - $form->{"media"} = - $form->{"media"} ? $form->{"media"} : - $myconfig{"default_media"} ? $myconfig{"default_media"} : - "screen"; + # names 3 parameters and returns a hashref, for use in templates + sub opthash { +{ value => shift, selected => shift, oname => shift } } + (@FORMNAME, @FORMNAME, @LANGUAGE_ID, @FORMAT, @SENDMODE, @MEDIA, @PRINTER_ID, @SELECTS) = (); - $form->{"printer_id"} = - defined($form->{"printer_id"}) ? $form->{"printer_id"} : - $myconfig{"default_printer_id"} ? $myconfig{"default_printer_id"} : - ""; + # note: "||"-selection is only correct for values where "0" is _not_ a correct entry + $form->{sendmode} = "attachment"; + $form->{format} = $form->{format} || $myconfig{template_format} || "pdf"; + $form->{copies} = $form->{copies} || $myconfig{copies} || 3; + $form->{media} = $form->{media} || $myconfig{default_media} || "screen"; + $form->{printer_id} = defined $form->{printer_id} ? $form->{printer_id} : + defined $myconfig{default_printer_id} ? $myconfig{default_printer_id} : ""; $form->{PD}{ $form->{formname} } = "selected"; $form->{DF}{ $form->{format} } = "selected"; $form->{OP}{ $form->{media} } = "selected"; - $form->{SM}{ $form->{sendmode} } = "selected"; - - if ($form->{type} eq 'purchase_order') { - $type = qq| - |; - } - - if ($latex_templates) { - $format .= qq||; - } - - $format .= qq||; - - if ($latex_templates) { - $format .= qq||; - } - - if ($opendocument_templates) { - $format .= qq||; - } - $format .= qq||; - - if (scalar(keys (%{ $form->{languages} })) !=0) { - $language_select = qq| - |; - foreach $item (@{ $form->{printers} }) { - $selected = $item->{"id"} == $form->{"printer_id"} ? "selected" : ""; - $printer_select .= qq||; - } - } - - - - print qq| - - - - - -
- - - |; - if (scalar(keys (%{ $form->{languages} })) !=0) { - print qq| - |; - } - print qq| - - |; - if (scalar(keys (%{ $form->{printers} })) !=0) { - print qq| - -|; - } - - if (scalar(keys (%{ $form->{printers} })) !=0 && $latex_templates && $form->{media} ne 'email') { - print qq| - -|; - } - - $form->{groupitems} = "checked" if $form->{groupitems}; - - print qq| - - - -
$type${language_select}$format$media$printer_select| . $locale->text('Copies') . qq| - {copies}>| . $locale->text('Group Items') . qq|{groupitems}>
- 		- - -|; + $form->{SM}{ $form->{formname} } = "selected"; + + push @FORMNAME, grep $_, + ($form->{type} eq 'purchase_order') ? ( + opthash("purchase_order", $form->{PD}{purchase_order}, $locale->text('Purchase Order')), + opthash("bin_list", $form->{PD}{bin_list}, $locale->text('Bin List')) + ) : undef, + ($form->{type} eq 'credit_note') ? + opthash("credit_note", $form->{PD}{credit_note}, $locale->text('Credit Note')) : undef, + ($form->{type} eq 'sales_order') ? ( + opthash("sales_order", $form->{PD}{sales_order}, $locale->text('Confirmation')), + opthash("proforma", $form->{PD}{proforma}, $locale->text('Proforma Invoice')), + opthash("pick_list", $form->{PD}{pick_list}, $locale->text('Pick List')), + opthash("packing_list", $form->{PD}{packing_list}, $locale->text('Packing List')) + ) : undef, + ($form->{type} =~ /_quotation$/) ? + opthash("$`_quotation", $form->{PD}{"$`_quotation"}, $locale->text('Quotation')) : undef, + ($form->{type} eq 'invoice') ? ( + opthash("invoice", $form->{PD}{invoice}, $locale->text('Invoice')), + opthash("proforma", $form->{PD}{proforma}, $locale->text('Proforma Invoice')), + opthash("packing_list", $form->{PD}{packing_list}, $locale->text('Packing List')) + ) : undef, + ($form->{type} eq 'invoice' && $form->{storno}) ? ( + opthash("storno_invoice", $form->{PD}{storno_invoice}, $locale->text('Storno Invoice')), + opthash("storno_packing_list", $form->{PD}{storno_packing_list}, $locale->text('Storno Packing List')) + ) : undef, + ($form->{type} eq 'credit_note') ? + opthash("credit_note", $form->{PD}{credit_note}, $locale->text('Credit Note')) : undef; + + push @SENDMODE, + opthash("attachment", $form->{SM}{attachment}, $locale->text('Attachment')), + opthash("inline", $form->{SM}{inline}, $locale->text('In-line')) + if ($form->{media} eq 'email'); + + push @MEDIA, grep $_, + opthash("screen", $form->{OP}{screen}, $locale->text('Screen')), + (scalar @{ $form->{printers} } && $latex_templates) ? + opthash("printer", $form->{OP}{printer}, $locale->text('Printer')) : undef, + ($latex_templates && !$options->{no_queue}) ? + opthash("queue", $form->{OP}{queue}, $locale->text('Queue')) : undef + if ($form->{media} ne 'email'); + + push @FORMAT, grep $_, + ($opendocument_templates && $openofficeorg_writer_bin && $xvfb_bin && (-x $openofficeorg_writer_bin) && (-x $xvfb_bin) + && !$options->{no_opendocument_pdf}) ? + opthash("opendocument_pdf", $form->{DF}{"opendocument_pdf"}, $locale->text("PDF (OpenDocument/OASIS)")) : undef, + ($latex_templates) ? + opthash("pdf", $form->{DF}{pdf}, $locale->text('PDF')) : undef, + ($latex_templates && !$options->{no_postscript}) ? + opthash("postscript", $form->{DF}{postscript}, $locale->text('Postscript')) : undef, + (!$options->{no_html}) ? + opthash("html", $form->{DF}{html}, "HTML") : undef, + ($opendocument_templates && !$options->{no_opendocument}) ? + opthash("opendocument", $form->{DF}{opendocument}, $locale->text("OpenDocument/OASIS")) : undef; + + push @LANGUAGE_ID, + map { opthash($_->{id}, ($_->{id} eq $form->{language_id} ? 'selected' : ''), $_->{description}) } +{}, @{ $form->{languages} } + if (ref $form->{languages} eq 'ARRAY'); + + push @PRINTER_ID, + map { opthash($_->{id}, ($_->{id} eq $form->{printer_id} ? 'selected' : ''), $_->{printer_description}) } +{}, @{ $form->{printers} } + if ((ref $form->{printers} eq 'ARRAY') && scalar @{ $form->{printers } }); + + @SELECTS = map { sname => lc $_, DATA => \@$_, show => !$options{"hide_" . lc($_)} && scalar @$_ }, qw(FORMNAME LANGUAGE_ID FORMAT SENDMODE MEDIA PRINTER_ID); + + my %dont_display_groupitems = ( + 'dunning' => 1, + ); - if ($form->{printed} =~ /$form->{formname}/) { - print qq| - -|; - } + %template_vars = ( + display_copies => scalar @{ $form->{printers} } && $latex_templates && $form->{media} ne 'email', + display_remove_draft => (!$form->{id} && $form->{draft_id}), + display_groupitems => !$dont_display_groupitems{$form->{type}}, + groupitems_checked => $form->{groupitems} ? "checked" : '', + remove_draft_checked => $form->{remove_draft} ? "checked" : '' + ); - if ($form->{emailed} =~ /$form->{formname}/) { - print qq| - -|; - } + my $print_options = $form->parse_html_template("generic/print_options", { SELECTS => \@SELECTS, %template_vars } ); - if ($form->{queued} =~ /$form->{formname}/) { - print qq| - -|; + if ($options{inline}) { + $lxdebug->leave_sub(); + return $print_options; } - print qq| - -
\|| . $locale->text('Printed') . qq|\|\|| . $locale->text('E-mailed') . qq|\|\|| . $locale->text('Queued') . qq|\|
-
-|; + print $print_options; $lxdebug->leave_sub(); } @@ -1695,6 +1077,12 @@ sub print_options { sub print { $lxdebug->enter_sub(); + if ($form->{print_nextsub}) { + call_sub($form->{print_nextsub}); + $lxdebug->leave_sub(); + return; + } + # if this goes to the printer pass through if ($form->{media} eq 'printer' || $form->{media} eq 'queue') { $form->error($locale->text('Select postscript or PDF!')) @@ -1747,7 +1135,7 @@ sub print_form { $inv = "ord"; $due = "req"; $form->{"${inv}date"} = $form->{transdate}; - $form->{label} = $locale->text('Sales Order'); + $form->{label} = $locale->text('Confirmation'); $numberfld = "sonumber"; $order = 1; } @@ -1755,8 +1143,7 @@ sub print_form { if (($form->{type} eq 'invoice') && ($form->{formname} eq 'proforma') ) { $inv = "inv"; $due = "due"; - $form->{"${inv}date"} = $form->{transdate}; - $form->{"invdate"} = $form->{transdate}; + $form->{"${inv}date"} = $form->{invdate}; $form->{label} = $locale->text('Proforma Invoice'); $numberfld = "sonumber"; $order = 0; @@ -1820,7 +1207,7 @@ sub print_form { $inv = "quo"; $due = "req"; $form->{"${inv}date"} = $form->{transdate}; - $form->{"invdate"} = $form->{transdate}; + $form->{"invdate"} = $form->{transdate}; $form->{label} = $locale->text('Proforma Invoice'); $numberfld = "sqnumber"; $order = 1; @@ -1830,7 +1217,7 @@ sub print_form { $inv = "quo"; $due = "req"; $form->{"${inv}date"} = $form->{transdate}; - $form->{label} = $locale->text('Quotation'); + $form->{label} = $locale->text('RFQ'); $numberfld = "rfqnumber"; $order = 1; } @@ -1838,7 +1225,9 @@ sub print_form { $form->isblank("email", $locale->text('E-mail address missing!')) if ($form->{media} eq 'email'); $form->isblank("${inv}date", - $locale->text($form->{label} . ' Date missing!')); + $locale->text($form->{label}) + . ": " + . $locale->text(' Date missing!')); # $locale->text('Invoice Number missing!') # $locale->text('Invoice Date missing!') @@ -1850,7 +1239,8 @@ sub print_form { # $locale->text('Quotation Date missing!') # assign number - if (!$form->{"${inv}number"} && !$form->{preview}) { + $form->{what_done} = $form->{formname}; + if (!$form->{"${inv}number"} && !$form->{preview} && !$form->{id}) { $form->{"${inv}number"} = $form->update_defaults(\%myconfig, $numberfld); if ($form->{media} ne 'email') { @@ -1862,7 +1252,14 @@ sub print_form { $form->{rowcount}--; - &{"$display_form"}; + call_sub($display_form); + # saving the history + if(!exists $form->{addition}) { + $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; + $form->{addition} = "PRINTED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history exit; } } @@ -1875,8 +1272,10 @@ sub print_form { $language_saved = $form->{language_id}; $payment_id_saved = $form->{payment_id}; + $salesman_id_saved = $form->{salesman_id}; + $cp_id_saved = $form->{cp_id}; - &{"$form->{vc}_details"}(); + call_sub("$form->{vc}_details"); $form->{language_id} = $language_saved; $form->{payment_id} = $payment_id_saved; @@ -1885,6 +1284,13 @@ sub print_form { $form->{"cc"} = $saved_cc if ($saved_cc); $form->{"bcc"} = $saved_bcc if ($saved_bcc); + if (!$cp_id_saved) { + # No contact was selected. Delete all contact variables because + # IS->customer_details() and IR->vendor_details() get the default + # contact anyway. + map({ delete($form->{$_}); } grep(/^cp_/, keys(%{ $form }))); + } + my ($language_tc, $output_numberformat, $output_dateformat, $output_longdates); if ($form->{"language_id"}) { ($language_tc, $output_numberformat, $output_dateformat, $output_longdates) = @@ -1896,7 +1302,6 @@ sub print_form { } ($form->{employee}) = split /--/, $form->{employee}; - ($form->{warehouse}, $form->{warehouse_id}) = split /--/, $form->{warehouse}; # create the form variables if ($order) { @@ -1905,6 +1310,8 @@ sub print_form { IS->invoice_details(\%myconfig, \%$form, $locale); } + $form->get_salesman(\%myconfig, $salesman_id_saved); + if ($form->{shipto_id}) { $form->get_shipto(\%myconfig); } @@ -1935,8 +1342,17 @@ sub print_form { $form->{templates} = "$myconfig{templates}"; + delete $form->{printer_command}; + $form->{language} = $form->get_template_language(\%myconfig); - $form->{printer_code} = $form->get_printer_code(\%myconfig); + + my $printer_code; + if ($form->{media} ne 'email') { + $printer_code = $form->get_printer_code(\%myconfig); + if ($printer_code ne "") { + $printer_code = "_" . $printer_code; + } + } if ($form->{language} ne "") { map({ $form->{"unit"}->[$_] = @@ -1964,26 +1380,25 @@ sub print_form { reformat_numbers($output_numberformat, 2, qw(invtotal ordtotal quototal subtotal linetotal listprice sellprice netprice discount - tax taxbase), + tax taxbase total paid), grep({ /^linetotal_\d+$/ || /^listprice_\d+$/ || /^sellprice_\d+$/ || /^netprice_\d+$/ || /^taxbase_\d+$/ || /^discount_\d+$/ || + /^paid_\d+$/ || + /^subtotal_\d+$/ || + /^total_\d+$/ || /^tax_\d+$/ } keys(%{$form}))); reformat_numbers($output_numberformat, undef, - qw(qty), + qw(qty price_factor), grep({ /^qty_\d+$/ } keys(%{$form}))); - if ($form->{printer_code} ne "") { - $form->{printer_code} = "_" . $form->{printer_code}; - } - - $form->{IN} = "$form->{formname}$form->{language}$form->{printer_code}.html"; + $form->{IN} = "$form->{formname}$form->{language}${printer_code}.html"; if ($form->{format} eq 'postscript') { $form->{postscript} = 1; $form->{IN} =~ s/html$/tex/; @@ -1999,6 +1414,8 @@ sub print_form { $form->{"IN"} =~ s/html$/odt/; } + delete $form->{OUT}; + if ($form->{media} eq 'printer') { $form->{OUT} = "| $form->{printer_command} &>/dev/null"; $form->{printed} .= " $form->{formname}"; @@ -2010,18 +1427,16 @@ sub print_form { $form->{subject} = qq|$form->{label} $form->{"${inv}number"}| unless $form->{subject}; - $form->{OUT} = "$sendmail"; - $form->{emailed} .= " $form->{formname}"; $form->{emailed} =~ s/^ //; } $emailed = $form->{emailed}; if ($form->{media} eq 'queue') { - %queued = split / /, $form->{queued}; + %queued = map { s|.*/|| } split / /, $form->{queued}; if ($filename = $queued{ $form->{formname} }) { - $form->{queued} =~ s/$form->{formname} $filename//; + $form->{queued} =~ s/\Q$form->{formname} $filename\E//; unlink "$spool/$filename"; $filename =~ s/\..*$//g; } else { @@ -2039,6 +1454,25 @@ sub print_form { } $queued = $form->{queued}; +# saving the history + if(!exists $form->{addition}) { + $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; + if($form->{media} =~ /printer/) { + $form->{addition} = "PRINTED"; + } + elsif($form->{media} =~ /email/) { + $form->{addition} = "MAILED"; + } + elsif($form->{media} =~ /queue/) { + $form->{addition} = "QUEUED"; + } + elsif($form->{media} =~ /screen/) { + $form->{addition} = "SCREENED"; + } + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history + $form->parse_template(\%myconfig, $userspath); $form->{callback} = ""; @@ -2054,6 +1488,8 @@ sub print_form { $form->update_status(\%myconfig) if ($form->{media} eq 'queue' && $form->{id}); + return $lxdebug->leave_sub() if ($old_form eq "return"); + if ($old_form) { $old_form->{"${inv}number"} = $form->{"${inv}number"}; @@ -2077,7 +1513,7 @@ sub print_form { } qw(paid exchangerate); } - &{"$display_form"}; + call_sub($display_form); exit; } @@ -2088,7 +1524,7 @@ sub print_form { $form->redirect(qq|$form->{label} $form->{"${inv}number"} $msg|); } if ($form->{printing}) { - &{"$display_form"}; + call_sub($display_form); exit; } @@ -2142,7 +1578,7 @@ sub ship_to { contact email phone fax)); # get details for name - &{"$form->{vc}_details"}(@addr_vars); + call_sub("$form->{vc}_details", @addr_vars); $number = ($form->{vc} eq 'customer') @@ -2164,85 +1600,86 @@ sub ship_to { print qq| -
{script}> + - +
- - + - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +
| +
| . $locale->text('Billing Address') . qq|| + | . $locale->text('Shipping Address') . qq|
$number$number $form->{"$form->{vc}number"}
| . $locale->text('Company Name') . qq|| . $locale->text('Company Name') . qq| $form->{name}
| . $locale->text('Department') . qq|| . $locale->text('Department') . qq| $form->{department_1}
   $form->{department_2}
| . $locale->text('Street') . qq|| . $locale->text('Street') . qq| $form->{street}
| . $locale->text('Zipcode') . qq|| . $locale->text('Zipcode') . qq| $form->{zipcode}
| . $locale->text('City') . qq|| . $locale->text('City') . qq| $form->{city}
| . $locale->text('Country') . qq|| . $locale->text('Country') . qq| $form->{country}
| . $locale->text('Contact') . qq|| . $locale->text('Contact') . qq| $form->{contact}
| . $locale->text('Phone') . qq|| . $locale->text('Phone') . qq| $form->{phone}
| . $locale->text('Fax') . qq|| . $locale->text('Fax') . qq| $form->{fax}
| . $locale->text('E-mail') . qq|| . $locale->text('E-mail') . qq| $form->{email}
+| . $cgi->hidden("-name" => "nextsub", "-value" => $nextsub); +; + - -|; # delete shipto map({ delete $form->{$_} } (@shipto_vars, qw(header))); @@ -2250,15 +1687,15 @@ sub ship_to { foreach $key (keys %$form) { $form->{$key} =~ s/\"/"/g; - print qq|\n|; + print qq|\n|; } print qq| -
+

-
@@ -2301,7 +1738,7 @@ sub new_license { map { $form->{$_} = $form->escape($form->{$_}, 1) } qw(partnumber description); $form->{callback} = - qq|$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&customer=$customer&partnumber=$form->{partnumber}&description=$form->{description}&previousform="$previousform"&initial=1|; + qq|$form->{script}?login=$form->{login}&password=$form->{password}&action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&customer=$customer&partnumber=$form->{partnumber}&description=$form->{description}&previousform="$previousform"&initial=1|; $form->redirect; $lxdebug->leave_sub(); @@ -2326,7 +1763,6 @@ sub relink_accounts { $lxdebug->leave_sub(); } - sub set_duedate { $lxdebug->enter_sub();