X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=ae8f500bbe192c7c66e239d666c7a52760fdcb42;hb=58b14f96d6a7aab3bad2ffac3f8930793cf15a09;hp=49d2d4331bc88a393002ec3d31156b30c223f928;hpb=992f833ae4a90b4ccb05c8765379438a164cb0fd;p=kivitendo-erp.git
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 49d2d4331..ae8f500bb 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -103,7 +103,10 @@ sub display_row {
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/)) {
+ 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);
}
@@ -251,8 +254,13 @@ sub display_row {
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|> |;
$column_data{ship} =
qq| format_amount(\%myconfig, $form->{"ship_$i"})
@@ -260,36 +268,37 @@ sub display_row {
$column_data{unit} =
qq| |;
-
-
# build in dragdrop for pricesgroups
if ($form->{"prices_$i"}) {
- $price_tmp = $form->format_amount(\%myconfig, $form->{"price_new_$i"}, 2);
+ $price_tmp =
+ $form->format_amount(\%myconfig, $form->{"price_new_$i"}, 2);
$column_data{sellprice_drag} =
qq|$form->{"prices_$i"} |;
$column_data{sellprice} =
qq| |;
} else {
+
# for last row and report
# set pricegroup dragdrop from report menu
if ($form->{"sellprice_$i"} != 0) {
$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 |;
- }else {
- # for last row
- $column_data{sellprice_drag} =
- qq| format_amount(\%myconfig, $form->{"prices_$i"},
- $decimalplaces)
- . qq|> |;
- }
+ } else {
+
+ # for last row
+ $column_data{sellprice_drag} =
+ qq| format_amount(\%myconfig, $form->{"prices_$i"},
+ $decimalplaces)
+ . qq|> |;
+ }
$column_data{sellprice} =
qq| {"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"}>
@@ -414,26 +424,28 @@ sub set_pricegroup {
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 } }) {
- $price = $form->round_amount($myconfig, $item->{price},5);
- $price = $form->format_amount($myconfig, $item->{price},2);
- $price = $item->{price};
+ $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 dragdrop for pricegroups
$prices .=
- qq|{selected}>$pricegroup \n|;
+ qq|{selected}>$pricegroup \n|;
$len += 1;
+
# set new selectedpricegroup_id and prices for "Preis"
if ($item->{selected}) {
$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;
@@ -441,6 +453,7 @@ sub set_pricegroup {
}
}
}
+
$lxdebug->leave_sub();
}
@@ -497,7 +510,8 @@ sub select_item {
}
map { $ref->{$_} =~ s/\"/"/g } qw(partnumber description unit);
-#sk tradediscount
+
+ #sk tradediscount
$ref->{sellprice} =
$form->round_amount($ref->{sellprice} * (1 - $form->{tradediscount}), 2);
$column_data{ndx} =
@@ -581,6 +595,7 @@ sub select_item {
sub item_selected {
$lxdebug->enter_sub();
+
# replace the last row with the checked row
$i = $form->{rowcount};
$i = $form->{assembly_rows} if ($form->{item} eq 'assembly');
@@ -655,7 +670,7 @@ sub item_selected {
IS->get_pricegroups_for_parts(\%myconfig, \%$form);
# build up html code for prices_$i
- set_pricegroup();
+ set_pricegroup($form->{rowcount});
&display_form;
@@ -760,12 +775,13 @@ sub display_form {
$form->{second_run} = 1;
$form->{action} = "display_form";
$form->{rowcount}--;
- my $rowcount = $form->{rowcount};
+ my $rowcount = $form->{rowcount};
+
# get pricegroups for parts
- IS->get_pricegroups_for_parts(\%myconfig, \%$form, "new");
+ IS->get_pricegroups_for_parts(\%myconfig, \%$form);
+
# build up html code for prices_$i
set_pricegroup($rowcount);
-
$form->{resubmit} = 1;
@@ -776,6 +792,7 @@ sub display_form {
$subroutine = "display_row";
if ($form->{item} eq 'part') {
+
#set preisgruppenanzahl
$numrows = $form->{price_rows};
$subroutine = "price_row";
@@ -921,17 +938,20 @@ sub check_form {
}
}
-
- #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;
@@ -979,6 +999,7 @@ sub invoicetotal {
sub validate_items {
$lxdebug->enter_sub();
+
# check if items are valid
if ($form->{rowcount} == 1) {
&update;
@@ -1105,7 +1126,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|
@@ -1377,6 +1398,7 @@ sub print {
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!'))
@@ -1395,8 +1417,8 @@ sub print_form {
$lxdebug->enter_sub();
my ($old_form) = @_;
- $inv = "inv";
- $due = "due";
+ $inv = "inv";
+ $due = "due";
$numberfld = "invnumber";
$display_form =
@@ -1488,13 +1510,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}--;
@@ -1728,7 +1749,6 @@ sub ship_to {
map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
qw(exchangerate creditlimit creditremaining);
-
# get details for name
&{"$form->{vc}_details"};
@@ -1737,12 +1757,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";