#
#######################################################################
+use Carp;
use CGI;
-use CGI::Ajax;
use List::Util qw(min max first);
use SL::CVar;
use SL::IC;
use SL::IO;
+use SL::DB::Language;
+use SL::DB::Printer;
+
require "bin/mozilla/common.pl";
+use strict;
+
# any custom scripts for this one
if (-f "bin/mozilla/custom_io.pl") {
eval { require "bin/mozilla/custom_io.pl"; };
}
-if (-f "bin/mozilla/$form->{login}_io.pl") {
- eval { require "bin/mozilla/$form->{login}_io.pl"; };
+if (-f "bin/mozilla/$::form->{login}_io.pl") {
+ eval { require "bin/mozilla/$::form->{login}_io.pl"; };
}
1;
use Data::Dumper;
sub _check_io_auth {
- $auth->assert('part_service_assembly_edit | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ $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');
}
# 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 = $::request->{cgi};
+
my $numrows = shift;
- my ($readonly, $stock_in_out, $stock_in_out_title);
+ my ($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_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';
{ 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 => ($form->{type} =~ /^sales_/) && !$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, },
);
my @column_index = map { $_->{id} } grep { $_->{display} } @HEADER;
+
# cache units
my $all_units = AM->retrieve_units(\%myconfig, $form);
# translations, unused commented out
# $runningnumber = $locale->text('No.');
- $deliverydate = $locale->text('Delivery Date');
- $serialnumber = $locale->text('Serial No.');
- $projectnumber = $locale->text('Project');
+# my $deliverydate = $locale->text('Delivery Date');
+ my $serialnumber = $locale->text('Serial No.');
+ my $projectnumber = $locale->text('Project');
# $partsgroup = $locale->text('Group');
- $reqdate = $locale->text('Reqdate');
- $deliverydate = $locale->text('Required by');
+ my $reqdate = $locale->text('Reqdate');
+ my $deliverydate = $locale->text('Required by');
# special alignings
my %align = map { $_ => 'right' } qw(qty ship right sellprice_pg discount linetotal stock_in_out);
_update_custom_variables();
# 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 discount sellprice price_new price_old) unless ($form->{simple_save});
+ map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) }
+ qw(qty discount sellprice lastcost price_new price_old)
+ unless ($form->{simple_save});
# unit begin
$form->{"unit_old_$i"} ||= $form->{"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} });
$column_data{"unit"} = AM->unit_select_html($all_units, "unit_$i", $this_unit, $form->{"id_$i"} ? $form->{"unit_$i"} : undef);
# / unit ending
- $form->{"sellprice_$i"} =~ /\.(\d+)/;
- $decimalplaces = max 2, length $1;
+ my $decimalplaces = ($form->{"sellprice_$i"} =~ /\.(\d+)/) ? max 2, length $1 : 2;
- $price_factor = $price_factors{$form->{"price_factor_id_$i"}} || 1;
- $discount = $form->round_amount($form->{"qty_$i"} * $form->{"sellprice_$i"} * $form->{"discount_$i"} / 100 / $price_factor, 2);
- $linetotal = $form->round_amount($form->{"qty_$i"} * $form->{"sellprice_$i"} * (100 - $form->{"discount_$i"}) / 100 / $price_factor, 2);
+ 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{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
+ $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')");
- $form->{"qty_$i"} =~ /\.(\d+)/;
- my $qty_dec = length $1;
+ my $qty_dec = ($form->{"qty_$i"} =~ /\.(\d+)/) ? length $1 : 2;
$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('*/'))
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};
+ $ship_qty /= ( $all_units->{$form->{"unit_$i"}}->{factor} || 1 );
$column_data{ship} = $form->format_amount(\%myconfig, $form->round_amount($ship_qty, 2) * 1) . ' ' . $form->{"unit_$i"};
}
# build in drop down list for pricesgroups
+ # $sellprice_value setzt den Wert etwas unabhängiger von der Darstellung.
+ # Hintergrund: Preisgruppen werden hier überprüft und neu berechnet.
+ # Vorher wurde der ganze cgi->textfield Block zweimal identisch eingebaut, dass passiert
+ # jetzt nach der Abfrage.
+ my $sellprice_value;
if ($form->{"prices_$i"}) {
$column_data{sellprice_pg} = qq|<select name="sellprice_pg_$i" style="width: 8em">$form->{"prices_$i"}</select>|;
- $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"})
+ $sellprice_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)));
+ : $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) {
+ # remember the pricegroup_id in pricegroup_old
+ # but don't overwrite it
$form->{"pricegroup_old_$i"} = $form->{"pricegroup_id_$i"};
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"} || '' }));
+ $column_data{sellprice_pg} = NTI($cgi->popup_menu("sellprice_pg_$i", [ $default_option ], $default_option, { $default_option => $form->{"pricegroup_$i"} || '' }));
} else {
$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));
+ $sellprice_value = $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces);
+
}
- $column_data{discount} = $cgi->textfield(-name => "discount_$i", -size => 3, -value => $form->format_amount(\%myconfig, $form->{"discount_$i"}));
+ # Falls der Benutzer die Preise nicht anpassen sollte, wird das entsprechende
+ # Textfield auf readonly gesetzt. Anm. von Sven: Manipulation der Preise ist
+ # immer noch möglich, konsequenterweise sollten diese NUR aus der Datenbank
+ # geholt werden.
+ my $edit_prices = $main::auth->assert('edit_prices', 1);
+ $column_data{sellprice} = (!$edit_prices)
+ ? $cgi->textfield(-readonly => "readonly",
+ -name => "sellprice_$i", -size => 10, -onBlur => "check_right_number_format(this)", -value => $sellprice_value)
+ : $cgi->textfield(-name => "sellprice_$i", -size => 10, -onBlur => "check_right_number_format(this)", -value => $sellprice_value);
+ $column_data{discount} = (!$edit_prices)
+ ? $cgi->textfield(-readonly => "readonly",
+ -name => "discount_$i", -size => 3, -value => $form->format_amount(\%myconfig, $form->{"discount_$i"}))
+ : $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"};
$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->{"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_color;
+ my $real_sellprice;
+ if ( $form->{taxincluded} and $form->{"qty_$i"} * 1 and $form->{$form->{"taxaccounts_$i"} . "_rate"} * 1) {
+ # if we use taxincluded we need to calculate the marge from the net_value
+ # all the marge calculations are based on linetotal which we need to
+ # convert to net first
+
+ # there is no direct form value for the tax_rate of the item, but
+ # form->{taxaccounts_$i} gives the tax account (e.g. 3806) and 3806_rate
+ # gives the tax percentage (e.g. 0.19)
+ $real_sellprice = $linetotal / (1 + $form->{$form->{"taxaccounts_$i"} . "_rate"});
+ } else {
+ $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;
}
- 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_absolut_$i"} = ($real_sellprice - $real_lastcost) * $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"};
+ $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|<font %s><b>%s</b> %s %s%% </font> <b>%s</b> %s <b>%s</b> %s|,
+ push @ROW2, { value => sprintf qq|
+ <font %s><b>%s</b> %s %s%% </font>
+ <b>%s</b> %s
+ <b>%s</b> <input size="5" name="lastcost_$i" value="%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;
+ if $form->{"id_$i"} && ($form->{type} =~ /^sales_/ || $form->{type} =~ /invoice/ || $form->{type} =~ /^credit_note$/ ) && !$is_delivery_order;
+
+ $form->{"listprice_$i"} = $form->format_amount(\%myconfig, $form->{"listprice_$i"}, 2)
+ if $form->{"id_$i"} && ($form->{type} =~ /^sales_/ || $form->{type} =~ /invoice/) ;
# / marge calculations ending
+# calculate onhand
+ if ($form->{"id_$i"}) {
+ my $part = IC->get_basic_part_info(id => $form->{"id_$i"});
+ my $onhand_color = $part->{onhand} < $part->{rop} ? 'color="#ff0000"' : '';
+ push @ROW2, { value => sprintf "<b>%s</b> <font %s>%s %s</font>",
+ $locale->text('On Hand'),
+ $onhand_color,
+ $form->format_amount(\%myconfig, $part->{onhand}, 2),
+ $part->{unit}
+ };
+ }
+# / calculate onhand
+
my @hidden_vars;
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);
+ map { $form->{"${_}_${i}"} = $form->format_amount(\%myconfig, $form->{"${_}_${i}"}) } qw(sellprice discount lastcost);
+ push @hidden_vars, qw(sellprice discount not_discountable price_factor_id lastcost pricegroup_id);
push @hidden_vars, "stock_${stock_in_out}_sum_qty", "stock_${stock_in_out}";
}
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)
+ longdescription basefactor marge_absolut marge_percent marge_price_factor), @hidden_vars)
);
map { $form->{"${_}_base"} += $linetotal } (split(/ /, $form->{"taxaccounts_$i"}));
$form->{invsubtotal} += $linetotal;
# Benutzerdefinierte Variablen für Waren/Dienstleistungen/Erzeugnisse
- _render_custom_variables_inputs(ROW2 => \@ROW2, row => $i);
+ _render_custom_variables_inputs(ROW2 => \@ROW2, row => $i, part_id => $form->{"id_$i"});
push @ROWS, { ROW1 => \@ROW1, ROW2 => \@ROW2, HIDDENS => \@HIDDENS, colspan => $colspan, error => $form->{"row_error_$i"}, };
}
$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 {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my $locale = $main::locale;
+ my $cgi = $::request->{cgi};
_check_io_auth();
my $rowcount = shift;
- for $j (1 .. $rowcount) {
+ for my $j (1 .. $rowcount) {
next unless $form->{PRICES}{$j};
# build drop down list for pricegroups
my $option_tmpl = qq|<option value="%s--%s" %s>%s</option>|;
$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} }) {
+ 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();
-# 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();
-
- @column_index = qw(ndx partnumber description rop onhand unit sellprice);
-
- $column_data{ndx} = qq|<th> </th>|;
- $column_data{partnumber} =
- qq|<th class="listheading">| . $locale->text('Number') . qq|</th>|;
- $column_data{description} =
- qq|<th class="listheading">| . $locale->text('Part Description') . qq|</th>|;
- $column_data{sellprice} =
- qq|<th class="listheading">| . $locale->text('Price') . qq|</th>|;
- if ($is_purchase){
- $column_data{rop} =
- qq|<th class="listheading">| . $locale->text('ROP') . qq|</th>|;
- }# ende if $is_purchase -> Überschrift Mindestlagerbestand - ähnliche Prüfung weiter unten
- $column_data{onhand} =
- qq|<th class="listheading">| . $locale->text('Qty') . qq|</th>|;
- $column_data{unit} =
- qq|<th class="listheading">| . $locale->text('Unit') . qq|</th>|;
- # list items with radio button on a form
- $form->header;
-
- $title = $locale->text('Select from one of the items below');
- $colspan = $#column_index + 1;
-
- print qq|
- <body>
+ $main::lxdebug->enter_sub();
-<form method="post" action="$form->{script}">
-
-<table width="100%">
- <tr>
- <th class="listtop" colspan="$colspan">$title</th>
- </tr>
- <tr height="5"></tr>
- <tr class="listheading">|;
-
- map { print "\n$column_data{$_}" } @column_index;
+ my %params = @_;
+ my $mode = $params{mode} || croak "Missing parameter 'mode'";
- print qq|</tr>|;
+ _check_io_auth();
- 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);
- push @new_fields, grep { m/^ic_cvar_/ } keys %{ $form->{item_list}->[0] };
-
- my $i = 0;
- foreach $ref (@{ $form->{item_list} }) {
- $checked = ($i++) ? "" : "checked";
-
- if ($lizenzen) {
- if ($ref->{inventory_accno} > 0) {
- $ref->{"lizenzen"} = qq|<option></option>|;
- foreach $item (@{ $form->{LIZENZEN}{ $ref->{"id"} } }) {
- $ref->{"lizenzen"} .=
- qq|<option value=\"$item->{"id"}\">$item->{"licensenumber"}</option>|;
- }
- $ref->{"lizenzen"} .= qq|<option value="-1">Neue Lizenz</option>|;
- $ref->{"lizenzen"} =~ s/\"/"/g;
- }
- }
+ my $previous_form = $::auth->save_form_in_session(form => $::form);
+ $::form->{title} = $::locale->text('Select from one of the items below');
+ $::form->header;
- map { $ref->{$_} =~ s/\"/"/g } qw(partnumber description unit);
-
- 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|<td><input name="ndx" class="radio" type="radio" value="$i" $checked></td>|;
- $column_data{partnumber} =
- qq|<td><input name="new_partnumber_$i" type="hidden" value="$ref->{partnumber}">$ref->{partnumber}</td>|;
- $column_data{description} =
- qq|<td><input name="new_description_$i" type="hidden" value="$ref->{description}">$ref->{description}</td>|;
- $column_data{sellprice} =
- qq|<td align="right"><input name="new_sellprice_$i" type="hidden" value="$ref->{sellprice}">|
- . $display_sellprice
- . qq|</td>|;
- $column_data{onhand} =
- qq|<td align="right"><input name="new_onhand_$i" type="hidden" value="$ref->{onhand}">|
- . $form->format_amount(\%myconfig, $ref->{onhand}, '', " ")
- . qq|</td>|;
- if ($is_purchase){
- $column_data{rop} =
- qq|<td align="right"><input name="new_rop$i" type="hidden" value="$ref->{rop}">|
- . $form->format_amount(\%myconfig, $ref->{rop}, '', " ")
- . qq|</td>|;
- }# 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|<td>$ref->{unit}</td>|;
- $j++;
- $j %= 2;
- print qq|
-<tr class=listrow$j>|;
-
- map { print "\n$column_data{$_}" } @column_index;
-
- print("</tr>\n");
-
- print join "\n", map { $cgi->hidden("-name" => "new_${_}_$i", "-value" => $ref->{$_}) } @new_fields;
- print "\n";
- }
-
- print qq|
-<tr><td colspan="8"><hr size="3" noshade></td></tr>
-</table>
-
-<input name="lastndx" type="hidden" value="$i">
-
-|;
+ my @item_list = map {
+ $_->{display_sellprice} = $_->{sellprice} * (1 - $::form->{tradediscount});
+ $_->{display_sellprice} /= $_->{price_factor} if ($_->{price_factor});
+ $_;
+ } @{ $::form->{item_list} };
# delete action variable
- map { delete $form->{$_} } qw(action item_list header);
+ delete @{$::form}{qw(action item_list header)};
- # 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|<input name="$key" type="hidden" value="$form->{$key}">\n|;
- }
+ print $::form->parse_html_template('io/select_item', { PREVIOUS_FORM => $previous_form,
+ MODE => $mode,
+ ITEM_LIST => \@item_list,
+ IS_PURCHASE => $mode eq 'IS' });
- print qq|
-<input type="hidden" name="nextsub" value="item_selected">
-
-<br>
-<input class="submit" type="submit" name="action" value="|
- . $locale->text('Continue') . qq|">
-</form>
-
-</body>
-</html>
-|;
-
- $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};
- $i = $form->{assembly_rows} if ($form->{item} eq 'assembly');
+ $::auth->restore_form_from_session($form->{select_item_previous_form} || croak('Missing previous form ID'), form => $form);
- # index for new item
- $j = $form->{ndx};
+ my $mode = delete($form->{select_item_mode}) || croak 'Missing item selection mode';
+ my $id = delete($form->{select_item_id}) || croak 'Missing item selection ID';
+ my $i = $form->{ $mode eq 'IC' ? 'assembly_rows' : 'rowcount' };
- #sk
- #($form->{"sellprice_$i"},$form->{"$pricegroup_old_$i"}) = split /--/, $form->{"sellprice_$i"};
- #$form->{"sellprice_$i"} = $form->{"sellprice_$i"};
+ $form->{"id_${i}"} = $id;
+
+ if ($mode eq 'IS') {
+ IS->retrieve_item(\%myconfig, \%$form);
+ } elsif ($mode eq 'IR') {
+ IR->retrieve_item(\%myconfig, \%$form);
+ } elsif ($mode eq 'IC') {
+ IC->assembly_item(\%myconfig, \%$form);
+ } else {
+ croak "Invalid item selection mode '${mode}'";
+ }
+
+ my $new_item = $form->{item_list}->[0] || croak "No item found for mode '${mode}' and ID '${id}'";
# 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
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"} } @new_fields;
+ map { $form->{"${_}_$i"} = $new_item->{$_} } @new_fields;
- $form->{"marge_price_factor_$i"} = $form->{"new_price_factor_$j"};
+ $form->{"marge_price_factor_$i"} = $new_item->{price_factor};
if ($form->{"part_payment_id_$i"} ne "") {
$form->{payment_id} = $form->{"part_payment_id_$i"};
}
- if ($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;
$form->{"sellprice_$i"} =
$form->round_amount($form->{"sellprice_$i"}, $decimalplaces);
}
+
+ # tradediscount
+ if ($::form->{tradediscount}) {
+ $::form->{"sellprice_$i"} *= 1 - $::form->{tradediscount};
+ }
}
map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
$form->{"discount_$i"} = 0;
}
- $amount =
+ my $amount =
$form->{"sellprice_$i"} * (1 - $form->{"discount_$i"} / 100) *
$form->{"qty_$i"};
map { $form->{"${_}_base"} += $amount }
$form->{"runningnumber_$i"} = $i;
- # delete all the new_ variables
- for $i (1 .. $form->{lastndx}) {
- map { delete $form->{"new_${_}_$i"} } @new_fields;
- }
-
- map { delete $form->{$_} } qw(ndx lastndx nextsub);
+ delete $form->{nextsub};
# format amounts
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);
&display_form;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub new_item {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
_check_io_auth();
$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;
+ # save all form variables except action in the session and keep the key in the previousform variable
+ my $previousform = $::auth->save_form_in_session(skip_keys => [ qw(action) ]);
- push @HIDDENS, { 'name' => 'previousform', 'value' => $form->escape($previousform, 1) };
+ my @HIDDENS;
+ push @HIDDENS, { 'name' => 'previousform', 'value' => $previousform };
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} };
$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 check_form {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
_check_io_auth();
#($form->{"sellprice_$i"},$form->{"$pricegroup_old_$i"}) = split /--/, $form->{"sellprice_$i"};
# fuer assemblies auskommentiert. siehe oben
- # $form->{sellprice} += ($form->{"qty_$i"} * $form->{"sellprice_$i"} / ($form->{"price_factor_$i"} || 1));
+ # $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++;
}
map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(listprice sellprice lastcost);
} else {
- 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);
-
- my $ic_cvar_configs = CVar->get_configs(module => 'IC');
- push @flds, map { "ic_cvar_$_->{name}" } @{ $ic_cvar_configs };
-
- # 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;
+ remove_emptied_rows(1);
- }
+ $form->{creditremaining} -= &invoicetotal;
}
#sk
&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();
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();
$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';
my $script = $form->{"script"};
$script =~ s|.*/||;
$script =~ s|.pl$||;
- $locale = new Locale($language, $script);
+ $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->{forex} = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{transdate}, $buysell);
$form->{exchangerate} = $form->{forex} || '';
- for $i (1 .. $form->{rowcount}) {
+ 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();
}
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';
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->{forex} = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{transdate}, $buysell);
$form->{exchangerate} = $form->{forex} || '';
- for $i (1 .. $form->{rowcount}) {
+ for my $i (1 .. $form->{rowcount}) {
map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig,
$form->{"${_}_${i}"})
if ($form->{"${_}_${i}"}) }
&prepare_order;
&display_form;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub request_for_quotation {
}
sub edit_e_mail {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
_check_io_auth();
$form->{email} = $form->{shiptoemail} if $form->{shiptoemail} && $form->{formname} =~ /(pick|packing|bin)_list/;
- if ($form->{"cp_id"} && !$form->{"email"}) {
+ if ($form->{"cp_id"}) {
CT->get_contact(\%myconfig, $form);
- $form->{"email"} = $form->{"cp_email"};
+ $form->{"email"} = $form->{"cp_email"} if $form->{"cp_email"};
}
- $title = $locale->text('E-mail') . " " . $form->get_formname_translation();
+ my $title = $locale->text('E-mail') . " " . $form->get_formname_translation();
$form->{oldmedia} = $form->{media};
$form->{media} = "email";
subject => $subject,
print_options => print_options('inline' => 1),
HIDDEN => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ],
- SHOW_BCC => $myconfig{role} eq 'admin' });
+ SHOW_BCC => $::auth->assert('email_bcc', 'may fail') });
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub send_email {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
_check_io_auth();
$form->{callback} = $callback;
$form->redirect();
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
# generate the printing options displayed at the bottom of oe and is forms.
#
# the inline options is untested, but intended to be used later in metatemplating
sub print_options {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
_check_io_auth();
# 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) = ();
+ my (@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";
) : undef,
($form->{type} eq 'invoice' && $form->{storno}) ? (
opthash("storno_invoice", $form->{PD}{storno_invoice}, $locale->text('Storno Invoice')),
- opthash("storno_packing_list", $form->{PD}{storno_packing_list}, $locale->text('Storno Packing List'))
) : undef,
($form->{type} =~ /_delivery_order$/) ? (
opthash($form->{type}, $form->{PD}{$form->{type}}, $locale->text('Delivery Order')),
push @MEDIA, grep $_,
opthash("screen", $form->{OP}{screen}, $locale->text('Screen')),
- (scalar @{ $form->{printers} } && $latex_templates) ?
+ ($form->{printers} && scalar @{ $form->{printers} } && $::lx_office_conf{print_templates}->{latex}) ?
opthash("printer", $form->{OP}{printer}, $locale->text('Printer')) : undef,
- ($latex_templates && !$options{no_queue}) ?
+ ($::lx_office_conf{print_templates}->{latex} && !$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)
+ ($::lx_office_conf{print_templates}->{opendocument} && $::lx_office_conf{applications}->{openofficeorg_writer} && $::lx_office_conf{applications}->{xvfb}
+ && (-x $::lx_office_conf{applications}->{openofficeorg_writer}) && (-x $::lx_office_conf{applications}->{xvfb})
&& !$options{no_opendocument_pdf}) ?
opthash("opendocument_pdf", $form->{DF}{"opendocument_pdf"}, $locale->text("PDF (OpenDocument/OASIS)")) : undef,
- ($latex_templates) ?
+ ($::lx_office_conf{print_templates}->{latex}) ?
opthash("pdf", $form->{DF}{pdf}, $locale->text('PDF')) : undef,
- ($latex_templates && !$options{no_postscript}) ?
+ ($::lx_office_conf{print_templates}->{latex} && !$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;
+ ($::lx_office_conf{print_templates}->{opendocument} && !$options{no_opendocument}) ?
+ opthash("opendocument", $form->{DF}{opendocument}, $locale->text("OpenDocument/OASIS")) : undef,
+ ($::lx_office_conf{print_templates}->{excel} && !$options{no_excel}) ?
+ opthash("excel", $form->{DF}{excel}, $locale->text("Excel")) : undef;
push @LANGUAGE_ID,
map { opthash($_->{id}, ($_->{id} eq $form->{language_id} ? 'selected' : ''), $_->{description}) } +{}, @{ $form->{languages} }
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 => $_->[1],
+ DATA => $_->[0],
+ show => !$options{"hide_" . $_->[1]} && scalar @{ $_->[0] }
+ },
+ [ \@FORMNAME, 'formname', ],
+ [ \@LANGUAGE_ID, 'language_id', ],
+ [ \@FORMAT, 'format', ],
+ [ \@SENDMODE, 'sendmode', ],
+ [ \@MEDIA, 'media', ],
+ [ \@PRINTER_ID, 'printer_id', ];
my %dont_display_groupitems = (
'dunning' => 1,
);
- %template_vars = (
- display_copies => scalar @{ $form->{printers} } && $latex_templates && $form->{media} ne 'email',
+ my %template_vars = (
+ display_copies => scalar @{ $form->{printers} || [] } && $::lx_office_conf{print_templates}->{latex} && $form->{media} ne 'email',
display_remove_draft => (!$form->{id} && $form->{draft_id}),
display_groupitems => !$dont_display_groupitems{$form->{type}},
groupitems_checked => $form->{groupitems} ? "checked" : '',
my $print_options = $form->parse_html_template("generic/print_options", { SELECTS => \@SELECTS, %template_vars } );
if ($options{inline}) {
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
return $print_options;
}
print $print_options;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub print {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my $locale = $main::locale;
_check_io_auth();
if ($form->{print_nextsub}) {
call_sub($form->{print_nextsub});
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
return;
}
# if this goes to the printer pass through
+ my $old_form;
if ($form->{media} eq 'printer' || $form->{media} eq 'queue') {
$form->error($locale->text('Select postscript or PDF!'))
if ($form->{format} !~ /(postscript|pdf)/);
&save();
$form->{formname} = $formname;
&edit();
- exit;
+ $::lxdebug->leave_sub();
+ ::end_of_request();
}
&print_form($old_form);
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub print_form {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
_check_io_auth();
my ($old_form) = @_;
- $inv = "inv";
- $due = "due";
- $numberfld = "invnumber";
+ my $inv = "inv";
+ my $due = "due";
+ my $numberfld = "invnumber";
+ my $order;
- $display_form =
+ my $display_form =
($form->{display_form}) ? $form->{display_form} : "display_form";
# $form->{"notes"} will be overridden by the customer's/vendor's "notes" field. So save it here.
if ($form->{formname} eq "invoice") {
$form->{label} = $locale->text('Invoice');
}
- if ($form->{formname} eq "packing_list") {
-
- # this is from an invoice
- $form->{label} = $locale->text('Packing List');
- }
if ($form->{formname} eq 'sales_order') {
$inv = "ord";
$due = "req";
$order = 1;
}
- if ($form->{formname} eq 'packing_list' && $form->{type} ne 'invoice') {
-
- # we use the same packing list as from an invoice
- $inv = "ord";
- $due = "req";
- $form->{invdate} = $form->{"${inv}date"} = $form->{transdate};
- $form->{label} = $locale->text('Packing List');
- $order = 1;
- # set invnumber for template packing_list
- $form->{invnumber} = $form->{ordnumber};
- }
if ($form->{formname} eq 'purchase_order') {
$inv = "ord";
$due = "req";
# $locale->text('Invoice Number missing!')
# $locale->text('Invoice Date missing!')
- # $locale->text('Packing List Number missing!')
- # $locale->text('Packing List Date missing!')
# $locale->text('Order Number missing!')
# $locale->text('Order Date missing!')
# $locale->text('Quotation Number missing!')
call_sub($display_form);
# saving the history
- if(!exists $form->{addition}) {
+ if(!exists $form->{addition}) {
$form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
- $form->{addition} = "PRINTED";
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->{addition} = "PRINTED";
+ $form->save_history;
}
# /saving the history
- exit;
+ ::end_of_request();
}
}
my ($saved_email, $saved_cc, $saved_bcc) =
($form->{"email"}, $form->{"cc"}, $form->{"bcc"});
- $language_saved = $form->{language_id};
- $payment_id_saved = $form->{payment_id};
- $salesman_id_saved = $form->{salesman_id};
- $cp_id_saved = $form->{cp_id};
+ my $language_saved = $form->{language_id};
+ my $payment_id_saved = $form->{payment_id};
+ my $salesman_id_saved = $form->{salesman_id};
+ my $cp_id_saved = $form->{cp_id};
+ my $taxzone_id_saved = $form->{taxzone_id};
+ my $currency_saved = $form->{currency};
call_sub("$form->{vc}_details") if ($form->{vc});
$form->{language_id} = $language_saved;
$form->{payment_id} = $payment_id_saved;
+ $form->{taxzone_id} = $taxzone_id_saved;
+ $form->{currency} = $currency_saved;
$form->{"email"} = $saved_email if ($saved_email);
$form->{"cc"} = $saved_cc if ($saved_cc);
$output_longdates = 1;
}
+ # Store the output number format so that the template modules know
+ # how to parse the amounts back if requested.
+ $myconfig{output_numberformat} = $output_numberformat || $myconfig{numberformat};
+
($form->{employee}) = split /--/, $form->{employee};
# create the form variables
$form->get_shipto(\%myconfig);
}
- @a = qw(name street zipcode city country contact);
+ my @a = qw(name street zipcode city country contact);
- $shipto = 1;
+ my $shipto = 1;
# if there is no shipto fill it in from billto
- foreach $item (@a) {
+ foreach my $item (@a) {
if ($form->{"shipto$item"}) {
$shipto = 0;
last;
}
if ($form->{language} ne "") {
- map({ $form->{"unit"}->[$_] =
- AM->translate_units($form, $form->{"language"},
- $form->{"unit"}->[$_], $form->{"qty"}->[$_]); }
- (0..scalar(@{$form->{"unit"}}) - 1));
+ my $template_arrays = $form->{TEMPLATE_ARRAYS} || $form;
+ map { $template_arrays->{unit}->[$_] = AM->translate_units($form, $form->{language}, $template_arrays->{unit}->[$_], $template_arrays->{qty}->[$_]); } (0..scalar(@{ $template_arrays->{unit} }) - 1);
+
$form->{language} = "_" . $form->{language};
}
qw(invtotal ordtotal quototal subtotal linetotal
listprice sellprice netprice discount
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})));
+ grep({ /^(?:linetotal|nodiscount_linetotal|listprice|sellprice|netprice|taxbase|discount|p_discount|discount_sub|nodiscount_sub|paid|subtotal|total|tax)_\d+$/ } keys(%{$form})));
reformat_numbers($output_numberformat, undef,
qw(qty price_factor),
} elsif ($form->{"format"} =~ /opendocument/) {
$form->{opendocument} = 1;
$extension = 'odt';
+ } elsif ($form->{"format"} =~ /excel/) {
+ $form->{excel} = 1;
+ $extension = 'xls';
+ }
+
+ # search for the template
+ my @template_files;
+ push @template_files, "$form->{formname}_email$form->{language}$printer_code.$extension" if $form->{media} eq 'email';
+ push @template_files, "$form->{formname}$form->{language}$printer_code.$extension";
+ push @template_files, "$form->{formname}.$extension";
+ push @template_files, "default.$extension";
+
+ $form->{IN} = undef;
+ for my $filename (@template_files) {
+ if (-f "$myconfig{templates}/$filename") {
+ $form->{IN} = $filename;
+ last;
+ }
}
- my $email_extension = '_email' if (($form->{media} eq 'email') && (-f "$myconfig{templates}/$form->{formname}_email$form->{language}${printer_code}.${extension}"));
-
- $form->{IN} = "$form->{formname}${email_extension}$form->{language}${printer_code}.${extension}";
+ if (!defined $form->{IN}) {
+ $::form->error($::locale->text('Cannot find matching template for this print request. Please contact your template maintainer. I tried these: #1.', join ', ', map { "'$_'"} @template_files));
+ }
delete $form->{OUT};
if ($form->{media} eq 'printer') {
- #$form->{OUT} = "| $form->{printer_command} &>/dev/null";
- $form->{OUT} = "| $form->{printer_command} ";
+ $form->{OUT} = $form->{printer_command};
+ $form->{OUT_MODE} = '|-';
$form->{printed} .= " $form->{formname}";
- $form->{printed} =~ s/^ //;
+ $form->{printed} =~ s/^ //;
}
- $printed = $form->{printed};
+ my $printed = $form->{printed};
if ($form->{media} eq 'email') {
$form->{subject} = qq|$form->{label} $form->{"${inv}number"}|
$form->{emailed} .= " $form->{formname}";
$form->{emailed} =~ s/^ //;
}
- $emailed = $form->{emailed};
+ my $emailed = $form->{emailed};
if ($form->{media} eq 'queue') {
- %queued = map { s|.*/|| } split / /, $form->{queued};
+ my %queued = map { s|.*/|| } split / /, $form->{queued};
+ my $filename;
if ($filename = $queued{ $form->{formname} }) {
$form->{queued} =~ s/\Q$form->{formname} $filename\E//;
- unlink "$spool/$filename";
+ unlink $::lx_office_conf{paths}->{spool} . "/$filename";
$filename =~ s/\..*$//g;
} else {
$filename = time;
}
$filename .= ($form->{postscript}) ? '.ps' : '.pdf';
- $form->{OUT} = ">$spool/$filename";
+ $form->{OUT} = $::lx_office_conf{paths}->{spool} . "/$filename";
+ $form->{OUT_MODE} = '>';
# add type
$form->{queued} .= " $form->{formname} $filename";
$form->{queued} =~ s/^ //;
}
- $queued = $form->{queued};
+ my $queued = $form->{queued};
# saving the history
if(!exists $form->{addition}) {
$form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
if($form->{media} =~ /printer/) {
- $form->{addition} = "PRINTED";
+ $form->{addition} = "PRINTED";
}
elsif($form->{media} =~ /email/) {
- $form->{addition} = "MAILED";
+ $form->{addition} = "MAILED";
}
elsif($form->{media} =~ /queue/) {
- $form->{addition} = "QUEUED";
+ $form->{addition} = "QUEUED";
}
elsif($form->{media} =~ /screen/) {
- $form->{addition} = "SCREENED";
+ $form->{addition} = "SCREENED";
}
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->save_history;
}
# /saving the history
- $form->parse_template(\%myconfig, $userspath);
+ # prepare meta information for template introspection
+ $form->{template_meta} = {
+ formname => $form->{formname},
+ language => SL::DB::Manager::Language->find_by_or_create(id => $form->{language_id}),
+ format => $form->{format},
+ media => $form->{media},
+ extension => $extension,
+ printer => SL::DB::Manager::Printer->find_by_or_create(id => $form->{printer_id}),
+ today => DateTime->today,
+ };
+
+ $form->parse_template(\%myconfig);
$form->{callback} = "";
if ($form->{media} eq 'email') {
$form->{message} = $locale->text('sent') unless $form->{message};
}
- $message = $form->{message};
+ my $message = $form->{message};
# if we got back here restore the previous form
if ($form->{media} =~ /(printer|email|queue)/) {
$form->update_status(\%myconfig)
if ($form->{media} eq 'queue' && $form->{id});
- return $lxdebug->leave_sub() if ($old_form eq "return");
+ return $main::lxdebug->leave_sub() if ($old_form eq "return");
if ($old_form) {
map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
qw(exchangerate creditlimit creditremaining);
- for $i (1 .. $form->{paidaccounts}) {
+ for my $i (1 .. $form->{paidaccounts}) {
map {
$form->{"${_}_$i"} =
$form->parse_amount(\%myconfig, $form->{"${_}_$i"})
}
call_sub($display_form);
- exit;
+ ::end_of_request();
}
- $msg =
+ my $msg =
($form->{media} eq 'printer')
? $locale->text('sent to printer')
: $locale->text('emailed to') . " $form->{email}";
}
if ($form->{printing}) {
call_sub($display_form);
- exit;
+ ::end_of_request();
}
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub customer_details {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
IS->customer_details(\%myconfig, \%$form, @_);
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub vendor_details {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
IR->vendor_details(\%myconfig, \%$form, @_);
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub post_as_new {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
_check_io_auth();
&post;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub ship_to {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
_check_io_auth();
- if ($form->{second_run}) {
- $form->{print_and_post} = 0;
- }
-
- $title = $form->{title};
- $form->{title} = $locale->text('Ship to');
-
- map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
- qw(exchangerate creditlimit creditremaining);
-
- my @shipto_vars =
- qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry
- shiptocontact shiptophone shiptofax shiptoemail
- shiptodepartment_1 shiptodepartment_2);
+ $::form->{print_and_post} = 0 if $::form->{second_run};
- my @addr_vars =
- (qw(name department_1 department_2 street zipcode city country
- contact email phone fax));
+ map { $::form->{$_} = $::form->parse_amount(\%::myconfig, $::form->{$_}) } qw(exchangerate creditlimit creditremaining);
- # get details for name
- call_sub("$form->{vc}_details", @addr_vars);
-
- $number =
- ($form->{vc} eq 'customer')
- ? $locale->text('Customer Number')
- : $locale->text('Vendor Number');
+ # get details for customer/vendor
+ call_sub($::form->{vc} . "_details", qw(name department_1 department_2 street zipcode city country contact email phone fax), $::form->{vc} . "number");
# get pricegroups for parts
- IS->get_pricegroups_for_parts(\%myconfig, \%$form);
+ IS->get_pricegroups_for_parts(\%::myconfig, \%$::form);
# build up html code for prices_$i
- set_pricegroup($form->{rowcount});
+ set_pricegroup($::form->{rowcount});
- $nextsub = ($form->{display_form}) ? $form->{display_form} : "display_form";
+ $::form->{rowcount}--;
- $form->{rowcount}--;
+ my @shipto_vars = qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry
+ shiptocontact shiptocp_gender shiptophone shiptofax shiptoemail
+ shiptodepartment_1 shiptodepartment_2);
+ my $previous_form = $::auth->save_form_in_session(skip_keys => [ @shipto_vars, qw(header shipto_id) ]);
+ $::form->{title} = $::locale->text('Ship to');
+ $::form->header;
- $form->header;
+ print $::form->parse_html_template('io/ship_to', { previousform => $previous_form,
+ nextsub => $::form->{display_form} || 'display_form',
+ });
- print qq|
-<body>
-
-<form method="post" action="$form->{script}">
-
-<table width="100%">
- <tr>
- <td>
- <table>
- <tr class="listheading">
- <th class="listheading" colspan="2" width="50%">|
- . $locale->text('Billing Address') . qq|</th>
- <th class="listheading" width="50%">|
- . $locale->text('Shipping Address') . qq|</th>
- </tr>
- <tr height="5"></tr>
- <tr>
- <th align="right" nowrap>$number</th>
- <td>$form->{"$form->{vc}number"}</td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('Company Name') . qq|</th>
- <td>$form->{name}</td>
- <td><input name="shiptoname" size="35" value="$form->{shiptoname}"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('Department') . qq|</th>
- <td>$form->{department_1}</td>
- <td><input name="shiptodepartment_1" size="35" value="$form->{shiptodepartment_1}"></td>
- </tr>
- <tr>
- <th align="right" nowrap> </th>
- <td>$form->{department_2}</td>
- <td><input name="shiptodepartment_2" size="35" value="$form->{shiptodepartment_2}"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('Street') . qq|</th>
- <td>$form->{street}</td>
- <td><input name="shiptostreet" size="35" value="$form->{shiptostreet}"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('Zipcode') . qq|</th>
- <td>$form->{zipcode}</td>
- <td><input name="shiptozipcode" size="35" value="$form->{shiptozipcode}"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('City') . qq|</th>
- <td>$form->{city}</td>
- <td><input name="shiptocity" size="35" value="$form->{shiptocity}"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('Country') . qq|</th>
- <td>$form->{country}</td>
- <td><input name="shiptocountry" size="35" value="$form->{shiptocountry}"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('Contact') . qq|</th>
- <td>$form->{contact}</td>
- <td><input name="shiptocontact" size="35" value="$form->{shiptocontact}"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('Phone') . qq|</th>
- <td>$form->{phone}</td>
- <td><input name="shiptophone" size="20" value="$form->{shiptophone}"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('Fax') . qq|</th>
- <td>$form->{fax}</td>
- <td><input name="shiptofax" size="20" value="$form->{shiptofax}"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('E-mail') . qq|</th>
- <td>$form->{email}</td>
- <td><input name="shiptoemail" size="35" value="$form->{shiptoemail}"></td>
- </tr>
- </table>
- </td>
- </tr>
-</table>
-| . $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|<input type="hidden" name="$key" value="$form->{$key}">\n|;
- }
-
- print qq|
-
-<hr size="3" noshade>
-
-<br>
-<input class="submit" type="submit" name="action" value="|
- . $locale->text('Continue') . qq|">
-</form>
-
-</body>
-</html>
-|;
-
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
-sub new_license {
- $lxdebug->enter_sub();
-
- _check_io_auth();
-
- my $row = shift;
-
- # change callback
- $form->{old_callback} = $form->escape($form->{callback}, 1);
- $form->{callback} = $form->escape("$form->{script}?action=display_form", 1);
- $form->{old_callback} = $form->escape($form->{old_callback}, 1);
-
- # delete action
- delete $form->{action};
- $customer = $form->{customer};
- map { $form->{"old_$_"} = $form->{"${_}_$row"} } qw(partnumber description);
-
- # 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;
- $previousform .= qq|$key=$form->{$key}&|;
- }
- chop $previousform;
- $previousform = $form->escape($previousform, 1);
-
- $form->{script} = "licenses.pl";
-
- map { $form->{$_} = $form->{"old_$_"} } qw(partnumber description);
- map { $form->{$_} = $form->escape($form->{$_}, 1) }
- qw(partnumber description);
- $form->{callback} =
- 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();
+sub ship_to_entered {
+ $::auth->restore_form_from_session(delete $::form->{previousform});
+ call_sub($::form->{nextsub});
}
sub relink_accounts {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
_check_io_auth();
}
$form->{"taxaccounts"} = "";
- for (my $i = 1; $i <= $form->{"rowcount"}; $i++) {
- if ($form->{"id_$i"}) {
- IC->retrieve_accounts(\%myconfig, $form, $form->{"id_$i"}, $i, 1);
- }
- }
+ IC->retrieve_accounts(\%myconfig, $form, map { $_ => $form->{"id_$_"} } 1 .. $form->{rowcount});
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub set_duedate {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
_check_io_auth();
print $form->ajax_response_header() . $duedate;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub _update_part_information {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
my %part_information = IC->get_basic_part_info('id' => [ grep { $_ } map { $form->{"id_${_}"} } (1..$form->{rowcount}) ],
'vendor_id' => $form->{vendor_id});
$form->{"partunit_${i}"} = $info->{unit};
}
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub _update_ship {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
if (!$form->{ordnumber} || !$form->{id}) {
map { $form->{"ship_$_"} = 0 } (1..$form->{rowcount});
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
return;
}
- AM->retrieve_all_units();
+ my $all_units = AM->retrieve_all_units();
my %ship = DO->get_shipped_qty('type' => ($form->{type} eq 'purchase_order') ? 'purchase' : 'sales',
'oe_id' => $form->{id},);
$ship_entry->{qty} = 0;
}
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub _update_custom_variables {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
- $form->{CVAR_CONFIGS} ||= { };
- $form->{CVAR_CONFIGS}->{IC} = CVar->get_configs(module => 'IC');
+ $form->{CVAR_CONFIGS} = { } unless ref $form->{CVAR_CONFIGS} eq 'HASH';
+ $form->{CVAR_CONFIGS}->{IC} ||= CVar->get_configs(module => 'IC');
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub _render_custom_variables_inputs {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub(2);
+
+ my $form = $main::form;
my %params = @_;
if (!$form->{CVAR_CONFIGS}->{IC}) {
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
return;
}
- foreach my $cvar (@{ $form->{CVAR_CONFIGS}->{IC} }) {
- $cvar->{value} = $form->{"ic_cvar_" . $cvar->{name} . "_$params{row}"};
- }
-
- CVar->render_inputs(hide_non_editable => 1,
- variables => $form->{CVAR_CONFIGS}->{IC},
- name_prefix => 'ic_',
- name_postfix => "_$params{row}");
+ my $valid = CVar->custom_variables_validity_by_trans_id(trans_id => $params{part_id});
my $num_visible_cvars = 0;
foreach my $cvar (@{ $form->{CVAR_CONFIGS}->{IC} }) {
+ $cvar->{valid} = $params{part_id} && $valid->($cvar->{id});
+
my $description = '';
- if ($cvar->{flag_editable}) {
+ if ($cvar->{flag_editable} && $cvar->{valid}) {
$num_visible_cvars++;
$description = $cvar->{description} . ' ';
}
- push @{ $params{ROW2} }, { line_break => $num_visible_cvars == 1,
- value => $description . $cvar->{HTML_CODE},
- };
+ my $form_key = "ic_cvar_" . $cvar->{name} . "_$params{row}";
+
+ push @{ $params{ROW2} }, {
+ line_break => $num_visible_cvars == 1,
+ description => $description,
+ cvar => 1,
+ render_options => {
+ hide_non_editable => 1,
+ var => $cvar,
+ name_prefix => 'ic_',
+ name_postfix => "_$params{row}",
+ valid => $cvar->{valid},
+ value => CVar->parse($::form->{$form_key}, $cvar),
+ }
+ };
}
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub(2);
}