# Based on SQL-Ledger Version 2.1.9
# Web http://www.lx-office.org
#############################################################################
-# Veraendert 2005-01-05 - Marco Welter <mawe@linux-studio.de> - Neue Optik #
+# Changelog: Wann - Wer - Was
+# Veraendert 2005-01-05 - Marco Welter <mawe@linux-studio.de> - Neue Optik
+# 08.11.2008 - information@richardson-bueren.de jb - Backport von Revision 7339 xplace - E-Mail-Vorlage automatisch auswählen
+# 02.02.2009 - information@richardson-bueren.de jb - Backport von Revision 8535 xplace - Erweiterung der Waren bei Lieferantenauftrag um den Eintrag Mindestlagerbestand. Offen: Auswahlliste auf Lieferantenaufträge einschränken -> Erledigt 2.2.09 Prüfung wie das Skript heisst (oe.pl) -> das ist nur die halbe Miete, nochmal mb fragen -> mb gefragt und es gibt die variable is_purchase
#############################################################################
# SQL-Ledger, Accounting
# Copyright (c) 1998-2002
#
#######################################################################
+use CGI;
+use CGI::Ajax;
+use List::Util qw(min max first);
+
+use SL::CVar;
+use SL::Common;
use SL::CT;
use SL::IC;
-use CGI::Ajax;
-use CGI;
+use SL::IO;
require "bin/mozilla/common.pl";
+use strict;
+
# any custom scripts for this one
if (-f "bin/mozilla/custom_io.pl") {
eval { require "bin/mozilla/custom_io.pl"; };
}
-if (-f "bin/mozilla/$form->{login}_io.pl") {
- eval { require "bin/mozilla/$form->{login}_io.pl"; };
+if (-f "bin/mozilla/$::form->{login}_io.pl") {
+ eval { require "bin/mozilla/$::form->{login}_io.pl"; };
}
1;
use SL::PE;
use SL::AM;
use Data::Dumper;
+
+sub _check_io_auth {
+ $main::auth->assert('part_service_assembly_edit | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ 'request_quotation_edit | sales_quotation_edit | purchase_order_edit | ' .
+ 'purchase_delivery_order_edit | sales_delivery_order_edit');
+}
+
########################################
# 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);
+ $main::lxdebug->enter_sub();
- #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);
- }
+ _check_io_auth();
- push @column_index, qw(sellprice);
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+ my $cgi = $main::cgi;
- if ($form->{vc} eq 'customer') {
- push @column_index, qw(discount);
- }
+ my $numrows = shift;
- push @column_index, "linetotal";
+ my ($readonly, $stock_in_out, $stock_in_out_title);
- my $colspan = $#column_index + 1;
+ my $is_purchase = (first { $_ eq $form->{type} } qw(request_quotation purchase_order purchase_delivery_order)) || ($form->{script} eq 'ir.pl');
+ my $show_min_order_qty = first { $_ eq $form->{type} } qw(request_quotation purchase_order);
+ my $is_delivery_order = $form->{type} =~ /_delivery_order$/;
+ my $is_s_p_order = (first { $_ eq $form->{type} } qw(sales_order purchase_order));
- $form->{invsubtotal} = 0;
- map { $form->{"${_}_base"} = 0 } (split(/ /, $form->{taxaccounts}));
+ if ($is_delivery_order) {
+ $readonly = ' readonly' if ($form->{closed});
-########################################
- # 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" : "";
+ if ($form->{type} eq 'sales_delivery_order') {
+ $stock_in_out_title = $locale->text('Release From Stock');
+ $stock_in_out = 'out';
+ } else {
+ $stock_in_out_title = $locale->text('Transfer To Stock');
+ $stock_in_out = 'in';
+ }
- 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">|;
+ retrieve_partunits();
+ }
+
+ # column_index
+ my @header_sort = qw(runningnumber partnumber description ship qty unit sellprice_pg sellprice discount linetotal);
+ my @HEADER = (
+ { id => 'runningnumber', width => 5, value => $locale->text('No.'), display => 1, },
+ { id => 'partnumber', width => 8, value => $locale->text('Number'), display => 1, },
+ { id => 'description', width => 30, value => $locale->text('Part Description'), display => 1, },
+ { id => 'ship', width => 5, value => $locale->text('Delivered'), display => $is_s_p_order, },
+ { 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 => !$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, },
+ { id => 'stock_in_out', width => 10, value => $stock_in_out_title, display => $is_delivery_order, },
+ );
+ my @column_index = map { $_->{id} } grep { $_->{display} } @HEADER;
- map { print "\n$column_data{$_}" } @column_index;
- print qq|
- </tr>
-|;
+ # cache units
+ my $all_units = AM->retrieve_units(\%myconfig, $form);
- $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');
+ my %price_factors = map { $_->{id} => $_->{factor} } @{ $form->{ALL_PRICE_FACTORS} };
- $delvar = 'deliverydate';
+ my $colspan = scalar @column_index;
- if ($form->{type} =~ /_order$/ || $form->{type} =~ /_quotation$/) {
- $deliverydate = $locale->text('Required by');
- $delvar = 'reqdate';
- }
+ $form->{invsubtotal} = 0;
+ map { $form->{"${_}_base"} = 0 } (split(/ /, $form->{taxaccounts}));
+ # about details
+ $myconfig{show_form_details} = 1 unless (defined($myconfig{show_form_details}));
+ $form->{show_details} = $myconfig{show_form_details} unless (defined($form->{show_details}));
+ # /about details
+
+ # translations, unused commented out
+# $runningnumber = $locale->text('No.');
+# my $deliverydate = $locale->text('Delivery Date');
+ my $serialnumber = $locale->text('Serial No.');
+ my $projectnumber = $locale->text('Project');
+# $partsgroup = $locale->text('Group');
+ my $reqdate = $locale->text('Reqdate');
+ my $deliverydate = $locale->text('Required by');
+
+ # special alignings
+ my %align = map { $_ => 'right' } qw(qty ship right sellprice_pg discount linetotal stock_in_out);
+ my %nowrap = map { $_ => 1 } qw(description unit);
+
+ $form->{marge_total} = 0;
+ $form->{sellprice_total} = 0;
+ $form->{lastcost_total} = 0;
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) {
+ _update_part_information();
+ _update_ship() if ($is_s_p_order);
+ _update_custom_variables();
+
+ # rows
+
+ my @ROWS;
+ for my $i (1 .. $numrows) {
+ my %column_data = ();
# 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"};
- }
+ map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) }
+ qw(qty discount sellprice lastcost price_new price_old)
+ unless ($form->{simple_save});
+
+# unit begin
+ $form->{"unit_old_$i"} ||= $form->{"unit_$i"};
+ $form->{"selected_unit_$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 ( !$all_units->{$form->{"selected_unit_$i"}} # Die ausgewaehlte Einheit ist fuer diesen Artikel nicht gueltig
+ || !AM->convert_unit($form->{"selected_unit_$i"}, $form->{"unit_old_$i"}, $all_units)) { # (z.B. Dimensionseinheit war ausgewaehlt, es handelt sich aber
+ $form->{"unit_old_$i"} = $form->{"selected_unit_$i"} = $form->{"unit_$i"}; # um eine Dienstleistung). Dann keinerlei Umrechnung vornehmen.
}
+ # adjust prices by unit, ignore if pricegroup changed
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"};
- }
+ $form->{"sellprice_$i"} *= AM->convert_unit($form->{"selected_unit_$i"}, $form->{"unit_old_$i"}, $all_units) || 1;
+ $form->{"unit_old_$i"} = $form->{"selected_unit_$i"};
+ }
+ my $this_unit = $form->{"unit_$i"};
+ $this_unit = $form->{"selected_unit_$i"} if AM->convert_unit($this_unit, $form->{"selected_unit_$i"}, $all_units);
+
+ if (0 < scalar @{ $form->{ALL_PRICE_FACTORS} }) {
+ my @values = ('', map { $_->{id} } @{ $form->{ALL_PRICE_FACTORS} });
+ my %labels = map { $_->{id} => $_->{description} } @{ $form->{ALL_PRICE_FACTORS} };
+
+ $column_data{price_factor} =
+ NTI($cgi->popup_menu('-name' => "price_factor_id_$i",
+ '-default' => $form->{"price_factor_id_$i"},
+ '-values' => \@values,
+ '-labels' => \%labels,
+ '-style' => 'width:90px'));
+ } else {
+ $column_data{price_factor} = ' ';
}
- ($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);
+ $column_data{"unit"} = AM->unit_select_html($all_units, "unit_$i", $this_unit, $form->{"id_$i"} ? $form->{"unit_$i"} : undef);
+# / unit ending
- $linetotal =
- $form->round_amount($form->{"sellprice_$i"} - $discount, $decimalplaces);
- $linetotal = $form->round_amount($linetotal * $form->{"qty_$i"}, 2);
+ my $decimalplaces = ($form->{"sellprice_$i"} =~ /\.(\d+)/) ? max 2, length $1 : 2;
- # convert " to "
- map { $form->{"${_}_$i"} =~ s/\"/"/g }
- qw(partnumber description unit unit_old);
+ my $price_factor = $price_factors{$form->{"price_factor_id_$i"}} || 1;
+ my $discount = $form->round_amount($form->{"qty_$i"} * $form->{"sellprice_$i"} * $form->{"discount_$i"} / 100 / $price_factor, 2);
+ my $linetotal = $form->round_amount($form->{"qty_$i"} * $form->{"sellprice_$i"} * (100 - $form->{"discount_$i"}) / 100 / $price_factor, 2);
+ my $rows = $form->numtextrows($form->{"description_$i"}, 30, 6);
-########################################
- # 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{runningnumber} = $cgi->textfield(-name => "runningnumber_$i", -size => 5, -value => $i); # HuT
+ $column_data{partnumber} = $cgi->textfield(-name => "partnumber_$i", -size => 12, -value => $form->{"partnumber_$i"});
+ $column_data{description} = (($rows > 1) # if description is too large, use a textbox instead
+ ? $cgi->textarea( -name => "description_$i", -default => $form->{"description_$i"}, -rows => $rows, -columns => 30)
+ : $cgi->textfield(-name => "description_$i", -size => 30, -value => $form->{"description_$i"}))
+ . $cgi->button(-value => $locale->text('L'), -onClick => "set_longdescription_window('longdescription_$i')");
- $column_data{partnumber} =
- qq|<td><input name="partnumber_$i" size=12 value="$form->{"partnumber_$i"}"></td>|;
+ my $qty_dec = ($form->{"qty_$i"} =~ /\.(\d+)/) ? length $1 : 2;
- 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>|;
- }
+ $column_data{qty} = $cgi->textfield(-name => "qty_$i", -size => 5, -value => $form->format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec));
+ $column_data{qty} .= $cgi->button(-onclick => "calculate_qty_selection_window('qty_$i','alu_$i', 'formel_$i', $i)", -value => $locale->text('*/'))
+ . $cgi->hidden(-name => "formel_$i", -value => $form->{"formel_$i"}) . $cgi->hidden("-name" => "alu_$i", "-value" => $form->{"alu_$i"})
+ if $form->{"formel_$i"};
- (my $qty_dec) = ($form->{"qty_$i"} =~ /\.(\d+)/);
- $qty_dec = length $qty_dec;
+ $column_data{ship} = '';
+ if ($form->{"id_$i"}) {
+ my $ship_qty = $form->{"ship_$i"} * 1;
+ $ship_qty *= $all_units->{$form->{"partunit_$i"}}->{factor};
+ $ship_qty /= ( $all_units->{$form->{"unit_$i"}}->{factor} || 1 );
- $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{ship} = $form->format_amount(\%myconfig, $form->round_amount($ship_qty, 2) * 1) . ' ' . $form->{"unit_$i"};
}
- $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" onBlur=\"check_right_number_format(this)\"></td>|;
+ $column_data{sellprice_pg} = qq|<select name="sellprice_pg_$i" style="width: 8em">$form->{"prices_$i"}</select>|;
+ $column_data{sellprice} = $cgi->textfield(-name => "sellprice_$i", -size => 10, -onBlur => 'check_right_number_format(this)', -value =>
+ (($form->{"new_pricegroup_$i"} != $form->{"old_pricegroup_$i"})
+ ? $form->format_amount(\%myconfig, $form->{"price_new_$i"}, $decimalplaces)
+ : $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces)));
} else {
-
# for last row and report
# set pricegroup drop down list from report menu
if ($form->{"sellprice_$i"} != 0) {
- $prices =
- qq|<option value="$form->{"sellprice_$i"}--$form->{"pricegroup_id_$i"}" selected>$form->{"pricegroup_$i"}</option>\n|;
-
+ # remember the pricegroup_id in pricegroup_old
+ # but don't overwrite it
$form->{"pricegroup_old_$i"} = $form->{"pricegroup_id_$i"};
-
- $column_data{sellprice_pg} =
- qq|<td align="right"><select name="sellprice_pg_$i">$prices</select></td>|;
-
+ my $default_option = $form->{"sellprice_$i"}.'--'.$form->{"pricegroup_id_$i"};
+ $column_data{sellprice_pg} = NTI($cgi->popup_menu("sellprice_pg_$i", [ $default_option ], $default_option, { $default_option => $form->{"pricegroup_$i"} || '' }));
} else {
+ $column_data{sellprice_pg} = qq| |;
+ }
+ $column_data{sellprice} = $cgi->textfield(-name => "sellprice_$i", -size => 10, -onBlur => "check_right_number_format(this)", -value =>
+ $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces));
- # for last row
- $column_data{sellprice_pg} = qq|<td align="right"> </td>|;
- }
-
- $column_data{sellprice} =
- qq|<td><input name="sellprice_$i" size="10" onBlur=\"check_right_number_format(this)\" 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>|;
+ $column_data{discount} = $cgi->textfield(-name => "discount_$i", -size => 3, -value => $form->format_amount(\%myconfig, $form->{"discount_$i"}));
+ $column_data{linetotal} = $form->format_amount(\%myconfig, $linetotal, 2);
+ $column_data{bin} = $form->{"bin_$i"};
-########################################
- # 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">|;
+ if ($is_delivery_order) {
+ $column_data{stock_in_out} = calculate_stock_in_out($i);
+ }
- map { print "\n$column_data{$_}" } @column_index;
+ my @ROW1 = map { value => $column_data{$_}, align => $align{$_}, nowrap => $nowrap{$_} }, @column_index;
+
+ # second row
+ my @ROW2 = ();
+ push @ROW2, { value => qq|<b>$serialnumber</b> <input name="serialnumber_$i" size="15" value="$form->{"serialnumber_$i"}">| }
+ if $form->{type} !~ /_quotation/;
+ push @ROW2, { value => qq|<b>$projectnumber</b> | . NTI($cgi->popup_menu('-name' => "project_id_$i", '-values' => \@projectnumber_values,
+ '-labels' => \%projectnumber_labels, '-default' => $form->{"project_id_$i"})) };
+ push @ROW2, { value => qq|<b>$reqdate</b> <input name="reqdate_$i" size="11" onBlur="check_right_date_format(this)" value="$form->{"reqdate_$i"}">| }
+ if ($form->{type} =~ /order/ || $form->{type} =~ /invoice/);
+ push @ROW2, { value => sprintf qq|<b>%s</b> <input type="checkbox" name="subtotal_$i" value="1" %s>|,
+ $locale->text('Subtotal'), $form->{"subtotal_$i"} ? 'checked' : '' };
+
+# begin marge calculations
+ $form->{"lastcost_$i"} *= 1;
+ $form->{"marge_percent_$i"} = 0;
+
+ my $marge_color;
+ my $real_sellprice = $linetotal;
+ my $real_lastcost = $form->{"lastcost_$i"} * $form->{"qty_$i"} / ( $form->{"marge_price_factor_$i"} || 1 );
+ my $marge_percent_warn = $myconfig{marge_percent_warn} * 1 || 15;
+ my $marge_adjust_credit_note = $form->{type} eq 'credit_note' ? -1 : 1;
+
+ if ($real_sellprice * 1 && ($form->{"qty_$i"} * 1)) {
+ $form->{"marge_percent_$i"} = ($real_sellprice - $real_lastcost) * 100 / $real_sellprice;
+ $marge_color = 'color="#ff0000"' if $form->{"id_$i"} && $form->{"marge_percent_$i"} < $marge_percent_warn;
+ }
- 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"));
+ $form->{"marge_absolut_$i"} = ($real_sellprice - $real_lastcost) * $marge_adjust_credit_note;
+ $form->{"marge_total"} += $form->{"marge_absolut_$i"};
+ $form->{"lastcost_total"} += $real_lastcost;
+ $form->{"sellprice_total"} += $real_sellprice;
-########################################
- # Eintrag fuer Version 2.2.0 geaendert #
- # neue Optik im Rechnungsformular #
-########################################
+ map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, 2) } qw(marge_absolut marge_percent);
- my $row_style_attr =
- 'style="display:none;"' if (!$form->{"show_details"});
+ push @ROW2, { value => sprintf qq|
+ <font %s><b>%s</b> %s %s%% </font>
+ <b>%s</b> %s
+ <b>%s</b> <input size="5" name="lastcost_$i" value="%s">|,
+ $marge_color, $locale->text('Ertrag'),$form->{"marge_absolut_$i"}, $form->{"marge_percent_$i"},
+ $locale->text('LP'), $form->format_amount(\%myconfig, $form->{"listprice_$i"}, 2),
+ $locale->text('EK'), $form->format_amount(\%myconfig, $form->{"lastcost_$i"}, 2) }
+ if $form->{"id_$i"} && ($form->{type} =~ /^sales_/ || $form->{type} =~ /invoice/) && !$is_delivery_order;
+# / marge calculations ending
- # 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"}">|;
+# 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};
+ push @ROW2, { value => sprintf "<b>%s</b> <font %s>%s %s</font>",
+ $locale->text('On Hand'),
+ $onhand_color,
+ $form->format_amount(\%myconfig, $part->{onhand}, 2),
+ $part->{unit}
+ };
}
+# / calculate onhand
- 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" onBlur="check_right_date_format(this)" 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>
+ my @hidden_vars;
-|;
+ 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, "stock_${stock_in_out}_sum_qty", "stock_${stock_in_out}";
+ }
-############## ENDE Neueintrag ##################
+ my @HIDDENS = map { value => $_}, (
+ $cgi->hidden("-name" => "unit_old_$i", "-value" => $form->{"selected_unit_$i"}),
+ $cgi->hidden("-name" => "price_new_$i", "-value" => $form->format_amount(\%myconfig, $form->{"price_new_$i"})),
+ map { ($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } map { $_."_$i" }
+ (qw(orderitems_id bo pricegroup_old price_old id inventory_accno bin partsgroup partnotes
+ income_accno expense_accno listprice assembly taxaccounts ordnumber transdate cusordnumber
+ longdescription basefactor marge_absolut marge_percent marge_price_factor), @hidden_vars)
+ );
- map { $form->{"${_}_base"} += $linetotal }
- (split(/ /, $form->{"taxaccounts_$i"}));
+ map { $form->{"${_}_base"} += $linetotal } (split(/ /, $form->{"taxaccounts_$i"}));
$form->{invsubtotal} += $linetotal;
+
+ # Benutzerdefinierte Variablen für Waren/Dienstleistungen/Erzeugnisse
+ _render_custom_variables_inputs(ROW2 => \@ROW2, row => $i, part_id => $form->{"id_$i"});
+
+ push @ROWS, { ROW1 => \@ROW1, ROW2 => \@ROW2, HIDDENS => \@HIDDENS, colspan => $colspan, error => $form->{"row_error_$i"}, };
}
- print qq|
- </table>
- </td>
- </tr>
-|;
+ print $form->parse_html_template('oe/sales_order', { ROWS => \@ROWS,
+ HEADER => \@HEADER,
+ });
- $lxdebug->leave_sub();
+ if (0 != ($form->{sellprice_total} * 1)) {
+ $form->{marge_percent} = ($form->{sellprice_total} - $form->{lastcost_total}) / $form->{sellprice_total} * 100;
+ }
+
+ $main::lxdebug->leave_sub();
}
##################################################
# build html-code for pricegroups in variable $form->{prices_$j}
sub set_pricegroup {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my $locale = $main::locale;
+ my $cgi = $main::cgi;
+
+ _check_io_auth();
+
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;
+ for my $j (1 .. $rowcount) {
+ next unless $form->{PRICES}{$j};
+ # build drop down list for pricegroups
+ my $option_tmpl = qq|<option value="%s--%s" %s>%s</option>|;
+ $form->{"prices_$j"} = join '', map { sprintf $option_tmpl, @$_{qw(price pricegroup_id selected pricegroup)} }
+ (+{ pricegroup => $locale->text("none (pricegroup)") }, @{ $form->{PRICES}{$j} });
+
+ foreach my $item (@{ $form->{PRICES}{$j} }) {
+ # set new selectedpricegroup_id and prices for "Preis"
+ $form->{"pricegroup_old_$j"} = $item->{pricegroup_id} if $item->{selected} && $item->{pricegroup_id};
+ $form->{"sellprice_$j"} = $item->{price} if $item->{selected} && $item->{pricegroup_id};
+ $form->{"price_new_$j"} = $form->{"sellprice_$j"} if $item->{selected} || !$item->{pricegroup_id};
}
}
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub select_item {
- $lxdebug->enter_sub();
- @column_index = qw(ndx partnumber description onhand unit sellprice);
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+ my $cgi = $main::cgi;
+
+# diese variable kommt schon in der methode display_row vor, kann man die besser wiederverwenden? @mb fragen. ich check das jetzt erstmal so ein
+ my $is_purchase = (first { $_ eq $form->{type} } qw(request_quotation purchase_order purchase_delivery_order)) || ($form->{script} eq 'ir.pl');
+ _check_io_auth();
+ my @column_index = qw(ndx partnumber description rop onhand unit sellprice);
+ my %column_data;
$column_data{ndx} = qq|<th> </th>|;
$column_data{partnumber} =
qq|<th class="listheading">| . $locale->text('Number') . qq|</th>|;
qq|<th class="listheading">| . $locale->text('Part Description') . qq|</th>|;
$column_data{sellprice} =
qq|<th class="listheading">| . $locale->text('Price') . qq|</th>|;
+ if ($is_purchase){
+ $column_data{rop} =
+ qq|<th class="listheading">| . $locale->text('ROP') . qq|</th>|;
+ }# ende if $is_purchase -> Überschrift Mindestlagerbestand - ähnliche Prüfung weiter unten
$column_data{onhand} =
qq|<th class="listheading">| . $locale->text('Qty') . qq|</th>|;
$column_data{unit} =
# list items with radio button on a form
$form->header;
- $title = $locale->text('Select from one of the items below');
- $colspan = $#column_index + 1;
+ my $title = $locale->text('Select from one of the items below');
+ my $colspan = $#column_index + 1;
print qq|
<body>
print qq|</tr>|;
+ 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;
- foreach $ref (@{ $form->{item_list} }) {
- $checked = ($i++) ? "" : "checked";
+ my $j;
+ foreach my $ref (@{ $form->{item_list} }) {
+ my $checked = ($i++) ? "" : "checked";
- if ($lizenzen) {
+ if ($main::lizenzen) {
if ($ref->{inventory_accno} > 0) {
$ref->{"lizenzen"} = qq|<option></option>|;
- foreach $item (@{ $form->{LIZENZEN}{ $ref->{"id"} } }) {
+ foreach my $item (@{ $form->{LIZENZEN}{ $ref->{"id"} } }) {
$ref->{"lizenzen"} .=
qq|<option value=\"$item->{"id"}\">$item->{"licensenumber"}</option>|;
}
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_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}">|
. $form->format_amount(\%myconfig, $ref->{onhand}, '', " ")
. qq|</td>|;
+ if ($is_purchase){
+ $column_data{rop} =
+ qq|<td align="right"><input name="new_rop$i" type="hidden" value="$ref->{rop}">|
+ . $form->format_amount(\%myconfig, $ref->{rop}, '', " ")
+ . qq|</td>|;
+ }# ende if $is_purchase -> Falls der Aufruf über eine Einkaufsmaske kam, handelt es sich um einen Lieferantenauftrag und uns interessiert auch die Mindestbestandsmenge
$column_data{unit} =
qq|<td>$ref->{unit}</td>|;
$j++;
print("</tr>\n");
- my @new_fields =
- qw(bin listprice inventory_accno income_accno expense_accno unit weight
- assembly taxaccounts partsgroup formel logdescription not_discountable
- part_payment_id partnodes id);
- push(@new_fields, "lizenzen") if ($lizenzen);
-
- map({ print($cgi->hidden("-name" => "new_${_}_$i",
- "-value" => $ref->{$_})); } @new_fields);
+ print join "\n", map { $cgi->hidden("-name" => "new_${_}_$i", "-value" => $ref->{$_}) } @new_fields;
+ print "\n";
}
print qq|
map { delete $form->{$_} } qw(action item_list header);
# save all other form variables
- foreach $key (keys %${form}) {
+ foreach my $key (keys %${form}) {
+ next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
$form->{$key} =~ s/\"/"/g;
print qq|<input name="$key" type="hidden" value="$form->{$key}">\n|;
}
</html>
|;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub item_selected {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+
+ _check_io_auth();
# replace the last row with the checked row
- $i = $form->{rowcount};
+ my $i = $form->{rowcount};
$i = $form->{assembly_rows} if ($form->{item} eq 'assembly');
# index for new item
- $j = $form->{ndx};
+ my $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"});
+ my $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);
+
+ 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;
+
+ $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"};
}
- if ($lizenzen) {
+ if ($main::lizenzen) {
map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} } qw(lizenzen);
}
- ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);
+ my ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);
$dec = length $dec;
- $decimalplaces = ($dec > 2) ? $dec : 2;
+ my $decimalplaces = ($dec > 2) ? $dec : 2;
if ($sellprice) {
$form->{"sellprice_$i"} = $sellprice;
$form->{sellprice} += ($form->{"sellprice_$i"} * $form->{"qty_$i"});
$form->{weight} += ($form->{"weight_$i"} * $form->{"qty_$i"});
-
+
if ($form->{"not_discountable_$i"}) {
$form->{"discount_$i"} = 0;
}
- $amount =
+ my $amount =
$form->{"sellprice_$i"} * (1 - $form->{"discount_$i"} / 100) *
$form->{"qty_$i"};
map { $form->{"${_}_base"} += $amount }
# 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);
map {
$form->{"${_}_$i"} =
$form->format_amount(\%myconfig, $form->{"${_}_$i"}, $decimalplaces)
- } qw(sellprice listprice) if $form->{item} ne 'assembly';
+ } qw(sellprice listprice lastcost) if $form->{item} ne 'assembly';
# get pricegroups for parts
IS->get_pricegroups_for_parts(\%myconfig, \%$form);
&display_form;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub new_item {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
- # change callback
- $form->{old_callback} = $form->escape($form->{callback}, 1);
- $form->{callback} = $form->escape("$form->{script}?action=display_form", 1);
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
- # delete action
- delete $form->{action};
+ _check_io_auth();
- # save all other form variables in a previousform variable
- foreach $key (keys %$form) {
+ my $price_key = ($form->{type} =~ m/request_quotation|purchase_order/) || ($form->{script} eq 'ir.pl') ? 'lastcost' : 'sellprice';
- # 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);
-
- $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">
+ # change callback
+ $form->{old_callback} = $form->escape($form->{callback}, 1);
+ $form->{callback} = $form->escape("$form->{script}?action=display_form", 1);
-<p>
+ # 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;
- <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->{$_})); }
- qw(rowcount vc login password));
- map({ print($cgi->hidden("-name" => $_, "-value" => $form->{"$__$i"})); }
- ("partnumber", "description"));
-print $cgi->hidden("-name" => "taxaccount2", "-value" => $form->{taxaccounts});
+ my @HIDDENS;
+ push @HIDDENS, { 'name' => 'previousform', 'value' => $form->escape($previousform, 1) };
+ 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} };
+ push @HIDDENS, { 'name' => $price_key, 'value' => $form->parse_amount(\%myconfig, $form->{"sellprice_$form->{rowcount}"}) };
+ push @HIDDENS, { 'name' => 'notes', 'value' => $form->{"longdescription_$form->{rowcount}"} };
-print qq|
-<input type="hidden" name="nextsub" value="add">
+ $form->header();
+ print $form->parse_html_template("generic/new_item", { HIDDENS => [ sort { $a->{name} cmp $b->{name} } @HIDDENS ] } );
-<p>
-<input class="submit" type="submit" name="action" value="|
- . $locale->text('Continue') . qq|">
-</form>
-
-</body>
-</html>
-|;
-
- $lxdebug->leave_sub();
+ $main::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}) {
- 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};
- $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";
-
- &{$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;
+sub check_form {
+ $main::lxdebug->enter_sub();
- &form_footer;
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
- $lxdebug->leave_sub();
-}
+ _check_io_auth();
-sub check_form {
- $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)
- );
-
# remove any makes or model rows
if ($form->{item} eq 'part') {
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;
-
- map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds;
- $count++;
- }
- }
-
- $form->redo_rows(\@flds, \@a, $count, $form->{makemodel_rows});
- $form->{makemodel_rows} = $count;
-
} elsif ($form->{item} eq 'assembly') {
- $form->{sellprice} = 0;
+ # fuer assemblies auskommentiert. seiteneffekte? ;-) wird die woanders benoetigt?
+ #$form->{sellprice} = 0;
$form->{weight} = 0;
map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
- qw(listprice rop stock);
+ qw(listprice sellprice rop stock);
- @flds =
- qw(id qty unit bom partnumber description sellprice weight runningnumber partsgroup);
+ my @flds = qw(id qty unit bom partnumber description sellprice weight runningnumber partsgroup lastcost);
for my $i (1 .. ($form->{assembly_rows} - 1)) {
if ($form->{"qty_$i"}) {
#($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"});
+ # fuer assemblies auskommentiert. siehe oben
+ # $form->{sellprice} += ($form->{"qty_$i"} * $form->{"sellprice_$i"} / ($form->{"price_factor_$i"} || 1));
+ $form->{weight} += ($form->{"qty_$i"} * $form->{"weight_$i"} / ($form->{"price_factor_$i"} || 1));
$count++;
}
}
-
+ # kann das hier auch weg? s.o. jb
$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 = ();
-
- for my $i (1 .. ($form->{makemodel_rows})) {
- if (($form->{"make_$i"} ne "") || ($form->{"model_$i"} ne "")) {
- push @a, {};
- my $j = $#a;
-
- map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds;
- $count++;
- }
- }
-
- $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 {
+ remove_emptied_rows(1);
- # this section applies to invoices and orders
- # remove any empty numbers
- if ($form->{rowcount}) {
- for my $i (1 .. $form->{rowcount} - 1) {
- if ($form->{"partnumber_$i"}) {
- push @a, {};
- my $j = $#a;
-
- map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds;
- $count++;
- if ($lizenzen) {
- if ($form->{"licensenumber_$i"} == -1) {
- &new_license($i);
- exit;
- }
- }
- }
- }
-
- $form->redo_rows(\@flds, \@a, $count, $form->{rowcount});
- $form->{rowcount} = $count;
-
- $form->{creditremaining} -= &invoicetotal;
-
- }
+ $form->{creditremaining} -= &invoicetotal;
}
#sk
&display_form;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
+}
+
+sub remove_emptied_rows {
+ my $dont_add_empty = shift;
+ my $form = $::form;
+
+ return unless $form->{rowcount};
+
+ my @flds = qw(id partnumber description qty ship sellprice unit
+ discount inventory_accno income_accno expense_accno listprice
+ taxaccounts bin assembly weight projectnumber project_id
+ oldprojectnumber runningnumber serialnumber partsgroup payment_id
+ not_discountable shop ve gv buchungsgruppen_id language_values
+ sellprice_pg pricegroup_old price_old price_new unit_old ordnumber
+ transdate longdescription basefactor marge_total marge_percent
+ marge_price_factor lastcost price_factor_id partnotes
+ stock_out stock_in has_sernumber reqdate);
+
+ my $ic_cvar_configs = CVar->get_configs(module => 'IC');
+ push @flds, map { "ic_cvar_$_->{name}" } @{ $ic_cvar_configs };
+
+ my @new_rows;
+ for my $i (1 .. $form->{rowcount} - 1) {
+ next unless $form->{"partnumber_$i"};
+
+ push @new_rows, { map { $_ => $form->{"${_}_$i" } } @flds };
+ }
+
+ my $new_rowcount = scalar @new_rows;
+ $form->redo_rows(\@flds, \@new_rows, $new_rowcount, $form->{rowcount});
+ $form->{rowcount} = $new_rowcount + ($dont_add_empty ? 0 : 1);
}
sub invoicetotal {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+
+ _check_io_auth();
$form->{oldinvtotal} = 0;
if !$form->{taxincluded};
$form->{oldtotalpaid} = 0;
- for $i (1 .. $form->{paidaccounts}) {
+ for my $i (1 .. $form->{paidaccounts}) {
$form->{oldtotalpaid} += $form->{"paid_$i"};
}
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
# return total
return ($form->{oldinvtotal} - $form->{oldtotalpaid});
}
sub validate_items {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my $locale = $main::locale;
+
+ _check_io_auth();
# check if items are valid
if ($form->{rowcount} == 1) {
&update;
- exit;
+ ::end_of_request();
}
- for $i (1 .. $form->{rowcount} - 1) {
+ for my $i (1 .. $form->{rowcount} - 1) {
$form->isblank("partnumber_$i",
$locale->text('Number missing in Row') . " $i");
}
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub order {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
+ _check_io_auth();
+
if ($form->{second_run}) {
$form->{print_and_post} = 0;
}
$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);
+ my $buysell;
if ($form->{script} eq 'ir.pl' || $form->{type} eq 'request_quotation') {
$form->{title} = $locale->text('Add Purchase Order');
$form->{vc} = 'vendor';
my $script = $form->{"script"};
$script =~ s|.*/||;
$script =~ s|.pl$||;
- $locale = new Locale($language, $script);
+ $locale = new Locale($main::language, $script);
- map { $form->{"select$_"} = "" } ($form->{vc}, currency);
+ map { $form->{"select$_"} = "" } ($form->{vc}, "currency");
- $currency = $form->{currency};
+ my $currency = $form->{currency};
&order_links;
$form->{currency} = $currency;
- $form->{exchangerate} = "";
- $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}"})
+ $form->{forex} = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{transdate}, $buysell);
+ $form->{exchangerate} = $form->{forex} || '';
+
+ for my $i (1 .. $form->{rowcount}) {
+ map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"})
if ($form->{"${_}_${i}"}) }
- qw(ship qty sellprice listprice basefactor));
+ qw(ship qty sellprice listprice basefactor discount));
}
&prepare_order;
&display_form;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub quotation {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
+ _check_io_auth();
+
if ($form->{second_run}) {
$form->{print_and_post} = 0;
}
map { delete $form->{$_} } qw(id printed emailed queued);
+ my $buysell;
if ($form->{script} eq 'ir.pl' || $form->{type} eq 'purchase_order') {
$form->{title} = $locale->text('Add Request for Quotation');
$form->{vc} = 'vendor';
require "bin/mozilla/$form->{script}";
- map { $form->{"select$_"} = "" } ($form->{vc}, currency);
+ map { $form->{"select$_"} = "" } ($form->{vc}, "currency");
- $currency = $form->{currency};
+ my $currency = $form->{currency};
&order_links;
$form->{currency} = $currency;
- $form->{exchangerate} = "";
- $form->{forex} = "";
- $form->{exchangerate} = $exchangerate
- if (
- $form->{forex} = (
- $exchangerate =
- $form->check_exchangerate(
- \%myconfig, $form->{currency}, $form->{transdate}, $buysell
- )));
-
- for $i (1 .. $form->{rowcount}) {
+ $form->{forex} = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{transdate}, $buysell);
+ $form->{exchangerate} = $form->{forex} || '';
+
+ for my $i (1 .. $form->{rowcount}) {
map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig,
$form->{"${_}_${i}"})
if ($form->{"${_}_${i}"}) }
- qw(ship qty sellprice listprice basefactor));
+ qw(ship qty sellprice listprice basefactor discount));
}
&prepare_order;
&display_form;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub request_for_quotation {
}
sub edit_e_mail {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
+ _check_io_auth();
+
if ($form->{second_run}) {
$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"}) {
+ if ($form->{"cp_id"}) {
CT->get_contact(\%myconfig, $form);
- $form->{"email"} = $form->{"cp_email"};
+ $form->{"email"} = $form->{"cp_email"} if $form->{"cp_email"};
}
- $name = $form->{ $form->{vc} };
- $name =~ s/--.*//g;
- $title = $locale->text('E-mail') . " $name";
+ my $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;
-
- 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 = "";
- }
+ my $attachment_filename = $form->generate_attachment_filename();
+ my $subject = $form->{subject} || $form->generate_email_subject();
- 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>
-|;
+ my (@dont_hide_key_list, %dont_hide_key, @hidden_keys);
+ @dont_hide_key_list = qw(action email cc bcc subject message sendmode format header override login password);
+ @dont_hide_key{@dont_hide_key_list} = (1) x @dont_hide_key_list;
+ @hidden_keys = sort grep { !$dont_hide_key{$_} } grep { !ref $form->{$_} } keys %$form;
- print_options();
+ print $form->parse_html_template('generic/edit_email',
+ { title => $title,
+ a_filename => $attachment_filename,
+ subject => $subject,
+ print_options => print_options('inline' => 1),
+ HIDDEN => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ],
+ SHOW_BCC => $myconfig{role} eq 'admin' });
- 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>
-
-<input type="hidden" name="nextsub" value="send_email">
-
-<br>
-<input name="action" class="submit" type="submit" value="|
- . $locale->text('Continue') . qq|">
-</form>
-
-</body>
-</html>
-|;
-
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub send_email {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+
+ _check_io_auth();
my $callback = $form->{script} . "?action=edit";
- map({ $callback .= "\&${_}=" . E($form->{$_}); }
- qw(login password type id));
+ map({ $callback .= "\&${_}=" . E($form->{$_}); } qw(type id));
print_form("return");
+ Common->save_email_status(\%myconfig, $form);
+
$form->{callback} = $callback;
$form->redirect();
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
# generate the printing options displayed at the bottom of oe and is forms.
# this function will attempt to guess what type of form is displayed, and will generate according options
#
-# about the coding:
+# 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.
+# 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() and my ($inline) = @_;
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
+ _check_io_auth();
+
+ my %options = @_;
# names 3 parameters and returns a hashref, for use in templates
sub opthash { +{ value => shift, selected => shift, oname => shift } }
- (@FORMNAME, @FORMNAME, @LANGUAGE_ID, @FORMAT, @SENDMODE, @MEDIA, @PRINTER_ID, @SELECTS) = ();
+ my (@FORMNAME, @LANGUAGE_ID, @FORMAT, @SENDMODE, @MEDIA, @PRINTER_ID, @SELECTS) = ();
# note: "||"-selection is only correct for values where "0" is _not_ a correct entry
$form->{sendmode} = "attachment";
$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')),
) : undef,
- ($form->{type} =~ /_quotation$/) ?
- opthash("$`_quotation", $form->{PD}{"$`_quotation"}, $locale->text('Quotation')) : undef,
+ ($form->{type} =~ /sales_quotation$/) ?
+ opthash('sales_quotation', $form->{PD}{sales_quotation}, $locale->text('Quotation')) : undef,
+ ($form->{type} =~ /request_quotation$/) ?
+ opthash('request_quotation', $form->{PD}{request_quotation}, $locale->text('Request for 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')),
) : 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'))
+ opthash("storno_invoice", $form->{PD}{storno_invoice}, $locale->text('Storno Invoice')),
) : undef,
- ($form->{type} eq 'credit_note') ?
- 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'))
+ ($form->{type} =~ /_delivery_order$/) ? (
+ opthash($form->{type}, $form->{PD}{$form->{type}}, $locale->text('Delivery Order')),
+ opthash('pick_list', $form->{PD}{pick_list}, $locale->text('Pick List')),
+ ) : undef;
+
+ push @SENDMODE,
+ 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 @{ $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')),
+ ($form->{printers} && scalar @{ $form->{printers} } && $main::latex_templates) ?
+ opthash("printer", $form->{OP}{printer}, $locale->text('Printer')) : undef,
+ ($main::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;
-
- push @LANGUAGE_ID,
- map { opthash($_->{id}, ($_->{id} eq $form->{language} ? 'selected' : ''), $_->{description}) } +{}, @{ $form->{languages} }
+ ($main::opendocument_templates && $main::openofficeorg_writer_bin && $main::xvfb_bin
+ && (-x $main::openofficeorg_writer_bin) && (-x $main::xvfb_bin)
+ && !$options{no_opendocument_pdf}) ?
+ opthash("opendocument_pdf", $form->{DF}{"opendocument_pdf"}, $locale->text("PDF (OpenDocument/OASIS)")) : undef,
+ ($main::latex_templates) ?
+ opthash("pdf", $form->{DF}{pdf}, $locale->text('PDF')) : undef,
+ ($main::latex_templates && !$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}) ?
+ opthash("opendocument", $form->{DF}{opendocument}, $locale->text("OpenDocument/OASIS")) : undef,
+ ($main::excel_templates && !$options{no_excel}) ?
+ opthash("excel", $form->{DF}{excel}, $locale->text("Excel")) : undef;
+
+ push @LANGUAGE_ID,
+ map { opthash($_->{id}, ($_->{id} eq $form->{language_id} ? 'selected' : ''), $_->{description}) } +{}, @{ $form->{languages} }
if (ref $form->{languages} eq 'ARRAY');
- push @PRINTER_ID,
+ push @PRINTER_ID,
map { opthash($_->{id}, ($_->{id} eq $form->{printer_id} ? 'selected' : ''), $_->{printer_description}) } +{}, @{ $form->{printers} }
if ((ref $form->{printers} eq 'ARRAY') && scalar @{ $form->{printers } });
- @SELECTS = map { sname => lc $_, DATA => \@$_, show => scalar @$_ }, qw(FORMNAME LANGUAGE_ID FORMAT SENDMODE MEDIA PRINTER_ID);
+ @SELECTS = map {
+ sname => $_->[1],
+ DATA => $_->[0],
+ show => !$options{"hide_" . $_->[1]} && scalar @{ $_->[0] }
+ },
+ [ \@FORMNAME, 'formname', ],
+ [ \@LANGUAGE_ID, 'language_id', ],
+ [ \@FORMAT, 'format', ],
+ [ \@SENDMODE, 'sendmode', ],
+ [ \@MEDIA, 'media', ],
+ [ \@PRINTER_ID, 'printer_id', ];
+
+ my %dont_display_groupitems = (
+ 'dunning' => 1,
+ );
- %template_vars = (
- display_copies => scalar @{ $form->{printers} } && $latex_templates && $form->{media} ne 'email',
+ my %template_vars = (
+ display_copies => scalar @{ $form->{printers} || [] } && $main::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) {
- $lxdebug->leave_sub() and return $print_options;
- } else {
- print $print_options; $lxdebug->leave_sub();
+ if ($options{inline}) {
+ $main::lxdebug->leave_sub();
+ return $print_options;
}
+
+ print $print_options;
+
+ $main::lxdebug->leave_sub();
}
sub print {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my $locale = $main::locale;
+
+ _check_io_auth();
+
+ if ($form->{print_nextsub}) {
+ call_sub($form->{print_nextsub});
+ $main::lxdebug->leave_sub();
+ return;
+ }
# if this goes to the printer pass through
+ my $old_form;
if ($form->{media} eq 'printer' || $form->{media} eq 'queue') {
$form->error($locale->text('Select postscript or PDF!'))
if ($form->{format} !~ /(postscript|pdf)/);
&save();
$form->{formname} = $formname;
&edit();
- exit;
+ $::lxdebug->leave_sub();
+ ::end_of_request();
}
&print_form($old_form);
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub print_form {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
+ _check_io_auth();
+
my ($old_form) = @_;
- $inv = "inv";
- $due = "due";
- $numberfld = "invnumber";
+ my $inv = "inv";
+ my $due = "due";
+ my $numberfld = "invnumber";
+ my $order;
- $display_form =
+ my $display_form =
($form->{display_form}) ? $form->{display_form} : "display_form";
# $form->{"notes"} will be overridden by the customer's/vendor's "notes" field. So save it here.
if ($form->{formname} eq "invoice") {
$form->{label} = $locale->text('Invoice');
}
- if ($form->{formname} eq "packing_list") {
-
- # this is from an invoice
- $form->{label} = $locale->text('Packing List');
- }
if ($form->{formname} eq 'sales_order') {
$inv = "ord";
$due = "req";
$form->{"${inv}date"} = $form->{transdate};
- $form->{label} = $locale->text('Sales Order');
+ $form->{label} = $locale->text('Confirmation');
$numberfld = "sonumber";
$order = 1;
}
$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 'pick_list') {
- $inv = "ord";
- $due = "req";
- $form->{"${inv}date"} =
- ($form->{transdate}) ? $form->{transdate} : $form->{invdate};
- $form->{label} = $locale->text('Pick List');
- $order = 1 unless $form->{type} eq 'invoice';
- }
if ($form->{formname} eq 'purchase_order') {
$inv = "ord";
$due = "req";
$inv = "quo";
$due = "req";
$form->{"${inv}date"} = $form->{transdate};
- $form->{label} = $locale->text('Quotation');
+ $form->{label} = $locale->text('RFQ');
$numberfld = "rfqnumber";
$order = 1;
}
+ if ($form->{type} =~ /_delivery_order$/) {
+ undef $due;
+ $inv = "do";
+ $form->{"${inv}date"} = $form->{transdate};
+ $numberfld = $form->{type} =~ /^sales/ ? 'sdonumber' : 'pdonumber';
+ $form->{label} = $form->{formname} eq 'pick_list' ? $locale->text('Pick List') : $locale->text('Delivery Order');
+ }
+
$form->isblank("email", $locale->text('E-mail address missing!'))
if ($form->{media} eq 'email');
$form->isblank("${inv}date",
- $locale->text($form->{label})
+ $locale->text($form->{label})
. ": "
. $locale->text(' Date missing!'));
# $locale->text('Invoice Number missing!')
# $locale->text('Invoice Date missing!')
- # $locale->text('Packing List Number missing!')
- # $locale->text('Packing List Date missing!')
# $locale->text('Order Number missing!')
# $locale->text('Order Date missing!')
# $locale->text('Quotation Number missing!')
call_sub($display_form);
# saving the history
- if(!exists $form->{addition}) {
- $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
- $form->{addition} = "PRINTED";
- $form->save_history($form->dbconnect(\%myconfig));
+ if(!exists $form->{addition}) {
+ $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
+ $form->{addition} = "PRINTED";
+ $form->save_history;
}
# /saving the history
- exit;
+ ::end_of_request();
}
}
my ($saved_email, $saved_cc, $saved_bcc) =
($form->{"email"}, $form->{"cc"}, $form->{"bcc"});
- $language_saved = $form->{language_id};
- $payment_id_saved = $form->{payment_id};
- $salesman_id_saved = $form->{salesman_id};
- $cp_id_saved = $form->{cp_id};
+ my $language_saved = $form->{language_id};
+ my $payment_id_saved = $form->{payment_id};
+ my $salesman_id_saved = $form->{salesman_id};
+ my $cp_id_saved = $form->{cp_id};
- call_sub("$form->{vc}_details");
+ call_sub("$form->{vc}_details") if ($form->{vc});
$form->{language_id} = $language_saved;
$form->{payment_id} = $payment_id_saved;
($form->{employee}) = split /--/, $form->{employee};
# create the form variables
- if ($order) {
+ if ($form->{type} =~ /_delivery_order$/) {
+ DO->order_details();
+ } elsif ($order) {
OE->order_details(\%myconfig, \%$form);
} else {
IS->invoice_details(\%myconfig, \%$form, $locale);
}
- $form->get_salesman(\%myconfig, $salesman_id_saved);
+ $form->get_employee_data('prefix' => 'employee', 'id' => $form->{employee_id});
+ $form->get_employee_data('prefix' => 'salesman', 'id' => $salesman_id_saved);
if ($form->{shipto_id}) {
$form->get_shipto(\%myconfig);
}
- @a = qw(name street zipcode city country);
+ my @a = qw(name street zipcode city country contact);
- $shipto = 1;
+ my $shipto = 1;
# if there is no shipto fill it in from billto
- foreach $item (@a) {
+ foreach my $item (@a) {
if ($form->{"shipto$item"}) {
$shipto = 0;
last;
$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"}->[$_] =
- AM->translate_units($form, $form->{"language"},
- $form->{"unit"}->[$_], $form->{"qty"}->[$_]); }
- (0..scalar(@{$form->{"unit"}}) - 1));
+ my $template_arrays = $form->{TEMPLATE_ARRAYS} || $form;
+ map { $template_arrays->{unit}->[$_] = AM->translate_units($form, $form->{language}, $template_arrays->{unit}->[$_], $template_arrays->{qty}->[$_]); } (0..scalar(@{ $template_arrays->{unit} }) - 1);
+
$form->{language} = "_" . $form->{language};
}
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};
+ my ($cvar_date_fields, $cvar_number_fields) = CVar->get_field_format_list('module' => 'CT', 'prefix' => 'vc_');
+
+ if (scalar @{ $cvar_date_fields }) {
+ format_dates($output_dateformat, $output_longdates, @{ $cvar_date_fields });
}
- $form->{IN} = "$form->{formname}$form->{language}$form->{printer_code}.html";
+ while (my ($precision, $field_list) = each %{ $cvar_number_fields }) {
+ reformat_numbers($output_numberformat, $precision, @{ $field_list });
+ }
+
+ my $extension = 'html';
if ($form->{format} eq 'postscript') {
- $form->{postscript} = 1;
- $form->{IN} =~ s/html$/tex/;
+ $form->{postscript} = 1;
+ $extension = 'tex';
+
} elsif ($form->{"format"} =~ /pdf/) {
- $form->{pdf} = 1;
- if ($form->{"format"} =~ /opendocument/) {
- $form->{IN} =~ s/html$/odt/;
- } else {
- $form->{IN} =~ s/html$/tex/;
- }
+ $form->{pdf} = 1;
+ $extension = $form->{'format'} =~ m/opendocument/i ? 'odt' : 'tex';
+
} elsif ($form->{"format"} =~ /opendocument/) {
- $form->{"opendocument"} = 1;
- $form->{"IN"} =~ s/html$/odt/;
+ $form->{opendocument} = 1;
+ $extension = 'odt';
+ } elsif ($form->{"format"} =~ /excel/) {
+ $form->{excel} = 1;
+ $extension = 'xls';
}
+ my $email_extension = '_email' if (($form->{media} eq 'email') && (-f "$myconfig{templates}/$form->{formname}_email$form->{language}${printer_code}.${extension}"));
+
+ $form->{IN} = "$form->{formname}${email_extension}$form->{language}${printer_code}.${extension}";
+
+ delete $form->{OUT};
+
if ($form->{media} eq 'printer') {
- $form->{OUT} = "| $form->{printer_command} &>/dev/null";
+ #$form->{OUT} = "| $form->{printer_command} &>/dev/null";
+ $form->{OUT} = "| $form->{printer_command} ";
$form->{printed} .= " $form->{formname}";
$form->{printed} =~ s/^ //;
}
- $printed = $form->{printed};
+ my $printed = $form->{printed};
if ($form->{media} eq 'email') {
$form->{subject} = qq|$form->{label} $form->{"${inv}number"}|
unless $form->{subject};
- $form->{OUT} = "$sendmail";
-
$form->{emailed} .= " $form->{formname}";
$form->{emailed} =~ s/^ //;
}
- $emailed = $form->{emailed};
+ my $emailed = $form->{emailed};
if ($form->{media} eq 'queue') {
- %queued = split / /, $form->{queued};
+ my %queued = map { s|.*/|| } split / /, $form->{queued};
+ my $filename;
if ($filename = $queued{ $form->{formname} }) {
- $form->{queued} =~ s/$form->{formname} $filename//;
- unlink "$spool/$filename";
+ $form->{queued} =~ s/\Q$form->{formname} $filename\E//;
+ unlink "$main::spool/$filename";
$filename =~ s/\..*$//g;
} else {
$filename = time;
}
$filename .= ($form->{postscript}) ? '.ps' : '.pdf';
- $form->{OUT} = ">$spool/$filename";
+ $form->{OUT} = ">$main::spool/$filename";
# add type
$form->{queued} .= " $form->{formname} $filename";
$form->{queued} =~ s/^ //;
}
- $queued = $form->{queued};
+ my $queued = $form->{queued};
# saving the history
if(!exists $form->{addition}) {
$form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
if($form->{media} =~ /printer/) {
- $form->{addition} = "PRINTED";
+ $form->{addition} = "PRINTED";
}
elsif($form->{media} =~ /email/) {
- $form->{addition} = "MAILED";
+ $form->{addition} = "MAILED";
}
elsif($form->{media} =~ /queue/) {
- $form->{addition} = "QUEUED";
+ $form->{addition} = "QUEUED";
}
elsif($form->{media} =~ /screen/) {
- $form->{addition} = "SCREENED";
+ $form->{addition} = "SCREENED";
}
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->save_history;
}
# /saving the history
- $form->parse_template(\%myconfig, $userspath);
+ $form->parse_template(\%myconfig, $main::userspath);
$form->{callback} = "";
if ($form->{media} eq 'email') {
$form->{message} = $locale->text('sent') unless $form->{message};
}
- $message = $form->{message};
+ my $message = $form->{message};
# if we got back here restore the previous form
if ($form->{media} =~ /(printer|email|queue)/) {
$form->update_status(\%myconfig)
if ($form->{media} eq 'queue' && $form->{id});
- return $lxdebug->leave_sub() if ($old_form eq "return");
+ return $main::lxdebug->leave_sub() if ($old_form eq "return");
if ($old_form) {
map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
qw(exchangerate creditlimit creditremaining);
- for $i (1 .. $form->{paidaccounts}) {
+ for my $i (1 .. $form->{paidaccounts}) {
map {
$form->{"${_}_$i"} =
$form->parse_amount(\%myconfig, $form->{"${_}_$i"})
}
call_sub($display_form);
- exit;
+ ::end_of_request();
}
- $msg =
+ my $msg =
($form->{media} eq 'printer')
? $locale->text('sent to printer')
: $locale->text('emailed to') . " $form->{email}";
}
if ($form->{printing}) {
call_sub($display_form);
- exit;
+ ::end_of_request();
}
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub customer_details {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+
IS->customer_details(\%myconfig, \%$form, @_);
- $lxdebug->leave_sub();
+
+ $main::lxdebug->leave_sub();
}
sub vendor_details {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
IR->vendor_details(\%myconfig, \%$form, @_);
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub post_as_new {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+
+ _check_io_auth();
$form->{postasnew} = 1;
map { delete $form->{$_} } qw(printed emailed queued);
&post;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub ship_to {
- $lxdebug->enter_sub();
+ $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;
}
- $title = $form->{title};
+ my $title = $form->{title};
$form->{title} = $locale->text('Ship to');
map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
my @shipto_vars =
qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry
- shiptocontact shiptophone shiptofax shiptoemail
+ shiptocontact shiptocp_gender shiptophone shiptofax shiptoemail
shiptodepartment_1 shiptodepartment_2);
my @addr_vars =
# get details for name
call_sub("$form->{vc}_details", @addr_vars);
- $number =
+ my $number =
($form->{vc} eq 'customer')
? $locale->text('Customer Number')
: $locale->text('Vendor Number');
+ # sieht nicht nett aus, funktioniert aber
+ # das vorausgewählte select-feld wird über shiptocp_gender
+ # entsprechend vorbelegt
+ my $selected_m='';
+ my $selected_f='';
+ if ($form->{shiptocp_gender} eq 'm') {
+ $selected_m='selected';
+ $selected_f='';
+ } elsif ($form->{shiptocp_gender} eq 'f') {
+ $selected_m='';
+ $selected_f='selected';
+ }
+
# get pricegroups for parts
IS->get_pricegroups_for_parts(\%myconfig, \%$form);
# build up html code for prices_$i
set_pricegroup($form->{rowcount});
- $nextsub = ($form->{display_form}) ? $form->{display_form} : "display_form";
+ my $nextsub = ($form->{display_form}) ? $form->{display_form} : "display_form";
$form->{rowcount}--;
<tr>
<td>
<table>
- <tr class="listheading">
- <th class="listheading" colspan="2" width="50%">|
+ <tr class="listheading">
+ <th class="listheading" colspan="2" width="50%">|
. $locale->text('Billing Address') . qq|</th>
- <th class="listheading" width="50%">|
+ <th class="listheading" width="50%">|
. $locale->text('Shipping Address') . qq|</th>
- </tr>
- <tr height="5"></tr>
- <tr>
- <th align="right" nowrap>$number</th>
- <td>$form->{"$form->{vc}number"}</td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('Company Name') . qq|</th>
- <td>$form->{name}</td>
- <td><input name="shiptoname" size="35" value="$form->{shiptoname}"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('Department') . qq|</th>
- <td>$form->{department_1}</td>
- <td><input name="shiptodepartment_1" size="35" value="$form->{shiptodepartment_1}"></td>
- </tr>
- <tr>
- <th align="right" nowrap> </th>
- <td>$form->{department_2}</td>
- <td><input name="shiptodepartment_2" size="35" value="$form->{shiptodepartment_2}"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('Street') . qq|</th>
- <td>$form->{street}</td>
- <td><input name="shiptostreet" size="35" value="$form->{shiptostreet}"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('Zipcode') . qq|</th>
- <td>$form->{zipcode}</td>
- <td><input name="shiptozipcode" size="35" value="$form->{shiptozipcode}"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('City') . qq|</th>
- <td>$form->{city}</td>
- <td><input name="shiptocity" size="35" value="$form->{shiptocity}"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('Country') . qq|</th>
- <td>$form->{country}</td>
- <td><input name="shiptocountry" size="35" value="$form->{shiptocountry}"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('Contact') . qq|</th>
- <td>$form->{contact}</td>
- <td><input name="shiptocontact" size="35" value="$form->{shiptocontact}"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('Phone') . qq|</th>
- <td>$form->{phone}</td>
- <td><input name="shiptophone" size="20" value="$form->{shiptophone}"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('Fax') . qq|</th>
- <td>$form->{fax}</td>
- <td><input name="shiptofax" size="20" value="$form->{shiptofax}"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('E-mail') . qq|</th>
- <td>$form->{email}</td>
- <td><input name="shiptoemail" size="35" value="$form->{shiptoemail}"></td>
- </tr>
+ </tr>
+ <tr height="5"></tr>
+ <tr>
+ <th align="right" nowrap>$number</th>
+ <td>$form->{"$form->{vc}number"}</td>
+ </tr>
+ <tr>
+ <th align="right" nowrap>| . $locale->text('Company Name') . qq|</th>
+ <td>$form->{name}</td>
+ <td><input name="shiptoname" size="35" value="$form->{shiptoname}"></td>
+ </tr>
+ <tr>
+ <th align="right" nowrap>| . $locale->text('Department') . qq|</th>
+ <td>$form->{department_1}</td>
+ <td><input name="shiptodepartment_1" size="35" value="$form->{shiptodepartment_1}"></td>
+ </tr>
+ <tr>
+ <th align="right" nowrap> </th>
+ <td>$form->{department_2}</td>
+ <td><input name="shiptodepartment_2" size="35" value="$form->{shiptodepartment_2}"></td>
+ </tr>
+ <tr>
+ <th align="right" nowrap>| . $locale->text('Street') . qq|</th>
+ <td>$form->{street}</td>
+ <td><input name="shiptostreet" size="35" value="$form->{shiptostreet}"></td>
+ </tr>
+ <tr>
+ <th align="right" nowrap>| . $locale->text('Zipcode') . qq|</th>
+ <td>$form->{zipcode}</td>
+ <td><input name="shiptozipcode" size="35" value="$form->{shiptozipcode}"></td>
+ </tr>
+ <tr>
+ <th align="right" nowrap>| . $locale->text('City') . qq|</th>
+ <td>$form->{city}</td>
+ <td><input name="shiptocity" size="35" value="$form->{shiptocity}"></td>
+ </tr>
+ <tr>
+ <th align="right" nowrap>| . $locale->text('Country') . qq|</th>
+ <td>$form->{country}</td>
+ <td><input name="shiptocountry" size="35" value="$form->{shiptocountry}"></td>
+ </tr>
+ <tr>
+ <th align="right" nowrap>| . $locale->text('Contact') . qq|</th>
+ <td>$form->{contact}</td>
+ <td><input name="shiptocontact" size="35" value="$form->{shiptocontact}"></td>
+ </tr>
+ <tr>
+ <th align="right" nowrap>| . $locale->text('Gender') . qq|</th>
+ <td></td>
+ <td><select id="shiptocp_gender" name="shiptocp_gender">
+ <option value="m"| . $selected_m . qq|>| . $locale->text('male') . qq|</option>
+ <option value="f"| . $selected_f . qq|>| . $locale->text('female') . qq|</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <th align="right" nowrap>| . $locale->text('Phone') . qq|</th>
+ <td>$form->{phone}</td>
+ <td><input name="shiptophone" size="20" value="$form->{shiptophone}"></td>
+ </tr>
+ <tr>
+ <th align="right" nowrap>| . $locale->text('Fax') . qq|</th>
+ <td>$form->{fax}</td>
+ <td><input name="shiptofax" size="20" value="$form->{shiptofax}"></td>
+ </tr>
+ <tr>
+ <th align="right" nowrap>| . $locale->text('E-mail') . qq|</th>
+ <td>$form->{email}</td>
+ <td><input name="shiptoemail" size="35" value="$form->{shiptoemail}"></td>
+ </tr>
</table>
</td>
</tr>
# delete shipto
- map({ delete $form->{$_} } (@shipto_vars, qw(header)));
+ map({ delete $form->{$_} } (@shipto_vars, qw(header shipto_id)));
$form->{title} = $title;
- foreach $key (keys %$form) {
+ foreach my $key (keys %$form) {
+ next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
$form->{$key} =~ s/\"/"/g;
print qq|<input type="hidden" name="$key" value="$form->{$key}">\n|;
}
</html>
|;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub new_license {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+
+ _check_io_auth();
my $row = shift;
# delete action
delete $form->{action};
- $customer = $form->{customer};
+ my $customer = $form->{customer};
map { $form->{"old_$_"} = $form->{"${_}_$row"} } qw(partnumber description);
# save all other form variables in a previousform variable
$form->{row} = $row;
- foreach $key (keys %$form) {
+ 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;
map { $form->{$_} = $form->escape($form->{$_}, 1) }
qw(partnumber description);
$form->{callback} =
- 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|;
+ 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;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub relink_accounts {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+
+ _check_io_auth();
$form->{"taxaccounts"} =~ s/\s*$//;
$form->{"taxaccounts"} =~ s/^\s*//;
}
$form->{"taxaccounts"} = "";
- for (my $i = 1; $i <= $form->{"rowcount"}; $i++) {
- if ($form->{"id_$i"}) {
- IC->retrieve_accounts(\%myconfig, $form, $form->{"id_$i"}, $i, 1);
- }
- }
+ IC->retrieve_accounts(\%myconfig, $form, map { $_ => $form->{"id_$_"} } 1 .. $form->{rowcount});
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub set_duedate {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+
+ _check_io_auth();
+
+ my $invdate = $form->{invdate} eq 'undefined' ? undef : $form->{invdate};
+ my $duedate = $form->get_duedate(\%myconfig, $invdate);
+
+ print $form->ajax_response_header() . $duedate;
+
+ $main::lxdebug->leave_sub();
+}
+
+sub _update_part_information {
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+
+ my %part_information = IC->get_basic_part_info('id' => [ grep { $_ } map { $form->{"id_${_}"} } (1..$form->{rowcount}) ],
+ 'vendor_id' => $form->{vendor_id});
+
+ $form->{PART_INFORMATION} = \%part_information;
+
+ foreach my $i (1..$form->{rowcount}) {
+ next unless ($form->{"id_${i}"});
+
+ my $info = $form->{PART_INFORMATION}->{$form->{"id_${i}"}} || { };
+ $form->{"partunit_${i}"} = $info->{unit};
+ }
+
+ $main::lxdebug->leave_sub();
+}
+
+sub _update_ship {
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+
+ if (!$form->{ordnumber} || !$form->{id}) {
+ map { $form->{"ship_$_"} = 0 } (1..$form->{rowcount});
+ $main::lxdebug->leave_sub();
+ return;
+ }
+
+ my $all_units = AM->retrieve_all_units();
+
+ my %ship = DO->get_shipped_qty('type' => ($form->{type} eq 'purchase_order') ? 'purchase' : 'sales',
+ 'oe_id' => $form->{id},);
+
+ foreach my $i (1..$form->{rowcount}) {
+ next unless ($form->{"id_${i}"});
- $form->get_duedate(\%myconfig);
+ $form->{"ship_$i"} = 0;
- my $q = new CGI;
- $result = "$form->{duedate}";
- print $q->header();
- print $result;
- $lxdebug->leave_sub();
+ my $ship_entry = $ship{$form->{"id_$i"}};
+ next if (!$ship_entry || ($ship_entry->{qty} <= 0));
+
+ my $rowqty =
+ ($form->{simple_save} ? $form->{"qty_$i"} : $form->parse_amount(\%myconfig, $form->{"qty_$i"}))
+ * $all_units->{$form->{"unit_$i"}}->{factor}
+ / $all_units->{$form->{"partunit_$i"}}->{factor};
+
+ $form->{"ship_$i"} = min($rowqty, $ship_entry->{qty});
+ $ship_entry->{qty} -= $form->{"ship_$i"};
+ }
+
+ foreach my $i (1..$form->{rowcount}) {
+ next unless ($form->{"id_${i}"});
+
+ my $ship_entry = $ship{$form->{"id_$i"}};
+
+ next if (!$ship_entry || ($ship_entry->{qty} <= 0.01));
+
+ $form->{"ship_$i"} += $ship_entry->{qty};
+ $ship_entry->{qty} = 0;
+ }
+
+ $main::lxdebug->leave_sub();
+}
+
+sub _update_custom_variables {
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+
+ $form->{CVAR_CONFIGS} = { } unless ref $form->{CVAR_CONFIGS} eq 'HASH';
+ $form->{CVAR_CONFIGS}->{IC} ||= CVar->get_configs(module => 'IC');
+
+ $main::lxdebug->leave_sub();
}
+sub _render_custom_variables_inputs {
+ $main::lxdebug->enter_sub(2);
+
+ my $form = $main::form;
+
+ my %params = @_;
+
+ if (!$form->{CVAR_CONFIGS}->{IC}) {
+ $main::lxdebug->leave_sub();
+ return;
+ }
+
+ my $valid = CVar->custom_variables_validity_by_trans_id(trans_id => $params{part_id});
+
+ my $num_visible_cvars = 0;
+ foreach my $cvar (@{ $form->{CVAR_CONFIGS}->{IC} }) {
+ $cvar->{valid} = $params{part_id} && $valid->($cvar->{id});
+
+ my $description = '';
+ if ($cvar->{flag_editable} && $cvar->{valid}) {
+ $num_visible_cvars++;
+ $description = $cvar->{description} . ' ';
+ }
+
+ push @{ $params{ROW2} }, {
+ line_break => $num_visible_cvars == 1,
+ description => $description,
+ cvar => 1,
+ render_options => {
+ hide_non_editable => 1,
+ var => $cvar,
+ name_prefix => 'ic_',
+ name_postfix => "_$params{row}",
+ valid => $cvar->{valid},
+ value => $form->{"ic_cvar_" . $cvar->{name} . "_$params{row}"},
+ }
+ };
+ }
+
+ $main::lxdebug->leave_sub(2);
+}