Revision 2b88ba77
Von Jan Büren vor fast 15 Jahren hinzugefügt
| SL/DO.pm | ||
|---|---|---|
|
$form->{"lastcost_$i"} *= 1;
|
||
|
|
||
|
# set values to 0 if nothing entered
|
||
|
$form->{"discount_$i"} = $form->parse_amount($myconfig, $form->{"discount_$i"}) / 100;
|
||
|
$form->{"discount_$i"} = $form->parse_amount($myconfig, $form->{"discount_$i"});
|
||
|
$form->{"sellprice_$i"} = $form->parse_amount($myconfig, $form->{"sellprice_$i"});
|
||
|
|
||
|
$price_factor = $price_factors{ $form->{"price_factor_id_$i"} } || 1;
|
||
| ... | ... | |
|
@values = (conv_i($item_id), conv_i($form->{id}), conv_i($form->{"id_$i"}),
|
||
|
$form->{"description_$i"}, $form->{"longdescription_$i"},
|
||
|
$form->{"qty_$i"}, $baseqty,
|
||
|
$form->{"sellprice_$i"}, $form->{"discount_$i"},
|
||
|
$form->{"sellprice_$i"}, $form->{"discount_$i"} / 100,
|
||
|
$form->{"unit_$i"}, conv_date($reqdate), conv_i($form->{"project_id_$i"}),
|
||
|
$form->{"serialnumber_$i"},
|
||
|
$form->{"ordnumber_$i"}, conv_date($form->{"transdate_$i"}),
|
||
| bin/mozilla/do.pl | ||
|---|---|---|
|
IR->get_vendor(\%myconfig, \%$form);
|
||
|
} else {
|
||
|
IS->get_customer(\%myconfig, \%$form);
|
||
|
# OFFEN tritt bug 1284 auch bei vendor auf?
|
||
|
$form->{discount} = $form->{customer_discount};
|
||
|
}
|
||
|
|
||
|
$form->restore_vars(qw(payment_id language_id taxzone_id intnotes cp_id));
|
||
| ... | ... | |
|
# wird die Maske mit dem falschen Rabatt wieder aufgebaut.
|
||
|
# Wie immer: backup_vars verwenden um nichts anderes kaputt zu
|
||
|
# machen. jan 03.03.2010
|
||
|
for my $i (1 .. $form->{rowcount}) {
|
||
|
$form->{"backup_discount_$i"} = $form->{"discount_$i"};
|
||
|
};
|
||
|
# nicht mehr notwendig da für bug 1284 der backend aufruf entsprechend
|
||
|
# geändert wurde
|
||
|
DO->save();
|
||
|
for my $i (1 .. $form->{rowcount}) {
|
||
|
$form->{"discount_$i"} = $form->{"backup_discount_$i"};
|
||
|
delete $form->{"backup_discount_$i"};
|
||
|
};
|
||
|
# saving the history
|
||
|
if(!exists $form->{addition}) {
|
||
|
$form->{snumbers} = qq|donumber_| . $form->{donumber};
|
||
| ... | ... | |
|
}
|
||
|
|
||
|
for my $i (1 .. $form->{rowcount}) {
|
||
|
# für bug 1284
|
||
|
if ($form->{discount}){ # Falls wir einen Kundenrabatt haben
|
||
|
# und keinen anderen discount wert an $i ...
|
||
|
$form->{"discount_$i"} ||= $form->{discount}*100; # ... nehmen wir den kundenrabatt
|
||
|
}
|
||
|
map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if $form->{"${_}_${i}"} } qw(ship qty sellprice listprice basefactor);
|
||
|
}
|
||
|
|
||
Auch abrufbar als: Unified diff
Endlich der Bugfix für 1284. Kundenrabatt wird nicht aus dem Lieferschein übernommen.