Revision a7ecfa38
Von Niclas Zimmermann vor fast 12 Jahren hinzugefügt
| SL/IS.pm | ||
|---|---|---|
|
p.unit, p.assembly, p.bin, p.onhand,
|
||
|
p.notes AS partnotes, p.notes AS longdescription,
|
||
|
p.not_discountable, p.formel, p.payment_id AS part_payment_id,
|
||
|
p.price_factor_id,
|
||
|
p.price_factor_id, p.weight,
|
||
|
|
||
|
pfac.factor AS price_factor,
|
||
|
|
||
| bin/mozilla/io.pl | ||
|---|---|---|
|
}
|
||
|
|
||
|
# column_index
|
||
|
my @header_sort = qw(runningnumber partnumber description ship qty unit sellprice_pg sellprice discount linetotal);
|
||
|
my @header_sort = qw(runningnumber partnumber description ship qty unit weight 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 => '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 => 'weight', width => 5, value => $locale->text('Weight'), display => 1, },
|
||
|
{ 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, },
|
||
| ... | ... | |
|
my $deliverydate = $locale->text('Required by');
|
||
|
|
||
|
# special alignings
|
||
|
my %align = map { $_ => 'right' } qw(qty ship right sellprice_pg discount linetotal stock_in_out);
|
||
|
my %align = map { $_ => 'right' } qw(qty ship right sellprice_pg discount linetotal stock_in_out weight);
|
||
|
my %nowrap = map { $_ => 1 } qw(description unit);
|
||
|
|
||
|
$form->{marge_total} = 0;
|
||
|
$form->{sellprice_total} = 0;
|
||
|
$form->{lastcost_total} = 0;
|
||
|
$form->{totalweight} = 0;
|
||
|
my %projectnumber_labels = ();
|
||
|
my @projectnumber_values = ("");
|
||
|
|
||
| ... | ... | |
|
_update_ship() if ($is_s_p_order);
|
||
|
_update_custom_variables();
|
||
|
|
||
|
my $totalweight = 0;
|
||
|
my $defaults = AM->get_defaults();
|
||
|
# rows
|
||
|
|
||
|
my @ROWS;
|
||
| ... | ... | |
|
if ((!$form->{"prices_$i"}) || ($form->{"new_pricegroup_$i"} == $form->{"old_pricegroup_$i"})) {
|
||
|
$form->{"sellprice_$i"} *= AM->convert_unit($form->{"selected_unit_$i"}, $form->{"unit_old_$i"}, $all_units) || 1;
|
||
|
$form->{"lastcost_$i"} *= AM->convert_unit($form->{"selected_unit_$i"}, $form->{"unit_old_$i"}, $all_units) || 1;
|
||
|
$form->{"weight_$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"};
|
||
| ... | ... | |
|
$column_data{linetotal} = $form->format_amount(\%myconfig, $linetotal, 2);
|
||
|
$column_data{bin} = $form->{"bin_$i"};
|
||
|
|
||
|
$column_data{weight} = $form->format_amount(\%myconfig, $form->{"qty_$i"} * $form->{"weight_$i"}, 3) . ' ' . $defaults->{weightunit};
|
||
|
|
||
|
if ($is_delivery_order) {
|
||
|
$column_data{stock_in_out} = calculate_stock_in_out($i);
|
||
|
}
|
||
| ... | ... | |
|
if $form->{"id_$i"} && ($form->{type} =~ /^sales_/ || $form->{type} =~ /invoice/) ;
|
||
|
# / marge calculations ending
|
||
|
|
||
|
# Calculate total weight
|
||
|
$totalweight += ($form->{"qty_$i"} * $form->{"weight_$i"});
|
||
|
|
||
|
# calculate onhand
|
||
|
if ($form->{"id_$i"}) {
|
||
|
my $part = IC->get_basic_part_info(id => $form->{"id_$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)
|
||
|
longdescription basefactor marge_absolut marge_percent marge_price_factor weight), @hidden_vars)
|
||
|
);
|
||
|
|
||
|
map { $form->{"${_}_base"} += $linetotal } (split(/ /, $form->{"taxaccounts_$i"}));
|
||
| ... | ... | |
|
push @ROWS, { ROW1 => \@ROW1, ROW2 => \@ROW2, HIDDENS => \@HIDDENS, colspan => $colspan, error => $form->{"row_error_$i"}, };
|
||
|
}
|
||
|
|
||
|
$form->{totalweight} = $totalweight;
|
||
|
|
||
|
print $form->parse_html_template('oe/sales_order', { ROWS => \@ROWS,
|
||
|
HEADER => \@HEADER,
|
||
|
});
|
||
| ... | ... | |
|
|
||
|
my $info = $form->{PART_INFORMATION}->{$form->{"id_${i}"}} || { };
|
||
|
$form->{"partunit_${i}"} = $info->{unit};
|
||
|
$form->{"weight_$i"} = $info->{weight};
|
||
|
}
|
||
|
|
||
|
$main::lxdebug->leave_sub();
|
||
| templates/webpages/is/form_footer.html | ||
|---|---|---|
|
[%- END %]
|
||
|
</table>
|
||
|
</td>
|
||
|
<td>
|
||
|
<table>
|
||
|
<tr>
|
||
|
<th align=left>[% 'Total weight' | $T8 %]</th>
|
||
|
<td>
|
||
|
[% LxERP.format_amount(totalweight) %] [% HTML.escape(weightunit) %]
|
||
|
<input type=hidden name="totalweight" value="[% marge_total %]">
|
||
|
</td>
|
||
|
</tr>
|
||
|
</table>
|
||
|
</td>
|
||
|
<td>
|
||
|
<table>
|
||
|
<tr>
|
||
Auch abrufbar als: Unified diff
Grundstein für Gewicht in Auftrag/Lieferschein/Rechnung
In allen VK- und EK-Masken soll bald auch das Gewicht angezeigt
werden. Grundsätzlich ist das mit diesem Commit schon für alle
VK-Masken möglich, allerdings sind noch kleine Verbesserungen nötig.