#
#######################################################################
+use CGI;
+use CGI::Ajax;
+use List::Util qw(max);
+
+use SL::Common;
use SL::CT;
use SL::IC;
-use CGI::Ajax;
-use CGI;
-require "$form->{path}/common.pl";
+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;
# Eintrag fuer Version 2.2.0 geaendert #
# neue Optik im Rechnungsformular #
########################################
-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);
- }
- }
-############## ENDE Neueintrag ##################
-
- 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}));
-
-########################################
- # Eintrag fuer Version 2.2.0 geaendert #
- # neue Optik im Rechnungsformular #
-########################################
- $column_data{runningnumber} =
- qq|<th align="left" nowrap width="5" class="listheading">|
- . $locale->text('No.')
- . qq|</th>|;
- $column_data{partnumber} =
- qq|<th align="left" nowrap width="12" class="listheading">|
- . $locale->text('Number')
- . qq|</th>|;
- $column_data{description} =
- qq|<th align="left" nowrap width="30" class="listheading">|
- . $locale->text('Part Description')
- . qq|</th>|;
- if ($form->{"type"} eq "purchase_order") {
- $column_data{ship} =
- qq|<th align="left" nowrap width="5" class="listheading">|
- . $locale->text('Ship rcvd')
- . qq|</th>|;
- } else {
- $column_data{ship} =
- qq|<th align="left" nowrap width="5" class="listheading">|
- . $locale->text('Ship')
- . qq|</th>|;
- }
- $column_data{qty} =
- qq|<th align="left" nowrap width="5" class="listheading">|
- . $locale->text('Qty')
- . qq|</th>|;
- $column_data{unit} =
- qq|<th align="left" nowrap width="5" class="listheading">|
- . $locale->text('Unit')
- . qq|</th>|;
- $column_data{license} =
- qq|<th align="left" nowrap width="10" class="listheading">|
- . $locale->text('License')
- . qq|</th>|;
- $column_data{serialnr} =
- qq|<th align="left" nowrap width="10" class="listheading">|
- . $locale->text('Serial No.')
- . qq|</th>|;
- $column_data{projectnr} =
- qq|<th align="left" nowrap width="10" class="listheading">|
- . $locale->text('Project')
- . qq|</th>|;
- $column_data{sellprice} =
- qq|<th align="left" nowrap width="15" class="listheading">|
- . $locale->text('Price')
- . qq|</th>|;
- $column_data{sellprice_pg} =
- qq|<th align="left" nowrap width="15" class="listheading">|
- . $locale->text('Pricegroup')
- . qq|</th>|;
- $column_data{discount} =
- qq|<th align="left" class="listheading">|
- . $locale->text('Discount')
- . qq|</th>|;
- $column_data{linetotal} =
- qq|<th align="left" nowrap width="10" class="listheading">|
- . $locale->text('Extended')
- . qq|</th>|;
- $column_data{bin} =
- qq|<th align="left" nowrap width="10" class="listheading">|
- . $locale->text('Bin')
- . qq|</th>|;
-############## 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|
- <tr>
- <td>| . $cgi->hidden("-name" => "show_details", "-value" => $form->{show_details}) . qq|
- <input type="checkbox" id="cb_show_details" onclick="show_form_details($show_details_new);" $show_details_checked>
- <label for="cb_show_details">| . $locale->text("Show details") . qq|</label><br>
- <table width="100%">
- <tr class="listheading">|;
-
- map { print "\n$column_data{$_}" } @column_index;
-
- print qq|
- </tr>
-|;
-
- $runningnumber = $locale->text('No.');
- $deliverydate = $locale->text('Delivery Date');
- $serialnumber = $locale->text('Serial No.');
- $projectnumber = $locale->text('Project');
- $partsgroup = $locale->text('Group');
- $reqdate = $locale->text('Reqdate');
-
- $delvar = 'deliverydate';
-
- if ($form->{type} =~ /_order$/ || $form->{type} =~ /_quotation$/) {
- $deliverydate = $locale->text('Required by');
- $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 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;
- $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);
- $linetotal = $form->round_amount($linetotal * $form->{"qty_$i"}, 2);
-
- # convert " to "
- map { $form->{"${_}_$i"} =~ s/\"/"/g }
- qw(partnumber description unit unit_old);
-
-########################################
- # Eintrag fuer Version 2.2.0 geaendert #
- # neue Optik im Rechnungsformular #
-########################################
- $column_data{runningnumber} =
- qq|<td><input name="runningnumber_$i" size="5" value="$i"></td>|; # HuT
-############## ENDE Neueintrag ##################
-
- $column_data{partnumber} =
- qq|<td><input name="partnumber_$i" size=12 value="$form->{"partnumber_$i"}"></td>|;
-
- if (($rows = $form->numtextrows($form->{"description_$i"}, 30, 6)) > 1) {
- $column_data{description} =
- qq|<td><textarea name="description_$i" rows="$rows" cols="30" wrap="soft">| . H($form->{"description_$i"}) . qq|</textarea><button type="button" onclick="set_longdescription_window('longdescription_$i')">| . $locale->text('L') . qq|</button></td>|;
- } else {
- $column_data{description} =
- qq|<td><input name="description_$i" size="30" value="| . $form->quote($form->{"description_$i"}) . qq|"><button type="button" onclick="set_longdescription_window('longdescription_$i')">| . $locale->text('L') . qq|</button></td>|;
- }
-
- (my $qty_dec) = ($form->{"qty_$i"} =~ /\.(\d+)/);
- $qty_dec = length $qty_dec;
-
- $column_data{qty} =
- qq|<td align="right"><input name="qty_$i" size="5" value="|
- . $form->format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec) .qq|">|;
- if ($form->{"formel_$i"}) {
- $column_data{qty} .= qq|<button type="button" onclick="calculate_qty_selection_window('qty_$i','alu_$i', 'formel_$i', $i)">| . $locale->text('*/') . qq|</button>| .
- $cgi->hidden("-name" => "formel_$i", "-value" => $form->{"formel_$i"}) . $cgi->hidden("-name" => "alu_$i", "-value" => $form->{"alu_$i"}). qq|</td>|;
- }
- $column_data{ship} =
- qq|<td align="right"><input name="ship_$i" size=5 value="|
- . $form->format_amount(\%myconfig, $form->{"ship_$i"})
- . qq|"></td>|;
-
- 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"} = "<td>" .
- 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)
- . "</td>";
-
- # 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|<td align="right"><select name="sellprice_pg_$i">$form->{"prices_$i"}</select></td>|;
- $column_data{sellprice} =
- qq|<td><input name="sellprice_$i" size="10" value="$price_tmp"></td>|;
- } else {
-
- # for last row and report
- # set pricegroup drop down list from report menu
- if ($form->{"sellprice_$i"} != 0) {
- $prices =
- qq|<option value="$form->{"sellprice_$i"}--$form->{"pricegroup_id_$i"}" selected>$form->{"pricegroup_$i"}</option>\n|;
-
- $form->{"pricegroup_old_$i"} = $form->{"pricegroup_id_$i"};
-
- $column_data{sellprice_pg} =
- qq|<td align="right"><select name="sellprice_pg_$i">$prices</select></td>|;
-
- } else {
-
- # for last row
- $column_data{sellprice_pg} = qq|<td align="right"> </td>|;
- }
-
- $column_data{sellprice} =
- qq|<td><input name="sellprice_$i" size="10" value="|
- . $form->format_amount(\%myconfig, $form->{"sellprice_$i"},
- $decimalplaces)
- . qq|"></td>|;
- }
- $column_data{discount} =
- qq|<td align="right"><input name="discount_$i" size=3 value="|
- . $form->format_amount(\%myconfig, $form->{"discount_$i"})
- . qq|"></td>|;
- $column_data{linetotal} =
- qq|<td align="right">|
- . $form->format_amount(\%myconfig, $linetotal, 2)
- . qq|</td>|;
- $column_data{bin} = qq|<td>$form->{"bin_$i"}</td>|;
-
-########################################
- # 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|<td><select name="licensenumber_$i">$form->{"lizenzen_$i"}></select></td>|;
- # }
- #
- # if ($form->{type} !~ /_quotation/) {
- # $column_data{serialnr} = qq|<td><input name="serialnumber_$i" size=10 value="$form->{"serialnumber_$i"}"></td>|;
- # }
- #
- # $column_data{projectnr} = qq|<td><input name="projectnumber_$i" size=10 value="$form->{"projectnumber_$i"}"></td>|;
-############## ENDE Neueintrag ##################
- my $j = $i % 2;
- print qq|
-
- <tr valign="top" class="listrow$j">|;
-
- map { print "\n$column_data{$_}" } @column_index;
-
- print("</tr>\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"));
-
-########################################
- # Eintrag fuer Version 2.2.0 geaendert #
- # neue Optik im Rechnungsformular #
-########################################
-
- my $row_style_attr =
- 'style="display:none;"' if (!$form->{"show_details"});
-
- # print second row
- print qq|
- <tr class="listrow$j" $row_style_attr>
- <td colspan="$colspan">
-|;
- if ($lizenzen && $form->{type} eq "invoice" && $form->{vc} eq "customer") {
- my $selected = $form->{"licensenumber_$i"};
- my $lizenzen_quoted;
- $form->{"lizenzen_$i"} =~ s/ selected//g;
- $form->{"lizenzen_$i"} =~
- s/value="${selected}"\>/value="${selected}" selected\>/;
- $lizenzen_quoted = $form->{"lizenzen_$i"};
- $lizenzen_quoted =~ s/\"/"/g;
- print qq|
- <b>Lizenz\#</b> <select name="licensenumber_$i" size="1">
- $form->{"lizenzen_$i"}
- </select>
- <input type="hidden" name="lizenzen_$i" value="${lizenzen_quoted}">
-|;
- }
- if ($form->{type} !~ /_quotation/) {
- print qq|
- <b>$serialnumber</b> <input name="serialnumber_$i" size="15" value="$form->{"serialnumber_$i"}">|;
- }
-
- print qq|<b>$projectnumber</b> | .
- 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|
- <b>${$reqdate_term}</b> <input name="${reqdate_term}_$i" size="11" value="$form->{"${reqdate_term}_$i"}">
-|;
- }
- my $subtotalchecked = ($form->{"subtotal_$i"}) ? "checked" : "";
- print qq|
- <b>|.$locale->text('Subtotal').qq|</b> <input type="checkbox" name="subtotal_$i" value="1" "$subtotalchecked">
- </td>
- </tr>
-
-|;
-
-############## ENDE Neueintrag ##################
-
- map { $form->{"${_}_base"} += $linetotal }
- (split(/ /, $form->{"taxaccounts_$i"}));
-
- $form->{invsubtotal} += $linetotal;
- }
-
- print qq|
- </table>
- </td>
- </tr>
-|;
-
- $lxdebug->leave_sub();
-}
##################################################
# build html-code for pricegroups in variable $form->{prices_$j}
$lxdebug->enter_sub();
my $rowcount = shift;
for $j (1 .. $rowcount) {
- my $pricegroup_old = $form->{"pricegroup_old_$i"};
- if ($form->{PRICES}{$j}) {
- $len = 0;
- $prices = '<option value="--">' . $locale->text("none (pricegroup)") . '</option>';
- $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|<option value="$price--$pricegroup_id"$item->{selected}>$pricegroup</option>\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;
+ next unless $form->{PRICES}{$j};
+ # build drop down list for pricegroups
+ my $option_tmpl = qq|<option value="%s--%s" %s>%s</option>|;
+ $form->{"prices_$j"} = join '', map { sprintf $option_tmpl, @$_{qw(price pricegroup_id selected pricegroup)} }
+ (+{ pricegroup => $locale->text("none (pricegroup)") }, @{ $form->{PRICES}{$j} });
+
+ foreach $item (@{ $form->{PRICES}{$j} }) {
+ # set new selectedpricegroup_id and prices for "Preis"
+ $form->{"pricegroup_old_$j"} = $item->{pricegroup_id} if $item->{selected} && $item->{pricegroup_id};
+ $form->{"sellprice_$j"} = $item->{price} if $item->{selected} && $item->{pricegroup_id};
+ $form->{"price_new_$j"} = $form->{"sellprice_$j"} if $item->{selected} || !$item->{pricegroup_id};
}
}
$lxdebug->leave_sub();
$colspan = $#column_index + 1;
print qq|
-<body>
+ <body>
<form method="post" action="$form->{script}">
map { $ref->{$_} =~ s/\"/"/g } qw(partnumber description unit);
- #sk tradediscount
- $ref->{sellprice} =
- $form->round_amount($ref->{sellprice} * (1 - $form->{tradediscount}), 2);
+ my $display_sellprice = $ref->{sellprice} * (1 - $form->{tradediscount});
+ $display_sellprice /= $ref->{price_factor} if ($ref->{price_factor});
+ $display_sellprice = $form->format_amount(\%myconfig, $display_sellprice, 2);
+
$column_data{ndx} =
qq|<td><input name="ndx" class="radio" type="radio" value="$i" $checked></td>|;
$column_data{partnumber} =
qq|<td><input name="new_partnumber_$i" type="hidden" value="$ref->{partnumber}">$ref->{partnumber}</td>|;
$column_data{description} =
- qq|<td><input name="new_description_$i" type="hidden" value=$ref->{description}>$ref->{description}</td>|;
+ qq|<td><input name="new_description_$i" type="hidden" value="$ref->{description}">$ref->{description}</td>|;
$column_data{sellprice} =
qq|<td align="right"><input name="new_sellprice_$i" type="hidden" value="$ref->{sellprice}">|
- . $form->format_amount(\%myconfig, $ref->{sellprice}, 2, " ")
+ . $display_sellprice
. qq|</td>|;
$column_data{onhand} =
qq|<td align="right"><input name="new_onhand_$i" type="hidden" value="$ref->{onhand}">|
map { print "\n$column_data{$_}" } @column_index;
- print qq|
-</tr>
-|;
-map({ print($cgi->hidden("-name" => "new_$__$i", "-value" => $ref->{$_})); }
- qw(bin listprice inventory_accno income_accno expense_accno unit weight assembly taxaccounts partsgroup
- formel logdescription not_discountable part_payment_id partnodes id));
-if ($lizenzen) {
- print qq|
-<input name="new_lizenzen_$i" type="hidden" value="$ref->{lizenzen}">
-|;
- }
+ print("</tr>\n");
+
+ my @new_fields =
+ qw(bin listprice inventory_accno income_accno expense_accno unit weight
+ assembly taxaccounts partsgroup formel longdescription not_discountable
+ part_payment_id partnotes id lastcost price_factor_id price_factor);
+ push(@new_fields, "lizenzen") if ($lizenzen);
+ print join "\n", map { $cgi->hidden("-name" => "new_${_}_$i", "-value" => $ref->{$_}) } @new_fields;
+ print "\n";
}
print qq|
# if there was a price entered, override it
$sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
- map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} }
+ my @new_fields =
qw(id partnumber description sellprice listprice inventory_accno
income_accno expense_accno bin unit weight assembly taxaccounts
- partsgroup formel longdescription not_discountable partnotes);
+ partsgroup formel longdescription not_discountable partnotes lastcost
+ price_factor_id price_factor);
+
+ map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} } @new_fields;
+
+ $form->{"marge_price_factor_$i"} = $form->{"new_price_factor_$j"};
+
if ($form->{"part_payment_id_$i"} ne "") {
$form->{payment_id} = $form->{"part_payment_id_$i"};
}
# delete all the new_ variables
for $i (1 .. $form->{lastndx}) {
- map { delete $form->{"new_${_}_$i"} }
- qw(partnumber description sellprice bin listprice inventory_accno income_accno expense_accno unit assembly taxaccounts id);
+ map { delete $form->{"new_${_}_$i"} } @new_fields;
}
map { delete $form->{$_} } qw(ndx lastndx nextsub);
# change callback
$form->{old_callback} = $form->escape($form->{callback}, 1);
- $form->{callback} = $form->escape("$form->{script}?action=display_form", 1);
+ $form->{callback} = $form->escape("$form->{script}?action=display_form", 1);
- # delete action
- delete $form->{action};
+ # save all form variables except action in a previousform variable
+ my $previousform = join '&', map { $form->{$_} =~ s/&/%26/; "$_=$form->{$_}" } grep { !/action/ } keys %$form;
- # save all other form variables in a previousform variable
- foreach $key (keys %$form) {
-
- # escape ampersands
- $form->{$key} =~ s/&/%26/g;
- $previousform .= qq|$key=$form->{$key}&|;
- }
- chop $previousform;
- $previousform = $form->escape($previousform, 1);
-
- $i = $form->{rowcount};
- map { $form->{"${_}_$i"} =~ s/\"/"/g } qw(partnumber description);
+ map { $form->{"${_}_$form->{rowcount}"} =~ s/\"/"/g } qw(partnumber description);
$form->header;
- print qq|
-<body>
-
-<h4 class="error">| . $locale->text('Item not on file!') . qq|
-
-<p>
-| . $locale->text('What type of item is this?') . qq|</h4>
-
-<form method="post" action="ic.pl">
-
-<p>
-
- <input class="radio" type="radio" name="item" value="part" checked> |
- . $locale->text('Part') . qq|<br>
- <input class="radio" type="radio" name="item" value="service"> |
- . $locale->text('Service');
-print $cgi->hidden("-name" => "previousform", "-value" => $previousform);
-map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); }
- ("partnumber_$i", "description_$i", "rowcount", "taxaccounts", "vc", "path", "login", "password"));
-
-#<input type="hidden" name="partnumber" value="$form->{"partnumber_$i"}">
-#<input type="hidden" name="description" value="$form->{"description_$i"}">
-#<input type="hidden" name="rowcount" value="$form->{rowcount}">
-#<input type="hidden" name="taxaccount2" value="$form->{taxaccounts}">
-#<input type="hidden" name="vc" value="$form->{vc}">
-#
-#<input type="hidden" name="path" value="$form->{path}">
-#<input type="hidden" name="login" value="$form->{login}">
-#<input type="hidden" name="password" value="$form->{password}">
-
-print qq|
-<input type="hidden" name="nextsub" value="add">
-
-<p>
-<input class="submit" type="submit" name="action" value="|
- . $locale->text('Continue') . qq|">
-</form>
-
-</body>
-</html>
-|;
-
- $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}"};
- 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};
- $subroutine = "display_row";
-
- if ($form->{item} eq 'part') {
-
- #set preisgruppenanzahl
- $numrows = $form->{price_rows};
- $subroutine = "price_row";
-
- &{$subroutine}($numrows);
-
- $numrows = ++$form->{makemodel_rows};
- $subroutine = "makemodel_row";
- }
- if ($form->{item} eq 'assembly') {
- $numrows = $form->{price_rows};
- $subroutine = "price_row";
+ push @HIDDENS, { value => $cgi->hidden("-name" => "previousform", "-value" => $form->escape($previousform, 1)) };
+ push @HIDDENS, map +{ value => $cgi->hidden("-name" => $_, "-value" => $form->{$_}) }, qw(rowcount vc login password);
+ push @HIDDENS, map +{ value => $cgi->hidden("-name" => $_, "-value" => $form->{"${_}_$form->{rowcount}"}) }, qw(partnumber description unit sellprice);
+ push @HIDDENS, { value => $cgi->hidden("-name" => "taxaccount2", "-value" => $form->{taxaccounts}) };
- &{$subroutine}($numrows);
-
- $numrows = ++$form->{makemodel_rows};
- $subroutine = "makemodel_row";
-
- # create makemodel rows
- &{$subroutine}($numrows);
-
- $numrows = ++$form->{assembly_rows};
- $subroutine = "assembly_row";
- }
- if ($form->{item} eq 'service') {
- $numrows = $form->{price_rows};
- $subroutine = "price_row";
-
- &{$subroutine}($numrows);
-
- $numrows = 0;
- }
-
- # create rows
- &{$subroutine}($numrows) if $numrows;
-
- &form_footer;
+ print $form->parse_html_template("generic/new_item", { HIDDENS => \@HIDDENS} );
$lxdebug->leave_sub();
}
$lxdebug->enter_sub();
my @a = ();
my $count = 0;
- my @flds = (
- qw(id partnumber description qty ship sellprice unit discount inventory_accno income_accno expense_accno listprice taxaccounts bin assembly weight projectnumber project_id oldprojectnumber runningnumber serialnumber partsgroup 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)
- );
-
+ my @flds = (qw(id partnumber description qty ship sellprice unit discount inventory_accno income_accno expense_accno listprice taxaccounts bin assembly weight projectnumber project_id oldprojectnumber runningnumber serialnumber partsgroup payment_id not_discountable shop ve gv buchungsgruppen_id language_values sellprice_pg pricegroup_old price_old price_new unit_old ordnumber transdate longdescription basefactor marge_total marge_percent marge_price_factor lastcost price_factor_id));
# remove any makes or model rows
if ($form->{item} eq 'part') {
$form->redo_rows(\@flds, \@a, $count, $form->{makemodel_rows});
$form->{makemodel_rows} = $count;
+ } elsif ($form->{item} eq 'service') {
+ map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(listprice sellprice lastcost);
+
} else {
# this section applies to invoices and orders
}
$form->{ordnumber} = $form->{invnumber};
+ $form->{old_employee_id} = $form->{employee_id};
+ $form->{old_salesman_id} = $form->{salesman_id};
+
map { delete $form->{$_} } qw(id printed emailed queued);
if ($form->{script} eq 'ir.pl' || $form->{type} eq 'request_quotation') {
$form->{title} = $locale->text('Add Purchase Order');
$form->{cp_id} *= 1;
- require "$form->{path}/$form->{script}";
+ require "bin/mozilla/$form->{script}";
my $script = $form->{"script"};
$script =~ s|.*/||;
$script =~ s|.pl$||;
$form->{rowcount}--;
- require "$form->{path}/$form->{script}";
+ require "bin/mozilla/$form->{script}";
map { $form->{"select$_"} = "" } ($form->{vc}, currency);
$form->{print_and_post} = 0;
$form->{resubmit} = 0;
}
- if ($myconfig{role} eq 'admin') {
- $bcc = qq|
- <tr>
- <th align="right" nowrap="true">| . $locale->text('Bcc') . qq|</th>
- <td><input name="bcc" size="30" value="| . Q($form->{bcc}) . qq|"></td>
- </tr>
-|;
- }
- if ($form->{formname} =~ /(pick|packing|bin)_list/) {
- $form->{email} = $form->{shiptoemail} if $form->{shiptoemail};
- }
+ $form->{email} = $form->{shiptoemail} if $form->{shiptoemail} && $form->{formname} =~ /(pick|packing|bin)_list/;
if ($form->{"cp_id"} && !$form->{"email"}) {
CT->get_contact(\%myconfig, $form);
$form->{"email"} = $form->{"cp_email"};
}
- $name = $form->{ $form->{vc} };
- $name =~ s/--.*//g;
- $title = $locale->text('E-mail') . " $name";
+ $title = $locale->text('E-mail') . " " . $form->get_formname_translation();
$form->{oldmedia} = $form->{media};
$form->{media} = "email";
- my %formname_translations =
- (
- "bin_list" => $locale->text('Bin List'),
- "credit_note" => $locale->text('Credit Note'),
- "invoice" => $locale->text('Invoice'),
- "packing_list" => $locale->text('Packing List'),
- "pick_list" => $locale->text('Pick List'),
- "proforma" => $locale->text('Proforma Invoice'),
- "purchase_order" => $locale->text('Purchase Order'),
- "request_quotation" => $locale->text('RFQ'),
- "sales_order" => $locale->text('Confirmation'),
- "sales_quotation" => $locale->text('Quotation'),
- "storno_invoice" => $locale->text('Storno Invoice'),
- "storno_packing_list" => $locale->text('Storno Packing List'),
- );
-
- my $attachment_filename = $formname_translations{$form->{"formname"}};
- my $prefix;
+ my $attachment_filename = $form->generate_attachment_filename();
- if (grep({ $form->{"type"} eq $_ } qw(invoice credit_note))) {
- $prefix = "inv";
- } elsif ($form->{"type"} =~ /_quotation$/) {
- $prefix = "quo";
- } else {
- $prefix = "ord";
- }
-
- if ($attachment_filename && $form->{"${prefix}number"}) {
- $attachment_filename .= "_" . $form->{"${prefix}number"} .
- ($form->{"format"} =~ /pdf/i ? ".pdf" :
- $form->{"format"} =~ /postscript/i ? ".ps" :
- $form->{"format"} =~ /opendocument/i ? ".odt" :
- $form->{"format"} =~ /html/i ? ".html" : "");
- $attachment_filename =~ s/ /_/g;
- my %umlaute =
- (
- "ä" => "ae", "ö" => "oe", "ü" => "ue",
- "Ä" => "Ae", "Ö" => "Oe", "Ü" => "Ue",
- "ß" => "ss"
- );
- map({ $attachment_filename =~ s/$_/$umlaute{$_}/g; } keys(%umlaute));
- } else {
- $attachment_filename = "";
- }
-
- if ($form->{"email"}) {
- $form->{"fokus"} = "Form.subject";
- } else {
- $form->{"fokus"} = "Form.email";
- }
+ $form->{"fokus"} = $form->{"email"} ? "Form.subject" : "Form.email";
$form->header;
- print qq|
-<body onload="fokus()">
-
-<form name="Form" method="post" action="$form->{script}">
-
-<table width="100%">
- <tr class="listtop">
- <th class="listtop">$title</th>
- </tr>
- <tr height="5"></tr>
- <tr>
- <td>
- <table>
- <tr>
- <th align="right" nowrap>| . $locale->text('To') . qq|</th>
- <td><input name="email" size="30" value="| .
- Q($form->{"email"}) . qq|"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('Cc') . qq|</th>
- <td><input name="cc" size="30" value="| .
- Q($form->{"cc"}) . qq|"></td>
- </tr>
- $bcc
- <tr>
- <th align="right" nowrap>| . $locale->text('Subject') . qq|</th>
- <td><input name="subject" size="30" value="| .
- Q($form->{"subject"}) . qq|"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('Attachment name') .
- qq|</th>
- <td><input name="attachment_filename" size="30" value="| .
- Q($attachment_filename) . qq|"></td>
- </table>
- </td>
- </tr>
- <tr>
- <td>
- <table>
- <tr>
- <th align="left" nowrap>| . $locale->text('Message') . qq|</th>
- </tr>
- <tr>
- <td><textarea name="message" rows="15" cols="60" wrap="soft">| .
- H($form->{"message"}) . qq|</textarea></td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td>
-|;
-
- &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|<input type="hidden" name="$key" value="| . Q($form->{$key}) . qq|">\n|;
- }
-
- print qq|
- </td>
- </tr>
- <tr>
- <td><hr size="3" noshade></td>
- </tr>
-</table>
+ 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;
-<input type="hidden" name="nextsub" value="send_email">
-
-<br>
-<input name="action" class="submit" type="submit" value="|
- . $locale->text('Continue') . qq|">
-</form>
-
-</body>
-</html>
-|;
+ 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();
}
my $callback = $form->{script} . "?action=edit";
map({ $callback .= "\&${_}=" . E($form->{$_}); }
- qw(login password path type id));
+ qw(login password type id));
print_form("return");
+ Common->save_email_status(\%myconfig, $form);
+
$form->{callback} = $callback;
$form->redirect();
#
# the inline options is untested, but intended to be used later in metatemplating
sub print_options {
- $lxdebug->enter_sub() and my ($inline) = @_;
+ $lxdebug->enter_sub();
+
+ my %options = @_;
# names 3 parameters and returns a hashref, for use in templates
sub opthash { +{ value => shift, selected => shift, oname => shift } }
# note: "||"-selection is only correct for values where "0" is _not_ a correct entry
$form->{sendmode} = "attachment";
$form->{format} = $form->{format} || $myconfig{template_format} || "pdf";
- $form->{copies} = $form->{copies} || $myconfig{copies} || 3;
- $form->{media} = $form->{media} || $myconfig{default_media} || "screen";
+ $form->{copies} = $form->{copies} || $myconfig{copies} || 3;
+ $form->{media} = $form->{media} || $myconfig{default_media} || "screen";
$form->{printer_id} = defined $form->{printer_id} ? $form->{printer_id} :
defined $myconfig{default_printer_id} ? $myconfig{default_printer_id} : "";
push @FORMNAME, grep $_,
($form->{type} eq 'purchase_order') ? (
- opthash("purchase_order", $form->{PD}{purchase_order}, $locale->text('Purchase Order')),
- opthash("bin_list", $form->{PD}{bin_list}, $locale->text('Bin List'))
+ opthash("purchase_order", $form->{PD}{purchase_order}, $locale->text('Purchase Order')),
+ opthash("bin_list", $form->{PD}{bin_list}, $locale->text('Bin List'))
) : undef,
($form->{type} eq 'credit_note') ?
- opthash("credit_note", $form->{PD}{credit_note}, $locale->text('Credit Note')) : undef,
+ opthash("credit_note", $form->{PD}{credit_note}, $locale->text('Credit Note')) : undef,
($form->{type} eq 'sales_order') ? (
- opthash("sales_order", $form->{PD}{sales_order}, $locale->text('Confirmation')),
- opthash("proforma", $form->{PD}{proforma}, $locale->text('Proforma Invoice')),
- opthash("pick_list", $form->{PD}{pick_list}, $locale->text('Pick List')),
- opthash("packing_list", $form->{PD}{packing_list}, $locale->text('Packing List'))
+ opthash("sales_order", $form->{PD}{sales_order}, $locale->text('Confirmation')),
+ opthash("proforma", $form->{PD}{proforma}, $locale->text('Proforma Invoice')),
+ opthash("pick_list", $form->{PD}{pick_list}, $locale->text('Pick List')),
+ opthash("packing_list", $form->{PD}{packing_list}, $locale->text('Packing List'))
) : undef,
($form->{type} =~ /_quotation$/) ?
- opthash("$`_quotation", $form->{PD}{"$`_quotation"}, $locale->text('Quotation')) : undef,
+ opthash("$`_quotation", $form->{PD}{"$`_quotation"}, $locale->text('Quotation')) : undef,
($form->{type} eq 'invoice') ? (
- opthash("invoice", $form->{PD}{invoice}, $locale->text('Invoice')),
- opthash("proforma", $form->{PD}{proforma}, $locale->text('Proforma Invoice')),
- opthash("packing_list", $form->{PD}{packing_list}, $locale->text('Packing List'))
+ opthash("invoice", $form->{PD}{invoice}, $locale->text('Invoice')),
+ opthash("proforma", $form->{PD}{proforma}, $locale->text('Proforma Invoice')),
+ opthash("packing_list", $form->{PD}{packing_list}, $locale->text('Packing List'))
) : undef,
($form->{type} eq 'invoice' && $form->{storno}) ? (
- opthash("storno_invoice", $form->{PD}{storno_invoice}, $locale->text('Storno Invoice')),
+ 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} eq 'credit_note') ?
- opthash("credit_note", $form->{PD}{credit_note}, $locale->text('Credit Note')) : undef;
+ opthash("credit_note", $form->{PD}{credit_note}, $locale->text('Credit Note')) : undef;
push @SENDMODE,
- opthash("attachment", $form->{SM}{attachment}, $locale->text('Attachment')),
- opthash("inline", $form->{SM}{inline}, $locale->text('In-line'))
+ opthash("attachment", $form->{SM}{attachment}, $locale->text('Attachment')),
+ opthash("inline", $form->{SM}{inline}, $locale->text('In-line'))
if ($form->{media} eq 'email');
push @MEDIA, grep $_,
- opthash("screen", $form->{OP}{screen}, $locale->text('Screen')),
- (scalar keys %{ $form->{printers} } && $latex_templates) ?
- opthash("printer", $form->{OP}{printer}, $locale->text('Printer')) : undef,
- ($latex_templates) ?
- opthash("queue", $form->{OP}{queue}, $locale->text('Queue')) : undef
+ opthash("screen", $form->{OP}{screen}, $locale->text('Screen')),
+ (scalar @{ $form->{printers} } && $latex_templates) ?
+ opthash("printer", $form->{OP}{printer}, $locale->text('Printer')) : undef,
+ ($latex_templates && !$options->{no_queue}) ?
+ opthash("queue", $form->{OP}{queue}, $locale->text('Queue')) : undef
if ($form->{media} ne 'email');
push @FORMAT, grep $_,
- ($opendocument_templates && $openofficeorg_writer_bin && $xvfb_bin && (-x $openofficeorg_writer_bin) && (-x $xvfb_bin)) ?
- opthash("opendocument_pdf", $form->{DF}{"opendocument_pdf"}, $locale->text("PDF (OpenDocument/OASIS)")) : undef,
- ($latex_templates) ? (
- opthash("pdf", $form->{DF}{pdf}, $locale->text('PDF')),
- opthash("postscript", $form->{DF}{postscript}, $locale->text('Postscript'))
- ) : undef,
- opthash("html", $form->{DF}{html}, "HTML"),
- ($opendocument_templates) ?
- opthash("opendocument", $form->{DF}{opendocument}, $locale->text("OpenDocument/OASIS")) : undef;
+ ($opendocument_templates && $openofficeorg_writer_bin && $xvfb_bin && (-x $openofficeorg_writer_bin) && (-x $xvfb_bin)
+ && !$options->{no_opendocument_pdf}) ?
+ opthash("opendocument_pdf", $form->{DF}{"opendocument_pdf"}, $locale->text("PDF (OpenDocument/OASIS)")) : undef,
+ ($latex_templates) ?
+ opthash("pdf", $form->{DF}{pdf}, $locale->text('PDF')) : undef,
+ ($latex_templates && !$options->{no_postscript}) ?
+ opthash("postscript", $form->{DF}{postscript}, $locale->text('Postscript')) : undef,
+ (!$options->{no_html}) ?
+ opthash("html", $form->{DF}{html}, "HTML") : undef,
+ ($opendocument_templates && !$options->{no_opendocument}) ?
+ opthash("opendocument", $form->{DF}{opendocument}, $locale->text("OpenDocument/OASIS")) : undef;
push @LANGUAGE_ID,
- map { opthash($_->{id}, ($_->{id} eq $form->{language} ? 'selected' : ''), $_->{description}) } +{}, @{ $form->{languages} }
+ map { opthash($_->{id}, ($_->{id} eq $form->{language_id} ? 'selected' : ''), $_->{description}) } +{}, @{ $form->{languages} }
if (ref $form->{languages} eq 'ARRAY');
push @PRINTER_ID,
map { opthash($_->{id}, ($_->{id} eq $form->{printer_id} ? 'selected' : ''), $_->{printer_description}) } +{}, @{ $form->{printers} }
- if (ref $form->{printers} eq 'ARRAY');
+ if ((ref $form->{printers} eq 'ARRAY') && scalar @{ $form->{printers } });
- @SELECTS = map { sname => lc $_, DATA => \@$_, show => scalar @$_ }, qw(FORMNAME LANGUAGE_ID FORMAT SENDMODE MEDIA PRINTER_ID);
+ @SELECTS = map { sname => lc $_, DATA => \@$_, show => !$options{"hide_" . lc($_)} && scalar @$_ }, qw(FORMNAME LANGUAGE_ID FORMAT SENDMODE MEDIA PRINTER_ID);
+
+ my %dont_display_groupitems = (
+ 'dunning' => 1,
+ );
%template_vars = (
- display_copies => scalar keys %{ $form->{printers} } && $latex_templates && $form->{media} ne 'email',
+ display_copies => scalar @{ $form->{printers} } && $latex_templates && $form->{media} ne 'email',
display_remove_draft => (!$form->{id} && $form->{draft_id}),
+ display_groupitems => !$dont_display_groupitems{$form->{type}},
groupitems_checked => $form->{groupitems} ? "checked" : '',
remove_draft_checked => $form->{remove_draft} ? "checked" : ''
);
my $print_options = $form->parse_html_template("generic/print_options", { SELECTS => \@SELECTS, %template_vars } );
- if ($inline) {
+ if ($options{inline}) {
$lxdebug->leave_sub() and return $print_options;
} else {
print $print_options; $lxdebug->leave_sub();
sub print {
$lxdebug->enter_sub();
+ if ($form->{print_nextsub}) {
+ call_sub($form->{print_nextsub});
+ $lxdebug->leave_sub();
+ return;
+ }
+
# if this goes to the printer pass through
if ($form->{media} eq 'printer' || $form->{media} eq 'queue') {
$form->error($locale->text('Select postscript or PDF!'))
$inv = "ord";
$due = "req";
$form->{"${inv}date"} = $form->{transdate};
- $form->{label} = $locale->text('Sales Order');
+ $form->{label} = $locale->text('Confirmation');
$numberfld = "sonumber";
$order = 1;
}
$inv = "quo";
$due = "req";
$form->{"${inv}date"} = $form->{transdate};
- $form->{label} = $locale->text('Quotation');
+ $form->{label} = $locale->text('RFQ');
$numberfld = "rfqnumber";
$order = 1;
}
$form->{rowcount}--;
- &{"$display_form"};
+ call_sub($display_form);
# saving the history
if(!exists $form->{addition}) {
+ $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
$form->{addition} = "PRINTED";
$form->save_history($form->dbconnect(\%myconfig));
}
$salesman_id_saved = $form->{salesman_id};
$cp_id_saved = $form->{cp_id};
- &{"$form->{vc}_details"}();
+ call_sub("$form->{vc}_details");
$form->{language_id} = $language_saved;
$form->{payment_id} = $payment_id_saved;
$form->{templates} = "$myconfig{templates}";
+ delete $form->{printer_command};
+
$form->{language} = $form->get_template_language(\%myconfig);
- $form->{printer_code} = $form->get_printer_code(\%myconfig);
+
+ my $printer_code;
+ if ($form->{media} ne 'email') {
+ $printer_code = $form->get_printer_code(\%myconfig);
+ if ($printer_code ne "") {
+ $printer_code = "_" . $printer_code;
+ }
+ }
if ($form->{language} ne "") {
map({ $form->{"unit"}->[$_] =
reformat_numbers($output_numberformat, 2,
qw(invtotal ordtotal quototal subtotal linetotal
listprice sellprice netprice discount
- tax taxbase),
+ 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})));
reformat_numbers($output_numberformat, undef,
- qw(qty),
+ qw(qty price_factor),
grep({ /^qty_\d+$/
} keys(%{$form})));
- if ($form->{printer_code} ne "") {
- $form->{printer_code} = "_" . $form->{printer_code};
- }
-
- $form->{IN} = "$form->{formname}$form->{language}$form->{printer_code}.html";
+ $form->{IN} = "$form->{formname}$form->{language}${printer_code}.html";
if ($form->{format} eq 'postscript') {
$form->{postscript} = 1;
$form->{IN} =~ s/html$/tex/;
$form->{"IN"} =~ s/html$/odt/;
}
+ delete $form->{OUT};
+
if ($form->{media} eq 'printer') {
$form->{OUT} = "| $form->{printer_command} &>/dev/null";
$form->{printed} .= " $form->{formname}";
$form->{subject} = qq|$form->{label} $form->{"${inv}number"}|
unless $form->{subject};
- $form->{OUT} = "$sendmail";
-
$form->{emailed} .= " $form->{formname}";
$form->{emailed} =~ s/^ //;
}
$emailed = $form->{emailed};
if ($form->{media} eq 'queue') {
- %queued = split / /, $form->{queued};
+ %queued = map { s|.*/|| } split / /, $form->{queued};
if ($filename = $queued{ $form->{formname} }) {
- $form->{queued} =~ s/$form->{formname} $filename//;
+ $form->{queued} =~ s/\Q$form->{formname} $filename\E//;
unlink "$spool/$filename";
$filename =~ s/\..*$//g;
} else {
# saving the history
if(!exists $form->{addition}) {
+ $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
if($form->{media} =~ /printer/) {
$form->{addition} = "PRINTED";
}
} qw(paid exchangerate);
}
- &{"$display_form"};
+ call_sub($display_form);
exit;
}
$form->redirect(qq|$form->{label} $form->{"${inv}number"} $msg|);
}
if ($form->{printing}) {
- &{"$display_form"};
+ call_sub($display_form);
exit;
}
contact email phone fax));
# get details for name
- &{"$form->{vc}_details"}(@addr_vars);
+ call_sub("$form->{vc}_details", @addr_vars);
$number =
($form->{vc} eq 'customer')
<tr>
<th align="right" nowrap>| . $locale->text('Contact') . qq|</th>
<td>$form->{contact}</td>
- <td><input name="shiptocontac"t size="35" value="$form->{shiptocontact}"></td>
+ <td><input name="shiptocontact" size="35" value="$form->{shiptocontact}"></td>
</tr>
<tr>
<th align="right" nowrap>| . $locale->text('Phone') . qq|</th>
</td>
</tr>
</table>
-| . $cgi->hidden("-name" => "nexsub", "-value" => $nextsub);
+| . $cgi->hidden("-name" => "nextsub", "-value" => $nextsub);
;
map { $form->{$_} = $form->escape($form->{$_}, 1) }
qw(partnumber description);
$form->{callback} =
- qq|$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&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}?login=$form->{login}&password=$form->{password}&action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&customer=$customer&partnumber=$form->{partnumber}&description=$form->{description}&previousform="$previousform"&initial=1|;
$form->redirect;
$lxdebug->leave_sub();
projects / kivitendo-erp.git / blobdiff