Commit f8e3f6ee authored by Dmitry.Shahtanov's avatar Dmitry.Shahtanov Committed by Alexander.Trofimov

дополнительно для предыдущей ревизии

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56215 954022d7-b5bf-4e40-9824-e11837661b57
parent 01ad3b79
......@@ -3744,7 +3744,7 @@ cODDLPRICE.prototype.Calculate = function ( arg ) {
basis = basis.getValue();
if ( maturity <= settlement || settlement <= last_interest || basis < 0 || basis > 4 || yld < 0 || rate < 0 ||
frequency != 1 && frequency != 2 && frequency != 4 || redemption < 0 ){
frequency != 1 && frequency != 2 && frequency != 4 || redemption <= 0 ){
return this.value = new cError( cErrorType.not_numeric );
}
......@@ -3883,7 +3883,7 @@ cODDLYIELD.prototype.Calculate = function ( arg ) {
basis = basis.getValue();
if ( maturity <= settlement || settlement <= last_interest || basis < 0 || basis > 4 || pr < 0 || rate < 0 ||
frequency != 1 && frequency != 2 && frequency != 4 || redemption < 0 ){
frequency != 1 && frequency != 2 && frequency != 4 || redemption <= 0 ){
return this.value = new cError( cErrorType.not_numeric );
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment