Revision 2b88ba77
Von Jan Büren vor fast 15 Jahren hinzugefügt
| SL/DO.pm | ||
|---|---|---|
| 280 | 280 |
$form->{"lastcost_$i"} *= 1;
|
| 281 | 281 |
|
| 282 | 282 |
# set values to 0 if nothing entered |
| 283 |
$form->{"discount_$i"} = $form->parse_amount($myconfig, $form->{"discount_$i"}) / 100;
|
|
| 283 |
$form->{"discount_$i"} = $form->parse_amount($myconfig, $form->{"discount_$i"});
|
|
| 284 | 284 |
$form->{"sellprice_$i"} = $form->parse_amount($myconfig, $form->{"sellprice_$i"});
|
| 285 | 285 |
|
| 286 | 286 |
$price_factor = $price_factors{ $form->{"price_factor_id_$i"} } || 1;
|
| ... | ... | |
| 295 | 295 |
@values = (conv_i($item_id), conv_i($form->{id}), conv_i($form->{"id_$i"}),
|
| 296 | 296 |
$form->{"description_$i"}, $form->{"longdescription_$i"},
|
| 297 | 297 |
$form->{"qty_$i"}, $baseqty,
|
| 298 |
$form->{"sellprice_$i"}, $form->{"discount_$i"},
|
|
| 298 |
$form->{"sellprice_$i"}, $form->{"discount_$i"} / 100,
|
|
| 299 | 299 |
$form->{"unit_$i"}, conv_date($reqdate), conv_i($form->{"project_id_$i"}),
|
| 300 | 300 |
$form->{"serialnumber_$i"},
|
| 301 | 301 |
$form->{"ordnumber_$i"}, conv_date($form->{"transdate_$i"}),
|
| bin/mozilla/do.pl | ||
|---|---|---|
| 183 | 183 |
IR->get_vendor(\%myconfig, \%$form); |
| 184 | 184 |
} else {
|
| 185 | 185 |
IS->get_customer(\%myconfig, \%$form); |
| 186 |
# OFFEN tritt bug 1284 auch bei vendor auf? |
|
| 187 |
$form->{discount} = $form->{customer_discount};
|
|
| 186 | 188 |
} |
| 187 | 189 |
|
| 188 | 190 |
$form->restore_vars(qw(payment_id language_id taxzone_id intnotes cp_id)); |
| ... | ... | |
| 628 | 630 |
# wird die Maske mit dem falschen Rabatt wieder aufgebaut. |
| 629 | 631 |
# Wie immer: backup_vars verwenden um nichts anderes kaputt zu |
| 630 | 632 |
# machen. jan 03.03.2010 |
| 631 |
for my $i (1 .. $form->{rowcount}) {
|
|
| 632 |
$form->{"backup_discount_$i"} = $form->{"discount_$i"};
|
|
| 633 |
}; |
|
| 633 |
# nicht mehr notwendig da für bug 1284 der backend aufruf entsprechend |
|
| 634 |
# geändert wurde |
|
| 634 | 635 |
DO->save(); |
| 635 |
for my $i (1 .. $form->{rowcount}) {
|
|
| 636 |
$form->{"discount_$i"} = $form->{"backup_discount_$i"};
|
|
| 637 |
delete $form->{"backup_discount_$i"};
|
|
| 638 |
}; |
|
| 639 | 636 |
# saving the history |
| 640 | 637 |
if(!exists $form->{addition}) {
|
| 641 | 638 |
$form->{snumbers} = qq|donumber_| . $form->{donumber};
|
| ... | ... | |
| 734 | 731 |
} |
| 735 | 732 |
|
| 736 | 733 |
for my $i (1 .. $form->{rowcount}) {
|
| 734 |
# für bug 1284 |
|
| 735 |
if ($form->{discount}){ # Falls wir einen Kundenrabatt haben
|
|
| 736 |
# und keinen anderen discount wert an $i ... |
|
| 737 |
$form->{"discount_$i"} ||= $form->{discount}*100; # ... nehmen wir den kundenrabatt
|
|
| 738 |
} |
|
| 737 | 739 |
map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if $form->{"${_}_${i}"} } qw(ship qty sellprice listprice basefactor);
|
| 738 | 740 |
} |
| 739 | 741 |
|
Auch abrufbar als: Unified diff
Endlich der Bugfix für 1284. Kundenrabatt wird nicht aus dem Lieferschein übernommen.