[lmi-commits] [5427] Provide 'RiderCharges' for certain reports

[Greg Chicares]

Revision: 5427
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5427
Author:   chicares
Date:     2012-03-10 22:57:16 +0000 (Sat, 10 Mar 2012)
Log Message:
-----------
Provide 'RiderCharges' for certain reports

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/ledger_text_formats.cpp
    lmi/trunk/mc_enum_types.cpp
    lmi/trunk/mc_enum_types.xpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2012-03-10 22:17:25 UTC (rev 5426)
+++ lmi/trunk/ChangeLog 2012-03-10 22:57:16 UTC (rev 5427)
@@ -29822,3 +29822,50 @@
   xml_serializable.tpp
 Add proem to xml product files.
 
+20120308T1057Z <address@hidden> [573]
+
+  ihs_avmly.cpp
+Improve documentation.
+
+20120308T1819Z <address@hidden> [573]
+
+  ihs_acctval.cpp
+Resolve some taxation issues.
+
+20120310T0953Z <address@hidden> [573]
+
+  account_value.hpp
+  ihs_acctval.cpp
+Refactor, moving data member 'RiderDeductions'.
+
+20120310T1029Z <address@hidden> [573]
+
+  account_value.hpp
+  ihs_acctval.cpp
+  ihs_avdebug.cpp
+  ihs_avmly.cpp
+Rename data member 'RiderDeductions' to 'RiderCharges'; change header
+in monthly trace accordingly.
+
+20120310T1154Z <address@hidden> [573]
+
+  account_value.hpp
+  ihs_acctval.cpp
+  ihs_avmly.cpp
+Accumulate rider deductions by policy year.
+
+20120310T2217Z <address@hidden> [573]
+
+  ihs_acctval.cpp
+  ledger_variant.cpp
+  ledger_variant.hpp
+  ledger_xml_io.cpp
+Add 'RiderCharges' to ledger.
+
+20120310T2257Z <address@hidden> [573]
+
+  ledger_text_formats.cpp
+  mc_enum_types.cpp
+  mc_enum_types.xpp
+Provide 'RiderCharges' for certain reports.
+

Modified: lmi/trunk/ledger_text_formats.cpp
===================================================================
--- lmi/trunk/ledger_text_formats.cpp   2012-03-10 22:17:25 UTC (rev 5426)
+++ lmi/trunk/ledger_text_formats.cpp   2012-03-10 22:57:16 UTC (rev 5427)
@@ -102,6 +102,7 @@
         m["TermPurchased_Guaranteed"   ] = ledger_metadata(0, oe_format_normal 
   , "Guar Term Amt Purchased"               ); // "Guaranteed Term Purchased"
         m["COICharge_Current"          ] = ledger_metadata(0, oe_format_normal 
   , "Curr COI Charge"                       ); // "Current Mortality Charge"
         m["COICharge_Guaranteed"       ] = ledger_metadata(0, oe_format_normal 
   , "Guar COI Charge"                       ); // "Guaranteed Mortality Charge"
+        m["RiderCharges_Current"       ] = ledger_metadata(0, oe_format_normal 
   , "Curr Rider Charges"                    ); // "Current Rider Charges"
         m["IrrCsv_Current"             ] = ledger_metadata(2, 
oe_format_percentage, "Curr IRR on CSV"                       ); // "Current 
Cash Value IRR"
         m["IrrCsv_Guaranteed"          ] = ledger_metadata(2, 
oe_format_percentage, "Guar IRR on CSV"                       ); // "Guaranteed 
Cash Value IRR"
         m["IrrDb_Current"              ] = ledger_metadata(2, 
oe_format_percentage, "Curr IRR on DB"                        ); // "Current 
Death Benefit IRR"
@@ -546,6 +547,7 @@
         ,"SpecifiedAmountLoad"
         ,"MonthlyFlatExtra"
         ,"MortalityCharge"
+        ,"RiderCharges"
         ,"NetMortalityCharge"
         ,"SeparateAccountCharges"
         ,"CurrentSeparateAccountInterestRate"
@@ -607,6 +609,7 @@
         os << Curr_.value_str("SpecAmtLoad"           ,j) << '\t';
         os << Invar.value_str("MonthlyFlatExtra"      ,j) << '\t';
         os << Curr_.value_str("COICharge"             ,j) << '\t';
+        os << Curr_.value_str("RiderCharges"          ,j) << '\t';
         os << Curr_.value_str("NetCOICharge"          ,j) << '\t';
         os << Curr_.value_str("SepAcctCharges"        ,j) << '\t';
 

Modified: lmi/trunk/mc_enum_types.cpp
===================================================================
--- lmi/trunk/mc_enum_types.cpp 2012-03-10 22:17:25 UTC (rev 5426)
+++ lmi/trunk/mc_enum_types.cpp 2012-03-10 22:57:16 UTC (rev 5427)
@@ -155,7 +155,7 @@
 MC_DEFINE(premium_table,1)
 MC_DEFINE(from_point,4)
 MC_DEFINE(to_point,4)
-MC_DEFINE(report_column,56)
+MC_DEFINE(report_column,57)
 
 #undef MC_DEFINE
 

Modified: lmi/trunk/mc_enum_types.xpp
===================================================================
--- lmi/trunk/mc_enum_types.xpp 2012-03-10 22:17:25 UTC (rev 5426)
+++ lmi/trunk/mc_enum_types.xpp 2012-03-10 22:57:16 UTC (rev 5427)
@@ -576,6 +576,7 @@
     ,mce_guaranteed_term_purchased \
     ,mce_current_mortality_charge \
     ,mce_guaranteed_mortality_charge \
+    ,mce_current_rider_charges \
     ,mce_current_cash_value_irr \
     ,mce_guaranteed_cash_value_irr \
     ,mce_current_death_benefit_irr \
@@ -634,6 +635,7 @@
     ,"TermPurchased_Guaranteed" \
     ,"COICharge_Current" \
     ,"COICharge_Guaranteed" \
+    ,"RiderCharges_Current" \
     ,"IrrCsv_Current" \
     ,"IrrCsv_Guaranteed" \
     ,"IrrDb_Current" \
@@ -694,6 +696,7 @@
     ,"Guaranteed Term Purchased" \
     ,"Current Mortality Charge" \
     ,"Guaranteed Mortality Charge" \
+    ,"Current Rider Charges" \
     ,"Current Cash Value IRR" \
     ,"Guaranteed Cash Value IRR" \
     ,"Current Death Benefit IRR" \