[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [5038] Add a premium-tax-state field
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [5038] Add a premium-tax-state field |
|
Date: |
Mon, 19 Jul 2010 13:49:16 +0000 |
Revision: 5038
http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5038
Author: chicares
Date: 2010-07-19 13:49:15 +0000 (Mon, 19 Jul 2010)
Log Message:
-----------
Add a premium-tax-state field
Modified Paths:
--------------
lmi/trunk/ChangeLog
lmi/trunk/input.cpp
lmi/trunk/input.hpp
lmi/trunk/input_xml_io.cpp
lmi/trunk/mec.xrc
lmi/trunk/mec_input.cpp
lmi/trunk/mec_input.hpp
lmi/trunk/sample.cns
lmi/trunk/sample.ill
lmi/trunk/yare_input.cpp
lmi/trunk/yare_input.hpp
Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2010-07-19 13:47:20 UTC (rev 5037)
+++ lmi/trunk/ChangeLog 2010-07-19 13:49:15 UTC (rev 5038)
@@ -26355,3 +26355,24 @@
xml_serializable.tpp
Improve documentation.
+20100719T1347Z <address@hidden> [693]
+
+ skin.xrc
+Reserve 'FilingApprovalState' for use only in admin-system extracts.
+Elsewhere, 'StateOfJurisdiction' is already in widespread use and need
+not be changed.
+
+20100719T1349Z <address@hidden> [693]
+
+ input.cpp
+ input.hpp
+ input_xml_io.cpp
+ mec.xrc
+ mec_input.cpp
+ mec_input.hpp
+ sample.cns
+ sample.ill
+ yare_input.cpp
+ yare_input.hpp
+Add a premium-tax-state field.
+
Modified: lmi/trunk/input.cpp
===================================================================
--- lmi/trunk/input.cpp 2010-07-19 13:47:20 UTC (rev 5037)
+++ lmi/trunk/input.cpp 2010-07-19 13:49:15 UTC (rev 5038)
@@ -168,6 +168,7 @@
// ,InforceContractMonth ("")
// ,InforceLeastDeathBenefit ("")
,StateOfJurisdiction ("CT")
+ ,PremiumTaxState ("CT")
,SalarySpecifiedAmountFactor ("1")
,SalarySpecifiedAmountCap ("100000")
,SalarySpecifiedAmountOffset ("50000")
@@ -468,6 +469,7 @@
ascribe("InforceContractMonth" ,
&Input::InforceContractMonth );
ascribe("InforceLeastDeathBenefit" ,
&Input::InforceLeastDeathBenefit );
ascribe("StateOfJurisdiction" ,
&Input::StateOfJurisdiction );
+ ascribe("PremiumTaxState" , &Input::PremiumTaxState
);
ascribe("SalarySpecifiedAmountFactor" ,
&Input::SalarySpecifiedAmountFactor );
ascribe("SalarySpecifiedAmountCap" ,
&Input::SalarySpecifiedAmountCap );
ascribe("SalarySpecifiedAmountOffset" ,
&Input::SalarySpecifiedAmountOffset );
Modified: lmi/trunk/input.hpp
===================================================================
--- lmi/trunk/input.hpp 2010-07-19 13:47:20 UTC (rev 5037)
+++ lmi/trunk/input.hpp 2010-07-19 13:49:15 UTC (rev 5038)
@@ -372,6 +372,7 @@
tnr_month InforceContractMonth ;
tnr_nonnegative_double InforceLeastDeathBenefit ;
mce_state StateOfJurisdiction ;
+ mce_state PremiumTaxState ;
tnr_nonnegative_double SalarySpecifiedAmountFactor ;
tnr_nonnegative_double SalarySpecifiedAmountCap ;
tnr_nonnegative_double SalarySpecifiedAmountOffset ;
Modified: lmi/trunk/input_xml_io.cpp
===================================================================
--- lmi/trunk/input_xml_io.cpp 2010-07-19 13:47:20 UTC (rev 5037)
+++ lmi/trunk/input_xml_io.cpp 2010-07-19 13:49:15 UTC (rev 5038)
@@ -72,6 +72,7 @@
/// version 3: 20090302T0509Z [see important note below]
/// version 4: 20090330T0137Z
/// version 5: 20090526T1331Z
+/// version 6: 201007DDTHHMMZ
///
/// Important note concerning version 3. On or about 20090311, some
/// end users were given an off-cycle release that should have used
@@ -80,7 +81,7 @@
int Input::class_version() const
{
- return 5;
+ return 6;
}
std::string const& Input::xml_root_name() const
@@ -366,6 +367,12 @@
,true
);
}
+
+ if(file_version < 6)
+ {
+ LMI_ASSERT(contains(residuary_names, "PremiumTaxState"));
+ PremiumTaxState = StateOfJurisdiction;
+ }
}
void Input::redintegrate_ad_terminum()
Modified: lmi/trunk/mec.xrc
===================================================================
--- lmi/trunk/mec.xrc 2010-07-19 13:47:20 UTC (rev 5037)
+++ lmi/trunk/mec.xrc 2010-07-19 13:49:15 UTC (rev 5038)
@@ -375,11 +375,26 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
<object class="wxComboBox"
name="StateOfJurisdiction">
- <help>State of jurisdiction</help>
+ <help>State that approves policy form
and rate filing, and governs everything else except premium tax</help>
<size>80,-1</size>
<style>wxCB_DROPDOWN|wxCB_READONLY</style>
</object>
</object>
+ <object class="sizeritem">
+
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
+ <border>4</border>
+ <object class="wxStaticText">
+ <label>Premium tax state</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
+ <object class="wxComboBox"
name="PremiumTaxState">
+ <help>State to which premium tax is
paid--affects premium load if the tax is passed through</help>
+ <size>80,-1</size>
+
<style>wxCB_DROPDOWN|wxCB_READONLY</style>
+ </object>
+ </object>
</object>
</object>
</object>
Modified: lmi/trunk/mec_input.cpp
===================================================================
--- lmi/trunk/mec_input.cpp 2010-07-19 13:47:20 UTC (rev 5037)
+++ lmi/trunk/mec_input.cpp 2010-07-19 13:49:15 UTC (rev 5038)
@@ -30,6 +30,7 @@
#include "xml_serializable.tpp"
#include "alert.hpp"
+#include "assert_lmi.hpp"
#include "contains.hpp"
#include "database.hpp"
#include "dbnames.hpp"
@@ -104,6 +105,7 @@
// ,InforceContractMonth ("")
,InforceLeastDeathBenefit ("1000000")
,StateOfJurisdiction ("CT")
+ ,PremiumTaxState ("CT")
,FlatExtra ("0")
,PaymentHistory ("0")
,BenefitHistory ("1000000")
@@ -196,6 +198,7 @@
ascribe("InforceContractMonth" ,
&mec_input::InforceContractMonth );
ascribe("InforceLeastDeathBenefit" ,
&mec_input::InforceLeastDeathBenefit );
ascribe("StateOfJurisdiction" ,
&mec_input::StateOfJurisdiction );
+ ascribe("PremiumTaxState" ,
&mec_input::PremiumTaxState );
ascribe("FlatExtra" , &mec_input::FlatExtra
);
ascribe("PaymentHistory" ,
&mec_input::PaymentHistory );
ascribe("BenefitHistory" ,
&mec_input::BenefitHistory );
@@ -607,10 +610,11 @@
/// Backward-compatibility serial number of this class's xml version.
///
/// version 0: 20090627T2249Z
+/// version 1: 201007DDTHHMMZ
int mec_input::class_version() const
{
- return 0;
+ return 1;
}
std::string const& mec_input::xml_root_name() const
@@ -629,6 +633,38 @@
return contains(v, s);
}
+void mec_input::redintegrate_ex_ante
+ (int file_version
+ ,std::string const& // name
+ ,std::string & // value
+ ) const
+{
+ if(class_version() == file_version)
+ {
+ return;
+ }
+
+ // Nothing to do for now.
+}
+
+void mec_input::redintegrate_ex_post
+ (int file_version
+ ,std::map<std::string, std::string> const& // detritus_map
+ ,std::list<std::string> const& residuary_names
+ )
+{
+ if(class_version() == file_version)
+ {
+ return;
+ }
+
+ if(file_version < 1)
+ {
+ LMI_ASSERT(contains(residuary_names, "PremiumTaxState"));
+ PremiumTaxState = StateOfJurisdiction;
+ }
+}
+
void mec_input::redintegrate_ad_terminum()
{
Reconcile();
Modified: lmi/trunk/mec_input.hpp
===================================================================
--- lmi/trunk/mec_input.hpp 2010-07-19 13:47:20 UTC (rev 5037)
+++ lmi/trunk/mec_input.hpp 2010-07-19 13:49:15 UTC (rev 5038)
@@ -103,6 +103,16 @@
// xml_serializable overrides.
virtual bool is_detritus(std::string const&) const;
+ virtual void redintegrate_ex_ante
+ (int file_version
+ ,std::string const& name
+ ,std::string & value
+ ) const;
+ virtual void redintegrate_ex_post
+ (int file_version
+ ,std::map<std::string, std::string> const& detritus_map
+ ,std::list<std::string> const& residuary_names
+ );
virtual void redintegrate_ad_terminum();
// MvcModel required implementation.
@@ -167,6 +177,7 @@
tnr_month InforceContractMonth ;
tnr_nonnegative_double InforceLeastDeathBenefit ;
mce_state StateOfJurisdiction ;
+ mce_state PremiumTaxState ;
datum_sequence FlatExtra ;
datum_sequence PaymentHistory ;
datum_sequence BenefitHistory ;
Modified: lmi/trunk/sample.cns
===================================================================
--- lmi/trunk/sample.cns 2010-07-19 13:47:20 UTC (rev 5037)
+++ lmi/trunk/sample.cns 2010-07-19 13:49:15 UTC (rev 5038)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<multiple_cell_document>
- <cell version="5">
+ <cell version="6">
<AccidentalDeathBenefit>No</AccidentalDeathBenefit>
<Address/>
<AgentAddress>*** REQUIRED FIELD MISSING ***</AgentAddress>
@@ -132,6 +132,7 @@
<PolicyNumber/>
<PostHoneymoonSpread>0</PostHoneymoonSpread>
<PremiumHistory>0</PremiumHistory>
+ <PremiumTaxState>CT</PremiumTaxState>
<ProductName>sample</ProductName>
<ProjectedSalary>100000</ProjectedSalary>
<RetireesCanEnroll>No</RetireesCanEnroll>
@@ -206,7 +207,7 @@
<ZipCode/>
</cell>
<NumberOfClasses>1</NumberOfClasses>
- <cell version="5">
+ <cell version="6">
<AccidentalDeathBenefit>No</AccidentalDeathBenefit>
<Address/>
<AgentAddress>*** REQUIRED FIELD MISSING ***</AgentAddress>
@@ -338,6 +339,7 @@
<PolicyNumber/>
<PostHoneymoonSpread>0</PostHoneymoonSpread>
<PremiumHistory>0</PremiumHistory>
+ <PremiumTaxState>CT</PremiumTaxState>
<ProductName>sample</ProductName>
<ProjectedSalary>100000</ProjectedSalary>
<RetireesCanEnroll>No</RetireesCanEnroll>
@@ -412,7 +414,7 @@
<ZipCode/>
</cell>
<NumberOfCells>1</NumberOfCells>
- <cell version="5">
+ <cell version="6">
<AccidentalDeathBenefit>No</AccidentalDeathBenefit>
<Address/>
<AgentAddress>*** REQUIRED FIELD MISSING ***</AgentAddress>
@@ -544,6 +546,7 @@
<PolicyNumber/>
<PostHoneymoonSpread>0</PostHoneymoonSpread>
<PremiumHistory>0</PremiumHistory>
+ <PremiumTaxState>CT</PremiumTaxState>
<ProductName>sample</ProductName>
<ProjectedSalary>100000</ProjectedSalary>
<RetireesCanEnroll>No</RetireesCanEnroll>
Modified: lmi/trunk/sample.ill
===================================================================
--- lmi/trunk/sample.ill 2010-07-19 13:47:20 UTC (rev 5037)
+++ lmi/trunk/sample.ill 2010-07-19 13:49:15 UTC (rev 5038)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<single_cell_document>
- <cell version="5">
+ <cell version="6">
<AccidentalDeathBenefit>No</AccidentalDeathBenefit>
<Address/>
<AgentAddress>*** REQUIRED FIELD MISSING ***</AgentAddress>
@@ -132,6 +132,7 @@
<PolicyNumber/>
<PostHoneymoonSpread>0</PostHoneymoonSpread>
<PremiumHistory>0</PremiumHistory>
+ <PremiumTaxState>CT</PremiumTaxState>
<ProductName>sample</ProductName>
<ProjectedSalary>100000</ProjectedSalary>
<RetireesCanEnroll>No</RetireesCanEnroll>
Modified: lmi/trunk/yare_input.cpp
===================================================================
--- lmi/trunk/yare_input.cpp 2010-07-19 13:47:20 UTC (rev 5037)
+++ lmi/trunk/yare_input.cpp 2010-07-19 13:49:15 UTC (rev 5038)
@@ -163,6 +163,7 @@
InforceContractMonth = z.InforceContractMonth
.value();
InforceLeastDeathBenefit = z.InforceLeastDeathBenefit
.value();
StateOfJurisdiction = z.StateOfJurisdiction
.value();
+ PremiumTaxState = z.PremiumTaxState
.value();
SalarySpecifiedAmountFactor = z.SalarySpecifiedAmountFactor
.value();
SalarySpecifiedAmountCap = z.SalarySpecifiedAmountCap
.value();
SalarySpecifiedAmountOffset = z.SalarySpecifiedAmountOffset
.value();
Modified: lmi/trunk/yare_input.hpp
===================================================================
--- lmi/trunk/yare_input.hpp 2010-07-19 13:47:20 UTC (rev 5037)
+++ lmi/trunk/yare_input.hpp 2010-07-19 13:49:15 UTC (rev 5038)
@@ -193,6 +193,7 @@
int InforceContractMonth ;
double InforceLeastDeathBenefit ;
mcenum_state StateOfJurisdiction ;
+ mcenum_state PremiumTaxState ;
double SalarySpecifiedAmountFactor ;
double SalarySpecifiedAmountCap ;
double SalarySpecifiedAmountOffset ;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [5038] Add a premium-tax-state field,
Greg Chicares <=