[Libreoffice-commits] help.git: Branch 'libreoffice-5-3' - source/text

Gabor Kelemen kelemeng at gnome.hu
Wed Nov 30 21:20:55 UTC 2016 

 source/text/scalc/01/04060103.xhp |    3 ++-
 source/text/scalc/01/04060118.xhp |    8 ++++----
 source/text/scalc/01/04060119.xhp |    4 +++-
 3 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 58d8c98f612bdd9c8e4a25581e165ab01881dec8
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date:   Fri Nov 25 11:12:32 2016 +0100

    tdf#103241 Link XIRR and IRR as well as XNPV and NPV to each other
    
    Change-Id: I3a2697d8a71d78042721ff963476e4f592cb7e62
    Reviewed-on: https://gerrit.libreoffice.org/31191
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/31422

diff --git a/source/text/scalc/01/04060103.xhp b/source/text/scalc/01/04060103.xhp
index aeaf02e..4550c4b 100644
--- a/source/text/scalc/01/04060103.xhp
+++ b/source/text/scalc/01/04060103.xhp
@@ -723,6 +723,7 @@
 <paragraph xml-lang="en-US" id="hd_id3153948" role="heading" level="2" l10n="U"
                     oldref="128">IRR</paragraph>
          <paragraph xml-lang="en-US" id="par_id3143282" role="paragraph" l10n="U" oldref="129"><ahelp hid="HID_FUNC_IKV">Calculates the internal rate of return for an investment.</ahelp> The values represent cash flow values at regular intervals, at least one value must be negative (payments), and at least one value must be positive (income).</paragraph>
+         <paragraph id="par_idN10E621" role="paragraph" xml-lang="en-US">If the payments take place at irregular intervals, use the <link href="text/scalc/01/04060118.xhp#xirr" name="XIRR">XIRR</link> function.</paragraph>
          <paragraph xml-lang="en-US" id="hd_id3150599" role="heading" level="3" l10n="U"
                     oldref="130">Syntax</paragraph>
          <paragraph xml-lang="en-US" id="par_id3155427" role="code" l10n="U" oldref="131">IRR(Values; Guess)</paragraph>
@@ -765,4 +766,4 @@
       <paragraph xml-lang="en-US" id="par_id3154411" role="paragraph" l10n="U" oldref="427"><link href="text/scalc/01/04060118.xhp" name="Forward to Financial Functions Part Three">Financial Functions Part Three</link></paragraph>
       <embed href="text/scalc/01/04060100.xhp#drking"/>
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/source/text/scalc/01/04060118.xhp b/source/text/scalc/01/04060118.xhp
index b2dd4bb..14181cc 100644
--- a/source/text/scalc/01/04060118.xhp
+++ b/source/text/scalc/01/04060118.xhp
@@ -171,7 +171,7 @@
 
 <paragraph id="hd_id3147485" role="heading" level="2" xml-lang="en-US">XIRR</paragraph>
 <paragraph id="par_id3145614" role="paragraph" xml-lang="en-US"><ahelp hid="HID_AAI_FUNC_XIRR">Calculates the internal rate of return for a list of payments which take place on different dates.</ahelp> The calculation is based on a 365 days per year basis, ignoring leap years.</paragraph>
-<paragraph id="par_idN10E62" role="paragraph" xml-lang="en-US">If the payments take place at regular intervals, use the IRR function.</paragraph>
+<paragraph id="par_idN10E62" role="paragraph" xml-lang="en-US">If the payments take place at regular intervals, use the <link href="text/scalc/01/04060103.xhp#irr" name="IRR">IRR</link> function.</paragraph>
 
 <paragraph id="hd_id3146149" role="heading" level="3" xml-lang="en-US">Syntax</paragraph>
 <paragraph id="par_id3149826" role="code" xml-lang="en-US">XIRR(Values; Dates; Guess)</paragraph>
@@ -275,8 +275,8 @@
 <bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_XNPV" id="bm_id3151172" localize="false"/>
 
 <paragraph id="hd_id3149198" role="heading" level="2" xml-lang="en-US">XNPV</paragraph>
-<paragraph id="par_id3153904" role="paragraph" xml-lang="en-US"><ahelp hid="HID_AAI_FUNC_XNPV">Calculates the capital value (net present value)for a list of payments which take place on different dates.</ahelp> The calculation is based on a 365 days per year basis, ignoring leap years.</paragraph>
-<paragraph id="par_idN11138" role="paragraph" xml-lang="en-US">If the payments take place at regular intervals, use the NPV function.</paragraph>
+<paragraph id="par_id3153904" role="paragraph" xml-lang="en-US"><ahelp hid="HID_AAI_FUNC_XNPV">Calculates the capital value (net present value) for a list of payments which take place on different dates.</ahelp> The calculation is based on a 365 days per year basis, ignoring leap years.</paragraph>
+<paragraph id="par_idN11138" role="paragraph" xml-lang="en-US">If the payments take place at regular intervals, use the <link href="text/scalc/01/04060119.xhp#npv" name="NPV">NPV</link> function.</paragraph>
 
 <paragraph id="hd_id3155323" role="heading" level="3" xml-lang="en-US">Syntax</paragraph>
 <paragraph id="par_id3150117" role="code" xml-lang="en-US">XNPV(Rate; Values; Dates)</paragraph>
@@ -601,4 +601,4 @@
 <embed href="text/scalc/01/04060100.xhp#drking"/>
 </body>
 
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/source/text/scalc/01/04060119.xhp b/source/text/scalc/01/04060119.xhp
index d2301cf..743c238 100644
--- a/source/text/scalc/01/04060119.xhp
+++ b/source/text/scalc/01/04060119.xhp
@@ -328,7 +328,9 @@
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_NBW" id="bm_id3148417" localize="false"/>
 <paragraph role="heading" id="hd_id3149242" xml-lang="en-US" level="2" l10n="U" oldref="301">NPV</paragraph>
-<paragraph role="paragraph" id="par_id3145308" xml-lang="en-US" l10n="CHG" oldref="302"><ahelp hid="HID_FUNC_NBW">Returns the present value of an investment based on a series of periodic cash flows and a discount rate. To get the net present value, subtract the cost of the project (the initial cash flow at time zero) from the returned value.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3145308" xml-lang="en-US"><ahelp hid="HID_FUNC_NBW">Returns the present value of an investment based on a series of periodic cash flows and a discount rate. To get the net present value, subtract the cost of the project (the initial cash flow at time zero) from the returned value.</ahelp></paragraph>
+<paragraph id="par_idN111381" role="paragraph" xml-lang="en-US">If the payments take place at irregular intervals, use the <link href="text/scalc/01/04060118.xhp#xnpv" name="XNPV">XNPV</link> function.</paragraph>
+
 <paragraph role="heading" id="hd_id3149937" xml-lang="en-US" level="3" l10n="U" oldref="303">Syntax</paragraph>
 <paragraph role="code" id="par_id3153321" xml-lang="en-US" l10n="U" oldref="304">NPV(Rate; Value1; Value2; ...)</paragraph>
 <paragraph role="paragraph" id="par_id3150630" xml-lang="en-US" l10n="U" oldref="305">

More information about the Libreoffice-commits mailing list