X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=d5209cf0808b6f48510311192c2d80f4e0b25e27;hb=1118dab96d2c42e872c9782b4374709d52b20653;hp=c6b6df21de7cd2c7aba20c82aa06401f79f85272;hpb=4dbb09950c9f5596646537c12d991c99086fe7c1;p=kivitendo-erp.git diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index c6b6df21d..d5209cf08 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -33,18 +33,24 @@ # ####################################################################### +use SL::CT; +use SL::IC; +use CGI::Ajax; +use CGI; + +require "bin/mozilla/common.pl"; + # any custom scripts for this one -if (-f "$form->{path}/custom_io.pl") { - eval { require "$form->{path}/custom_io.pl"; }; +if (-f "bin/mozilla/custom_io.pl") { + eval { require "bin/mozilla/custom_io.pl"; }; } -if (-f "$form->{path}/$form->{login}_io.pl") { - eval { require "$form->{path}/$form->{login}_io.pl"; }; +if (-f "bin/mozilla/$form->{login}_io.pl") { + eval { require "bin/mozilla/$form->{login}_io.pl"; }; } - 1; -# end of main +# end of main # this is for our long dates # $locale->text('January') @@ -73,6 +79,9 @@ if (-f "$form->{path}/$form->{login}_io.pl") { # $locale->text('Oct') # $locale->text('Nov') # $locale->text('Dec') +use SL::IS; +use SL::PE; +use SL::AM; use Data::Dumper; ######################################## # Eintrag fuer Version 2.2.0 geaendert # @@ -82,66 +91,135 @@ sub display_row { $lxdebug->enter_sub(); my $numrows = shift; - -if ($lizenzen && $form->{vc} eq "customer") { - if ($form->{type} =~ /sales_order/) { - @column_index = (runningnumber, partnumber, description, ship, qty); - } - elsif ($form->{type} =~ /sales_quotation/){ - @column_index = (runningnumber, partnumber, description, qty); - } - else { - @column_index = (runningnumber, partnumber, description, qty); - } -} -else { - if (($form->{type} =~ /purchase_order/) || ($form->{type} =~ /sales_order/)) { - @column_index = (runningnumber, partnumber, description, ship, qty); - } - else { - @column_index = (runningnumber, partnumber, description, qty); + if ($lizenzen && $form->{vc} eq "customer") { + if ($form->{type} =~ /sales_order/) { + @column_index = (runningnumber, partnumber, description, ship, qty); + } elsif ($form->{type} =~ /sales_quotation/) { + @column_index = (runningnumber, partnumber, description, qty); + } else { + @column_index = (runningnumber, partnumber, description, qty); + } + } else { + if ( ($form->{type} =~ /purchase_order/) + || ($form->{type} =~ /sales_order/)) { + @column_index = (runningnumber, partnumber, description, ship, qty); + } else { + @column_index = (runningnumber, partnumber, description, qty); + } } -} ############## ENDE Neueintrag ################## - push @column_index, qw(unit sellprice); + my $dimension_units = AM->retrieve_units(\%myconfig, $form, "dimension"); + my $service_units = AM->retrieve_units(\%myconfig, $form, "service"); + my $all_units = AM->retrieve_units(\%myconfig, $form); + + push @column_index, qw(unit); + + #for pricegroups column + if ( $form->{type} =~ (/sales_quotation/) + or (($form->{level} =~ /Sales/) and ($form->{type} =~ /invoice/)) + or (($form->{level} eq undef) and ($form->{type} =~ /invoice/)) + or ($form->{type} =~ /sales_order/)) { + push @column_index, qw(sellprice_pg); + } + + push @column_index, qw(sellprice); if ($form->{vc} eq 'customer') { push @column_index, qw(discount); } - + push @column_index, "linetotal"; my $colspan = $#column_index + 1; - $form->{invsubtotal} = 0; - map { $form->{"${_}_base"} = 0 } (split / /, $form->{taxaccounts}); + map { $form->{"${_}_base"} = 0 } (split(/ /, $form->{taxaccounts})); ######################################## -# Eintrag fuer Version 2.2.0 geaendert # -# neue Optik im Rechnungsformular # + # Eintrag fuer Version 2.2.0 geaendert # + # neue Optik im Rechnungsformular # ######################################## - $column_data{runningnumber} = qq||.$locale->text('No.').qq||; - $column_data{partnumber} = qq||.$locale->text('Number').qq||; - $column_data{description} = qq||.$locale->text('Part Description').qq||; - $column_data{ship} = qq||.$locale->text('Ship').qq||; - $column_data{qty} = qq||.$locale->text('Qty').qq||; - $column_data{unit} = qq||.$locale->text('Unit').qq||; - $column_data{license} = qq||.$locale->text('License').qq||; - $column_data{serialnr} = qq||.$locale->text('Serial No.').qq||; - $column_data{projectnr} = qq||.$locale->text('Project').qq||; - $column_data{sellprice} = qq||.$locale->text('Price').qq||; - $column_data{discount} = qq||.$locale->text('Discount').qq||; - $column_data{linetotal} = qq||.$locale->text('Extended').qq||; - $column_data{bin} = qq||.$locale->text('Bin').qq||; + $column_data{runningnumber} = + qq|| + . $locale->text('No.') + . qq||; + $column_data{partnumber} = + qq|| + . $locale->text('Number') + . qq||; + $column_data{description} = + qq|| + . $locale->text('Part Description') + . qq||; + if ($form->{"type"} eq "purchase_order") { + $column_data{ship} = + qq|| + . $locale->text('Ship rcvd') + . qq||; + } else { + $column_data{ship} = + qq|| + . $locale->text('Ship') + . qq||; + } + $column_data{qty} = + qq|| + . $locale->text('Qty') + . qq||; + $column_data{unit} = + qq|| + . $locale->text('Unit') + . qq||; + $column_data{license} = + qq|| + . $locale->text('License') + . qq||; + $column_data{serialnr} = + qq|| + . $locale->text('Serial No.') + . qq||; + $column_data{projectnr} = + qq|| + . $locale->text('Project') + . qq||; + $column_data{sellprice} = + qq|| + . $locale->text('Price') + . qq||; + $column_data{sellprice_pg} = + qq|| + . $locale->text('Pricegroup') + . qq||; + $column_data{discount} = + qq|| + . $locale->text('Discount') + . qq||; + $column_data{linetotal} = + qq|| + . $locale->text('Extended') + . qq||; + $column_data{bin} = + qq|| + . $locale->text('Bin') + . qq||; ############## ENDE Neueintrag ################## + $myconfig{"show_form_details"} = 1 + unless (defined($myconfig{"show_form_details"})); + $form->{"show_details"} = $myconfig{"show_form_details"} + unless (defined($form->{"show_details"})); + $form->{"show_details"} = $form->{"show_details"} ? 1 : 0; + my $show_details_new = 1 - $form->{"show_details"}; + my $show_details_checked = $form->{"show_details"} ? "checked" : ""; + print qq| - - - |; + - -|; - } - - if ($form->{formname} =~ /(pick|packing|bin)_list/) { - $form->{email} = $form->{shiptoemail} if $form->{shiptoemail}; + if ($form->{second_run}) { + $form->{print_and_post} = 0; + $form->{resubmit} = 0; } - $name = $form->{$form->{vc}}; - $name =~ s/--.*//g; - $title = $locale->text('E-mail')." $name"; - - $form->{oldmedia} = $form->{media}; - $form->{media} = "email"; - - $form->header; + $form->{email} = $form->{shiptoemail} if $form->{shiptoemail} && $form->{formname} =~ /(pick|packing|bin)_list/; - print qq| - - -{script}> + if ($form->{"cp_id"} && !$form->{"email"}) { + CT->get_contact(\%myconfig, $form); + $form->{"email"} = $form->{"cp_email"}; + } -
| . $cgi->hidden("-name" => "show_details", "-value" => $form->{show_details}) . qq| + +
+ + |; map { print "\n$column_data{$_}" } @column_index; @@ -149,133 +227,271 @@ else { |; - $runningnumber = $locale->text('No.'); - $deliverydate = $locale->text('Delivery Date'); - $serialnumber = $locale->text('Serial No.'); + $deliverydate = $locale->text('Delivery Date'); + $serialnumber = $locale->text('Serial No.'); $projectnumber = $locale->text('Project'); - $partsgroup = $locale->text('Group'); + $partsgroup = $locale->text('Group'); + $reqdate = $locale->text('Reqdate'); $delvar = 'deliverydate'; - + if ($form->{type} =~ /_order$/ || $form->{type} =~ /_quotation$/) { $deliverydate = $locale->text('Required by'); - $delvar = 'reqdate'; + $delvar = 'reqdate'; + } + + my %projectnumber_labels = (); + my @projectnumber_values = (""); + foreach my $item (@{ $form->{"ALL_PROJECTS"} }) { + push(@projectnumber_values, $item->{"id"}); + $projectnumber_labels{$item->{"id"}} = $item->{"projectnumber"}; } - for $i (1 .. $numrows) { + # undo formatting - map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(qty ship discount sellprice); - + map { + $form->{"${_}_$i"} = + $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) + } qw(qty ship discount sellprice price_new price_old) unless ($form->{simple_save}); + + if (!$form->{"unit_old_$i"}) { + # Neue Ware aus der Datenbank. In diesem Fall ist unit_$i die + # Einheit, wie sie in den Stammdaten hinterlegt wurde. + # Es sollte also angenommen werden, dass diese ausgewaehlt war. + $form->{"unit_old_$i"} = $form->{"unit_$i"}; + } + # Die zuletzt ausgewaehlte mit der aktuell ausgewaehlten Einheit + # vergleichen und bei Unterschied den Preis entsprechend umrechnen. + $form->{"selected_unit_$i"} = $form->{"unit_$i"} unless ($form->{"selected_unit_$i"}); + + my $check_units = $form->{"inventory_accno_$i"} ? $dimension_units : $service_units; + if (!$check_units->{$form->{"selected_unit_$i"}} || + ($check_units->{$form->{"selected_unit_$i"}}->{"base_unit"} ne + $all_units->{$form->{"unit_old_$i"}}->{"base_unit"})) { + # Die ausgewaehlte Einheit ist fuer diesen Artikel nicht gueltig + # (z.B. Dimensionseinheit war ausgewaehlt, es handelt sich aber + # um eine Dienstleistung). Dann keinerlei Umrechnung vornehmen. + $form->{"unit_old_$i"} = $form->{"selected_unit_$i"} = $form->{"unit_$i"}; + } + if ((!$form->{"prices_$i"}) || ($form->{"new_pricegroup_$i"} == $form->{"old_pricegroup_$i"})) { + if ($form->{"unit_old_$i"} ne $form->{"selected_unit_$i"}) { + my $basefactor = 1; + if (defined($all_units->{$form->{"unit_old_$i"}}->{"factor"}) && + $all_units->{$form->{"unit_old_$i"}}->{"factor"}) { + $basefactor = $all_units->{$form->{"selected_unit_$i"}}->{"factor"} / + $all_units->{$form->{"unit_old_$i"}}->{"factor"}; + } + $form->{"sellprice_$i"} *= $basefactor; + $form->{"unit_old_$i"} = $form->{"selected_unit_$i"}; + } + } ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/); - $dec = length $dec; + $dec = length $dec; $decimalplaces = ($dec > 2) ? $dec : 2; - - $discount = $form->round_amount($form->{"sellprice_$i"} * $form->{"discount_$i"}/100, $decimalplaces); - $linetotal = $form->round_amount($form->{"sellprice_$i"} - $discount, $decimalplaces); + + $discount = + $form->round_amount( + $form->{"sellprice_$i"} * $form->{"discount_$i"} / 100, + $decimalplaces); + + $linetotal = + $form->round_amount($form->{"sellprice_$i"} - $discount, $decimalplaces); $linetotal = $form->round_amount($linetotal * $form->{"qty_$i"}, 2); # convert " to " - map { $form->{"${_}_$i"} =~ s/\"/"/g } qw(partnumber description unit); + map { $form->{"${_}_$i"} =~ s/\"/"/g } + qw(partnumber description unit unit_old); ######################################## -# Eintrag fuer Version 2.2.0 geaendert # -# neue Optik im Rechnungsformular # + # Eintrag fuer Version 2.2.0 geaendert # + # neue Optik im Rechnungsformular # ######################################## - $column_data{runningnumber} = qq||; # HuT + $column_data{runningnumber} = + qq||; # HuT ############## ENDE Neueintrag ################## - - $column_data{partnumber} = qq||; + + $column_data{partnumber} = + qq||; if (($rows = $form->numtextrows($form->{"description_$i"}, 30, 6)) > 1) { - $column_data{description} = qq||; + $column_data{description} = + qq||; } else { - $column_data{description} = qq||; + $column_data{description} = + qq||; } - $column_data{qty} = qq||; - $column_data{ship} = qq||; - $column_data{unit} = qq||; - $column_data{sellprice} = qq||; - $column_data{discount} = qq||; - $column_data{linetotal} = qq||; - $column_data{bin} = qq||; + (my $qty_dec) = ($form->{"qty_$i"} =~ /\.(\d+)/); + $qty_dec = length $qty_dec; + + $column_data{qty} = + qq||; + } + $column_data{ship} = + qq||; + + my $is_part = $form->{"inventory_accno_$i"}; + my $is_assembly = $form->{"assembly_$i"}; + my $is_assigned = $form->{"id_$i"}; + my $this_unit = $form->{"unit_$i"}; + if ($form->{"selected_unit_$i"} && $this_unit && + $all_units->{$form->{"selected_unit_$i"}} && $all_units->{$this_unit} && + ($all_units->{$form->{"selected_unit_$i"}}->{"base_unit"} eq $all_units->{$this_unit}->{"base_unit"})) { + $this_unit = $form->{"selected_unit_$i"}; + } elsif (!$is_assigned || + ($is_part && !$this_unit && ($all_units->{$this_unit} && ($all_units->{$this_unit}->{"base_unit"} eq $all_units->{"kg"}->{"base_unit"})))) { + $this_unit = "kg"; + } + + $column_data{"unit"} = ""; + + # build in drop down list for pricesgroups + if ($form->{"prices_$i"}) { + if ($form->{"new_pricegroup_$i"} != $form->{"old_pricegroup_$i"}) { + $price_tmp = $form->format_amount(\%myconfig, $form->{"price_new_$i"}, $decimalplaces); + } else { + $price_tmp = $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces); + } + + $column_data{sellprice_pg} = + qq||; + $column_data{sellprice} = + qq||; + } else { + + # for last row and report + # set pricegroup drop down list from report menu + if ($form->{"sellprice_$i"} != 0) { + $prices = + qq|\n|; + + $form->{"pricegroup_old_$i"} = $form->{"pricegroup_id_$i"}; + + $column_data{sellprice_pg} = + qq||; + } else { + + # for last row + $column_data{sellprice_pg} = qq||; + } + + $column_data{sellprice} = + qq||; + } + $column_data{discount} = + qq||; + $column_data{linetotal} = + qq||; + $column_data{bin} = qq||; ######################################## -# Eintrag fuer Version 2.2.0 geaendert # -# neue Optik im Rechnungsformular # -######################################## -# if ($lizenzen && $form->{type} eq "invoice" && $form->{vc} eq "customer") { -# $column_data{license} = qq||; -# } -# -# if ($form->{type} !~ /_quotation/) { -# $column_data{serialnr} = qq||; -# } -# -# $column_data{projectnr} = qq||; + # Eintrag fuer Version 2.2.0 geaendert # + # neue Optik im Rechnungsformular # +######################################## + # if ($lizenzen && $form->{type} eq "invoice" && $form->{vc} eq "customer") { + # $column_data{license} = qq||; + # } + # + # if ($form->{type} !~ /_quotation/) { + # $column_data{serialnr} = qq||; + # } + # + # $column_data{projectnr} = qq||; ############## ENDE Neueintrag ################## - - + my $j = $i % 2; print qq| - |; + + |; map { print "\n$column_data{$_}" } @column_index; - - print qq| - -{"orderitems_id_$i"}> -{"bo_$i"}> + print("\n" . + $cgi->hidden("-name" => "unit_old_$i", + "-value" => $form->{"selected_unit_$i"}) + . "\n" . + $cgi->hidden("-name" => "price_new_$i", + "-value" => $form->format_amount(\%myconfig, $form->{"price_new_$i"})) + . "\n"); + map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_}) . "\n"); } + ("orderitems_id_$i", "bo_$i", "pricegroup_old_$i", "price_old_$i", + "id_$i", "inventory_accno_$i", "bin_$i", "partsgroup_$i", "partnotes_$i", + "income_accno_$i", "expense_accno_$i", "listprice_$i", "assembly_$i", + "taxaccounts_$i", "ordnumber_$i", "transdate_$i", "cusordnumber_$i", + "longdescription_$i", "basefactor_$i")); -{"id_$i"}> -{"inventory_accno_$i"}> - - - -{"income_accno_$i"}> -{"expense_accno_$i"}> - - - +######################################## + # Eintrag fuer Version 2.2.0 geaendert # + # neue Optik im Rechnungsformular # +######################################## -|; + my $row_style_attr = + 'style="display:none;"' if (!$form->{"show_details"}); -######################################## -# Eintrag fuer Version 2.2.0 geaendert # -# neue Optik im Rechnungsformular # -######################################## # print second row print qq| - - + @@ -283,9 +499,9 @@ else { ############## ENDE Neueintrag ################## + map { $form->{"${_}_base"} += $linetotal } + (split(/ /, $form->{"taxaccounts_$i"})); - map { $form->{"${_}_base"} += $linetotal } (split / /, $form->{"taxaccounts_$i"}); - $form->{invsubtotal} += $linetotal; } @@ -298,122 +514,169 @@ else { $lxdebug->leave_sub(); } +################################################## +# build html-code for pricegroups in variable $form->{prices_$j} -sub select_item { +sub set_pricegroup { $lxdebug->enter_sub(); - - @column_index = qw(ndx partnumber description onhand sellprice); + my $rowcount = shift; + for $j (1 .. $rowcount) { + my $pricegroup_old = $form->{"pricegroup_old_$i"}; + if ($form->{PRICES}{$j}) { + $len = 0; + $prices = ''; + $price = 0; + foreach $item (@{ $form->{PRICES}{$j} }) { + + #$price = $form->round_amount($myconfig, $item->{price}, 5); + #$price = $form->format_amount($myconfig, $item->{price}, 2); + $price = $item->{price}; + $pricegroup_id = $item->{pricegroup_id}; + $pricegroup = $item->{pricegroup}; + + # build drop down list for pricegroups + $prices .= + qq|\n|; + + $len += 1; + + # map { + # $form->{"${_}_$j"} = + # $form->format_amount(\%myconfig, $form->{"${_}_$j"}) + # } qw(sellprice price_new price_old); + + # set new selectedpricegroup_id and prices for "Preis" + if ($item->{selected} && ($pricegroup_id != 0)) { + $form->{"pricegroup_old_$j"} = $pricegroup_id; + $form->{"price_new_$j"} = $price; + $form->{"sellprice_$j"} = $price; + } + if ($pricegroup_id == 0) { + $form->{"price_new_$j"} = $form->{"sellprice_$j"}; + } + } + $form->{"prices_$j"} = $prices; + } + } + $lxdebug->leave_sub(); +} - $column_data{ndx} = qq||; - $column_data{partnumber} = qq||; - $column_data{description} = qq||; - $column_data{sellprice} = qq||; - $column_data{onhand} = qq||; - - +sub select_item { + $lxdebug->enter_sub(); + @column_index = qw(ndx partnumber description onhand unit sellprice); + + $column_data{ndx} = qq||; + $column_data{partnumber} = + qq||; + $column_data{description} = + qq||; + $column_data{sellprice} = + qq||; + $column_data{onhand} = + qq||; + $column_data{unit} = + qq||; # list items with radio button on a form $form->header; - $title = $locale->text('Select from one of the items below'); + $title = $locale->text('Select from one of the items below'); $colspan = $#column_index + 1; - - print qq| - + -{script}> + -
format_amount(\%myconfig, $form->{"qty_$i"}).qq|>format_amount(\%myconfig, $form->{"ship_$i"}).qq|>format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces).qq|>format_amount(\%myconfig, $form->{"discount_$i"}).qq|>|.$form->format_amount(\%myconfig, $linetotal, 2).qq|$form->{"bin_$i"}|; + if ($form->{"formel_$i"}) { + $column_data{qty} .= qq|| . + $cgi->hidden("-name" => "formel_$i", "-value" => $form->{"formel_$i"}) . $cgi->hidden("-name" => "alu_$i", "-value" => $form->{"alu_$i"}). qq|" . + AM->unit_select_html($is_part || $is_assembly ? $dimension_units : + $is_assigned ? $service_units : $all_units, + "unit_$i", $this_unit, + $is_assigned ? $form->{"unit_$i"} : undef) + . " | + . $form->format_amount(\%myconfig, $linetotal, 2) + . qq|$form->{"bin_$i"}
+
|; - if ($lizenzen && $form->{type} eq "invoice" && $form->{vc} eq "customer") { + if ($lizenzen && $form->{type} eq "invoice" && $form->{vc} eq "customer") { my $selected = $form->{"licensenumber_$i"}; my $lizenzen_quoted; $form->{"lizenzen_$i"} =~ s/ selected//g; - $form->{"lizenzen_$i"} =~ s/value="${selected}"\>/value="${selected}" selected\>/; + $form->{"lizenzen_$i"} =~ + s/value="${selected}"\>/value="${selected}" selected\>/; $lizenzen_quoted = $form->{"lizenzen_$i"}; $lizenzen_quoted =~ s/\"/"/g; print qq| - Lizenz\#  $form->{"lizenzen_$i"} - + |; } if ($form->{type} !~ /_quotation/) { print qq| - $serialnumber |; + $serialnumber |; } + print qq|$projectnumber | . + NTI($cgi->popup_menu('-name' => "project_id_$i", + '-values' => \@projectnumber_values, + '-labels' => \%projectnumber_labels, + '-default' => $form->{"project_id_$i"})); + + if ($form->{type} eq 'invoice' or $form->{type} =~ /order/) { + my $reqdate_term = + ($form->{type} eq 'invoice') + ? 'deliverydate' + : 'reqdate'; # invoice uses a different term for the same thing. + print qq| + ${$reqdate_term}  +|; + } + my $subtotalchecked = ($form->{"subtotal_$i"}) ? "checked" : ""; print qq| - $projectnumber  - - + |.$locale->text('Subtotal').qq| 
 |.$locale->text('Number').qq||.$locale->text('Part Description').qq||.$locale->text('Price').qq||.$locale->text('Qty').qq| | . $locale->text('Number') . qq|| . $locale->text('Part Description') . qq|| . $locale->text('Price') . qq|| . $locale->text('Qty') . qq|| . $locale->text('Unit') . qq|
+
- + - |; + |; map { print "\n$column_data{$_}" } @column_index; - + print qq||; my $i = 0; foreach $ref (@{ $form->{item_list} }) { $checked = ($i++) ? "" : "checked"; - + if ($lizenzen) { - if ($ref->{inventory_accno} > 0) { - $ref->{"lizenzen"} = qq||; - foreach $item (@{ $form->{LIZENZEN}{$ref->{"id"}}}) { - $ref->{"lizenzen"} .= qq||; - } - $ref->{"lizenzen"} .= qq||; - $ref->{"lizenzen"} =~ s/\"/"/g; + if ($ref->{inventory_accno} > 0) { + $ref->{"lizenzen"} = qq||; + foreach $item (@{ $form->{LIZENZEN}{ $ref->{"id"} } }) { + $ref->{"lizenzen"} .= + qq||; } + $ref->{"lizenzen"} .= qq||; + $ref->{"lizenzen"} =~ s/\"/"/g; + } } - map { $ref->{$_} =~ s/\"/"/g } qw(partnumber description unit); - $ref->{sellprice} = $form->round_amount($ref->{sellprice} * (1 - $form->{tradediscount}), 2); - - $column_data{ndx} = qq||; - $column_data{partnumber} = qq||; - $column_data{description} = qq||; - $column_data{sellprice} = qq||; - $column_data{onhand} = qq||; - - $j++; $j %= 2; + #sk tradediscount + $ref->{sellprice} = + $form->round_amount($ref->{sellprice} * (1 - $form->{tradediscount}), 2); + $column_data{ndx} = + qq||; + $column_data{partnumber} = + qq||; + $column_data{description} = + qq||; + $column_data{sellprice} = + qq||; + $column_data{onhand} = + qq||; + $column_data{unit} = + qq||; + $j++; + $j %= 2; print qq| |; map { print "\n$column_data{$_}" } @column_index; - print qq| - - - -{listprice}> -{inventory_accno}> -{income_accno}> -{expense_accno}> - - - - - + print("\n"); -{id}> + 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); + push(@new_fields, "lizenzen") if ($lizenzen); -|; - if ($lizenzen) { - print qq| - -|; + print join "\n", map { $cgi->hidden("-name" => "new_${_}_$i", "-value" => $ref->{$_}) } @new_fields; + print "\n"; } - } - print qq| - +
$title$title
$ref->{partnumber}$ref->{description}{sellprice}>|.$form->format_amount(\%myconfig, $ref->{sellprice}, 2, " ").qq|{onhand}>|.$form->format_amount(\%myconfig, $ref->{onhand}, '', " ").qq|$ref->{partnumber}$ref->{description}| + . $form->format_amount(\%myconfig, $ref->{sellprice}, 2, " ") + . qq|| + . $form->format_amount(\%myconfig, $ref->{onhand}, '', " ") + . qq|$ref->{unit}
- + |; # delete action variable map { delete $form->{$_} } qw(action item_list header); - + # save all other form variables foreach $key (keys %${form}) { $form->{$key} =~ s/\"/"/g; - print qq|\n|; + print qq|\n|; } print qq| - +
- + @@ -423,8 +686,6 @@ sub select_item { $lxdebug->leave_sub(); } - - sub item_selected { $lxdebug->enter_sub(); @@ -435,70 +696,102 @@ sub item_selected { # index for new item $j = $form->{ndx}; + #sk + #($form->{"sellprice_$i"},$form->{"$pricegroup_old_$i"}) = split /--/, $form->{"sellprice_$i"}; + #$form->{"sellprice_$i"} = $form->{"sellprice_$i"}; + # if there was a price entered, override it $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"}); - - map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} } qw(id partnumber description sellprice listprice inventory_accno income_accno expense_accno bin unit weight assembly taxaccounts partsgroup); - + + map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} } + qw(id partnumber description sellprice listprice inventory_accno + income_accno expense_accno bin unit weight assembly taxaccounts + partsgroup formel longdescription not_discountable partnotes); + 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); + map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} } qw(lizenzen); } ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/); - $dec = length $dec; + $dec = length $dec; $decimalplaces = ($dec > 2) ? $dec : 2; if ($sellprice) { $form->{"sellprice_$i"} = $sellprice; } else { + # if there is an exchange rate adjust sellprice if (($form->{exchangerate} * 1) != 0) { $form->{"sellprice_$i"} /= $form->{exchangerate}; - $form->{"sellprice_$i"} = $form->round_amount($form->{"sellprice_$i"}, $decimalplaces); + $form->{"sellprice_$i"} = + $form->round_amount($form->{"sellprice_$i"}, $decimalplaces); } } - map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(sellprice listprice weight); + map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } + qw(sellprice listprice weight); $form->{sellprice} += ($form->{"sellprice_$i"} * $form->{"qty_$i"}); - $form->{weight} += ($form->{"weight_$i"} * $form->{"qty_$i"}); + $form->{weight} += ($form->{"weight_$i"} * $form->{"qty_$i"}); + + if ($form->{"not_discountable_$i"}) { + $form->{"discount_$i"} = 0; + } - $amount = $form->{"sellprice_$i"} * (1 - $form->{"discount_$i"} / 100) * $form->{"qty_$i"}; - map { $form->{"${_}_base"} += $amount } (split / /, $form->{"taxaccounts_$i"}); - map { $amount += ($form->{"${_}_base"} * $form->{"${_}_rate"}) } split / /, $form->{"taxaccounts_$i"} if !$form->{taxincluded}; + $amount = + $form->{"sellprice_$i"} * (1 - $form->{"discount_$i"} / 100) * + $form->{"qty_$i"}; + map { $form->{"${_}_base"} += $amount } + (split / /, $form->{"taxaccounts_$i"}); + map { $amount += ($form->{"${_}_base"} * $form->{"${_}_rate"}) } split / /, + $form->{"taxaccounts_$i"} + if !$form->{taxincluded}; $form->{creditremaining} -= $amount; $form->{"runningnumber_$i"} = $i; - + # delete all the new_ variables for $i (1 .. $form->{lastndx}) { - map { delete $form->{"new_${_}_$i"} } qw(partnumber description sellprice bin listprice inventory_accno income_accno expense_accno unit assembly taxaccounts id); + map { delete $form->{"new_${_}_$i"} } + qw(partnumber description sellprice bin listprice inventory_accno income_accno expense_accno unit assembly taxaccounts id); } - + map { delete $form->{$_} } qw(ndx lastndx nextsub); # format amounts - map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, $decimalplaces) } qw(sellprice listprice) if $form->{item} ne 'assembly'; + map { + $form->{"${_}_$i"} = + $form->format_amount(\%myconfig, $form->{"${_}_$i"}, $decimalplaces) + } qw(sellprice listprice) if $form->{item} ne 'assembly'; + + # get pricegroups for parts + IS->get_pricegroups_for_parts(\%myconfig, \%$form); + + # build up html code for prices_$i + set_pricegroup($form->{rowcount}); &display_form; - + $lxdebug->leave_sub(); } - sub new_item { $lxdebug->enter_sub(); # change callback - $form->{old_callback} = $form->escape($form->{callback},1); - $form->{callback} = $form->escape("$form->{script}?action=display_form",1); + $form->{old_callback} = $form->escape($form->{callback}, 1); + $form->{callback} = $form->escape("$form->{script}?action=display_form", 1); # delete action delete $form->{action}; # save all other form variables in a previousform variable foreach $key (keys %$form) { + # escape ampersands $form->{$key} =~ s/&/%26/g; $previousform .= qq|$key=$form->{$key}&|; @@ -514,35 +807,32 @@ sub new_item { print qq| -

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

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

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

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

-  |.$locale->text('Part') -.qq|
-  |.$locale->text('Service') - -.qq| - - - -{rowcount}> -{taxaccounts}> -{vc}> +  | + . $locale->text('Part') . qq|
+  | + . $locale->text('Service'); +print $cgi->hidden("-name" => "previousform", "-value" => $previousform); +map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } + qw(rowcount vc login password)); + map({ print($cgi->hidden("-name" => $_, "-value" => $form->{"$__$i"})); } + ("partnumber", "description")); +print $cgi->hidden("-name" => "taxaccount2", "-value" => $form->{taxaccounts}); -{path}> -{login}> -{password}> - - +print qq| +

- +

@@ -552,69 +842,127 @@ sub new_item { $lxdebug->leave_sub(); } - - sub display_form { $lxdebug->enter_sub(); + relink_accounts(); + + my $new_rowcount = $form->{"rowcount"} * 1 + 1; + $form->{"project_id_${new_rowcount}"} = $form->{"globalproject_id"}; + + $form->language_payment(\%myconfig); + # if we have a display_form if ($form->{display_form}) { - &{ "$form->{display_form}" }; + call_sub($form->{"display_form"}); exit; } - + + Common::webdav_folder($form) if ($webdav); + + # if ( $form->{print_and_post} + # && $form->{second_run} + # && ($form->{action} eq "display_form")) { + # for (keys %$form) { $old_form->{$_} = $form->{$_} } + # $old_form->{rowcount}++; + # + # #$form->{rowcount}--; + # #$form->{rowcount}--; + # + # $form->{print_and_post} = 0; + # + # &print_form($old_form); + # exit; + # } + # + # $form->{action} = ""; + # $form->{resubmit} = 0; + # + # if ($form->{print_and_post} && !$form->{second_run}) { + # $form->{second_run} = 1; + # $form->{action} = "display_form"; + # $form->{rowcount}--; + # my $rowcount = $form->{rowcount}; + # + # # get pricegroups for parts + # IS->get_pricegroups_for_parts(\%myconfig, \%$form); + # + # # build up html code for prices_$i + # set_pricegroup($rowcount); + # + # $form->{resubmit} = 1; + # + # } &form_header; - $numrows = ++$form->{rowcount}; + $numrows = ++$form->{rowcount}; $subroutine = "display_row"; if ($form->{item} eq 'part') { - $numrows = ++$form->{makemodel_rows}; + + #set preisgruppenanzahl + $numrows = $form->{price_rows}; + $subroutine = "price_row"; + + &{$subroutine}($numrows); + + $numrows = ++$form->{makemodel_rows}; $subroutine = "makemodel_row"; } if ($form->{item} eq 'assembly') { - $numrows = ++$form->{makemodel_rows}; + $numrows = $form->{price_rows}; + $subroutine = "price_row"; + + &{$subroutine}($numrows); + + $numrows = ++$form->{makemodel_rows}; $subroutine = "makemodel_row"; - + # create makemodel rows - &{ $subroutine }($numrows); + &{$subroutine}($numrows); - $numrows = ++$form->{assembly_rows}; + $numrows = ++$form->{assembly_rows}; $subroutine = "assembly_row"; } if ($form->{item} eq 'service') { + $numrows = $form->{price_rows}; + $subroutine = "price_row"; + + &{$subroutine}($numrows); + $numrows = 0; } # create rows - &{ $subroutine }($numrows) if $numrows; + &{$subroutine}($numrows) if $numrows; &form_footer; $lxdebug->leave_sub(); } - - sub check_form { $lxdebug->enter_sub(); - - my @a = (); + my @a = (); my $count = 0; - my @flds = (qw(id partnumber description qty ship sellprice unit discount inventory_accno income_accno expense_accno listprice taxaccounts bin assembly weight projectnumber project_id oldprojectnumber runningnumber serialnumber partsgroup)); + 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) + ); + # remove any makes or model rows if ($form->{item} eq 'part') { - map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(listprice sellprice lastcost weight rop); - + map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } + qw(listprice sellprice lastcost weight rop); + @flds = (make, model); for my $i (1 .. ($form->{makemodel_rows})) { if (($form->{"make_$i"} ne "") || ($form->{"model_$i"} ne "")) { - push @a, {}; - my $j = $#a; + push @a, {}; + my $j = $#a; - map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds; - $count++; + map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds; + $count++; } } @@ -624,42 +972,46 @@ sub check_form { } elsif ($form->{item} eq 'assembly') { $form->{sellprice} = 0; - $form->{weight} = 0; - map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(listprice rop stock); + $form->{weight} = 0; + map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } + qw(listprice rop stock); + + @flds = + qw(id qty unit bom partnumber description sellprice weight runningnumber partsgroup); - @flds = qw(id qty unit bom partnumber description sellprice weight runningnumber partsgroup); - for my $i (1 .. ($form->{assembly_rows} - 1)) { if ($form->{"qty_$i"}) { - push @a, {}; - my $j = $#a; + push @a, {}; + my $j = $#a; $form->{"qty_$i"} = $form->parse_amount(\%myconfig, $form->{"qty_$i"}); - map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds; + map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds; + + #($form->{"sellprice_$i"},$form->{"$pricegroup_old_$i"}) = split /--/, $form->{"sellprice_$i"}; - $form->{sellprice} += ($form->{"qty_$i"} * $form->{"sellprice_$i"}); - $form->{weight} += ($form->{"qty_$i"} * $form->{"weight_$i"}); - $count++; + $form->{sellprice} += ($form->{"qty_$i"} * $form->{"sellprice_$i"}); + $form->{weight} += ($form->{"qty_$i"} * $form->{"weight_$i"}); + $count++; } } $form->{sellprice} = $form->round_amount($form->{sellprice}, 2); - + $form->redo_rows(\@flds, \@a, $count, $form->{assembly_rows}); $form->{assembly_rows} = $count; - + $count = 0; - @flds = qw(make model); - @a = (); - + @flds = qw(make model); + @a = (); + for my $i (1 .. ($form->{makemodel_rows})) { if (($form->{"make_$i"} ne "") || ($form->{"model_$i"} ne "")) { - push @a, {}; - my $j = $#a; + push @a, {}; + my $j = $#a; - map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds; - $count++; + map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds; + $count++; } } @@ -672,556 +1024,590 @@ sub check_form { # 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; - } - } - } + 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; - + } } + #sk + # if pricegroups + if ( $form->{type} =~ (/sales_quotation/) + or (($form->{level} =~ /Sales/) and ($form->{type} =~ /invoice/)) + or (($form->{level} eq undef) and ($form->{type} =~ /invoice/)) + or ($form->{type} =~ /sales_order/)) { + + # get pricegroups for parts + IS->get_pricegroups_for_parts(\%myconfig, \%$form); + + # build up html code for prices_$i + set_pricegroup($form->{rowcount}); + + } + &display_form; $lxdebug->leave_sub(); } - sub invoicetotal { $lxdebug->enter_sub(); $form->{oldinvtotal} = 0; + # add all parts and deduct paid map { $form->{"${_}_base"} = 0 } split / /, $form->{taxaccounts}; my ($amount, $sellprice, $discount, $qty); - + for my $i (1 .. $form->{rowcount}) { $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"}); - $discount = $form->parse_amount(\%myconfig, $form->{"discount_$i"}); - $qty = $form->parse_amount(\%myconfig, $form->{"qty_$i"}); + $discount = $form->parse_amount(\%myconfig, $form->{"discount_$i"}); + $qty = $form->parse_amount(\%myconfig, $form->{"qty_$i"}); + + #($form->{"sellprice_$i"}, $form->{"$pricegroup_old_$i"}) = split /--/, $form->{"sellprice_$i"}; $amount = $sellprice * (1 - $discount / 100) * $qty; - map { $form->{"${_}_base"} += $amount } (split / /, $form->{"taxaccounts_$i"}); + map { $form->{"${_}_base"} += $amount } + (split (/ /, $form->{"taxaccounts_$i"})); $form->{oldinvtotal} += $amount; } - map { $form->{oldinvtotal} += ($form->{"${_}_base"} * $form->{"${_}_rate"}) } split / /, $form->{taxaccounts} if !$form->{taxincluded}; - + map { $form->{oldinvtotal} += ($form->{"${_}_base"} * $form->{"${_}_rate"}) } + split(/ /, $form->{taxaccounts}) + if !$form->{taxincluded}; + $form->{oldtotalpaid} = 0; for $i (1 .. $form->{paidaccounts}) { $form->{oldtotalpaid} += $form->{"paid_$i"}; } - + $lxdebug->leave_sub(); # return total return ($form->{oldinvtotal} - $form->{oldtotalpaid}); } - sub validate_items { $lxdebug->enter_sub(); - + # check if items are valid if ($form->{rowcount} == 1) { &update; exit; } - + for $i (1 .. $form->{rowcount} - 1) { - $form->isblank("partnumber_$i", $locale->text('Number missing in Row') . " $i"); + $form->isblank("partnumber_$i", + $locale->text('Number missing in Row') . " $i"); } $lxdebug->leave_sub(); } - sub order { $lxdebug->enter_sub(); - + if ($form->{second_run}) { + $form->{print_and_post} = 0; + } $form->{ordnumber} = $form->{invnumber}; - - map { delete $form->{$_} } qw(id printed emailed queued); - + map { delete $form->{$_} } qw(id printed emailed queued); if ($form->{script} eq 'ir.pl' || $form->{type} eq 'request_quotation') { $form->{title} = $locale->text('Add Purchase Order'); - $form->{vc} = 'vendor'; - $form->{type} = 'purchase_order'; - $buysell = 'sell'; + $form->{vc} = 'vendor'; + $form->{type} = 'purchase_order'; + $buysell = 'sell'; } if ($form->{script} eq 'is.pl' || $form->{type} eq 'sales_quotation') { $form->{title} = $locale->text('Add Sales Order'); - $form->{vc} = 'customer'; - $form->{type} = 'sales_order'; - $buysell = 'buy'; + $form->{vc} = 'customer'; + $form->{type} = 'sales_order'; + $buysell = 'buy'; } $form->{script} = 'oe.pl'; $form->{shipto} = 1; - + $form->{rowcount}--; - - ($null, $form->{cp_id}) = split /--/, $form->{contact}; + $form->{cp_id} *= 1; - - require "$form->{path}/$form->{script}"; + + require "bin/mozilla/$form->{script}"; + my $script = $form->{"script"}; + $script =~ s|.*/||; + $script =~ s|.pl$||; + $locale = new Locale($language, $script); map { $form->{"select$_"} = "" } ($form->{vc}, currency); - + $currency = $form->{currency}; &order_links; - $form->{currency} = $currency; + $form->{currency} = $currency; $form->{exchangerate} = ""; - $form->{forex} = ""; - $form->{exchangerate} = $exchangerate if ($form->{forex} = ($exchangerate = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{transdate}, $buysell))); - + $form->{forex} = ""; + $form->{exchangerate} = $exchangerate + if ( + $form->{forex} = ( + $exchangerate = + $form->check_exchangerate( + \%myconfig, $form->{currency}, $form->{transdate}, $buysell + ))); + + for $i (1 .. $form->{rowcount}) { + map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, + $form->{"${_}_${i}"}) + if ($form->{"${_}_${i}"}) } + qw(ship qty sellprice listprice basefactor)); + } + &prepare_order; &display_form; $lxdebug->leave_sub(); } - sub quotation { $lxdebug->enter_sub(); - + if ($form->{second_run}) { + $form->{print_and_post} = 0; + } map { delete $form->{$_} } qw(id printed emailed queued); - + if ($form->{script} eq 'ir.pl' || $form->{type} eq 'purchase_order') { $form->{title} = $locale->text('Add Request for Quotation'); - $form->{vc} = 'vendor'; - $form->{type} = 'request_quotation'; - $buysell = 'sell'; + $form->{vc} = 'vendor'; + $form->{type} = 'request_quotation'; + $buysell = 'sell'; } if ($form->{script} eq 'is.pl' || $form->{type} eq 'sales_order') { $form->{title} = $locale->text('Add Quotation'); - $form->{vc} = 'customer'; - $form->{type} = 'sales_quotation'; - $buysell = 'buy'; + $form->{vc} = 'customer'; + $form->{type} = 'sales_quotation'; + $buysell = 'buy'; } - - ($null, $form->{cp_id}) = split /--/, $form->{contact}; + $form->{cp_id} *= 1; - + $form->{script} = 'oe.pl'; $form->{shipto} = 1; - + $form->{rowcount}--; - require "$form->{path}/$form->{script}"; + require "bin/mozilla/$form->{script}"; map { $form->{"select$_"} = "" } ($form->{vc}, currency); - + $currency = $form->{currency}; - + &order_links; - $form->{currency} = $currency; + $form->{currency} = $currency; $form->{exchangerate} = ""; - $form->{forex} = ""; - $form->{exchangerate} = $exchangerate if ($form->{forex} = ($exchangerate = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{transdate}, $buysell))); - + $form->{forex} = ""; + $form->{exchangerate} = $exchangerate + if ( + $form->{forex} = ( + $exchangerate = + $form->check_exchangerate( + \%myconfig, $form->{currency}, $form->{transdate}, $buysell + ))); + + for $i (1 .. $form->{rowcount}) { + map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, + $form->{"${_}_${i}"}) + if ($form->{"${_}_${i}"}) } + qw(ship qty sellprice listprice basefactor)); + } + &prepare_order; &display_form; $lxdebug->leave_sub(); } +sub request_for_quotation { + quotation(); +} - -sub e_mail { +sub edit_e_mail { $lxdebug->enter_sub(); - - if ($myconfig{role} eq 'admin') { - $bcc = qq| - 		|.$locale->text('Bcc').qq|
- - - - - - - - - - - - - - - - -
$title
- - - - - - - - - - - $bcc - -
|.$locale->text('To').qq||.$locale->text('Cc').qq|
|.$locale->text('Subject').qq|
-
- - - - - - - -
|.$locale->text('Message').qq|
-
-|; + $form->{ $form->{vc} } =~ /--/; + $title = $locale->text('E-mail') . " $`"; - &print_options; - - map { delete $form->{$_} } qw(action email cc bcc subject message formname sendmode format header override); - - # save all other variables - foreach $key (keys %$form) { - $form->{$key} =~ s/\"/"/g; - print qq|\n|; - } + $form->{oldmedia} = $form->{media}; + $form->{media} = "email"; - print qq| -
+ my $attachment_filename = $form->generate_attachment_filename(); - + $form->{"fokus"} = $form->{"email"} ? "Form.subject" : "Form.email"; + $form->header; -
- - + my (@dont_hide_key_list, %dont_hide_key, @hidden_keys); + @dont_hide_key_list = qw(action email cc bcc subject message formname sendmode format header override); + @dont_hide_key{@dont_hide_key_list} = (1) x @dont_hide_key_list; + @hidden_keys = grep { !$dont_hide_key{$_} } grep { !ref $form->{$_} } keys %$form; - - -|; + print $form->parse_html_template('generic/edit_email', + { title => $title, + a_filename => $attachment_filename, + _print_options_ => print_options({ 'inline' => 1 }), + HIDDEN => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ], + SHOW_BCC => $myconfig{role} eq 'admin' }); $lxdebug->leave_sub(); } - sub send_email { $lxdebug->enter_sub(); - $old_form = new Form; - - map { $old_form->{$_} = $form->{$_} } keys %$form; - $old_form->{media} = $form->{oldmedia}; - - &print_form($old_form); - + my $callback = $form->{script} . "?action=edit"; + map({ $callback .= "\&${_}=" . E($form->{$_}); } + qw(login password type id)); + + print_form("return"); + + $form->{callback} = $callback; + $form->redirect(); + $lxdebug->leave_sub(); } - - +# generate the printing options displayed at the bottom of oe and is forms. +# this function will attempt to guess what type of form is displayed, and will generate according options +# +# about the coding: +# this version builds the arrays of options pretty directly. if you have trouble understanding how, +# the opthash function builds hashrefs which are then pieced together for the template arrays. +# unneeded options are "undef"ed out, and then grepped out. +# +# the inline options is untested, but intended to be used later in metatemplating sub print_options { $lxdebug->enter_sub(); - $form->{sendmode} = "attachment"; - $form->{copies} = 3 unless $form->{copies}; - - $form->{PD}{$form->{formname}} = "selected"; - $form->{DF}{$form->{format}} = ""; - $form->{OP}{$form->{media}} = "selected"; - $form->{SM}{$form->{sendmode}} = "selected"; - - - if ($form->{type} eq 'purchase_order') { - $type = qq| -