X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=c7d7b694a5ae1e54783876cb1ce11052fab70987;hb=101a5e1f45b26386025a130be304a333ee8b64b7;hp=8cbe24456b01ed759d01cfd565466397b70ee880;hpb=a8d9f325b9a5d7b7336b8c6f16f12080a5bdba39;p=kivitendo-erp.git
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 8cbe24456..c7d7b694a 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -74,6 +74,7 @@ if (-f "$form->{path}/$form->{login}_io.pl") {
# $locale->text('Dec')
use SL::IS;
use SL::PE;
+use SL::AM;
use Data::Dumper;
########################################
# Eintrag fuer Version 2.2.0 geaendert #
@@ -82,7 +83,6 @@ use Data::Dumper;
sub display_row {
$lxdebug->enter_sub();
my $numrows = shift;
-print STDERR "io.pl-display_row\n";
if ($lizenzen && $form->{vc} eq "customer") {
if ($form->{type} =~ /sales_order/) {
@column_index = (runningnumber, partnumber, description, ship, qty);
@@ -101,11 +101,18 @@ print STDERR "io.pl-display_row\n";
}
############## ENDE Neueintrag ##################
+ my $dimension_units = AM->retrieve_units(\%myconfig, $form, "dimension");
+ my $service_units = AM->retrieve_units(\%myconfig, $form, "service");
+ my $all_units = AM->retrieve_units(\%myconfig, $form);
+
push @column_index, qw(unit);
#for pricegroups column
- if ($form->{type} =~ (/sales_quotation/) or (($form->{level} =~ /Sales/) and ($form->{type} =~ /invoice/)) or (($form->{level} eq undef) and ($form->{type} =~ /invoice/)) or ($form->{type} =~ /sales_order/)) {
- push @column_index, qw(sellprice_drag);
+ if ( $form->{type} =~ (/sales_quotation/)
+ or (($form->{level} =~ /Sales/) and ($form->{type} =~ /invoice/))
+ or (($form->{level} eq undef) and ($form->{type} =~ /invoice/))
+ or ($form->{type} =~ /sales_order/)) {
+ push @column_index, qw(sellprice_pg);
}
push @column_index, qw(sellprice);
@@ -165,7 +172,7 @@ print STDERR "io.pl-display_row\n";
qq|
|
. $locale->text('Price')
. qq| |;
- $column_data{sellprice_drag} =
+ $column_data{sellprice_pg} =
qq||
. $locale->text('Pricegroup')
. qq| |;
@@ -200,6 +207,7 @@ print STDERR "io.pl-display_row\n";
$serialnumber = $locale->text('Serial No.');
$projectnumber = $locale->text('Project');
$partsgroup = $locale->text('Group');
+ $reqdate = $locale->text('Reqdate');
$delvar = 'deliverydate';
@@ -214,8 +222,42 @@ print STDERR "io.pl-display_row\n";
map {
$form->{"${_}_$i"} =
$form->parse_amount(\%myconfig, $form->{"${_}_$i"})
- } qw(qty ship discount sellprice price_new price_old);
+ } qw(qty ship discount sellprice price_new price_old) unless ($form->{simple_save});
+
+ if (!$form->{"unit_old_$i"}) {
+ # Neue Ware aus der Datenbank. In diesem Fall ist unit_$i die
+ # Einheit, wie sie in den Stammdaten hinterlegt wurde.
+ # Es sollte also angenommen werden, dass diese ausgewaehlt war.
+ $form->{"unit_old_$i"} = $form->{"unit_$i"};
+ }
+
+
+ # Die zuletzt ausgewaehlte mit der aktuell ausgewaehlten Einheit
+ # vergleichen und bei Unterschied den Preis entsprechend umrechnen.
+ $form->{"selected_unit_$i"} = $form->{"unit_$i"} unless ($form->{"selected_unit_$i"});
+
+ my $check_units = $form->{"inventory_accno_$i"} ? $dimension_units : $service_units;
+ if (!$check_units->{$form->{"selected_unit_$i"}} ||
+ ($check_units->{$form->{"selected_unit_$i"}}->{"base_unit"} ne
+ $all_units->{$form->{"unit_old_$i"}}->{"base_unit"})) {
+ # Die ausgewaehlte Einheit ist fuer diesen Artikel nicht gueltig
+ # (z.B. Dimensionseinheit war ausgewaehlt, es handelt sich aber
+ # um eine Dienstleistung). Dann keinerlei Umrechnung vornehmen.
+ $form->{"unit_old_$i"} = $form->{"selected_unit_$i"} = $form->{"unit_$i"};
+ }
+ if ((!$form->{"prices_$i"}) || ($form->{"new_pricegroup_$i"} == $form->{"old_pricegroup_$i"})) {
+ if ($form->{"unit_old_$i"} ne $form->{"selected_unit_$i"}) {
+ my $basefactor = 1;
+ if (defined($all_units->{$form->{"unit_old_$i"}}->{"factor"}) &&
+ $all_units->{$form->{"unit_old_$i"}}->{"factor"}) {
+ $basefactor = $all_units->{$form->{"selected_unit_$i"}}->{"factor"} /
+ $all_units->{$form->{"unit_old_$i"}}->{"factor"};
+ }
+ $form->{"sellprice_$i"} *= $basefactor;
+ $form->{"unit_old_$i"} = $form->{"selected_unit_$i"};
+ }
+ }
($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);
$dec = length $dec;
$decimalplaces = ($dec > 2) ? $dec : 2;
@@ -231,7 +273,7 @@ print STDERR "io.pl-display_row\n";
# convert " to "
map { $form->{"${_}_$i"} =~ s/\"/"/g }
- qw(partnumber description unit);
+ qw(partnumber description unit unit_old);
########################################
# Eintrag fuer Version 2.2.0 geaendert #
@@ -246,64 +288,84 @@ print STDERR "io.pl-display_row\n";
if (($rows = $form->numtextrows($form->{"description_$i"}, 30, 6)) > 1) {
$column_data{description} =
- qq| |;
+ qq|| . $locale->text('L') . qq| |;
} else {
$column_data{description} =
- qq| |;
+ qq|| . $locale->text('L') . qq| |;
}
+ (my $qty_dec) = ($form->{"qty_$i"} =~ /\.(\d+)/);
+ $qty_dec = length $qty_dec;
+
$column_data{qty} =
- qq| format_amount(\%myconfig, $form->{"qty_$i"},0).qq|> |;
+ qq| format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec) .qq|>|;
+ if ($form->{"formel_$i"}) {
+ $column_data{qty} .= qq|| . $locale->text('*/') . qq|
+ |;
+ }
$column_data{ship} =
qq| format_amount(\%myconfig, $form->{"ship_$i"})
. qq|> |;
- $column_data{unit} =
- qq| |;
+ my $is_part = $form->{"inventory_accno_$i"};
+ my $is_assigned = $form->{"id_$i"};
+ my $this_unit = $form->{"unit_$i"};
+ if ($form->{"selected_unit_$i"} && $this_unit &&
+ $all_units->{$form->{"selected_unit_$i"}} && $all_units->{$this_unit} &&
+ ($all_units->{$form->{"selected_unit_$i"}}->{"base_unit"} eq $all_units->{$this_unit}->{"base_unit"})) {
+ $this_unit = $form->{"selected_unit_$i"};
+ } elsif (!$is_assigned ||
+ ($is_part && !$this_unit && ($all_units->{$this_unit} && ($all_units->{$this_unit}->{"base_unit"} eq $all_units->{"kg"}->{"base_unit"})))) {
+ $this_unit = "kg";
+ }
+ $column_data{"unit"} = "" .
+ ($qty_readonly ? " " :
+ AM->unit_select_html($is_part ? $dimension_units :
+ $is_assigned ? $service_units : $all_units,
+ "unit_$i", $this_unit,
+ $is_assigned ? $form->{"unit_$i"} : undef))
+ . " ";
- #print (STDERR "io.pl---111-i-$i", Dumper($form->{PRICES}));
- # build in dragdrop for pricesgroups
+ # build in drop down list for pricesgroups
if ($form->{"prices_$i"}) {
- print STDERR " YES prices\n";
- $price_tmp = $form->format_amount(\%myconfig, $form->{"price_new_$i"}, 2);
+ 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_drag} =
- qq|$form->{"prices_$i"} |;
+ $column_data{sellprice_pg} =
+ qq|$form->{"prices_$i"} |;
$column_data{sellprice} =
- qq| |;
+ qq| |;
} else {
- print STDERR " NO prices\n";
+
# for last row and report
- # set pricegroup dragdrop from report menu
+ # set pricegroup drop down list from report menu
if ($form->{"sellprice_$i"} != 0) {
-print STDERR " HIER NOCH FÜR RECHNUNGSAUFRUFE\n";
-print (STDERR "sellprice_$i ", Dumper($form->{"sellprice_$i"}), " pricegroup_id_$i ", Dumper($form->{"pricegroup_id_$i"}));
$prices =
- qq|{"pricegroup_id_$i"}" selected>$form->{"pricegroup_$i"} \n|;
+ qq|{"pricegroup_id_$i"}" selected>$form->{"pricegroup_$i"} \n|;
$form->{"pricegroup_old_$i"} = $form->{"pricegroup_id_$i"};
- $column_data{sellprice_drag} =
- qq|$prices |;
+ $column_data{sellprice_pg} =
+ qq|$prices |;
- }else {
- # for last row
- $column_data{sellprice_drag} =
- qq| format_amount(\%myconfig, $form->{"prices_$i"},
- $decimalplaces)
- . qq|> |;
- }
+ } else {
+
+ # for last row
+ $column_data{sellprice_pg} = qq| |;
+ }
$column_data{sellprice} =
- qq| format_amount(\%myconfig, $form->{"sellprice_$i"},
$decimalplaces)
. qq|> |;
}
-#print (STDERR "io.pl---555-i-$i", Dumper($form->{"price_old_$i"}));
$column_data{discount} =
qq| format_amount(\%myconfig, $form->{"discount_$i"})
@@ -328,9 +390,10 @@ print (STDERR "sellprice_$i ", Dumper($form->{"sellprice_$i"}), " pricegroup_i
#
# $column_data{projectnr} = qq| |;
############## ENDE Neueintrag ##################
-
+ my $j = $i % 2;
print qq|
- |;
+
+ |;
map { print "\n$column_data{$_}" } @column_index;
@@ -342,7 +405,9 @@ print (STDERR "sellprice_$i ", Dumper($form->{"sellprice_$i"}), " pricegroup_i
{"pricegroup_old_$i"}>
{"price_old_$i"}>
- format_amount(\%myconfig,$form->{"price_new_$i"}).qq|>
+
+ format_amount(\%myconfig, $form->{"price_new_$i"}) . qq|>
{"id_$i"}>
{"inventory_accno_$i"}>
@@ -354,6 +419,12 @@ print (STDERR "sellprice_$i ", Dumper($form->{"sellprice_$i"}), " pricegroup_i
+
+
+
+
+
+
|;
@@ -363,7 +434,7 @@ print (STDERR "sellprice_$i ", Dumper($form->{"sellprice_$i"}), " pricegroup_i
########################################
# print second row
print qq|
-
+
|;
if ($lizenzen && $form->{type} eq "invoice" && $form->{vc} eq "customer") {
@@ -390,6 +461,19 @@ print (STDERR "sellprice_$i ", Dumper($form->{"sellprice_$i"}), " pricegroup_i
$projectnumber
+|;
+ if ($form->{type} eq 'invoice' or $form->{type} =~ /order/) {
+ my $reqdate_term =
+ ($form->{type} eq 'invoice')
+ ? 'deliverydate'
+ : 'reqdate'; # invoice uses a different term for the same thing.
+ print qq|
+ ${$reqdate_term}
+|;
+ }
+ my $subtotalchecked = ($form->{"subtotal_$i"}) ? "checked" : "";
+ print qq|
+ |.$locale->text('Subtotal').qq|
@@ -416,39 +500,44 @@ print (STDERR "sellprice_$i ", Dumper($form->{"sellprice_$i"}), " pricegroup_i
# build html-code for pricegroups in variable $form->{prices_$j}
sub set_pricegroup {
- my $rowcount = shift;
$lxdebug->enter_sub();
+ my $rowcount = shift;
for $j (1 .. $rowcount) {
-
my $pricegroup_old = $form->{"pricegroup_old_$i"};
- if ($form->{PRICES}{ $j }) {
+ if ($form->{PRICES}{$j}) {
$len = 0;
- $prices = '';
- $price = 0;
- foreach $item (@{ $form->{PRICES}{ $j } }) {
-# print STDERR "-VOR PREIS--$item->{price}--PREISGRUOP-$item->{pricegroup_id}\n";
- $price = $form->round_amount($myconfig, $item->{price},5);
- $price = $form->format_amount($myconfig, $item->{price},2);
+ $prices = '' . $locale->text("none (pricegroup)") . ' ';
+ $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};
-# print STDERR "-NACH PREIS--$price--PREISGRUOP-$item->{pricegroup_id}\n";
$pricegroup_id = $item->{pricegroup_id};
$pricegroup = $item->{pricegroup};
- # build dragdrop for pricegroups
+
+ # build drop down list for pricegroups
$prices .=
- qq|{selected}>$pricegroup \n|;
+ qq|{selected}>$pricegroup \n|;
$len += 1;
-# print STDERR "prices---$prices\n";
+
+ # 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}) {
+ if ($item->{selected} && ($pricegroup_id != 0)) {
$form->{"pricegroup_old_$j"} = $pricegroup_id;
- $form->{"price_new_$j"} = $price;
- $form->{"sellprice_$j"} = $price;
+ $form->{"price_new_$j"} = $price;
+ $form->{"sellprice_$j"} = $price;
}
- if ($len >= 1) {
- $form->{"prices_$j"} = $prices;
+ if ($pricegroup_id == 0) {
+ $form->{"price_new_$j"} = $form->{"sellprice_$j"};
}
}
+ $form->{"prices_$j"} = $prices;
}
}
$lxdebug->leave_sub();
@@ -456,7 +545,6 @@ sub set_pricegroup {
sub select_item {
$lxdebug->enter_sub();
-print STDERR "io.pl-select_item\n";
@column_index = qw(ndx partnumber description onhand sellprice);
$column_data{ndx} = qq| |;
@@ -508,11 +596,10 @@ print STDERR "io.pl-select_item\n";
}
map { $ref->{$_} =~ s/\"/"/g } qw(partnumber description unit);
-#sk tradediscount
-print STDERR "TRADEDISCOUNT $ref->{sellprice}\n";
+
+ #sk tradediscount
$ref->{sellprice} =
$form->round_amount($ref->{sellprice} * (1 - $form->{tradediscount}), 2);
-print STDERR "TRADEDISCOUNT $ref->{sellprice}\n";
$column_data{ndx} =
qq| |;
$column_data{partnumber} =
@@ -548,6 +635,12 @@ print STDERR "TRADEDISCOUNT $ref->{sellprice}\n";
+
+
+
+
+
+
{id}>
@@ -594,7 +687,7 @@ print STDERR "TRADEDISCOUNT $ref->{sellprice}\n";
sub item_selected {
$lxdebug->enter_sub();
-print STDERR "io.pl-item_selected\n";
+
# replace the last row with the checked row
$i = $form->{rowcount};
$i = $form->{assembly_rows} if ($form->{item} eq 'assembly');
@@ -610,7 +703,10 @@ print STDERR "io.pl-item_selected\n";
$sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} }
- qw(id partnumber description sellprice listprice inventory_accno income_accno expense_accno bin unit weight assembly taxaccounts partsgroup);
+ qw(id partnumber description sellprice listprice inventory_accno income_accno expense_accno bin unit weight assembly taxaccounts partsgroup formel alu longdescription not_discountable adr_description);
+ if ($form->{"part_payment_id_$i"} ne "") {
+ $form->{payment_id} = $form->{"part_payment_id_$i"};
+ }
if ($lizenzen) {
map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} } qw(lizenzen);
@@ -637,6 +733,10 @@ print STDERR "io.pl-item_selected\n";
$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 =
$form->{"sellprice_$i"} * (1 - $form->{"discount_$i"} / 100) *
@@ -669,7 +769,7 @@ print STDERR "io.pl-item_selected\n";
IS->get_pricegroups_for_parts(\%myconfig, \%$form);
# build up html code for prices_$i
- set_pricegroup();
+ set_pricegroup($form->{rowcount});
&display_form;
@@ -746,50 +846,54 @@ sub new_item {
sub display_form {
$lxdebug->enter_sub();
+ $form->language_payment(\%myconfig);
# if we have a display_form
if ($form->{display_form}) {
&{"$form->{display_form}"};
exit;
}
- 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, "new");
- # build up html code for prices_$i
- set_pricegroup($rowcount);
-
-
- $form->{resubmit} = 1;
-
- }
+ # 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";
@@ -800,7 +904,7 @@ sub display_form {
$subroutine = "makemodel_row";
}
if ($form->{item} eq 'assembly') {
- $numrows = ++$form->{price_rows};
+ $numrows = $form->{price_rows};
$subroutine = "price_row";
&{$subroutine}($numrows);
@@ -815,7 +919,7 @@ sub display_form {
$subroutine = "assembly_row";
}
if ($form->{item} eq 'service') {
- $numrows = ++$form->{price_rows};
+ $numrows = $form->{price_rows};
$subroutine = "price_row";
&{$subroutine}($numrows);
@@ -833,13 +937,13 @@ sub display_form {
sub check_form {
$lxdebug->enter_sub();
-print STDERR "io.pl-check_form\n";
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)
+ 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 adr_id language_values)
);
+
# remove any makes or model rows
if ($form->{item} eq 'part') {
map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
@@ -936,17 +1040,20 @@ print STDERR "io.pl-check_form\n";
}
}
-
- #sk
+
+ #sk
# if pricegroups
- if ($form->{type} =~ (/sales_quotation/) or (($form->{level} =~ /Sales/) and ($form->{type} =~ /invoice/)) or (($form->{level} eq undef) and ($form->{type} =~ /invoice/)) or ($form->{type} =~ /sales_order/)) {
-
- # get pricegroups for parts
- IS->get_pricegroups_for_parts(\%myconfig, \%$form);
+ if ( $form->{type} =~ (/sales_quotation/)
+ or (($form->{level} =~ /Sales/) and ($form->{type} =~ /invoice/))
+ or (($form->{level} eq undef) and ($form->{type} =~ /invoice/))
+ or ($form->{type} =~ /sales_order/)) {
+
+ # get pricegroups for parts
+ IS->get_pricegroups_for_parts(\%myconfig, \%$form);
+
+ # build up html code for prices_$i
+ set_pricegroup($form->{rowcount});
- # build up html code for prices_$i
- set_pricegroup();
-
}
&display_form;
@@ -994,7 +1101,7 @@ sub invoicetotal {
sub validate_items {
$lxdebug->enter_sub();
-print STDERR "io.pl-validate_items\n";
+
# check if items are valid
if ($form->{rowcount} == 1) {
&update;
@@ -1017,7 +1124,6 @@ sub order {
$form->{ordnumber} = $form->{invnumber};
map { delete $form->{$_} } qw(id printed emailed queued);
-
if ($form->{script} eq 'ir.pl' || $form->{type} eq 'request_quotation') {
$form->{title} = $locale->text('Add Purchase Order');
$form->{vc} = 'vendor';
@@ -1036,7 +1142,6 @@ sub order {
$form->{rowcount}--;
- ($null, $form->{cp_id}) = split /--/, $form->{contact};
$form->{cp_id} *= 1;
require "$form->{path}/$form->{script}";
@@ -1084,7 +1189,6 @@ sub quotation {
$buysell = 'buy';
}
- ($null, $form->{cp_id}) = split /--/, $form->{contact};
$form->{cp_id} *= 1;
$form->{script} = 'oe.pl';
@@ -1122,7 +1226,7 @@ sub e_mail {
$lxdebug->enter_sub();
if ($form->{second_run}) {
$form->{print_and_post} = 0;
- $form->{resubmit} = 0;
+ $form->{resubmit} = 0;
}
if ($myconfig{role} eq 'admin') {
$bcc = qq|
@@ -1235,12 +1339,11 @@ sub send_email {
sub print_options {
$lxdebug->enter_sub();
-print STDERR "io.pl-print_options\n";
$form->{sendmode} = "attachment";
$form->{copies} = 3 unless $form->{copies};
$form->{PD}{ $form->{formname} } = "selected";
- $form->{DF}{ $form->{format} } = "";
+ $form->{DF}{ $form->{format} } = "selected";
$form->{OP}{ $form->{media} } = "selected";
$form->{SM}{ $form->{sendmode} } = "selected";
@@ -1252,26 +1355,57 @@ print STDERR "io.pl-print_options\n";
. $locale->text('Bin List');
}
+ if ($form->{type} eq 'credit_note') {
+ $type = qq|
+ {PD}{credit_note}>|
+ . $locale->text('Credit Note');
+ }
+
if ($form->{type} eq 'sales_order') {
$type = qq|
{PD}{sales_order}>|
. $locale->text('Confirmation') . qq|
+ {PD}{proforma}>|
+ . $locale->text('Proforma Invoice') . qq|
{PD}{pick_list}>|
. $locale->text('Pick List') . qq|
{PD}{packing_list}>|
- . $locale->text('Packing List');
+ . $locale->text('Packing List') . qq|
+ {PD}{agb}>|
+ . $locale->text('AGB') . qq|
+ {PD}{bunker_receipt}>|
+ . $locale->text('Bunker Receipt');
}
if ($form->{type} =~ /_quotation$/) {
$type = qq|
{PD}{"$`_quotation"}>|
- . $locale->text('Quotation') . qq|
-|;
+ . $locale->text('Quotation')
+;
}
if ($form->{type} eq 'invoice') {
$type = qq|
- {PD}{invoice}>| . $locale->text('Invoice');
+ {PD}{invoice}>|
+ . $locale->text('Invoice') . qq|
+ {PD}{proforma}>|
+ . $locale->text('Proforma Invoice') . qq|
+ {PD}{packing_list}>|
+ . $locale->text('Packing List');
+ }
+
+ if ($form->{type} eq 'invoice' && $form->{storno}) {
+ $type = qq|
+ {PD}{storno_invoice}>|
+ . $locale->text('Storno Invoice') . qq|
+ {PD}{storno_packing_list}>|
+ . $locale->text('Storno Packing List');
+ }
+
+ if ($form->{type} eq 'credit_note') {
+ $type = qq|
+ {PD}{credit_note}>|
+ . $locale->text('Credit Note');
}
if ($form->{type} eq 'ship_order') {
@@ -1296,52 +1430,87 @@ print STDERR "io.pl-print_options\n";
} else {
$media = qq|
{OP}{screen}>| . $locale->text('Screen');
- if ($myconfig{printer} && $latex) {
+ if (scalar(keys (%{ $form->{printers} })) !=0 && $latex_templates) {
$media .= qq|
{OP}{printer}>|
. $locale->text('Printer');
}
- if ($latex) {
+ if ($latex_templates) {
$media .= qq|
{OP}{queue}>| . $locale->text('Queue');
}
}
- $format = qq|
- {DF}{html}>html|;
+ $format = qq||;
+ if ($opendocument_templates && $openofficeorg_writer_bin &&
+ $xvfb_bin && (-x $openofficeorg_writer_bin) && (-x $xvfb_bin)) {
+ $format .= qq|{DF}{"opendocument_pdf"} . qq|>| .
+ $locale->text("PDF (OpenDocument/OASIS)") . qq| |;
+ }
+
+ if ($latex_templates) {
+ $format .= qq|{DF}{pdf}>| .
+ $locale->text('PDF') . qq| |;
+ }
+
+ $format .= qq|{DF}{html}>HTML |;
if ($latex) {
- $format = qq|
- {DF}{pdf}>| . $locale->text('PDF') . qq|
- {DF}{html}>html
- {DF}{postscript}>|
- . $locale->text('Postscript');
- }
-
- $language = qq|
- |;
- %lang = (de => "deutsch", en => "englisch", fr => "französisch");
- foreach $item (keys %lang) {
- if ($form->{language} eq $item) {
- $language .= qq|$lang{$item} |;
- } else {
- $language .= qq|$lang{$item} |;
+ $format .= qq|{DF}{postscript}>| .
+ $locale->text('Postscript') . qq| |;
+ }
+
+ if ($opendocument_templates) {
+ $format .= qq|{DF}{opendocument}>| .
+ $locale->text("OpenDocument/OASIS") . qq| |;
+ }
+ $format .= qq| |;
+
+ if (scalar(keys (%{ $form->{languages} })) !=0) {
+
+ $language_select = qq||;
+ foreach $item (@{ $form->{languages} }) {
+ if ($form->{language_id} eq $item->{id}) {
+ $language_select .= qq|$item->{description} |;
+ } else {
+ $language_select .= qq|$item->{description} |;
+ }
+ }
+ }
+
+ if (scalar(keys (%{ $form->{printers} })) !=0) {
+
+ $printer_select = qq|
+ |;
+ foreach $item (@{ $form->{printers} }) {
+ $printer_select .= qq|$item->{printer_description} |;
}
}
+
+
print qq|
- $type
- $language
+ $type |;
+ if (scalar(keys (%{ $form->{languages} })) !=0) {
+ print qq|
+ ${language_select} |;
+ }
+ print qq|
$format
- $media
+ $media |;
+ if (scalar(keys (%{ $form->{printers} })) !=0) {
+ print qq|
+ $printer_select
|;
+ }
- if ($myconfig{printer} && $latex && $form->{media} ne 'email') {
+ if (scalar(keys (%{ $form->{printers} })) !=0 && $latex_templates && $form->{media} ne 'email') {
print qq|
| . $locale->text('Copies') . qq|
{copies}>
@@ -1392,9 +1561,7 @@ print STDERR "io.pl-print_options\n";
sub print {
$lxdebug->enter_sub();
- if ($form->{second_run}) {
- $form->{print_and_post} = 0;
- }
+
# if this goes to the printer pass through
if ($form->{media} eq 'printer' || $form->{media} eq 'queue') {
$form->error($locale->text('Select postscript or PDF!'))
@@ -1404,6 +1571,18 @@ sub print {
map { $old_form->{$_} = $form->{$_} } keys %$form;
}
+ if (!$form->{id} || (($form->{formname} eq "proforma") && !$form->{proforma} && (($form->{type} =~ /_order$/) || ($form->{type} =~ /_quotation$/)))) {
+ if ($form->{formname} eq "proforma") {
+ $form->{proforma} = 1;
+ }
+ $form->{print_and_save} = 1;
+ my $formname = $form->{formname};
+ &save();
+ $form->{formname} = $formname;
+ &edit();
+ exit;
+ }
+
&print_form($old_form);
$lxdebug->leave_sub();
@@ -1413,8 +1592,8 @@ sub print_form {
$lxdebug->enter_sub();
my ($old_form) = @_;
- $inv = "inv";
- $due = "due";
+ $inv = "inv";
+ $due = "due";
$numberfld = "invnumber";
$display_form =
@@ -1431,7 +1610,7 @@ sub print_form {
# this is from an invoice
$form->{label} = $locale->text('Packing List');
}
- if ($form->{formname} eq 'sales_order') {
+ if (($form->{formname} eq 'sales_order') || ($form->{formname} eq 'agb') || ($form->{formname} eq 'bunker_receipt')) {
$inv = "ord";
$due = "req";
$form->{"${inv}date"} = $form->{transdate};
@@ -1439,6 +1618,28 @@ sub print_form {
$numberfld = "sonumber";
$order = 1;
}
+
+ if (($form->{type} eq 'invoice') && ($form->{formname} eq 'proforma') ) {
+ $inv = "inv";
+ $due = "due";
+ $form->{"${inv}date"} = $form->{transdate};
+ $form->{"invdate"} = $form->{transdate};
+ $form->{label} = $locale->text('Proforma Invoice');
+ $numberfld = "sonumber";
+ $order = 0;
+ }
+
+ if (($form->{type} eq 'sales_order') && ($form->{formname} eq 'proforma') ) {
+ $inv = "inv";
+ $due = "due";
+ $form->{"${inv}date"} = $form->{transdate};
+ $form->{"invdate"} = $form->{transdate};
+ $form->{invnumber} = $form->{ordnumber};
+ $form->{label} = $locale->text('Proforma Invoice');
+ $numberfld = "sonumber";
+ $order = 1;
+ }
+
if ($form->{formname} eq 'packing_list' && $form->{type} ne 'invoice') {
# we use the same packing list as from an invoice
@@ -1447,6 +1648,8 @@ sub print_form {
$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";
@@ -1479,6 +1682,17 @@ sub print_form {
$numberfld = "sqnumber";
$order = 1;
}
+
+ if (($form->{type} eq 'sales_quotation') && ($form->{formname} eq 'proforma') ) {
+ $inv = "quo";
+ $due = "req";
+ $form->{"${inv}date"} = $form->{transdate};
+ $form->{"invdate"} = $form->{transdate};
+ $form->{label} = $locale->text('Proforma Invoice');
+ $numberfld = "sqnumber";
+ $order = 1;
+ }
+
if ($form->{formname} eq 'request_quotation') {
$inv = "quo";
$due = "req";
@@ -1506,13 +1720,12 @@ sub print_form {
if (!$form->{"${inv}number"} && !$form->{preview}) {
$form->{"${inv}number"} = $form->update_defaults(\%myconfig, $numberfld);
if ($form->{media} ne 'email') {
-
- $i = $form->{rowcount};
- # get pricegroups for parts
- IS->get_pricegroups_for_parts(\%myconfig, \%$form);
- # build up html code for prices_$i
- set_pricegroup();
+ # get pricegroups for parts
+ IS->get_pricegroups_for_parts(\%myconfig, \%$form);
+
+ # build up html code for prices_$i
+ set_pricegroup($form->{rowcount});
$form->{rowcount}--;
@@ -1527,34 +1740,19 @@ sub print_form {
my ($saved_email, $saved_cc, $saved_bcc) =
($form->{"email"}, $form->{"cc"}, $form->{"bcc"});
- $language = $form->{language};
+ $language_saved = $form->{language_id};
&{"$form->{vc}_details"};
- $form->{language} = $language;
+ $form->{language_id} = $language_saved;
$form->{"email"} = $saved_email if ($saved_email);
$form->{"cc"} = $saved_cc if ($saved_cc);
$form->{"bcc"} = $saved_bcc if ($saved_bcc);
- @a = ();
- foreach $i (1 .. $form->{rowcount}) {
- push @a,
- ("partnumber_$i", "description_$i",
- "partsgroup_$i", "serialnumber_$i",
- "bin_$i", "unit_$i");
- }
- map { push @a, "${_}_description" } split / /, $form->{taxaccounts};
-
- $ARAP = ($form->{vc} eq 'customer') ? "AR" : "AP";
- push @a, $ARAP;
-
# format payment dates
for $i (1 .. $form->{paidaccounts} - 1) {
$form->{"datepaid_$i"} = $locale->date(\%myconfig, $form->{"datepaid_$i"});
- push @a, "${ARAP}_paid_$i", "source_$i", "memo_$i";
}
- $form->format_string(@a);
-
($form->{employee}) = split /--/, $form->{employee};
($form->{warehouse}, $form->{warehouse_id}) = split /--/, $form->{warehouse};
@@ -1565,8 +1763,20 @@ sub print_form {
IS->invoice_details(\%myconfig, \%$form, $locale);
}
+ # format global dates
map { $form->{$_} = $locale->date(\%myconfig, $form->{$_}, 1) }
- ("${inv}date", "${due}date", "shippingdate");
+ ("${inv}date", "${due}date", "shippingdate", "deliverydate");
+
+ # format item dates
+ for my $field (qw(transdate_oe deliverydate_oe)) {
+ map {
+ $form->{$field}[$_] = $locale->date(\%myconfig, $form->{$field}[$_], 1);
+ } 0 .. $#{ $form->{$field} };
+ }
+
+ if ($form->{shipto_id}) {
+ $form->get_shipto(\%myconfig);
+ }
@a = qw(name street zipcode city country);
@@ -1592,31 +1802,39 @@ sub print_form {
$form->{notes} =~ s/^\s+//g;
- # some of the stuff could have umlauts so we translate them
- push @a,
- qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptoemail shippingpoint shipvia company address signature employee contact);
+ map({ $form->{$_} =~ s/\\n/\n/g; } qw(company address));
- push @a, ("${inv}date", "${due}date", email, cc, bcc);
+ $form->{templates} = "$myconfig{templates}";
- $form->format_string(@a);
+ $form->{language} = $form->get_template_language(\%myconfig);
+ $form->{printer_code} = $form->get_printer_code(\%myconfig);
- $form->{templates} = "$myconfig{templates}";
if ($form->{language} ne "") {
$form->{language} = "_" . $form->{language};
}
- $form->{IN} = "$form->{formname}$form->{language}.html";
+ if ($form->{printer_code} ne "") {
+ $form->{printer_code} = "_" . $form->{printer_code};
+ }
+
+ $form->{IN} = "$form->{formname}$form->{language}$form->{printer_code}.html";
if ($form->{format} eq 'postscript') {
$form->{postscript} = 1;
$form->{IN} =~ s/html$/tex/;
- }
- if ($form->{format} eq 'pdf') {
+ } elsif ($form->{"format"} =~ /pdf/) {
$form->{pdf} = 1;
- $form->{IN} =~ s/html$/tex/;
+ if ($form->{"format"} =~ /opendocument/) {
+ $form->{IN} =~ s/html$/odt/;
+ } else {
+ $form->{IN} =~ s/html$/tex/;
+ }
+ } elsif ($form->{"format"} =~ /opendocument/) {
+ $form->{"opendocument"} = 1;
+ $form->{"IN"} =~ s/html$/odt/;
}
if ($form->{media} eq 'printer') {
- $form->{OUT} = "| $myconfig{printer}";
+ $form->{OUT} = "| $form->{printer_command} &>/dev/null";
$form->{printed} .= " $form->{formname}";
$form->{printed} =~ s/^ //;
}
@@ -1702,8 +1920,10 @@ sub print_form {
? $locale->text('sent to printer')
: $locale->text('emailed to') . " $form->{email}";
$form->redirect(qq|$form->{label} $form->{"${inv}number"} $msg|);
- } else {
- &{"$display_form"};
+ }
+ if ($form->{printing}) {
+ &{"$display_form"};
+ exit;
}
$lxdebug->leave_sub();
@@ -1711,7 +1931,6 @@ sub print_form {
sub customer_details {
$lxdebug->enter_sub();
-print STDERR "io.pl-customer_details\n";
IS->customer_details(\%myconfig, \%$form);
$lxdebug->leave_sub();
}
@@ -1747,7 +1966,6 @@ sub ship_to {
map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
qw(exchangerate creditlimit creditremaining);
-
# get details for name
&{"$form->{vc}_details"};
@@ -1756,12 +1974,11 @@ sub ship_to {
? $locale->text('Customer Number')
: $locale->text('Vendor Number');
- $i = $form->{rowcount};
# get pricegroups for parts
IS->get_pricegroups_for_parts(\%myconfig, \%$form);
# build up html code for prices_$i
- set_pricegroup();
+ set_pricegroup($form->{rowcount});
$nextsub = ($form->{display_form}) ? $form->{display_form} : "display_form";