Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 2de7b1da

Von Niclas Zimmermann vor fast 12 Jahren hinzugefügt

  • ID 2de7b1da5588237977366ff7e6526f5b7c84a83b
  • Vorgänger a7ecfa38
  • Nachfolger 7f6cc129

Gewicht im Einkauf/Verkauf

Gewicht wird nun sowohl im Einkauf als im Verkauf in allen Masken
angezeigt. Die Variablen stehen auch im Druck zur Verfügung.

Unterschiede anzeigen:

bin/mozilla/io.pl
my $totalweight = 0;
my $defaults = AM->get_defaults();
$form->{weightunit} = $defaults->{weightunit};
# 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"};
......
} else {
$column_data{price_factor} = ' ';
}
$form->{"weight_$i"} *= AM->convert_unit($form->{"selected_unit_$i"}, $form->{"partunit_$i"}, $all_units) || 1;
$column_data{"unit"} = AM->unit_select_html($all_units, "unit_$i", $this_unit, $form->{"id_$i"} ? $form->{"unit_$i"} : undef);
# / unit ending
......
$column_data{bin} = $form->{"bin_$i"};
$column_data{weight} = $form->format_amount(\%myconfig, $form->{"qty_$i"} * $form->{"weight_$i"}, 3) . ' ' . $defaults->{weightunit};
#To add the hidden variable lineweight:
$form->{"lineweight_$i"} = $column_data{weight};
if ($is_delivery_order) {
$column_data{stock_in_out} = calculate_stock_in_out($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 weight), @hidden_vars)
longdescription basefactor marge_absolut marge_percent marge_price_factor weight lineweight), @hidden_vars)
);
map { $form->{"${_}_base"} += $linetotal } (split(/ /, $form->{"taxaccounts_$i"}));
locale/de/all
'Total Fees' => 'Kumulierte Gebühren',
'Total stock value' => 'Gesamter Bestandswert',
'Total sum' => 'Gesamtsumme',
'Total weight' => 'Gesamtgewicht',
'Totals' => 'Summen',
'Trade Discount' => 'Rabatt',
'Trans Id' => 'Trans-ID',
templates/webpages/do/form_footer.html
</td>
</tr>
<tr>
<td>
<table width="100%">
<tr valign="bottom">
<td align="right">
<table>
<tr>
<th align="left">[% 'Total weight' | $T8 %]</th>
<td align="right">
[% LxERP.format_amount(totalweight, 3) %] [% HTML.escape(weightunit) %]
<input type="hidden" name="totalweight" value="[% HTML.escape(totalweight) %]">
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</table>
</p>
templates/webpages/ir/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="[% totalweight %]">
<input type=hidden name="weightunit" value="[% HTML.escape(weightunit) %]">
</td>
</tr>
</table>
</td>
<td align="right">
[%- IF taxaccounts %]
<input name="taxincluded" class="checkbox" type="checkbox" [% IF taxincluded %]checked[% END %]>
templates/webpages/is/form_footer.html
<th align=left>[% 'Total weight' | $T8 %]</th>
<td>
[% LxERP.format_amount(totalweight) %] [% HTML.escape(weightunit) %]
<input type=hidden name="totalweight" value="[% marge_total %]">
<input type=hidden name="totalweight" value="[% totalweight %]">
<input type=hidden name="weightunit" value="[% HTML.escape(weightunit) %]">
</td>
</tr>
</table>
templates/webpages/oe/form_footer.html
[%- END %]
</table>
</td>
<td>
<table>
<tr>
<th align="left">[% 'Total weight' | $T8 %]</th>
<td align="right">
[% LxERP.format_amount(totalweight, 3) %] [% HTML.escape(weightunit) %]
<input type=hidden name="totalweight" value="[% totalweight %]">
<input type="hidden" name="weightunit" value="[% HTML.escape(weightunit) %]">
</td>
</tr>
</table>
</td>
[%- IF is_sales %]
<td>
<table>

Auch abrufbar als: Unified diff