-
-
- |;
+ | . $cgi->hidden("-name" => "show_details", "-value" => $form->{show_details}) . qq|
+
+
+
+ |;
map { print "\n$column_data{$_}" } @column_index;
@@ -218,6 +251,16 @@ sub display_row {
$delvar = 'reqdate';
}
+ $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) {
# undo formatting
@@ -233,8 +276,6 @@ sub display_row {
$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"});
@@ -260,18 +301,45 @@ sub display_row {
$form->{"unit_old_$i"} = $form->{"selected_unit_$i"};
}
}
+
($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);
- $dec = length $dec;
- $decimalplaces = ($dec > 2) ? $dec : 2;
+ $decimalplaces = max length($dec), 2;
- $discount =
- $form->round_amount(
- $form->{"sellprice_$i"} * $form->{"discount_$i"} / 100,
- $decimalplaces);
+ $price_factor = $price_factors{$form->{"price_factor_id_$i"}} || 1;
+ $discount = (100 - $form->{"discount_$i"} * 1) / 100;
- $linetotal =
- $form->round_amount($form->{"sellprice_$i"} - $discount, $decimalplaces);
- $linetotal = $form->round_amount($linetotal * $form->{"qty_$i"}, 2);
+ $linetotal = $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"} * $discount / $price_factor, $decimalplaces);
+
+ my $real_sellprice = $form->{"sellprice_$i"} * $discount / $price_factor;
+
+ # marge calculations
+ my ($marge_font_start, $marge_font_end);
+
+ $form->{"lastcost_$i"} *= 1;
+
+ $marge_price_factor = $form->{"marge_price_factor_$i"} * 1 || 1;
+
+ if ($real_sellprice && ($form->{"qty_$i"} * 1)) {
+ $form->{"marge_percent_$i"} = ($real_sellprice - $form->{"lastcost_$i"} / $marge_price_factor) * 100 / $real_sellprice;
+ $myconfig{"marge_percent_warn"} = 15 unless (defined($myconfig{"marge_percent_warn"}));
+
+ if ($form->{"id_$i"} &&
+ ($form->{"marge_percent_$i"} < (1 * $myconfig{"marge_percent_warn"}))) {
+ $marge_font_start = "";
+ $marge_font_end = "";
+ }
+
+ } else {
+ $form->{"marge_percent_$i"} = 0;
+ }
+
+ my $marge_adjust_credit_note = $form->{type} eq 'credit_note' ? -1 : 1;
+ $form->{"marge_total_$i"} = ($real_sellprice - $form->{"lastcost_$i"} / $marge_price_factor) * $form->{"qty_$i"} * $marge_adjust_credit_note;
+ $form->{"marge_total"} += $form->{"marge_total_$i"};
+ $form->{"lastcost_total"} += $form->{"lastcost_$i"} * $form->{"qty_$i"} / $marge_price_factor;
+ $form->{"sellprice_total"} += $real_sellprice * $form->{"qty_$i"};
+
+ map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, 2) } qw(marge_total marge_percent);
# convert " to "
map { $form->{"${_}_$i"} =~ s/\"/"/g }
@@ -282,7 +350,7 @@ sub display_row {
# neue Optik im Rechnungsformular #
########################################
$column_data{runningnumber} =
- qq| | |; # HuT
+ qq| | |; # HuT
############## ENDE Neueintrag ##################
$column_data{partnumber} =
@@ -290,28 +358,30 @@ 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+)/);
$qty_dec = length $qty_dec;
$column_data{qty} =
- qq|format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec) .qq|>|;
+ qq| | |;
if ($form->{"formel_$i"}) {
- $column_data{qty} .= qq|
- | |;
+ $column_data{qty} .= qq||
+ . $cgi->hidden("-name" => "formel_$i", "-value" => $form->{"formel_$i"}) . $cgi->hidden("-name" => "alu_$i", "-value" => $form->{"alu_$i"});
}
+ $column_data{qty} .= qq||;
$column_data{ship} =
- qq| | |;
+ . qq|">|;
- my $is_part = $form->{"inventory_accno_$i"};
+ 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 &&
@@ -323,12 +393,26 @@ sub display_row {
$this_unit = "kg";
}
+ my $price_factor_select;
+ if (0 < scalar @{ $form->{ALL_PRICE_FACTORS} }) {
+ my @values = ('', map { $_->{id} } @{ $form->{ALL_PRICE_FACTORS} });
+ my %labels = map { $_->{id} => $_->{description} } @{ $form->{ALL_PRICE_FACTORS} };
+
+ $price_factor_select =
+ NTI($cgi->popup_menu('-name' => "price_factor_id_$i",
+ '-default' => $form->{"price_factor_id_$i"},
+ '-values' => \@values,
+ '-labels' => \%labels,
+ '-style' => 'width:90px'))
+ . ' ';
+ }
+
$column_data{"unit"} = "" .
- ($qty_readonly ? " " :
- AM->unit_select_html($is_part ? $dimension_units :
+ $price_factor_select .
+ 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))
+ $is_assigned ? $form->{"unit_$i"} : undef)
. " | ";
# build in drop down list for pricesgroups
@@ -340,9 +424,9 @@ sub display_row {
}
$column_data{sellprice_pg} =
- qq| | |;
+ qq| | |;
$column_data{sellprice} =
- qq| | |;
+ qq| | |;
} else {
# for last row and report
@@ -354,26 +438,26 @@ sub display_row {
$form->{"pricegroup_old_$i"} = $form->{"pricegroup_id_$i"};
$column_data{sellprice_pg} =
- qq| | |;
+ qq| | |;
} else {
# for last row
- $column_data{sellprice_pg} = qq| | |;
- }
-
+ $column_data{sellprice_pg} = qq| | |;
+ }
+
$column_data{sellprice} =
- qq| | |;
+ . qq|">|;
}
$column_data{discount} =
- qq| | |;
+ . qq|">|;
$column_data{linetotal} =
- qq||
+ qq| | |
. $form->format_amount(\%myconfig, $linetotal, 2)
. qq| | |;
$column_data{bin} = qq|$form->{"bin_$i"} | |;
@@ -395,48 +479,37 @@ sub display_row {
my $j = $i % 2;
print qq|
- |;
+ |;
map { print "\n$column_data{$_}" } @column_index;
- print qq|
-
-
-{"orderitems_id_$i"}>
-{"bo_$i"}>
-
-{"pricegroup_old_$i"}>
-{"price_old_$i"}>
-
-format_amount(\%myconfig, $form->{"price_new_$i"}) . qq|>
-
-{"id_$i"}>
-{"inventory_accno_$i"}>
-
-
-
-{"income_accno_$i"}>
-{"expense_accno_$i"}>
-
-
-
-
-
-
-
-
-
-|;
+ print("\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", "marge_total_$i", "marge_percent_$i", "lastcost_$i",
+ "marge_price_factor_$i"));
########################################
# Eintrag fuer Version 2.2.0 geaendert #
# neue Optik im Rechnungsformular #
########################################
+
+ my $row_style_attr =
+ 'style="display:none;"' if (!$form->{"show_details"});
+
# print second row
print qq|
-
- |
+ |
+ |
|;
if ($lizenzen && $form->{type} eq "invoice" && $form->{vc} eq "customer") {
my $selected = $form->{"licensenumber_$i"};
@@ -447,43 +520,61 @@ sub display_row {
$lizenzen_quoted = $form->{"lizenzen_$i"};
$lizenzen_quoted =~ s/\"/"/g;
print qq|
- Lizenz\# |
-
|;
############## ENDE Neueintrag ##################
map { $form->{"${_}_base"} += $linetotal }
- (split / /, $form->{"taxaccounts_$i"});
+ (split(/ /, $form->{"taxaccounts_$i"}));
$form->{invsubtotal} += $linetotal;
}
@@ -494,6 +585,10 @@ sub display_row {
|;
+ if (0 != ($form->{sellprice_total} * 1)) {
+ $form->{marge_percent} = ($form->{sellprice_total} - $form->{lastcost_total}) / $form->{sellprice_total} * 100;
+ }
+
$lxdebug->leave_sub();
}
@@ -546,18 +641,19 @@ sub set_pricegroup {
sub select_item {
$lxdebug->enter_sub();
- @column_index = qw(ndx partnumber description onhand sellprice);
+ @column_index = qw(ndx partnumber description onhand unit sellprice);
$column_data{ndx} = qq| | |;
$column_data{partnumber} =
- qq|| . $locale->text('Number') . qq| | |;
+ qq|| . $locale->text('Number') . qq| | |;
$column_data{description} =
- qq|| . $locale->text('Part Description') . qq| | |;
+ qq|| . $locale->text('Part Description') . qq| | |;
$column_data{sellprice} =
- qq|| . $locale->text('Price') . qq| | |;
+ qq|| . $locale->text('Price') . qq| | |;
$column_data{onhand} =
- qq|| . $locale->text('Qty') . qq| | |;
-
+ qq|| . $locale->text('Qty') . qq| | |;
+ $column_data{unit} =
+ qq|| . $locale->text('Unit') . qq| | |;
# list items with radio button on a form
$form->header;
@@ -565,16 +661,16 @@ sub select_item {
$colspan = $#column_index + 1;
print qq|
-
+
- | |