|
@@ -557,8 +557,10 @@ begin
|
|
begin
|
|
begin
|
|
Rec := sddDealPayment.Records[I];
|
|
Rec := sddDealPayment.Records[I];
|
|
if Rec.ValueByName('CalcType').AsInteger <> 0 then Continue;
|
|
if Rec.ValueByName('CalcType').AsInteger <> 0 then Continue;
|
|
- Rec.ValueByName('StartedPrice').AsFloat := FPayFormula.Calculate(Rec.ValueByName('SFormula').AsString);
|
|
|
|
- Rec.ValueByName('RangePrice').AsFloat := FPayFormula.Calculate(Rec.ValueByName('RFormula').AsString);
|
|
|
|
|
|
+ if Rec.ValueByName('SFormula').AsString <> '' then
|
|
|
|
+ Rec.ValueByName('StartedPrice').AsFloat := FPayFormula.Calculate(Rec.ValueByName('SFormula').AsString);
|
|
|
|
+ if Rec.ValueByName('RFormula').AsString <> '' then
|
|
|
|
+ Rec.ValueByName('RangePrice').AsFloat := FPayFormula.Calculate(Rec.ValueByName('RFormula').AsString);
|
|
end;
|
|
end;
|
|
end;
|
|
end;
|
|
|
|
|