X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=c65d742da99bc0ce36f3a0ffaaf7fae058e48a65;hb=cb25314000db992f8b413d10a0d20f0e80b4b677;hp=cd019264c91a23b08c214430f1ff18f57b311a89;hpb=b2945bf61775161f9ce9be9bdbd106ad44247a14;p=kivitendo-erp.git diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index cd019264c..c65d742da 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -36,6 +36,7 @@ # ####################################################################### +use Carp; use CGI; use CGI::Ajax; use List::Util qw(min max first); @@ -151,7 +152,7 @@ sub display_row { { 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_|invoice)/) && !$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, }, @@ -210,8 +211,8 @@ sub display_row { my %column_data = (); # undo formatting - map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } - qw(qty discount sellprice lastcost 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}); # unit begin @@ -229,7 +230,6 @@ sub display_row { } 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} }); @@ -289,9 +289,11 @@ sub display_row { # 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| |; } @@ -343,8 +345,8 @@ sub display_row { map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, 2) } qw(marge_absolut marge_percent); push @ROW2, { value => sprintf qq| - %s %s  %s%% -  %s %s + %s %s  %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), @@ -369,7 +371,7 @@ sub display_row { 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, qw(sellprice discount not_discountable price_factor_id lastcost); push @hidden_vars, "stock_${stock_in_out}_sum_qty", "stock_${stock_in_out}"; } @@ -436,13 +438,16 @@ sub set_pricegroup { sub select_item { $main::lxdebug->enter_sub(); + my %params = @_; + 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'); + my $mode = $params{mode} || croak "Missing parameter 'mode'"; + my $is_purchase = $mode eq 'IS'; + _check_io_auth(); my @column_index = qw(ndx partnumber description rop onhand unit sellprice); @@ -454,10 +459,10 @@ sub select_item { qq|| . $locale->text('Part Description') . qq||; $column_data{sellprice} = 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 + 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||; $column_data{unit} = @@ -484,19 +489,12 @@ sub select_item { 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 ($main::lizenzen); - push @new_fields, grep { m/^ic_cvar_/ } keys %{ $form->{item_list}->[0] }; - my $i = 0; my $j; foreach my $ref (@{ $form->{item_list} }) { my $checked = ($i++) ? "" : "checked"; - if ($main::lizenzen) { + if ($::lx_office_conf{features}->{lizenzen}) { if ($ref->{inventory_accno} > 0) { $ref->{"lizenzen"} = qq||; foreach my $item (@{ $form->{LIZENZEN}{ $ref->{"id"} } }) { @@ -508,34 +506,24 @@ sub select_item { } } - 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); + my $new_id = $ref->{id}; + + map { $ref->{$_} = H($ref->{$_}) } qw(id partnumber description unit); + + $column_data{ndx} = qq||; + $column_data{partnumber} = qq|$ref->{partnumber}|; + $column_data{description} = qq|$ref->{description}|; + $column_data{sellprice} = qq|${display_sellprice}|; + $column_data{onhand} = qq|| . $form->format_amount(\%myconfig, $ref->{onhand}, '', " ") . qq||; + $column_data{unit} = qq|$ref->{unit}|; - $column_data{ndx} = - qq||; - $column_data{partnumber} = - qq|$ref->{partnumber}|; - $column_data{description} = - qq|$ref->{description}|; - $column_data{sellprice} = - qq|| - . $display_sellprice - . qq||; - $column_data{onhand} = - qq|| - . $form->format_amount(\%myconfig, $ref->{onhand}, '', " ") - . qq||; if ($is_purchase){ - $column_data{rop} = - qq|| - . $form->format_amount(\%myconfig, $ref->{rop}, '', " ") - . qq||; + $column_data{rop} = qq|| . $form->format_amount(\%myconfig, $ref->{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|$ref->{unit}|; + $j++; $j %= 2; print qq| @@ -544,30 +532,21 @@ sub select_item { map { print "\n$column_data{$_}" } @column_index; print("\n"); - - print join "\n", map { $cgi->hidden("-name" => "new_${_}_$i", "-value" => $ref->{$_}) } @new_fields; - print "\n"; } print qq|
- - - |; # delete action variable map { delete $form->{$_} } qw(action item_list header); - # save all other form variables - foreach my $key (keys %${form}) { - next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key})); - $form->{$key} =~ s/\"/"/g; - print qq|\n|; - } + my $previous_form = $::auth->save_form_in_session(form => $form); print qq| + +
@@ -590,16 +569,25 @@ sub item_selected { _check_io_auth(); - # replace the last row with the checked row - my $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 - my $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 my $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"}); @@ -610,21 +598,19 @@ sub item_selected { partsgroup formel longdescription not_discountable partnotes lastcost price_factor_id price_factor); + push @new_fields, 'lizenzen' if $::lx_office_conf{features}->{lizenzen}; + 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 ($main::lizenzen) { - map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} } qw(lizenzen); - } - my ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/); $dec = length $dec; my $decimalplaces = ($dec > 2) ? $dec : 2; @@ -664,12 +650,7 @@ sub item_selected { $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 { @@ -702,11 +683,11 @@ sub new_item { $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) ]); my @HIDDENS; - push @HIDDENS, { 'name' => 'previousform', 'value' => $form->escape($previousform, 1) }; + 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} }; @@ -811,7 +792,7 @@ sub remove_emptied_rows { 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); + 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 }; @@ -936,7 +917,7 @@ sub order { my $script = $form->{"script"}; $script =~ s|.*/||; $script =~ s|.pl$||; - $locale = new Locale($main::language, $script); + $locale = new Locale($::lx_office_conf{system}->{language}, $script); map { $form->{"select$_"} = "" } ($form->{vc}, "currency"); @@ -1041,9 +1022,9 @@ sub edit_e_mail { $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"}; } my $title = $locale->text('E-mail') . " " . $form->get_formname_translation(); @@ -1152,7 +1133,6 @@ sub print_options { ) : 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')), @@ -1166,26 +1146,26 @@ sub print_options { push @MEDIA, grep $_, opthash("screen", $form->{OP}{screen}, $locale->text('Screen')), - (scalar @{ $form->{printers} } && $main::latex_templates) ? + ($form->{printers} && scalar @{ $form->{printers} } && $::lx_office_conf{print_templates}->{latex}) ? opthash("printer", $form->{OP}{printer}, $locale->text('Printer')) : undef, - ($main::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 $_, - ($main::opendocument_templates && $main::openofficeorg_writer_bin && $main::xvfb_bin - && (-x $main::openofficeorg_writer_bin) && (-x $main::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, - ($main::latex_templates) ? + ($::lx_office_conf{print_templates}->{latex}) ? opthash("pdf", $form->{DF}{pdf}, $locale->text('PDF')) : undef, - ($main::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, - ($main::opendocument_templates && !$options{no_opendocument}) ? + ($::lx_office_conf{print_templates}->{opendocument} && !$options{no_opendocument}) ? opthash("opendocument", $form->{DF}{opendocument}, $locale->text("OpenDocument/OASIS")) : undef, - ($main::excel_templates && !$options{no_excel}) ? + ($::lx_office_conf{print_templates}->{excel} && !$options{no_excel}) ? opthash("excel", $form->{DF}{excel}, $locale->text("Excel")) : undef; push @LANGUAGE_ID, @@ -1213,7 +1193,7 @@ sub print_options { ); my %template_vars = ( - display_copies => scalar @{ $form->{printers} || [] } && $main::latex_templates && $form->{media} ne 'email', + 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" : '', @@ -1265,6 +1245,7 @@ sub print { &save(); $form->{formname} = $formname; &edit(); + $::lxdebug->leave_sub(); ::end_of_request(); } @@ -1298,11 +1279,6 @@ sub print_form { 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"; @@ -1332,17 +1308,6 @@ sub print_form { $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"; @@ -1403,8 +1368,6 @@ sub print_form { # $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!') @@ -1429,7 +1392,7 @@ sub print_form { if(!exists $form->{addition}) { $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; $form->{addition} = "PRINTED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->save_history; } # /saving the history ::end_of_request(); @@ -1555,17 +1518,7 @@ sub print_form { 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), @@ -1628,7 +1581,7 @@ sub print_form { my $filename; if ($filename = $queued{ $form->{formname} }) { $form->{queued} =~ s/\Q$form->{formname} $filename\E//; - unlink "$main::spool/$filename"; + unlink $::lx_office_conf{paths}->{spool} . "/$filename"; $filename =~ s/\..*$//g; } else { $filename = time; @@ -1636,7 +1589,7 @@ sub print_form { } $filename .= ($form->{postscript}) ? '.ps' : '.pdf'; - $form->{OUT} = ">$main::spool/$filename"; + $form->{OUT} = ">" . $::lx_office_conf{paths}->{spool} . "/$filename"; # add type $form->{queued} .= " $form->{formname} $filename"; @@ -1660,11 +1613,11 @@ sub print_form { elsif($form->{media} =~ /screen/) { $form->{addition} = "SCREENED"; } - $form->save_history($form->dbconnect(\%myconfig)); + $form->save_history; } # /saving the history - $form->parse_template(\%myconfig, $main::userspath); + $form->parse_template(\%myconfig); $form->{callback} = ""; @@ -1781,7 +1734,7 @@ sub ship_to { my @shipto_vars = qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry - shiptocontact shiptophone shiptofax shiptoemail + shiptocontact shiptocp_gender shiptophone shiptofax shiptoemail shiptodepartment_1 shiptodepartment_2); my @addr_vars = @@ -1796,6 +1749,19 @@ sub ship_to { ? $locale->text('Customer Number') : $locale->text('Vendor Number'); + # sieht nicht nett aus, funktioniert aber + # das vorausgewählte select-feld wird über shiptocp_gender + # entsprechend vorbelegt + my $selected_m=''; + my $selected_f=''; + if ($form->{shiptocp_gender} eq 'm') { + $selected_m='selected'; + $selected_f=''; + } elsif ($form->{shiptocp_gender} eq 'f') { + $selected_m=''; + $selected_f='selected'; + } + # get pricegroups for parts IS->get_pricegroups_for_parts(\%myconfig, \%$form); @@ -1868,6 +1834,15 @@ sub ship_to { $form->{contact} + + | . $locale->text('Gender') . qq| + + + + | . $locale->text('Phone') . qq| $form->{phone} @@ -1952,13 +1927,11 @@ sub new_license { $form->{script} = "licenses.pl"; - our $name; - 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|; + qq|$form->{script}?action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$form->{name}&type=$form->{type}&customer=$customer&partnumber=$form->{partnumber}&description=$form->{description}&previousform="$previousform"&initial=1|; $form->redirect; $main::lxdebug->leave_sub(); @@ -1979,11 +1952,7 @@ sub relink_accounts { } $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}); $main::lxdebug->leave_sub(); } @@ -2078,8 +2047,8 @@ sub _update_custom_variables { 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'); $main::lxdebug->leave_sub(); } @@ -2096,30 +2065,31 @@ sub _render_custom_variables_inputs { return; } - foreach my $cvar (@{ $form->{CVAR_CONFIGS}->{IC} }) { - $cvar->{valid} = $params{part_id} - ? CVar->get_custom_variables_validity(config_id => $cvar->{id}, trans_id => $params{part_id}) - : 0; - - $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} && $cvar->{valid}) { $num_visible_cvars++; $description = $cvar->{description} . ' '; } - push @{ $params{ROW2} }, { line_break => $num_visible_cvars == 1, - value => $description . $cvar->{HTML_CODE}, - }; + 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 => $form->{"ic_cvar_" . $cvar->{name} . "_$params{row}"}, + } + }; } $main::lxdebug->leave_sub(2);