X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fio.pl;h=b71ca90b71b5adf0ad2f9611d85b82d53e3be2b7;hb=bb99760f9239bca52db6f4496bdb7aaa9055fbf7;hp=4291cf55d1dd4ed8603d169fe9782921060ffd6c;hpb=72539cb39a3d19f930a8e0e41e46bf41afe9a8f1;p=kivitendo-erp.git
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 4291cf55d..b71ca90b7 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 #
@@ -100,6 +101,10 @@ sub display_row {
}
############## 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
@@ -217,8 +222,42 @@ sub display_row {
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;
@@ -234,7 +273,7 @@ sub display_row {
# convert " to "
map { $form->{"${_}_$i"} =~ s/\"/"/g }
- qw(partnumber description unit);
+ qw(partnumber description unit unit_old);
########################################
# Eintrag fuer Version 2.2.0 geaendert #
@@ -249,10 +288,10 @@ sub display_row {
if (($rows = $form->numtextrows($form->{"description_$i"}, 30, 6)) > 1) {
$column_data{description} =
- qq|
| |;
+ qq| | |;
} else {
$column_data{description} =
- qq| | |;
+ qq| | |;
}
(my $qty_dec) = ($form->{"qty_$i"} =~ /\.(\d+)/);
@@ -260,24 +299,48 @@ sub display_row {
$column_data{qty} =
qq|format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec)
- . qq|> | |;
+ . $form->format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec) .qq|>|;
+ if ($form->{formel}) {
+ $column_data{qty} .= 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))
+ . " | ";
# build in dragdrop for pricesgroups
if ($form->{"prices_$i"}) {
- $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| | |;
$column_data{sellprice} =
- qq| | |;
+ qq| | |;
} else {
# for last row and report
@@ -300,9 +363,10 @@ sub display_row {
$decimalplaces)
. qq|>|;
}
+ print(STDERR "Sellprice vor Ausgabe: ",$form->{"sellprice_$i"},"\n");
$column_data{sellprice} =
- qq|format_amount(\%myconfig, $form->{"sellprice_$i"},
$decimalplaces)
. qq|> | |;
@@ -331,9 +395,10 @@ sub display_row {
#
# $column_data{projectnr} = qq| | |;
############## ENDE Neueintrag ##################
-
+ my $j = $i % 2;
print qq|
- |;
+
+
|;
map { print "\n$column_data{$_}" } @column_index;
@@ -345,6 +410,7 @@ sub display_row {
{"pricegroup_old_$i"}>
{"price_old_$i"}>
+
format_amount(\%myconfig, $form->{"price_new_$i"}) . qq|>
@@ -361,6 +427,9 @@ sub display_row {
+
+
+
|;
@@ -370,7 +439,7 @@ sub display_row {
########################################
# print second row
print qq|
-
+
|;
if ($lizenzen && $form->{type} eq "invoice" && $form->{vc} eq "customer") {
@@ -407,8 +476,9 @@ sub display_row {
${$reqdate_term}
|;
}
-
+ my $subtotalchecked = ($form->{"subtotal_$i"}) ? "checked" : "";
print qq|
+ |.$locale->text('Subtotal').qq|
|
@@ -572,6 +642,12 @@ sub select_item {
+
+
+
+
+
+
{id}>
@@ -634,7 +710,10 @@ sub item_selected {
$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);
@@ -661,6 +740,10 @@ sub item_selected {
$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) *
@@ -770,6 +853,7 @@ sub new_item {
sub display_form {
$lxdebug->enter_sub();
+ $form->language_payment(\%myconfig);
# if we have a display_form
if ($form->{display_form}) {
@@ -827,7 +911,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);
@@ -863,9 +947,10 @@ sub check_form {
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->{$_}) }
@@ -1064,7 +1149,6 @@ sub order {
$form->{rowcount}--;
- ($null, $form->{cp_id}) = split /--/, $form->{contact};
$form->{cp_id} *= 1;
require "$form->{path}/$form->{script}";
@@ -1112,7 +1196,6 @@ sub quotation {
$buysell = 'buy';
}
- ($null, $form->{cp_id}) = split /--/, $form->{contact};
$form->{cp_id} *= 1;
$form->{script} = 'oe.pl';
@@ -1279,26 +1362,57 @@ sub print_options {
. $locale->text('Bin List');
}
+ if ($form->{type} eq 'credit_note') {
+ $type = qq|