X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fic.pl;h=c7cb71b0736c9e4fa769885d4184a729e16665de;hb=03d3d025ea4c8bea085fc7cdf1fe7be0b513eb63;hp=cfe6451d7e1ba88caf1886f2fd43e0d2c1fdef39;hpb=935813e4a2959a0b94933d6b853dd5d129f1a61e;p=kivitendo-erp.git diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index cfe6451d7..c7cb71b07 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -1354,8 +1354,8 @@ sub generate_report { if ($ref->{module} eq 'oe') { # für oe gibt es vier fälle, jeweils nach kunde oder lieferant unterschiedlich: # - # | ist bestellt | Vom Kunde bestellt | -> edit_oe_ord_link - # | Anfrage | Angebot | -> edit_oe_quo_link + # | ist bestellt | Von Kunden bestellt | -> edit_oe_ord_link + # | Anfrage | Angebot | -> edit_oe_quo_link my $edit_oe_ord_link = build_std_url("script=oe.pl", 'action=edit', 'type=' . E($ref->{cv} eq 'vendor' ? 'purchase_order' : 'sales_order'), 'id=' . E($ref->{trans_id}), 'callback'); my $edit_oe_quo_link = build_std_url("script=oe.pl", 'action=edit', 'type=' . E($ref->{cv} eq 'vendor' ? 'request_quotation' : 'sales_quotation'), 'id=' . E($ref->{trans_id}), 'callback'); @@ -1773,14 +1773,18 @@ sub update { # parse pricegroups. and no, don't rely on check_form for this... map { $form->{"price_$_"} = $form->parse_amount(\%myconfig, $form->{"price_$_"}) } 1 .. $form->{price_rows}; - $form->{sellprice} = $form->parse_amount(\%myconfig, $form->{sellprice}); + $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) for qw(sellprice listprice ve gv); + + if ($form->{item} eq 'part') { + $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) for qw(weight rop); + } # same for makemodel lastcosts # but parse_amount not necessary for assembly component lastcosts unless ($form->{item} eq "assembly") { map { $form->{"lastcost_$_"} = $form->parse_amount(\%myconfig, $form->{"lastcost_$_"}) } 1 .. $form->{"makemodel_rows"}; - }; - $form->{listprice} = $form->parse_amount(\%myconfig, $form->{listprice}); + $form->{lastcost} = $form->parse_amount(\%myconfig, $form->{lastcost}); + } if ($form->{item} eq "assembly") { my $i = $form->{assembly_rows};