IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

GncTransPropType - use consistent naming

Browse Source 
A few freshly added values had a superfluous _ in the name
This commit is contained in:
Geert Janssens 2023-02-11 11:17:44 +01:00
parent e5de32fd73
commit 3af9374126
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp
View File

@ -73,8 +73,8 @@ std::map<GncTransPropType, const char*> gnc_csv_col_type_strs = {
{ GncTransPropType::REC_DATE, N_("Reconcile Date") }, { GncTransPropType::REC_DATE, N_("Reconcile Date") },
{ GncTransPropType::TACTION, N_("Transfer Action") }, { GncTransPropType::TACTION, N_("Transfer Action") },
{ GncTransPropType::TACCOUNT, N_("Transfer Account") }, { GncTransPropType::TACCOUNT, N_("Transfer Account") },
{ GncTransPropType::T_AMOUNT, N_("Transfer Amount") }, { GncTransPropType::TAMOUNT, N_("Transfer Amount") },
{ GncTransPropType::T_AMOUNT_NEG, N_("Transfer Amount (Negated)") }, { GncTransPropType::TAMOUNT_NEG, N_("Transfer Amount (Negated)") },
{ GncTransPropType::TMEMO, N_("Transfer Memo") }, { GncTransPropType::TMEMO, N_("Transfer Memo") },
{ GncTransPropType::TREC_STATE, N_("Transfer Reconciled") }, { GncTransPropType::TREC_STATE, N_("Transfer Reconciled") },
{ GncTransPropType::TREC_DATE, N_("Transfer Reconcile Date") } { GncTransPropType::TREC_DATE, N_("Transfer Reconcile Date") }
@ -89,8 +89,8 @@ std::vector<GncTransPropType> twosplit_blacklist = {
std::vector<GncTransPropType> multisplit_blacklist = { std::vector<GncTransPropType> multisplit_blacklist = {
GncTransPropType::TACTION, GncTransPropType::TACTION,
GncTransPropType::TACCOUNT, GncTransPropType::TACCOUNT,
GncTransPropType::T_AMOUNT, GncTransPropType::TAMOUNT,
GncTransPropType::T_AMOUNT_NEG, GncTransPropType::TAMOUNT_NEG,
GncTransPropType::TMEMO, GncTransPropType::TMEMO,
GncTransPropType::TREC_STATE, GncTransPropType::TREC_STATE,
GncTransPropType::TREC_DATE GncTransPropType::TREC_DATE
@ -99,8 +99,8 @@ std::vector<GncTransPropType> multisplit_blacklist = {
std::vector<GncTransPropType> multi_col_props = { std::vector<GncTransPropType> multi_col_props = {
GncTransPropType::AMOUNT, GncTransPropType::AMOUNT,
GncTransPropType::AMOUNT_NEG, GncTransPropType::AMOUNT_NEG,
GncTransPropType::T_AMOUNT, GncTransPropType::TAMOUNT,
GncTransPropType::T_AMOUNT_NEG GncTransPropType::TAMOUNT_NEG
}; };
bool is_multi_col_prop (GncTransPropType prop) bool is_multi_col_prop (GncTransPropType prop)
@ -473,12 +473,12 @@ void GncPreSplit::set (GncTransPropType prop_type, const std::string& value)
m_amount_neg = parse_monetary (value, m_currency_format); // Will throw if parsing fails m_amount_neg = parse_monetary (value, m_currency_format); // Will throw if parsing fails
break; break;
case GncTransPropType::T_AMOUNT: case GncTransPropType::TAMOUNT:
m_tamount = boost::none; m_tamount = boost::none;
m_tamount = parse_monetary (value, m_currency_format); // Will throw if parsing fails m_tamount = parse_monetary (value, m_currency_format); // Will throw if parsing fails
break; break;
case GncTransPropType::T_AMOUNT_NEG: case GncTransPropType::TAMOUNT_NEG:
m_tamount_neg = boost::none; m_tamount_neg = boost::none;
m_tamount_neg = parse_monetary (value, m_currency_format); // Will throw if parsing fails m_tamount_neg = parse_monetary (value, m_currency_format); // Will throw if parsing fails
break; break;
@ -577,14 +577,14 @@ void GncPreSplit::add (GncTransPropType prop_type, const std::string& value)
m_amount_neg = num_val; m_amount_neg = num_val;
break; break;
case GncTransPropType::T_AMOUNT: case GncTransPropType::TAMOUNT:
num_val = parse_monetary (value, m_currency_format); // Will throw if parsing fails num_val = parse_monetary (value, m_currency_format); // Will throw if parsing fails
if (m_tamount) if (m_tamount)
num_val += *m_tamount; num_val += *m_tamount;
m_tamount = num_val; m_tamount = num_val;
break; break;
case GncTransPropType::T_AMOUNT_NEG: case GncTransPropType::TAMOUNT_NEG:
num_val = parse_monetary (value, m_currency_format); // Will throw if parsing fails num_val = parse_monetary (value, m_currency_format); // Will throw if parsing fails
if (m_tamount_neg) if (m_tamount_neg)
num_val += *m_tamount_neg; num_val += *m_tamount_neg;

4
gnucash/import-export/csv-imp/gnc-imp-props-tx.hpp
View File

@ -67,8 +67,8 @@ enum class GncTransPropType {
REC_DATE, REC_DATE,
TACTION, TACTION,
TACCOUNT, TACCOUNT,
T_AMOUNT, TAMOUNT,
T_AMOUNT_NEG, TAMOUNT_NEG,
TMEMO, TMEMO,
TREC_STATE, TREC_STATE,
TREC_DATE, TREC_DATE,

4
gnucash/import-export/csv-imp/gnc-import-tx.cpp
View File

@ -219,8 +219,8 @@ void GncTxImport::currency_format (int currency_format)
std::vector<GncTransPropType> commodities = { std::vector<GncTransPropType> commodities = {
GncTransPropType::AMOUNT, GncTransPropType::AMOUNT,
GncTransPropType::AMOUNT_NEG, GncTransPropType::AMOUNT_NEG,
GncTransPropType::T_AMOUNT, GncTransPropType::TAMOUNT,
GncTransPropType::T_AMOUNT_NEG, GncTransPropType::TAMOUNT_NEG,
GncTransPropType::PRICE}; GncTransPropType::PRICE};
reset_formatted_column (commodities); reset_formatted_column (commodities);
} }