X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=aa5c24878991527bb49735068734463be2fd5b27;hb=0aea1ede8f4e69d7677f93944f74e29eb5ce7aa4;hp=c0b8856e60ccd2b4e8e7d07176ad8013fb63fcf0;hpb=94b6684903ced3d8b112830780ecde323795315f;p=kivitendo-erp.git diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index c0b8856e6..aa5c24878 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -33,19 +33,24 @@ # ####################################################################### +use CGI; +use CGI::Ajax; +use List::Util qw(max first); + +use SL::CVar; +use SL::Common; use SL::CT; use SL::IC; -use CGI::Ajax; -use CGI; +use SL::IO; -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; @@ -83,451 +88,279 @@ use SL::IS; use SL::PE; use SL::AM; use Data::Dumper; + +sub _check_io_auth { + $auth->assert('part_service_assembly_edit | vendor_invoice_edit | sales_order_edit | invoice_edit |' . + 'request_quotation_edit | sales_quotation_edit | purchase_order_edit | ' . + 'purchase_delivery_order_edit | sales_delivery_order_edit'); +} + ######################################## # Eintrag fuer Version 2.2.0 geaendert # # neue Optik im Rechnungsformular # ######################################## 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 ################## + _check_io_auth(); - 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 $numrows = shift; - push @column_index, qw(unit); + my ($readonly, $stock_in_out, $stock_in_out_title); - #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); - } + my $is_purchase = (first { $_ eq $form->{type} } qw(request_quotation purchase_order purchase_delivery_order)) || ($form->{script} eq 'ir.pl'); + my $show_min_order_qty = first { $_ eq $form->{type} } qw(request_quotation purchase_order); + my $is_delivery_order = $form->{type} =~ /_delivery_order$/; - push @column_index, qw(sellprice); + if ($is_delivery_order) { + $readonly = ' readonly' if ($form->{closed}); - if ($form->{vc} eq 'customer') { - push @column_index, qw(discount); + if ($form->{type} eq 'sales_delivery_order') { + $stock_in_out_title = $locale->text('Release From Stock'); + $stock_in_out = 'out'; + } else { + $stock_in_out_title = $locale->text('Transfer To Stock'); + $stock_in_out = 'in'; + } } - push @column_index, "linetotal"; + # 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 => 'price_factor', width => 5, value => $locale->text('Price Factor'), display => !$is_delivery_order, }, + { 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 => !$is_delivery_order, }, + { id => 'sellprice_pg', width => 15, value => $locale->text('Pricegroup'), display => ($form->{type} =~ /^sales_/) && !$is_delivery_order, }, + { id => 'discount', width => 5, value => $locale->text('Discount'), display => ($form->{vc} eq 'customer') && !$is_delivery_order, }, + { id => 'linetotal', width => 10, value => $locale->text('Extended'), display => !$is_delivery_order, }, + { id => 'bin', width => 10, value => $locale->text('Bin'), display => 0, }, + { id => 'stock_in_out', width => 10, value => $stock_in_out_title, display => $is_delivery_order, }, + ); + 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 %price_factors = map { $_->{id} => $_->{factor} } @{ $form->{ALL_PRICE_FACTORS} }; - my $colspan = $#column_index + 1; + my $colspan = scalar @column_index; $form->{invsubtotal} = 0; 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; - - print qq| - -|; + # 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 - $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'; - - if ($form->{type} =~ /_order$/ || $form->{type} =~ /_quotation$/) { - $deliverydate = $locale->text('Required by'); - $delvar = 'reqdate'; - } + # special alignings + my %align = map { $_ => 'right' } qw(qty ship right sellprice_pg discount linetotal stock_in_out); + my %nowrap = map { $_ => 1 } qw(description unit); + $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"; + + if (0 < scalar @{ $form->{ALL_PRICE_FACTORS} }) { + my @values = ('', map { $_->{id} } @{ $form->{ALL_PRICE_FACTORS} }); + my %labels = map { $_->{id} => $_->{description} } @{ $form->{ALL_PRICE_FACTORS} }; + + $column_data{price_factor} = + NTI($cgi->popup_menu('-name' => "price_factor_id_$i", + '-default' => $form->{"price_factor_id_$i"}, + '-values' => \@values, + '-labels' => \%labels, + '-style' => 'width:90px')); + } else { + $column_data{price_factor} = ' '; } - ($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); - - # convert " to " - map { $form->{"${_}_$i"} =~ s/\"/"/g } - qw(partnumber description unit unit_old); -######################################## - # Eintrag fuer Version 2.2.0 geaendert # - # neue Optik im Rechnungsformular # -######################################## - $column_data{runningnumber} = - qq||; # HuT -############## ENDE Neueintrag ################## + $column_data{"unit"} = AM->unit_select_html($local_units, "unit_$i", $this_unit, $form->{"id_$i"} ? $form->{"unit_$i"} : undef); +# / unit ending - $column_data{partnumber} = - qq||; + $form->{"sellprice_$i"} =~ /\.(\d+)/; + $decimalplaces = max 2, length $1; - 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 => $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{sellprice} = $cgi->textfield(-name => "sellprice_$i", -size => 10, -onBlur => "check_right_number_format(this)", -value => + $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces)); } - $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| - - |; + $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"}; - map { print "\n$column_data{$_}" } @column_index; + if ($is_delivery_order) { + $column_data{stock_in_out} = (!$form->{"assembly_$i"} && $form->{"inventory_accno_$i"}) ? calculate_stock_in_out($i) : ' '; + } - 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"}> - - - - - - - - + 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 $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"}; -######################################## - # Eintrag fuer Version 2.2.0 geaendert # - # neue Optik im Rechnungsformular # -######################################## + map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, 2) } qw(marge_absolut marge_percent); - my $row_style_attr = - 'style="display:none;"' if (!$form->{"show_details"}); + 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_/ && !$is_delivery_order; +# / marge calculations ending - # print second row - print qq| - - - -|; + push @hidden_vars, qw(partunit) if ($is_purchase); -############## ENDE Neueintrag ################## + 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), @hidden_vars) + ); - 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, error => $form->{"row_error_$i"}, }; } - 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|>" . - 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 |; - } + my @hidden_vars; - print qq|$projectnumber | . - NTI($cgi->popup_menu('-name' => "project_id_$i", - '-values' => \@projectnumber_values, - '-labels' => \%projectnumber_labels, - '-default' => $form->{"project_id_$i"})); - - 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}  -|; + if ($is_delivery_order) { + map { $form->{"${_}_${i}"} = $form->format_amount(\%myconfig, $form->{"${_}_${i}"}) } qw(sellprice discount); + push @hidden_vars, qw(sellprice discount price_factor_id); + push @hidden_vars, "stock_${stock_in_out}_sum_qty", "stock_${stock_in_out}"; } - 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(); } @@ -537,43 +370,22 @@ sub display_row { sub set_pricegroup { $lxdebug->enter_sub(); + + _check_io_auth(); + 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(); @@ -581,19 +393,22 @@ sub set_pricegroup { sub select_item { $lxdebug->enter_sub(); + + _check_io_auth(); + @column_index = qw(ndx partnumber description onhand unit sellprice); $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; @@ -601,16 +416,16 @@ sub select_item { $colspan = $#column_index + 1; print qq| - + -
{script}> + - +
- + - |; + |; map { print "\n$column_data{$_}" } @column_index; @@ -627,28 +442,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} = @@ -660,41 +476,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|
- + |; @@ -703,15 +501,16 @@ sub select_item { # save all other form variables foreach $key (keys %${form}) { + next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key})); $form->{$key} =~ s/\"/"/g; - print qq|\n|; + print qq|\n|; } print qq| - +
-
@@ -725,6 +524,8 @@ sub select_item { sub item_selected { $lxdebug->enter_sub(); + _check_io_auth(); + # replace the last row with the checked row $i = $form->{rowcount}; $i = $form->{assembly_rows} if ($form->{item} eq 'assembly'); @@ -739,10 +540,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"} } + 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); + 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"}; } @@ -792,8 +599,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); @@ -818,198 +624,49 @@ sub item_selected { sub new_item { $lxdebug->enter_sub(); + _check_io_auth(); + # 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|

+ $form->{callback} = $form->escape("$form->{script}?action=display_form", 1); -
+ # save all form variables except action in a previousform variable + my $previousform = join '&', map { $form->{$_} =~ s/&/%26/; "$_=$form->{$_}" } grep { !/action/ } keys %$form; -

+ push @HIDDENS, { 'name' => 'previousform', 'value' => $form->escape($previousform, 1) }; + push @HIDDENS, map +{ 'name' => $_, 'value' => $form->{$_} }, qw(rowcount vc); + push @HIDDENS, map +{ 'name' => $_, 'value' => $form->{"${_}_$form->{rowcount}"} }, qw(partnumber description unit sellprice); + push @HIDDENS, { 'name' => 'taxaccount2', 'value' => $form->{taxaccounts} }; -  | - . $locale->text('Part') . qq|
-  | - . $locale->text('Service') - - . qq| - - - -{rowcount}> -{taxaccounts}> -{vc}> - -{path}> -{login}> -{password}> - - - -

- -

- - - -|; + $form->header(); + print $form->parse_html_template("generic/new_item", { HIDDENS => [ sort { $a->{name} cmp $b->{name} } @HIDDENS ] } ); $lxdebug->leave_sub(); } -sub display_form { +sub check_form { $lxdebug->enter_sub(); - relink_accounts(); - - my $new_rowcount = $form->{"rowcount"} * 1 + 1; - $form->{"project_id_${new_rowcount}"} = $form->{"globalproject_id"}; - - $form->language_payment(\%myconfig); - - # if we have a display_form - if ($form->{display_form}) { - &{"$form->{display_form}"}; - exit; - } - - Common::webdav_folder($form) if ($webdav); - - # 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); - - $numrows = ++$form->{assembly_rows}; - $subroutine = "assembly_row"; - } - if ($form->{item} eq 'service') { - $numrows = $form->{price_rows}; - $subroutine = "price_row"; - - &{$subroutine}($numrows); - - $numrows = 0; - } - - # create rows - &{$subroutine}($numrows) if $numrows; - - &form_footer; - - $lxdebug->leave_sub(); -} + _check_io_auth(); -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 + stock_out stock_in); # remove any makes or model rows if ($form->{item} eq 'part') { map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(listprice sellprice lastcost weight rop); - @flds = (make, model); - for my $i (1 .. ($form->{makemodel_rows})) { - if (($form->{"make_$i"} ne "") || ($form->{"model_$i"} ne "")) { - push @a, {}; - my $j = $#a; - - map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds; - $count++; - } - } - - $form->redo_rows(\@flds, \@a, $count, $form->{makemodel_rows}); - $form->{makemodel_rows} = $count; - } elsif ($form->{item} eq 'assembly') { $form->{sellprice} = 0; @@ -1042,22 +699,8 @@ sub check_form { $form->redo_rows(\@flds, \@a, $count, $form->{assembly_rows}); $form->{assembly_rows} = $count; - $count = 0; - @flds = qw(make model); - @a = (); - - for my $i (1 .. ($form->{makemodel_rows})) { - if (($form->{"make_$i"} ne "") || ($form->{"model_$i"} ne "")) { - push @a, {}; - my $j = $#a; - - map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds; - $count++; - } - } - - $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 { @@ -1111,6 +754,8 @@ sub check_form { sub invoicetotal { $lxdebug->enter_sub(); + _check_io_auth(); + $form->{oldinvtotal} = 0; # add all parts and deduct paid @@ -1149,6 +794,8 @@ sub invoicetotal { sub validate_items { $lxdebug->enter_sub(); + _check_io_auth(); + # check if items are valid if ($form->{rowcount} == 1) { &update; @@ -1165,11 +812,17 @@ sub validate_items { sub order { $lxdebug->enter_sub(); + + _check_io_auth(); + if ($form->{second_run}) { $form->{print_and_post} = 0; } $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'); @@ -1191,7 +844,7 @@ 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$||; @@ -1229,6 +882,9 @@ sub order { sub quotation { $lxdebug->enter_sub(); + + _check_io_auth(); + if ($form->{second_run}) { $form->{print_and_post} = 0; } @@ -1255,7 +911,7 @@ sub quotation { $form->{rowcount}--; - require "$form->{path}/$form->{script}"; + require "bin/mozilla/$form->{script}"; map { $form->{"select$_"} = "" } ($form->{vc}, currency); @@ -1293,170 +949,42 @@ sub request_for_quotation { sub edit_e_mail { $lxdebug->enter_sub(); + + _check_io_auth(); + 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 (grep({ $form->{"type"} eq $_ } qw(invoice credit_note))) { - $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 login password); + @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(); } @@ -1464,12 +992,17 @@ sub edit_e_mail { sub send_email { $lxdebug->enter_sub(); - $old_form = new Form; + _check_io_auth(); - map { $old_form->{$_} = $form->{$_} } keys %$form; - $old_form->{media} = $form->{oldmedia}; + my $callback = $form->{script} . "?action=edit"; + map({ $callback .= "\&${_}=" . E($form->{$_}); } qw(type id)); - &print_form($old_form); + print_form("return"); + + Common->save_email_status(\%myconfig, $form); + + $form->{callback} = $callback; + $form->redirect(); $lxdebug->leave_sub(); } @@ -1484,17 +1017,23 @@ sub send_email { # # the inline options is untested, but intended to be used later in metatemplating sub print_options { - $lxdebug->enter_sub() and my ($inline) = @_; + $lxdebug->enter_sub(); + + _check_io_auth(); + + my %options = @_; # 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) = (); # 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} = $form->{printer_id} || $myconfig{default_printer_id} || ""; + $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"; @@ -1503,84 +1042,105 @@ sub print_options { 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')) + 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, + 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')) + opthash("sales_order", $form->{PD}{sales_order}, $locale->text('Confirmation')), + opthash("proforma", $form->{PD}{proforma}, $locale->text('Proforma Invoice')), ) : undef, - ($form->{type} =~ /_quotation$/) ? - opthash("$`_quotation", $form->{PD}{"$`_quotation"}, $locale->text('Quotation')) : undef, + ($form->{type} =~ /sales_quotation$/) ? + opthash('sales_quotation', $form->{PD}{sales_quotation}, $locale->text('Quotation')) : undef, + ($form->{type} =~ /request_quotation$/) ? + opthash('request_quotation', $form->{PD}{request_quotation}, $locale->text('Request for 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')) + opthash("invoice", $form->{PD}{invoice}, $locale->text('Invoice')), + opthash("proforma", $form->{PD}{proforma}, $locale->text('Proforma Invoice')), ) : undef, ($form->{type} eq 'invoice' && $form->{storno}) ? ( - opthash("storno_invoice", $form->{PD}{storno_invoice}, $locale->text('Storno Invoice')), + 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} =~ /_delivery_order$/) ? ( + opthash($form->{type}, $form->{PD}{$form->{type}}, $locale->text('Delivery Order')), + opthash('pick_list', $form->{PD}{pick_list}, $locale->text('Pick List')), + ) : undef; ($form->{type} eq 'credit_note') ? - opthash("credit_note", $form->{PD}{credit_note}, $locale->text('Credit Note')) : undef; + 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')) + 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 keys %{ $form->{printers} } && $latex_templates) ? - opthash("printer", $form->{OP}{printer}, $locale->text('Printer')) : undef, - ($latex_templates) ? - opthash("queue", $form->{OP}{queue}, $locale->text('Queue')) : undef + 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)) ? - opthash("opendocument_pdf", $form->{DF}{"opendocument_pdf"}, $locale->text("PDF (OpenDocument/OASIS)")) : undef, - ($latex_templates) ? ( - opthash("pdf", $form->{DF}{pdf}, $locale->text('PDF')), - opthash("postscript", $form->{DF}{postscript}, $locale->text('Postscript')) - ) : undef, - opthash("html", $form->{DF}{html}, "HTML"), - ($opendocument_templates) ? - opthash("opendocument", $form->{DF}{opendocument}, $locale->text("OpenDocument/OASIS")) : undef; + ($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} ? 'selected' : ''), $_->{description}) } +{}, @{ $form->{languages} } + 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' : ''), $_->{description}) } +{}, @{ $form->{printers} } - if (ref $form->{printers} eq 'ARRAY'); + 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); - @SELECTS = map { sname => lc $_, DATA => \@$_, show => scalar @$_ }, qw(FORMNAME LANGUAGE_ID FORMAT SENDMODE MEDIA PRINTER_ID); + my %dont_display_groupitems = ( + 'dunning' => 1, + ); %template_vars = ( - display_copies => scalar keys %{ $form->{printers} } && $latex_templates && $form->{media} ne 'email', + 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" : '' ); my $print_options = $form->parse_html_template("generic/print_options", { SELECTS => \@SELECTS, %template_vars } ); - if ($inline) { - $lxdebug->leave_sub() and return $print_options; - } else { - print $print_options; $lxdebug->leave_sub(); + if ($options{inline}) { + $lxdebug->leave_sub(); + return $print_options; } + + print $print_options; + + $lxdebug->leave_sub(); } sub print { $lxdebug->enter_sub(); + _check_io_auth(); + + 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!')) @@ -1609,6 +1169,9 @@ sub print { sub print_form { $lxdebug->enter_sub(); + + _check_io_auth(); + my ($old_form) = @_; $inv = "inv"; @@ -1633,7 +1196,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; } @@ -1669,14 +1232,6 @@ sub print_form { # set invnumber for template packing_list $form->{invnumber} = $form->{ordnumber}; } - if ($form->{formname} eq 'pick_list') { - $inv = "ord"; - $due = "req"; - $form->{"${inv}date"} = - ($form->{transdate}) ? $form->{transdate} : $form->{invdate}; - $form->{label} = $locale->text('Pick List'); - $order = 1 unless $form->{type} eq 'invoice'; - } if ($form->{formname} eq 'purchase_order') { $inv = "ord"; $due = "req"; @@ -1715,11 +1270,19 @@ 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; } + if ($form->{type} =~ /_delivery_order$/) { + undef $due; + $inv = "do"; + $form->{"${inv}date"} = $form->{transdate}; + $numberfld = $form->{type} =~ /^sales/ ? 'sdonumber' : 'pdonumber'; + $form->{label} = $form->{formname} eq 'pick_list' ? $locale->text('Pick List') : $locale->text('Delivery Order'); + } + $form->isblank("email", $locale->text('E-mail address missing!')) if ($form->{media} eq 'email'); $form->isblank("${inv}date", @@ -1750,9 +1313,10 @@ 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)); } @@ -1770,8 +1334,9 @@ 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") if ($form->{vc}); $form->{language_id} = $language_saved; $form->{payment_id} = $payment_id_saved; @@ -1780,6 +1345,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) = @@ -1793,7 +1365,9 @@ sub print_form { ($form->{employee}) = split /--/, $form->{employee}; # create the form variables - if ($order) { + if ($form->{type} =~ /_delivery_order$/) { + DO->order_details(); + } elsif ($order) { OE->order_details(\%myconfig, \%$form); } else { IS->invoice_details(\%myconfig, \%$form, $locale); @@ -1831,8 +1405,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"}->[$_] = @@ -1860,26 +1443,35 @@ 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}; + my ($cvar_date_fields, $cvar_number_fields) = CVar->get_field_format_list('module' => 'CT', 'prefix' => 'vc_'); + + if (scalar @{ $cvar_date_fields }) { + format_dates($output_dateformat, $output_longdates, @{ $cvar_date_fields }); + } + + while (my ($precision, $field_list) = each %{ $cvar_number_fields }) { + reformat_numbers($output_numberformat, $precision, @{ $field_list }); } - $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/; @@ -1895,6 +1487,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}"; @@ -1906,18 +1500,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 { @@ -1937,6 +1529,7 @@ sub print_form { # saving the history if(!exists $form->{addition}) { + $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; if($form->{media} =~ /printer/) { $form->{addition} = "PRINTED"; } @@ -1968,6 +1561,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"}; @@ -1991,7 +1586,7 @@ sub print_form { } qw(paid exchangerate); } - &{"$display_form"}; + call_sub($display_form); exit; } @@ -2002,7 +1597,7 @@ sub print_form { $form->redirect(qq|$form->{label} $form->{"${inv}number"} $msg|); } if ($form->{printing}) { - &{"$display_form"}; + call_sub($display_form); exit; } @@ -2011,7 +1606,9 @@ sub print_form { sub customer_details { $lxdebug->enter_sub(); + IS->customer_details(\%myconfig, \%$form, @_); + $lxdebug->leave_sub(); } @@ -2026,6 +1623,8 @@ sub vendor_details { sub post_as_new { $lxdebug->enter_sub(); + _check_io_auth(); + $form->{postasnew} = 1; map { delete $form->{$_} } qw(printed emailed queued); @@ -2036,6 +1635,9 @@ sub post_as_new { sub ship_to { $lxdebug->enter_sub(); + + _check_io_auth(); + if ($form->{second_run}) { $form->{print_and_post} = 0; } @@ -2056,7 +1658,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') @@ -2078,101 +1680,103 @@ 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))); $form->{title} = $title; foreach $key (keys %$form) { + next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key})); $form->{$key} =~ s/\"/"/g; - print qq|\n|; + print qq|\n|; } print qq| -
+

-
@@ -2186,6 +1790,8 @@ sub ship_to { sub new_license { $lxdebug->enter_sub(); + _check_io_auth(); + my $row = shift; # change callback @@ -2201,6 +1807,7 @@ sub new_license { # save all other form variables in a previousform variable $form->{row} = $row; foreach $key (keys %$form) { + next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key})); # escape ampersands $form->{$key} =~ s/&/%26/g; @@ -2215,7 +1822,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}?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(); @@ -2224,6 +1831,8 @@ sub new_license { sub relink_accounts { $lxdebug->enter_sub(); + _check_io_auth(); + $form->{"taxaccounts"} =~ s/\s*$//; $form->{"taxaccounts"} =~ s/^\s*//; foreach my $accno (split(/\s*/, $form->{"taxaccounts"})) { @@ -2243,13 +1852,12 @@ sub relink_accounts { sub set_duedate { $lxdebug->enter_sub(); + _check_io_auth(); + $form->get_duedate(\%myconfig); - my $q = new CGI; - $result = "$form->{duedate}"; - print $q->header(); - print $result; - $lxdebug->leave_sub(); + print $cgi->header() . $form->{duedate}; + $lxdebug->leave_sub(); }