X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=c1d9ca5d7ea5cb7b9ef09d5c5460369f1d1298b7;hb=d18df453f55190d4807af324725ea82a8835d7fc;hp=5cd38cd81282c53cd9c1a68cc6ec4bfe5bee242c;hpb=8235eb9367a551682031878a52aefae16f1987af;p=kivitendo-erp.git diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index 5cd38cd81..af69e4488 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -4,7 +4,10 @@ # Based on SQL-Ledger Version 2.1.9 # Web http://www.lx-office.org ############################################################################# -# Veraendert 2005-01-05 - Marco Welter - Neue Optik # +# Changelog: Wann - Wer - Was +# Veraendert 2005-01-05 - Marco Welter - Neue Optik +# 08.11.2008 - information@richardson-bueren.de jb - Backport von Revision 7339 xplace - E-Mail-Vorlage automatisch auswählen +# 02.02.2009 - information@richardson-bueren.de jb - Backport von Revision 8535 xplace - Erweiterung der Waren bei Lieferantenauftrag um den Eintrag Mindestlagerbestand. Offen: Auswahlliste auf Lieferantenaufträge einschränken -> Erledigt 2.2.09 Prüfung wie das Skript heisst (oe.pl) -> das ist nur die halbe Miete, nochmal mb fragen -> mb gefragt und es gibt die variable is_purchase ############################################################################# # SQL-Ledger, Accounting # Copyright (c) 1998-2002 @@ -33,12 +36,26 @@ # ####################################################################### +use CGI; +use CGI::Ajax; +use List::Util qw(min max first); + +use SL::CVar; +use SL::Common; +use SL::CT; +use SL::IC; +use SL::IO; + +require "bin/mozilla/common.pl"; + +use strict; + # 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; @@ -74,469 +91,452 @@ if (-f "$form->{path}/$form->{login}_io.pl") { # $locale->text('Dec') use SL::IS; use SL::PE; +use SL::AM; use Data::Dumper; + +sub _check_io_auth { + $main::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(); + $main::lxdebug->enter_sub(); + + _check_io_auth(); + + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; + my $cgi = $main::cgi; + 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); + + my ($readonly, $stock_in_out, $stock_in_out_title); + + 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$/; + my $is_s_p_order = (first { $_ eq $form->{type} } qw(sales_order purchase_order)); + + if ($is_delivery_order) { + $readonly = ' readonly' if ($form->{closed}); + + if ($form->{type} eq 'sales_delivery_order') { + $stock_in_out_title = $locale->text('Release From Stock'); + $stock_in_out = 'out'; } 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); + $stock_in_out_title = $locale->text('Transfer To Stock'); + $stock_in_out = 'in'; } - } -############## ENDE Neueintrag ################## - - push @column_index, qw(unit); - #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_drag); - } + retrieve_partunits(); + } + + # 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 => 8, value => $locale->text('Number'), display => 1, }, + { id => 'description', width => 30, value => $locale->text('Part Description'), display => 1, }, + { id => 'ship', width => 5, value => $locale->text('Delivered'), display => $is_s_p_order, }, + { 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 => 8, value => $locale->text('Pricegroup'), display => !$is_delivery_order && !$is_purchase, }, + { id => 'discount', width => 5, value => $locale->text('Discount'), display => !$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; - push @column_index, qw(sellprice); - if ($form->{vc} eq 'customer') { - push @column_index, qw(discount); - } + # cache units + my $all_units = AM->retrieve_units(\%myconfig, $form); - push @column_index, "linetotal"; + 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}); + 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||; - $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_drag} = - 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 ################## + # 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| - - - - |; + # translations, unused commented out +# $runningnumber = $locale->text('No.'); +# my $deliverydate = $locale->text('Delivery Date'); + my $serialnumber = $locale->text('Serial No.'); + my $projectnumber = $locale->text('Project'); +# $partsgroup = $locale->text('Group'); + my $reqdate = $locale->text('Reqdate'); + my $deliverydate = $locale->text('Required by'); - map { print "\n$column_data{$_}" } @column_index; + # special alignings + my %align = map { $_ => 'right' } qw(qty ship right sellprice_pg discount linetotal stock_in_out); + my %nowrap = map { $_ => 1 } qw(description unit); - print qq| - -|; + $form->{marge_total} = 0; + $form->{sellprice_total} = 0; + $form->{lastcost_total} = 0; + my %projectnumber_labels = (); + my @projectnumber_values = (""); - $runningnumber = $locale->text('No.'); - $deliverydate = $locale->text('Delivery Date'); - $serialnumber = $locale->text('Serial No.'); - $projectnumber = $locale->text('Project'); - $partsgroup = $locale->text('Group'); + foreach my $item (@{ $form->{"ALL_PROJECTS"} }) { + push(@projectnumber_values, $item->{"id"}); + $projectnumber_labels{$item->{"id"}} = $item->{"projectnumber"}; + } - $delvar = 'deliverydate'; + _update_part_information(); + _update_ship() if ($is_s_p_order); + _update_custom_variables(); - if ($form->{type} =~ /_order$/ || $form->{type} =~ /_quotation$/) { - $deliverydate = $locale->text('Required by'); - $delvar = 'reqdate'; - } + # rows - for $i (1 .. $numrows) { + my @ROWS; + for my $i (1 .. $numrows) { + my %column_data = (); # undo formatting - map { - $form->{"${_}_$i"} = - $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) - } qw(qty ship discount sellprice price_new price_old); + map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } + qw(qty discount sellprice lastcost price_new price_old) + unless ($form->{simple_save}); - ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/); - $dec = length $dec; - $decimalplaces = ($dec > 2) ? $dec : 2; +# unit begin + $form->{"unit_old_$i"} ||= $form->{"unit_$i"}; + $form->{"selected_unit_$i"} ||= $form->{"unit_$i"}; - $discount = - $form->round_amount( - $form->{"sellprice_$i"} * $form->{"discount_$i"} / 100, - $decimalplaces); + if ( !$all_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"})) { + $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); + + 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} = ' '; + } - $linetotal = - $form->round_amount($form->{"sellprice_$i"} - $discount, $decimalplaces); - $linetotal = $form->round_amount($linetotal * $form->{"qty_$i"}, 2); + $column_data{"unit"} = AM->unit_select_html($all_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); + my $decimalplaces = ($form->{"sellprice_$i"} =~ /\.(\d+)/) ? max 2, length $1 : 2; -######################################## - # Eintrag fuer Version 2.2.0 geaendert # - # neue Optik im Rechnungsformular # -######################################## - $column_data{runningnumber} = - qq||; # HuT -############## ENDE Neueintrag ################## + my $price_factor = $price_factors{$form->{"price_factor_id_$i"}} || 1; + my $discount = $form->round_amount($form->{"qty_$i"} * $form->{"sellprice_$i"} * $form->{"discount_$i"} / 100 / $price_factor, 2); + my $linetotal = $form->round_amount($form->{"qty_$i"} * $form->{"sellprice_$i"} * (100 - $form->{"discount_$i"}) / 100 / $price_factor, 2); + my $rows = $form->numtextrows($form->{"description_$i"}, 30, 6); - $column_data{partnumber} = - 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 > 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->{"description_$i"})) + . $cgi->button(-value => $locale->text('L'), -onClick => "set_longdescription_window('longdescription_$i')"); - if (($rows = $form->numtextrows($form->{"description_$i"}, 30, 6)) > 1) { - $column_data{description} = - qq||; - } else { - $column_data{description} = - qq||; - } + my $qty_dec = ($form->{"qty_$i"} =~ /\.(\d+)/) ? length $1 : 2; - (my $qty_dec) = ($form->{"qty_$i"} =~ /\.(\d+)/); - $qty_dec = length $qty_dec; - - $column_data{qty} = - qq||; - $column_data{ship} = - qq||; - $column_data{unit} = - qq||; + $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"}; - # build in dragdrop for pricesgroups - if ($form->{"prices_$i"}) { - $price_tmp = - $form->format_amount(\%myconfig, $form->{"price_new_$i"}, 2); + $column_data{ship} = ''; + if ($form->{"id_$i"}) { + my $ship_qty = $form->{"ship_$i"} * 1; + $ship_qty *= $all_units->{$form->{"partunit_$i"}}->{factor}; + $ship_qty /= ( $all_units->{$form->{"unit_$i"}}->{factor} || 1 ); - $column_data{sellprice_drag} = - qq||; - $column_data{sellprice} = - qq||; - } else { + $column_data{ship} = $form->format_amount(\%myconfig, $form->round_amount($ship_qty, 2) * 1) . ' ' . $form->{"unit_$i"}; + } + # build in drop down list for pricesgroups + if ($form->{"prices_$i"}) { + $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 dragdrop from report menu + # set pricegroup drop down list from report menu if ($form->{"sellprice_$i"} != 0) { - $prices = - qq|\n|; - + # remember the pricegroup_id in pricegroup_old + # but don't overwrite it $form->{"pricegroup_old_$i"} = $form->{"pricegroup_id_$i"}; - - $column_data{sellprice_drag} = - qq||; - + my $default_option = $form->{"sellprice_$i"}.'--'.$form->{"pricegroup_id_$i"}; + $column_data{sellprice_pg} = NTI($cgi->popup_menu("sellprice_pg_$i", [ $default_option ], $default_option, { $default_option => $form->{"pricegroup_$i"} || '' })); } else { - - # for last row - $column_data{sellprice_drag} = - qq||; + $column_data{sellprice_pg} = 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{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 ################## + $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"}; - print qq| - |; - - map { print "\n$column_data{$_}" } @column_index; + if ($is_delivery_order) { + $column_data{stock_in_out} = calculate_stock_in_out($i); + } - print qq| - + 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/ || $form->{type} =~ /invoice/); + push @ROW2, { value => sprintf qq|%s |, + $locale->text('Subtotal'), $form->{"subtotal_$i"} ? 'checked' : '' }; + +# begin marge calculations + $form->{"lastcost_$i"} *= 1; + $form->{"marge_percent_$i"} = 0; + + my $marge_color; + my $real_sellprice = $linetotal; + my $real_lastcost = $form->{"lastcost_$i"} * $form->{"qty_$i"} / ( $form->{"marge_price_factor_$i"} || 1 ); + my $marge_percent_warn = $myconfig{marge_percent_warn} * 1 || 15; + my $marge_adjust_credit_note = $form->{type} eq 'credit_note' ? -1 : 1; + + if ($real_sellprice * 1 && ($form->{"qty_$i"} * 1)) { + $form->{"marge_percent_$i"} = ($real_sellprice - $real_lastcost) * 100 / $real_sellprice; + $marge_color = 'color="#ff0000"' if $form->{"id_$i"} && $form->{"marge_percent_$i"} < $marge_percent_warn; + } -{"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"}> - - - - - - + $form->{"marge_absolut_$i"} = ($real_sellprice - $real_lastcost) * $marge_adjust_credit_note; + $form->{"marge_total"} += $form->{"marge_absolut_$i"}; + $form->{"lastcost_total"} += $real_lastcost; + $form->{"sellprice_total"} += $real_sellprice; + + 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|, + $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_/ || $form->{type} =~ /invoice/) && !$is_delivery_order; +# / marge calculations ending + +# calculate onhand + if ($form->{"id_$i"}) { + my $part = IC->get_basic_part_info(id => $form->{"id_$i"}); + my $onhand_color = 'color="#ff0000"' if $part->{onhand} < $part->{rop}; + push @ROW2, { value => sprintf "%s%s %s", + $locale->text('On Hand'), + $onhand_color, + $form->format_amount(\%myconfig, $part->{onhand}, 2), + $part->{unit} + }; + } +# / calculate onhand -|; + my @hidden_vars; -######################################## - # Eintrag fuer Version 2.2.0 geaendert # - # neue Optik im Rechnungsformular # -######################################## - # print second row - print qq| - - - + 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), @hidden_vars) + ); -|; + map { $form->{"${_}_base"} += $linetotal } (split(/ /, $form->{"taxaccounts_$i"})); -############## ENDE Neueintrag ################## + $form->{invsubtotal} += $linetotal; - map { $form->{"${_}_base"} += $linetotal } - (split / /, $form->{"taxaccounts_$i"}); + # Benutzerdefinierte Variablen für Waren/Dienstleistungen/Erzeugnisse + _render_custom_variables_inputs(ROW2 => \@ROW2, row => $i, part_id => $form->{"id_$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|>format_amount(\%myconfig, $form->{"ship_$i"}) - . qq|>format_amount(\%myconfig, $form->{"prices_$i"}, - $decimalplaces) - . qq|>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 |; + if ($is_delivery_order) { + map { $form->{"${_}_${i}"} = $form->format_amount(\%myconfig, $form->{"${_}_${i}"}) } qw(sellprice discount lastcost); + push @hidden_vars, qw(sellprice discount price_factor_id lastcost); + push @hidden_vars, "stock_${stock_in_out}_sum_qty", "stock_${stock_in_out}"; } - print qq| - $projectnumber  - - -
- - -|; + 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(); + $main::lxdebug->leave_sub(); } ################################################## # build html-code for pricegroups in variable $form->{prices_$j} sub set_pricegroup { + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my $locale = $main::locale; + my $cgi = $main::cgi; + + _check_io_auth(); + my $rowcount = shift; - $lxdebug->enter_sub(); - 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 dragdrop 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"}; - } - if ($len > 1) { - $form->{"prices_$j"} = $prices; - } - } + for my $j (1 .. $rowcount) { + 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 my $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(); + $main::lxdebug->leave_sub(); } sub select_item { - $lxdebug->enter_sub(); - @column_index = qw(ndx partnumber description onhand sellprice); + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; + my $cgi = $main::cgi; + +# diese variable kommt schon in der methode display_row vor, kann man die besser wiederverwenden? @mb fragen. ich check das jetzt erstmal so ein + my $is_purchase = (first { $_ eq $form->{type} } qw(request_quotation purchase_order purchase_delivery_order)) || ($form->{script} eq 'ir.pl'); + _check_io_auth(); + my @column_index = qw(ndx partnumber description rop onhand unit sellprice); + my %column_data; $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||; + if ($is_purchase){ + $column_data{rop} = + qq|| . $locale->text('ROP') . qq||; + }# ende if $is_purchase -> Überschrift Mindestlagerbestand - ähnliche Prüfung weiter unten $column_data{onhand} = - qq|| . $locale->text('Qty') . qq||; - + qq|| . $locale->text('Qty') . qq||; + $column_data{unit} = + qq|| . $locale->text('Unit') . qq||; # list items with radio button on a form $form->header; - $title = $locale->text('Select from one of the items below'); - $colspan = $#column_index + 1; + my $title = $locale->text('Select from one of the items below'); + my $colspan = $#column_index + 1; print qq| - + -
{script}> + - +
- + - |; + |; map { print "\n$column_data{$_}" } @column_index; 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 $::lx_office_conf{system}->{lizenzen}; + push @new_fields, grep { m/^ic_cvar_/ } keys %{ $form->{item_list}->[0] }; + my $i = 0; - foreach $ref (@{ $form->{item_list} }) { - $checked = ($i++) ? "" : "checked"; + my $j; + foreach my $ref (@{ $form->{item_list} }) { + my $checked = ($i++) ? "" : "checked"; - if ($lizenzen) { + if ($::lx_office_conf{system}->{lizenzen}) { if ($ref->{inventory_accno} > 0) { $ref->{"lizenzen"} = qq||; - foreach $item (@{ $form->{LIZENZEN}{ $ref->{"id"} } }) { + foreach my $item (@{ $form->{LIZENZEN}{ $ref->{"id"} } }) { $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||; - + if ($is_purchase){ + $column_data{rop} = + qq||; + }# ende if $is_purchase -> Falls der Aufruf über eine Einkaufsmaske kam, handelt es sich um einen Lieferantenauftrag und uns interessiert auch die Mindestbestandsmenge + $column_data{unit} = + qq||; $j++; $j %= 2; print qq| @@ -544,36 +544,17 @@ sub select_item { map { print "\n$column_data{$_}" } @column_index; - print qq| - - - -{listprice}> -{inventory_accno}> -{income_accno}> -{expense_accno}> - - - - - - -{id}> - -|; - if ($lizenzen) { - print qq| - -|; - } + print("\n"); + 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|| + . $form->format_amount(\%myconfig, $ref->{rop}, '', " ") + . qq|$ref->{unit}
- + |; @@ -581,16 +562,17 @@ sub select_item { map { delete $form->{$_} } qw(action item_list header); # save all other form variables - foreach $key (keys %${form}) { + foreach my $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| - +
-
@@ -598,36 +580,55 @@ sub select_item { |; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub item_selected { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my %myconfig = %main::myconfig; + + _check_io_auth(); # replace the last row with the checked row - $i = $form->{rowcount}; + my $i = $form->{rowcount}; $i = $form->{assembly_rows} if ($form->{item} eq 'assembly'); # index for new item - $j = $form->{ndx}; + my $j = $form->{ndx}; #sk #($form->{"sellprice_$i"},$form->{"$pricegroup_old_$i"}) = split /--/, $form->{"sellprice_$i"}; #$form->{"sellprice_$i"} = $form->{"sellprice_$i"}; # if there was a price entered, override it - $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"}); + my $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"}); + + 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); + + my $ic_cvar_configs = CVar->get_configs(module => 'IC'); + push @new_fields, map { "ic_cvar_$_->{name}" } @{ $ic_cvar_configs }; - map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} } - qw(id partnumber description sellprice listprice inventory_accno income_accno expense_accno bin unit weight assembly taxaccounts partsgroup); + map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} } @new_fields; - if ($lizenzen) { + $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"}; + } + + if ($::lx_office_conf{system}->{lizenzen}) { map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} } qw(lizenzen); } - ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/); + my ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/); $dec = length $dec; - $decimalplaces = ($dec > 2) ? $dec : 2; + my $decimalplaces = ($dec > 2) ? $dec : 2; if ($sellprice) { $form->{"sellprice_$i"} = $sellprice; @@ -647,7 +648,11 @@ sub item_selected { $form->{sellprice} += ($form->{"sellprice_$i"} * $form->{"qty_$i"}); $form->{weight} += ($form->{"weight_$i"} * $form->{"qty_$i"}); - $amount = + if ($form->{"not_discountable_$i"}) { + $form->{"discount_$i"} = 0; + } + + my $amount = $form->{"sellprice_$i"} * (1 - $form->{"discount_$i"} / 100) * $form->{"qty_$i"}; map { $form->{"${_}_base"} += $amount } @@ -662,8 +667,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); @@ -672,7 +676,7 @@ sub item_selected { map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, $decimalplaces) - } qw(sellprice listprice) if $form->{item} ne 'assembly'; + } qw(sellprice listprice lastcost) if $form->{item} ne 'assembly'; # get pricegroups for parts IS->get_pricegroups_for_parts(\%myconfig, \%$form); @@ -682,202 +686,65 @@ sub item_selected { &display_form; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub new_item { - $lxdebug->enter_sub(); - - # 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; + $main::lxdebug->enter_sub(); - print qq| - - -

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

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

+ my $form = $main::form; + my %myconfig = %main::myconfig; -
+ _check_io_auth(); -

+ my $price_key = ($form->{type} =~ m/request_quotation|purchase_order/) || ($form->{script} eq 'ir.pl') ? 'lastcost' : 'sellprice'; -  | - . $locale->text('Part') . qq|
-  | - . $locale->text('Service') - - . qq| - - - -{rowcount}> -{taxaccounts}> -{vc}> - -{path}> -{login}> -{password}> + # change callback + $form->{old_callback} = $form->escape($form->{callback}, 1); + $form->{callback} = $form->escape("$form->{script}?action=display_form", 1); - + # save all form variables except action in a previousform variable + my $previousform = join '&', map { my $value = $form->{$_}; $value =~ s/&/%26/; "$_=$value" } grep { !/action/ } keys %$form; -

- -

+ my @HIDDENS; + 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); + push @HIDDENS, { 'name' => 'taxaccount2', 'value' => $form->{taxaccounts} }; + push @HIDDENS, { 'name' => $price_key, 'value' => $form->parse_amount(\%myconfig, $form->{"sellprice_$form->{rowcount}"}) }; + push @HIDDENS, { 'name' => 'notes', 'value' => $form->{"longdescription_$form->{rowcount}"} }; - - -|; + $form->header(); + print $form->parse_html_template("generic/new_item", { HIDDENS => [ sort { $a->{name} cmp $b->{name} } @HIDDENS ] } ); - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } -sub display_form { - $lxdebug->enter_sub(); - - # 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); - - $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; +sub check_form { + $main::lxdebug->enter_sub(); - &form_footer; + my $form = $main::form; + my %myconfig = %main::myconfig; - $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) - ); # 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; + # fuer assemblies auskommentiert. seiteneffekte? ;-) wird die woanders benoetigt? + #$form->{sellprice} = 0; $form->{weight} = 0; map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } - qw(listprice rop stock); + qw(listprice sellprice rop stock); - @flds = - qw(id qty unit bom partnumber description sellprice weight runningnumber partsgroup); + my @flds = qw(id qty unit bom partnumber description sellprice weight runningnumber partsgroup lastcost); for my $i (1 .. ($form->{assembly_rows} - 1)) { if ($form->{"qty_$i"}) { @@ -890,61 +757,25 @@ sub check_form { #($form->{"sellprice_$i"},$form->{"$pricegroup_old_$i"}) = split /--/, $form->{"sellprice_$i"}; - $form->{sellprice} += ($form->{"qty_$i"} * $form->{"sellprice_$i"}); - $form->{weight} += ($form->{"qty_$i"} * $form->{"weight_$i"}); + # fuer assemblies auskommentiert. siehe oben + # $form->{sellprice} += ($form->{"qty_$i"} * $form->{"sellprice_$i"} / ($form->{"price_factor_$i"} || 1)); + $form->{weight} += ($form->{"qty_$i"} * $form->{"weight_$i"} / ($form->{"price_factor_$i"} || 1)); $count++; } } - + # kann das hier auch weg? s.o. jb $form->{sellprice} = $form->round_amount($form->{sellprice}, 2); $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 { + remove_emptied_rows(1); - # this section applies to invoices and orders - # remove any empty numbers - if ($form->{rowcount}) { - for my $i (1 .. $form->{rowcount} - 1) { - if ($form->{"partnumber_$i"}) { - push @a, {}; - my $j = $#a; - - map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds; - $count++; - if ($lizenzen) { - if ($form->{"licensenumber_$i"} == -1) { - &new_license($i); - exit; - } - } - } - } - - $form->redo_rows(\@flds, \@a, $count, $form->{rowcount}); - $form->{rowcount} = $count; - - $form->{creditremaining} -= &invoicetotal; - - } + $form->{creditremaining} -= &invoicetotal; } #sk @@ -964,11 +795,47 @@ sub check_form { &display_form; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); +} + +sub remove_emptied_rows { + my $dont_add_empty = shift; + my $form = $::form; + + return unless $form->{rowcount}; + + 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 partnotes + stock_out stock_in has_sernumber reqdate); + + my $ic_cvar_configs = CVar->get_configs(module => 'IC'); + push @flds, map { "ic_cvar_$_->{name}" } @{ $ic_cvar_configs }; + + my @new_rows; + for my $i (1 .. $form->{rowcount} - 1) { + next unless $form->{"partnumber_$i"}; + + push @new_rows, { map { $_ => $form->{"${_}_$i" } } @flds }; + } + + my $new_rowcount = scalar @new_rows; + $form->redo_rows(\@flds, \@new_rows, $new_rowcount, $form->{rowcount}); + $form->{rowcount} = $new_rowcount + ($dont_add_empty ? 0 : 1); } sub invoicetotal { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my %myconfig = %main::myconfig; + + _check_io_auth(); $form->{oldinvtotal} = 0; @@ -986,50 +853,66 @@ 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; - for $i (1 .. $form->{paidaccounts}) { + for my $i (1 .. $form->{paidaccounts}) { $form->{oldtotalpaid} += $form->{"paid_$i"}; } - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); # return total return ($form->{oldinvtotal} - $form->{oldtotalpaid}); } sub validate_items { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my $locale = $main::locale; + + _check_io_auth(); # check if items are valid if ($form->{rowcount} == 1) { &update; - exit; + ::end_of_request(); } - for $i (1 .. $form->{rowcount} - 1) { + for my $i (1 .. $form->{rowcount} - 1) { $form->isblank("partnumber_$i", $locale->text('Number missing in Row') . " $i"); } - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub order { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; + + _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); + my $buysell; if ($form->{script} eq 'ir.pl' || $form->{type} eq 'request_quotation') { $form->{title} = $locale->text('Add Purchase Order'); $form->{vc} = 'vendor'; @@ -1048,41 +931,51 @@ sub order { $form->{rowcount}--; - ($null, $form->{cp_id}) = split /--/, $form->{contact}; $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($::lx_office_conf{system}->{language}, $script); - map { $form->{"select$_"} = "" } ($form->{vc}, currency); + map { $form->{"select$_"} = "" } ($form->{vc}, "currency"); - $currency = $form->{currency}; + my $currency = $form->{currency}; &order_links; $form->{currency} = $currency; - $form->{exchangerate} = ""; - $form->{forex} = ""; - $form->{exchangerate} = $exchangerate - if ( - $form->{forex} = ( - $exchangerate = - $form->check_exchangerate( - \%myconfig, $form->{currency}, $form->{transdate}, $buysell - ))); + $form->{forex} = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{transdate}, $buysell); + $form->{exchangerate} = $form->{forex} || ''; + + for my $i (1 .. $form->{rowcount}) { + map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) + if ($form->{"${_}_${i}"}) } + qw(ship qty sellprice listprice basefactor discount)); + } &prepare_order; &display_form; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub quotation { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; + + _check_io_auth(); + if ($form->{second_run}) { $form->{print_and_post} = 0; } map { delete $form->{$_} } qw(id printed emailed queued); + my $buysell; if ($form->{script} eq 'ir.pl' || $form->{type} eq 'purchase_order') { $form->{title} = $locale->text('Add Request for Quotation'); $form->{vc} = 'vendor'; @@ -1096,7 +989,6 @@ sub quotation { $buysell = 'buy'; } - ($null, $form->{cp_id}) = split /--/, $form->{contact}; $form->{cp_id} *= 1; $form->{script} = 'oe.pl'; @@ -1105,309 +997,257 @@ sub quotation { $form->{rowcount}--; - require "$form->{path}/$form->{script}"; + require "bin/mozilla/$form->{script}"; - map { $form->{"select$_"} = "" } ($form->{vc}, currency); + map { $form->{"select$_"} = "" } ($form->{vc}, "currency"); - $currency = $form->{currency}; + my $currency = $form->{currency}; &order_links; $form->{currency} = $currency; - $form->{exchangerate} = ""; - $form->{forex} = ""; - $form->{exchangerate} = $exchangerate - if ( - $form->{forex} = ( - $exchangerate = - $form->check_exchangerate( - \%myconfig, $form->{currency}, $form->{transdate}, $buysell - ))); + $form->{forex} = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{transdate}, $buysell); + $form->{exchangerate} = $form->{forex} || ''; + + for my $i (1 .. $form->{rowcount}) { + map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, + $form->{"${_}_${i}"}) + if ($form->{"${_}_${i}"}) } + qw(ship qty sellprice listprice basefactor discount)); + } &prepare_order; &display_form; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); +} + +sub request_for_quotation { + quotation(); } -sub e_mail { - $lxdebug->enter_sub(); +sub edit_e_mail { + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; + + _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"}) { + CT->get_contact(\%myconfig, $form); + $form->{"email"} = $form->{"cp_email"} if $form->{"cp_email"}; } - $name = $form->{ $form->{vc} }; - $name =~ s/--.*//g; - $title = $locale->text('E-mail') . " $name"; + my $title = $locale->text('E-mail') . " " . $form->get_formname_translation(); $form->{oldmedia} = $form->{media}; $form->{media} = "email"; + my $attachment_filename = $form->generate_attachment_filename(); + my $subject = $form->{subject} || $form->generate_email_subject(); + + $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; -
{script}> + print $form->parse_html_template('generic/edit_email', + { title => $title, + a_filename => $attachment_filename, + subject => $subject, + print_options => print_options('inline' => 1), + HIDDEN => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ], + SHOW_BCC => $myconfig{role} eq 'admin' }); - - - - - - - - - - - - - - - - - -
$title
- - - - - - - - - - - $bcc - -
| . $locale->text('To') . qq|| . $locale->text('Cc') . qq|
| . $locale->text('Subject') . qq|
-
- - - - - - - -
| . $locale->text('Message') . qq|
-
-|; + $main::lxdebug->leave_sub(); +} - &print_options; +sub send_email { + $main::lxdebug->enter_sub(); - map { delete $form->{$_} } - qw(action email cc bcc subject message formname sendmode format header override); + my $form = $main::form; + my %myconfig = %main::myconfig; - # save all other variables - foreach $key (keys %$form) { - $form->{$key} =~ s/\"/"/g; - print qq|\n|; - } + _check_io_auth(); - print qq| -
+ my $callback = $form->{script} . "?action=edit"; + map({ $callback .= "\&${_}=" . E($form->{$_}); } qw(type id)); - + print_form("return"); -
- -
+ Common->save_email_status(\%myconfig, $form); - - -|; + $form->{callback} = $callback; + $form->redirect(); - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } -sub send_email { - $lxdebug->enter_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 { + $main::lxdebug->enter_sub(); - $old_form = new Form; + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; - map { $old_form->{$_} = $form->{$_} } keys %$form; - $old_form->{media} = $form->{oldmedia}; + _check_io_auth(); - &print_form($old_form); + my %options = @_; - $lxdebug->leave_sub(); -} + # names 3 parameters and returns a hashref, for use in templates + sub opthash { +{ value => shift, selected => shift, oname => shift } } + my (@FORMNAME, @LANGUAGE_ID, @FORMAT, @SENDMODE, @MEDIA, @PRINTER_ID, @SELECTS) = (); -sub print_options { - $lxdebug->enter_sub(); - $form->{sendmode} = "attachment"; - $form->{copies} = 3 unless $form->{copies}; + # 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} } = ""; + $form->{DF}{ $form->{format} } = "selected"; $form->{OP}{ $form->{media} } = "selected"; - $form->{SM}{ $form->{sendmode} } = "selected"; - - if ($form->{type} eq 'purchase_order') { - $type = qq| -