projects
/
kivitendo-erp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2fa5768
)
Fix für Bug 1136. Die Prüfung für not_discountable war zu früh. Zunächst muss form...
author
Jan Büren
<jan@weitan.org>
Thu, 17 Sep 2009 19:03:14 +0000
(21:03 +0200)
committer
Jan Büren
<jan@weitan.org>
Thu, 17 Sep 2009 19:03:14 +0000
(21:03 +0200)
bin/mozilla/oe.pl
patch
|
blob
|
history
diff --git
a/bin/mozilla/oe.pl
b/bin/mozilla/oe.pl
index
bac1804
..
919057c
100644
(file)
--- a/
bin/mozilla/oe.pl
+++ b/
bin/mozilla/oe.pl
@@
-527,9
+527,13
@@
sub update {
} else {
$sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
} else {
$sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
- $form->{"discount_$i"} = 0 if $form->{"not_discountable_$i"};
+ # hier werden parts (Artikeleigenschaften) aus item_list (retrieve_item aus IS.pm)
+ # (item wahrscheinlich synonym für parts) entsprechend in die form geschrieben ...
map { $form->{item_list}[$i]{$_} =~ s/\"/"/g } qw(partnumber description unit);
map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} } keys %{ $form->{item_list}[0] };
map { $form->{item_list}[$i]{$_} =~ s/\"/"/g } qw(partnumber description unit);
map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} } keys %{ $form->{item_list}[0] };
+
+ # ... deswegen muss die prüfung, ob es sich um einen nicht rabattierfähigen artikel handelt später erfolgen (Bug 1136)
+ $form->{"discount_$i"} = 0 if $form->{"not_discountable_$i"};
$form->{payment_id} = $form->{"part_payment_id_$i"} if $form->{"part_payment_id_$i"} ne "";
$form->{"marge_price_factor_$i"} = $form->{item_list}->[0]->{price_factor};
$form->{payment_id} = $form->{"part_payment_id_$i"} if $form->{"part_payment_id_$i"} ne "";
$form->{"marge_price_factor_$i"} = $form->{item_list}->[0]->{price_factor};