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

ошибка в функции XNPV и ошибка описания функции PRICEMAT

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58014 954022d7-b5bf-4e40-9824-e11837661b57
parent d44f80ad
......@@ -4710,7 +4710,7 @@ cPRICEMAT.prototype.Calculate = function ( arg ) {
cPRICEMAT.prototype.getInfo = function () {
return {
name:this.name,
args:"( settlement , maturity , discount , redemption [ , [ basis ] ] )"
args:"( settlement , maturity , issue , rate , yld [ , [ basis ] ] )"
};
};
......@@ -5875,16 +5875,12 @@ cXNPV.prototype.Calculate = function ( arg ) {
if ( arg0 instanceof cArea || arg0 instanceof cArea3D ) {
arg0 = arg0.cross( arguments[1].first );
}
if ( !(arg0 instanceof cNumber) ) {
return this.value = new cError( cErrorType.not_available );
if ( arg0 instanceof cArray ) {
arg0 = arg0.getElement( 0 );
}
arg0 = arg0.tocNumber();
if ( arg0 instanceof cArray ) {
arg0 = arg0.getElement( 0 );
}
if ( arg0 instanceof cError ) {
return this.value = arg0;
}
......
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