[gnumeric] Add more information in AMORDEGC description
- From: Andreas J. Guelzow <guelzow src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Add more information in AMORDEGC description
- Date: Sun, 3 Oct 2010 20:43:02 +0000 (UTC)
commit 65e5e175e67a07f38ca96183d79b37c71210fe55
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date: Sun Oct 3 14:42:20 2010 -0600
Add more information in AMORDEGC description
2010-10-03 Andreas J. Guelzow <aguelzow pyrshep ca>
* func.defs: update
* functions.xml: update
2010-10-03 Andreas J. Guelzow <aguelzow pyrshep ca>
* functions.c (help_amordegrc): add more information
doc/C/ChangeLog | 5 +++++
doc/C/func.defs | 7 ++++++-
doc/C/functions.xml | 7 ++++++-
plugins/fn-financial/ChangeLog | 4 ++++
plugins/fn-financial/functions.c | 10 +++++++++-
5 files changed, 30 insertions(+), 3 deletions(-)
---
diff --git a/doc/C/ChangeLog b/doc/C/ChangeLog
index dc6c355..73b6f3e 100644
--- a/doc/C/ChangeLog
+++ b/doc/C/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-03 Andreas J. Guelzow <aguelzow pyrshep ca>
+
+ * func.defs: update
+ * functions.xml: update
+
2010-10-02 Andreas J. Guelzow <aguelzow pyrshep ca>
* func.defs: update
diff --git a/doc/C/func.defs b/doc/C/func.defs
index b7df4cd..6ed22de 100644
--- a/doc/C/func.defs
+++ b/doc/C/func.defs
@@ -1354,7 +1354,12 @@ Otherwise ACCRINT returns the sum of the interest accrued in all coupon periods
@{rate}: depreciation rate
@{basis}: calendar basis
@DESCRIPTION=AMORDEGRC calculates the depreciation of an asset using French accounting conventions. Assets purchased in the middle of a period take prorated depreciation into account. This is similar to AMORLINC, except that a depreciation coefficient is applied in the calculation depending on the life of the assets.
- NOTE=Named for AMORtissement DEGRessif Comptabilite. If @{basis} is 0, then the US 30/360 method is used. If @{basis} is 1, then actual number of days is used. If @{basis} is 2, then actual number of days is used within a month, but years are considered only 360 days. If @{basis} is 3, then actual number of days is used within a month, but years are always considered 365 days. If @{basis} is 4, then the European 30/360 method is used.
+The depreciation coefficient used is:
+1 for an expected lifetime less than 3 years,
+1.5 for an expected lifetime of at least 3 years but less than 5 years,
+2 for an expected lifetime of at least 5 years but at most 6 years,
+2.5 for an expected lifetime of more than 6 years.
+ NOTE=Special depreciation rules are applied for the last two periods resulting in a possible total depreciation exceeding the difference of @{cost} - @{salvage}. Named for AMORtissement DEGRessif Comptabilite. If @{basis} is 0, then the US 30/360 method is used. If @{basis} is 1, then actual number of days is used. If @{basis} is 2, then actual number of days is used within a month, but years are considered only 360 days. If @{basis} is 3, then actual number of days is used within a month, but years are always considered 365 days. If @{basis} is 4, then the European 30/360 method is used.
@SEEALSO=AMORLINC
@CATEGORY=Finance
diff --git a/doc/C/functions.xml b/doc/C/functions.xml
index 91e56d2..29285e7 100644
--- a/doc/C/functions.xml
+++ b/doc/C/functions.xml
@@ -4716,10 +4716,15 @@
<refsect1>
<title>Description</title>
<para><function>AMORDEGRC</function> calculates the depreciation of an asset using French accounting conventions. Assets purchased in the middle of a period take prorated depreciation into account. This is similar to AMORLINC, except that a depreciation coefficient is applied in the calculation depending on the life of the assets.</para>
+ <para>The depreciation coefficient used is:</para>
+ <para>1 for an expected lifetime less than 3 years,</para>
+ <para>1.5 for an expected lifetime of at least 3 years but less than 5 years,</para>
+ <para>2 for an expected lifetime of at least 5 years but at most 6 years,</para>
+ <para>2.5 for an expected lifetime of more than 6 years.</para>
</refsect1>
<refsect1>
<title>Note</title>
- <para>Named for AMORtissement DEGRessif Comptabilite. If <parameter>basis</parameter> is 0, then the US 30/360 method is used. If <parameter>basis</parameter> is 1, then actual number of days is used. If <parameter>basis</parameter> is 2, then actual number of days is used within a month, but years are considered only 360 days. If <parameter>basis</parameter> is 3, then actual number of days is used within a month, but years are always considered 365 days. If <parameter>basis</parameter> is 4, then the European 30/360 method is used.</para>
+ <para>Special depreciation rules are applied for the last two periods resulting in a possible total depreciation exceeding the difference of <parameter>cost</parameter> - <parameter>salvage</parameter>. Named for AMORtissement DEGRessif Comptabilite. If <parameter>basis</parameter> is 0, then the US 30/360 method is used. If <parameter>basis</parameter> is 1, then actual number of days is used. If <parameter>basis</parameter> is 2, then actual number of days is used within a month, but years are considered only 360 days. If <parameter>basis</parameter> is 3, then actual number of days is used within a month, but years are always considered 365 days. If <parameter>basis</parameter> is 4, then the European 30/360 method is used.</para>
</refsect1>
<refsect1>
<title>See also</title>
diff --git a/plugins/fn-financial/ChangeLog b/plugins/fn-financial/ChangeLog
index 7938c5b..99ce935 100644
--- a/plugins/fn-financial/ChangeLog
+++ b/plugins/fn-financial/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-03 Andreas J. Guelzow <aguelzow pyrshep ca>
+
+ * functions.c (help_amordegrc): add more information
+
2010-10-01 Morten Welinder <terra gnome org>
* Release 1.10.11
diff --git a/plugins/fn-financial/functions.c b/plugins/fn-financial/functions.c
index 6c6b651..bac5064 100644
--- a/plugins/fn-financial/functions.c
+++ b/plugins/fn-financial/functions.c
@@ -2899,7 +2899,15 @@ static GnmFuncHelp const help_amordegrc[] = {
{ GNM_FUNC_HELP_DESCRIPTION, F_(
"AMORDEGRC calculates the depreciation of an asset using French accounting conventions. "
"Assets purchased in the middle of a period take prorated depreciation into account. "
- "This is similar to AMORLINC, except that a depreciation coefficient is applied in the calculation depending on the life of the assets.") },
+ "This is similar to AMORLINC, except that a depreciation coefficient is applied in the "
+ "calculation depending on the life of the assets.") },
+ { GNM_FUNC_HELP_DESCRIPTION, F_("The depreciation coefficient used is:\n"
+ "1.0 for an expected lifetime less than 3 years,\n"
+ "1.5 for an expected lifetime of at least 3 years but less than 5 years,\n"
+ "2.0 for an expected lifetime of at least 5 years but at most 6 years,\n"
+ "2.5 for an expected lifetime of more than 6 years.") },
+ { GNM_FUNC_HELP_NOTE, F_("Special depreciation rules are applied for the last two periods resulting in a possible total "
+ "depreciation exceeding the difference of @{cost} - @{salvage}.") },
{ GNM_FUNC_HELP_NOTE, F_("Named for AMORtissement DEGRessif Comptabilite.") },
GNM_DATE_BASIS_HELP
{ GNM_FUNC_HELP_EXAMPLES, "=AMORDEGRC(2400,DATE(1998,8,19),DATE(1998,12,30),300,1,0.14,1)" },
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]