Revision 92b2f11d
Von Thomas Kasulke vor fast 18 Jahren hinzugefügt
| SL/OE.pm | ||
|---|---|---|
| 1141 | 1141 |
$form->format_amount($myconfig, $form->{"${item}_rate"} * 100));
|
| 1142 | 1142 |
push(@{ $form->{taxnumber} }, $form->{"${item}_taxnumber"});
|
| 1143 | 1143 |
} |
| 1144 |
$form->{subtotal} = $form->format_amount($myconfig, $form->{total}, 2);
|
|
| 1144 |
if($form->{taxincluded}) {
|
|
| 1145 |
$form->{subtotal} = $form->format_amount($myconfig, $form->{total} - $tax, 2);
|
|
| 1146 |
} |
|
| 1147 |
else {
|
|
| 1148 |
$form->{subtotal} = $form->format_amount($myconfig, $form->{total}, 2);
|
|
| 1149 |
} |
|
| 1145 | 1150 |
$yesdiscount = $form->{nodiscount_total} - $nodiscount;
|
| 1146 | 1151 |
$form->{nodiscount_subtotal} = $form->format_amount($myconfig, $form->{nodiscount_total}, 2);
|
| 1147 | 1152 |
$form->{discount_total} = $form->format_amount($myconfig, $form->{discount_total}, 2);
|
| 1148 | 1153 |
$form->{nodiscount} = $form->format_amount($myconfig, $nodiscount, 2);
|
| 1149 | 1154 |
$form->{yesdiscount} = $form->format_amount($myconfig, $yesdiscount, 2);
|
| 1150 | 1155 |
|
| 1151 |
$form->{subtotal} = $form->format_amount($myconfig, $form->{ordtotal}, 2);
|
|
| 1156 |
if($form->{taxincluded}) {
|
|
| 1157 |
$form->{subtotal} = $form->format_amount($myconfig, $form->{ordtotal} - $tax, 2);
|
|
| 1158 |
} |
|
| 1159 |
else {
|
|
| 1160 |
$form->{subtotal} = $form->format_amount($myconfig, $form->{ordtotal}, 2);
|
|
| 1161 |
} |
|
| 1152 | 1162 |
$form->{ordtotal} =
|
| 1153 | 1163 |
($form->{taxincluded}) ? $form->{ordtotal} : $form->{ordtotal} + $tax;
|
| 1154 | 1164 |
|
Auch abrufbar als: Unified diff
Nettobeträge bei taxincluded auf Druckvorschau angepasst (Bug 576)