X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=5df76ed77da5bc9c323b5c2344cef73d72ad3580;hb=f3490e85153f60ce199993585fc11613185c3896;hp=83da8b5a9b7961b39abf5a8d95b48405dec9bec5;hpb=be253985ee9b61172d6cd468b3af11801eeb7118;p=kivitendo-erp.git diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index 83da8b5a9..5df76ed77 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -36,8 +36,8 @@ # ####################################################################### +use Carp; use CGI; -use CGI::Ajax; use List::Util qw(min max first); use SL::CVar; @@ -112,7 +112,7 @@ sub display_row { my $form = $main::form; my %myconfig = %main::myconfig; my $locale = $main::locale; - my $cgi = $main::cgi; + my $cgi = $::request->{cgi}; my $numrows = shift; @@ -147,11 +147,10 @@ sub display_row { { 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_|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, }, @@ -288,9 +287,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| |; } @@ -348,13 +349,16 @@ sub display_row { $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 = 'color="#ff0000"' if $part->{onhand} < $part->{rop}; + my $onhand_color = $part->{onhand} < $part->{rop} ? 'color="#ff0000"' : ''; push @ROW2, { value => sprintf "%s %s %s", $locale->text('On Hand'), $onhand_color, @@ -368,7 +372,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}"; } @@ -410,7 +414,7 @@ sub set_pricegroup { my $form = $main::form; my $locale = $main::locale; - my $cgi = $main::cgi; + my $cgi = $::request->{cgi}; _check_io_auth(); @@ -435,148 +439,28 @@ sub set_pricegroup { sub select_item { $main::lxdebug->enter_sub(); - my $form = $main::form; - my %myconfig = %main::myconfig; - my $locale = $main::locale; - my $cgi = $main::cgi; + my %params = @_; + my $mode = $params{mode} || croak "Missing parameter 'mode'"; -# 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||; - $column_data{description} = - 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 - $column_data{onhand} = - qq|| . $locale->text('Qty') . qq||; - $column_data{unit} = - qq|| . $locale->text('Unit') . qq||; - # list items with radio button on a form - $form->header; - - my $title = $locale->text('Select from one of the items below'); - my $colspan = $#column_index + 1; - - print qq| - + my $previous_form = $::auth->save_form_in_session(form => $::form); + $::form->{title} = $::locale->text('Select from one of the items below'); + $::form->header; -
- - - - - - - |; - - 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 ($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 ($ref->{inventory_accno} > 0) { - $ref->{"lizenzen"} = qq||; - foreach my $item (@{ $form->{LIZENZEN}{ $ref->{"id"} } }) { - $ref->{"lizenzen"} .= - qq||; - } - $ref->{"lizenzen"} .= qq||; - $ref->{"lizenzen"} =~ s/\"/"/g; - } - } - - 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||; - $column_data{partnumber} = - qq||; - $column_data{description} = - 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| -|; - - 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| - -
$title
$ref->{partnumber}$ref->{description}| - . $display_sellprice - . qq|| - . $form->format_amount(\%myconfig, $ref->{onhand}, '', " ") - . qq|| - . $form->format_amount(\%myconfig, $ref->{rop}, '', " ") - . qq|$ref->{unit}
- - - -|; + 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); - - # 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|; - } - - print qq| - - -
- -
+ delete @{$::form}{qw(action item_list header)}; - - -|; + print $::form->parse_html_template('io/select_item', { PREVIOUS_FORM => $previous_form, + MODE => $mode, + ITEM_LIST => \@item_list, + IS_PURCHASE => $mode eq 'IS' }); $main::lxdebug->leave_sub(); } @@ -589,16 +473,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"}); @@ -612,18 +505,14 @@ sub item_selected { 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; @@ -663,12 +552,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 { @@ -701,11 +585,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} }; @@ -810,7 +694,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 }; @@ -935,7 +819,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"); @@ -1040,9 +924,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(); @@ -1067,7 +951,7 @@ sub edit_e_mail { 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') }); $main::lxdebug->leave_sub(); } @@ -1151,7 +1035,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')), @@ -1165,26 +1048,26 @@ sub print_options { push @MEDIA, grep $_, opthash("screen", $form->{OP}{screen}, $locale->text('Screen')), - ($form->{printers} && 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, @@ -1212,7 +1095,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" : '', @@ -1264,6 +1147,7 @@ sub print { &save(); $form->{formname} = $formname; &edit(); + $::lxdebug->leave_sub(); ::end_of_request(); } @@ -1297,11 +1181,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"; @@ -1331,17 +1210,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"; @@ -1402,8 +1270,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!') @@ -1445,11 +1311,13 @@ sub print_form { 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}; 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->{"email"} = $saved_email if ($saved_email); $form->{"cc"} = $saved_cc if ($saved_cc); @@ -1472,6 +1340,10 @@ sub print_form { $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 @@ -1554,17 +1426,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), @@ -1598,7 +1460,7 @@ sub print_form { $extension = 'xls'; } - my $email_extension = '_email' if (($form->{media} eq 'email') && (-f "$myconfig{templates}/$form->{formname}_email$form->{language}${printer_code}.${extension}")); + my $email_extension = (($form->{media} eq 'email') && (-f "$myconfig{templates}/$form->{formname}_email$form->{language}${printer_code}.${extension}")) ? '_email' : ''; $form->{IN} = "$form->{formname}${email_extension}$form->{language}${printer_code}.${extension}"; @@ -1627,7 +1489,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; @@ -1635,7 +1497,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"; @@ -1663,7 +1525,7 @@ sub print_form { } # /saving the history - $form->parse_template(\%myconfig, $main::userspath); + $form->parse_template(\%myconfig); $form->{callback} = ""; @@ -1761,204 +1623,40 @@ sub post_as_new { sub ship_to { $main::lxdebug->enter_sub(); - my $form = $main::form; - my %myconfig = %main::myconfig; - my $locale = $main::locale; - my $cgi = $main::cgi; - _check_io_auth(); - if ($form->{second_run}) { - $form->{print_and_post} = 0; - } - - my $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); - - my @addr_vars = - (qw(name department_1 department_2 street zipcode city country - contact email phone fax)); + $::form->{print_and_post} = 0 if $::form->{second_run}; - # get details for name - call_sub("$form->{vc}_details", @addr_vars); + map { $::form->{$_} = $::form->parse_amount(\%::myconfig, $::form->{$_}) } qw(exchangerate creditlimit creditremaining); - my $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}); - my $nextsub = ($form->{display_form}) ? $form->{display_form} : "display_form"; + $::form->{rowcount}--; - $form->{rowcount}--; - - $form->header; + 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; - print qq| - - -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
| - . $locale->text('Billing Address') . qq|| - . $locale->text('Shipping Address') . qq|
$number$form->{"$form->{vc}number"}
| . $locale->text('Company Name') . qq|$form->{name}
| . $locale->text('Department') . qq|$form->{department_1}
 $form->{department_2}
| . $locale->text('Street') . qq|$form->{street}
| . $locale->text('Zipcode') . qq|$form->{zipcode}
| . $locale->text('City') . qq|$form->{city}
| . $locale->text('Country') . qq|$form->{country}
| . $locale->text('Contact') . qq|$form->{contact}
| . $locale->text('Phone') . qq|$form->{phone}
| . $locale->text('Fax') . qq|$form->{fax}
| . $locale->text('E-mail') . qq|$form->{email}
-
-| . $cgi->hidden("-name" => "nextsub", "-value" => $nextsub); -; - - - - # delete shipto - map({ delete $form->{$_} } (@shipto_vars, qw(header shipto_id))); - $form->{title} = $title; - - 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| - -
- -
- -
- - - -|; + print $::form->parse_html_template('io/ship_to', { previousform => $previous_form, + nextsub => $::form->{display_form} || 'display_form', + }); $main::lxdebug->leave_sub(); } -sub new_license { - $main::lxdebug->enter_sub(); - - my $form = $main::form; - - _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}; - my $customer = $form->{customer}; - map { $form->{"old_$_"} = $form->{"${_}_$row"} } qw(partnumber description); - - # save all other form variables in a previousform variable - $form->{row} = $row; - my $previousform; - foreach my $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}=$form->{name}&type=$form->{type}&customer=$customer&partnumber=$form->{partnumber}&description=$form->{description}&previousform="$previousform"&initial=1|; - $form->redirect; - - $main::lxdebug->leave_sub(); +sub ship_to_entered { + $::auth->restore_form_from_session(delete $::form->{previousform}); + call_sub($::form->{nextsub}); } sub relink_accounts { @@ -2101,6 +1799,8 @@ sub _render_custom_variables_inputs { $description = $cvar->{description} . ' '; } + my $form_key = "ic_cvar_" . $cvar->{name} . "_$params{row}"; + push @{ $params{ROW2} }, { line_break => $num_visible_cvars == 1, description => $description, @@ -2111,7 +1811,7 @@ sub _render_custom_variables_inputs { name_prefix => 'ic_', name_postfix => "_$params{row}", valid => $cvar->{valid}, - value => $form->{"ic_cvar_" . $cvar->{name} . "_$params{row}"}, + value => CVar->parse($::form->{$form_key}, $cvar), } }; }