Revision 2de7b1da
Von Niclas Zimmermann vor mehr als 11 Jahren hinzugefügt
| bin/mozilla/io.pl | ||
|---|---|---|
| 209 | 209 |
|
| 210 | 210 |
my $totalweight = 0; |
| 211 | 211 |
my $defaults = AM->get_defaults(); |
| 212 |
|
|
| 213 |
$form->{weightunit} = $defaults->{weightunit};
|
|
| 212 | 214 |
# rows |
| 213 | 215 |
|
| 214 | 216 |
my @ROWS; |
| ... | ... | |
| 232 | 234 |
if ((!$form->{"prices_$i"}) || ($form->{"new_pricegroup_$i"} == $form->{"old_pricegroup_$i"})) {
|
| 233 | 235 |
$form->{"sellprice_$i"} *= AM->convert_unit($form->{"selected_unit_$i"}, $form->{"unit_old_$i"}, $all_units) || 1;
|
| 234 | 236 |
$form->{"lastcost_$i"} *= AM->convert_unit($form->{"selected_unit_$i"}, $form->{"unit_old_$i"}, $all_units) || 1;
|
| 235 |
$form->{"weight_$i"} *= AM->convert_unit($form->{"selected_unit_$i"}, $form->{"unit_old_$i"}, $all_units) || 1;
|
|
| 236 | 237 |
$form->{"unit_old_$i"} = $form->{"selected_unit_$i"};
|
| 237 | 238 |
} |
| 238 | 239 |
my $this_unit = $form->{"unit_$i"};
|
| ... | ... | |
| 251 | 252 |
} else {
|
| 252 | 253 |
$column_data{price_factor} = ' ';
|
| 253 | 254 |
} |
| 255 |
$form->{"weight_$i"} *= AM->convert_unit($form->{"selected_unit_$i"}, $form->{"partunit_$i"}, $all_units) || 1;
|
|
| 254 | 256 |
|
| 255 | 257 |
$column_data{"unit"} = AM->unit_select_html($all_units, "unit_$i", $this_unit, $form->{"id_$i"} ? $form->{"unit_$i"} : undef);
|
| 256 | 258 |
# / unit ending |
| ... | ... | |
| 331 | 333 |
$column_data{bin} = $form->{"bin_$i"};
|
| 332 | 334 |
|
| 333 | 335 |
$column_data{weight} = $form->format_amount(\%myconfig, $form->{"qty_$i"} * $form->{"weight_$i"}, 3) . ' ' . $defaults->{weightunit};
|
| 336 |
#To add the hidden variable lineweight: |
|
| 337 |
$form->{"lineweight_$i"} = $column_data{weight};
|
|
| 334 | 338 |
|
| 335 | 339 |
if ($is_delivery_order) {
|
| 336 | 340 |
$column_data{stock_in_out} = calculate_stock_in_out($i);
|
| ... | ... | |
| 426 | 430 |
map { ($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } map { $_."_$i" }
|
| 427 | 431 |
(qw(orderitems_id bo pricegroup_old price_old id inventory_accno bin partsgroup partnotes |
| 428 | 432 |
income_accno expense_accno listprice assembly taxaccounts ordnumber transdate cusordnumber |
| 429 |
longdescription basefactor marge_absolut marge_percent marge_price_factor weight), @hidden_vars) |
|
| 433 |
longdescription basefactor marge_absolut marge_percent marge_price_factor weight lineweight), @hidden_vars)
|
|
| 430 | 434 |
); |
| 431 | 435 |
|
| 432 | 436 |
map { $form->{"${_}_base"} += $linetotal } (split(/ /, $form->{"taxaccounts_$i"}));
|
| locale/de/all | ||
|---|---|---|
| 2165 | 2165 |
'Total Fees' => 'Kumulierte Gebühren', |
| 2166 | 2166 |
'Total stock value' => 'Gesamter Bestandswert', |
| 2167 | 2167 |
'Total sum' => 'Gesamtsumme', |
| 2168 |
'Total weight' => 'Gesamtgewicht', |
|
| 2168 | 2169 |
'Totals' => 'Summen', |
| 2169 | 2170 |
'Trade Discount' => 'Rabatt', |
| 2170 | 2171 |
'Trans Id' => 'Trans-ID', |
| templates/webpages/do/form_footer.html | ||
|---|---|---|
| 20 | 20 |
|
| 21 | 21 |
</td> |
| 22 | 22 |
</tr> |
| 23 |
<tr> |
|
| 24 |
<td> |
|
| 25 |
<table width="100%"> |
|
| 26 |
<tr valign="bottom"> |
|
| 27 |
<td align="right"> |
|
| 28 |
<table> |
|
| 29 |
<tr> |
|
| 30 |
<th align="left">[% 'Total weight' | $T8 %]</th> |
|
| 31 |
<td align="right"> |
|
| 32 |
[% LxERP.format_amount(totalweight, 3) %] [% HTML.escape(weightunit) %] |
|
| 33 |
<input type="hidden" name="totalweight" value="[% HTML.escape(totalweight) %]"> |
|
| 34 |
</td> |
|
| 35 |
</tr> |
|
| 36 |
</table> |
|
| 37 |
</td> |
|
| 38 |
</tr> |
|
| 39 |
</table> |
|
| 40 |
</td> |
|
| 23 | 41 |
</table> |
| 24 | 42 |
</p> |
| 25 | 43 |
|
| templates/webpages/ir/form_footer.html | ||
|---|---|---|
| 33 | 33 |
[%- END %] |
| 34 | 34 |
</table> |
| 35 | 35 |
</td> |
| 36 |
<td> |
|
| 37 |
<table> |
|
| 38 |
<tr> |
|
| 39 |
<th align=left>[% 'Total weight' | $T8 %]</th> |
|
| 40 |
<td> |
|
| 41 |
[% LxERP.format_amount(totalweight) %] [% HTML.escape(weightunit) %] |
|
| 42 |
<input type=hidden name="totalweight" value="[% totalweight %]"> |
|
| 43 |
<input type=hidden name="weightunit" value="[% HTML.escape(weightunit) %]"> |
|
| 44 |
</td> |
|
| 45 |
</tr> |
|
| 46 |
</table> |
|
| 47 |
</td> |
|
| 36 | 48 |
<td align="right"> |
| 37 | 49 |
[%- IF taxaccounts %] |
| 38 | 50 |
<input name="taxincluded" class="checkbox" type="checkbox" [% IF taxincluded %]checked[% END %]> |
| templates/webpages/is/form_footer.html | ||
|---|---|---|
| 49 | 49 |
<th align=left>[% 'Total weight' | $T8 %]</th> |
| 50 | 50 |
<td> |
| 51 | 51 |
[% LxERP.format_amount(totalweight) %] [% HTML.escape(weightunit) %] |
| 52 |
<input type=hidden name="totalweight" value="[% marge_total %]"> |
|
| 52 |
<input type=hidden name="totalweight" value="[% totalweight %]"> |
|
| 53 |
<input type=hidden name="weightunit" value="[% HTML.escape(weightunit) %]"> |
|
| 53 | 54 |
</td> |
| 54 | 55 |
</tr> |
| 55 | 56 |
</table> |
| templates/webpages/oe/form_footer.html | ||
|---|---|---|
| 47 | 47 |
[%- END %] |
| 48 | 48 |
</table> |
| 49 | 49 |
</td> |
| 50 |
<td> |
|
| 51 |
<table> |
|
| 52 |
<tr> |
|
| 53 |
<th align="left">[% 'Total weight' | $T8 %]</th> |
|
| 54 |
<td align="right"> |
|
| 55 |
[% LxERP.format_amount(totalweight, 3) %] [% HTML.escape(weightunit) %] |
|
| 56 |
<input type=hidden name="totalweight" value="[% totalweight %]"> |
|
| 57 |
<input type="hidden" name="weightunit" value="[% HTML.escape(weightunit) %]"> |
|
| 58 |
</td> |
|
| 59 |
</tr> |
|
| 60 |
</table> |
|
| 61 |
</td> |
|
| 50 | 62 |
[%- IF is_sales %] |
| 51 | 63 |
<td> |
| 52 | 64 |
<table> |
Auch abrufbar als: Unified diff
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.