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

Add a test for from_commodity not being the same as to_currency

Browse Source
This commit is contained in:
Robert Fewell 2017-12-01 11:51:07 +00:00
parent 339fbaa587
commit b1becf3dd4
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnucash/import-export/csv-imp/gnc-price-props.cpp
View File

@ -269,7 +269,11 @@ void GncImportPrice::set (GncPricePropType prop_type, const std::string& value)
m_from_commodity = boost::none; m_from_commodity = boost::none;
comm = parse_commodity_price_comm (value); // Throws if parsing fails comm = parse_commodity_price_comm (value); // Throws if parsing fails
if (comm) if (comm)
{
if (m_to_currency == comm)
throw std::invalid_argument (_("'Commodity From' can not be the same as 'Currency To' column type."));
m_from_commodity = comm; m_from_commodity = comm;
}
break; break;
case GncPricePropType::TO_CURRENCY: case GncPricePropType::TO_CURRENCY:
@ -277,6 +281,8 @@ void GncImportPrice::set (GncPricePropType prop_type, const std::string& value)
comm = parse_commodity_price_comm (value); // Throws if parsing fails comm = parse_commodity_price_comm (value); // Throws if parsing fails
if (comm) if (comm)
{ {
if (m_from_commodity == comm)
throw std::invalid_argument (_("'Currency To' can not be the same as 'Commodity From' column type."));
if (gnc_commodity_is_currency (comm) != true) if (gnc_commodity_is_currency (comm) != true)
throw std::invalid_argument (_("Value parsed into an invalid currency for a currency column type.")); throw std::invalid_argument (_("Value parsed into an invalid currency for a currency column type."));
m_to_currency = comm; m_to_currency = comm;
@ -332,6 +338,8 @@ std::string GncImportPrice::verify_essentials (void)
return _("No 'Currency to' column."); return _("No 'Currency to' column.");
else if (m_from_commodity == boost::none) else if (m_from_commodity == boost::none)
return _("No 'Commodity from' column."); return _("No 'Commodity from' column.");
else if (gnc_commodity_equal (*m_from_commodity, *m_to_currency))
return _("'Commodity from' can not be the same as 'Currency to'.");
else else
return std::string(); return std::string();
} }