Patch for show register/category instead payee Copyright (c) 2007 Andrey Cherepanov diff -u kmymoney2-0.8.7/kmymoney2/widgets_old/kmymoneyregistercheckings.cpp kmymoney2-0.8.7/kmymoney2/widgets/kmymoneyregistercheckings.cpp --- kmymoney2-0.8.7/kmymoney2/widgets_old/kmymoneyregistercheckings.cpp 2007-10-12 18:49:39 +0400 +++ kmymoney2-0.8.7/kmymoney2/widgets/kmymoneyregistercheckings.cpp 2007-10-12 19:51:43 +0400 @@ -44,7 +44,7 @@ horizontalHeader()->setClickEnabled(true); horizontalHeader()->setLabel(0, i18n("No.")); horizontalHeader()->setLabel(1, i18n("Date")); - horizontalHeader()->setLabel(2, i18n("Payee")); + horizontalHeader()->setLabel(2, i18n("Category")); horizontalHeader()->setLabel(3, i18n("C")); horizontalHeader()->setLabel(4, i18n("Payment")); horizontalHeader()->setLabel(5, i18n("Deposit")); @@ -137,15 +137,6 @@ } } else { try { - txt = MyMoneyFile::instance()->payee(m_split.payeeId()).name(); - } catch(MyMoneyException *e) { - delete e; - } - } - break; - - case 1: - try { if(m_transaction->isLoanPayment()) { txt = i18n("Loan payment"); } else if(m_transaction->splitCount() > 2) @@ -154,6 +145,15 @@ MyMoneySplit split = m_transaction->splitByAccount(m_split.accountId(), false); txt = MyMoneyFile::instance()->accountToCategory(split.accountId()); } + } catch(MyMoneyException *e) { + delete e; + } + } + break; + + case 1: + try { + txt = MyMoneyFile::instance()->payee(m_split.payeeId()).name(); } catch(MyMoneyException *e) { delete e; } diff -u kmymoney2-0.8.7/kmymoney2/widgets_old/kmymoneyregistersearch.cpp kmymoney2-0.8.7/kmymoney2/widgets/kmymoneyregistersearch.cpp --- kmymoney2-0.8.7/kmymoney2/widgets_old/kmymoneyregistersearch.cpp 2007-10-12 18:49:39 +0400 +++ kmymoney2-0.8.7/kmymoney2/widgets/kmymoneyregistersearch.cpp 2007-10-12 19:50:05 +0400 @@ -42,7 +42,7 @@ horizontalHeader()->setLabel(0, i18n("No.")); horizontalHeader()->setLabel(1, i18n("Date")); horizontalHeader()->setLabel(2, i18n("Account")); - horizontalHeader()->setLabel(3, i18n("Payee")); + horizontalHeader()->setLabel(3, i18n("Category")); horizontalHeader()->setLabel(4, i18n("Payment")); horizontalHeader()->setLabel(5, i18n("Deposit")); setLeftMargin(0); @@ -127,27 +127,27 @@ case 3: align |= Qt::AlignLeft; switch(m_transactionRow) { - case 0: // payee + case 0: // category try { - if(!m_split.payeeId().isEmpty()) { - MyMoneyPayee payee; - payee = MyMoneyFile::instance()->payee(m_split.payeeId()); - txt = payee.name(); + if(m_transaction->isLoanPayment()) { + txt = i18n("Loan payment"); + } else if(m_transaction->splitCount() > 2) + txt = i18n("Split transaction"); + else { + MyMoneySplit split = m_transaction->splitByAccount(m_split.accountId(), false); + txt = MyMoneyFile::instance()->accountToCategory(split.accountId()); } } catch(MyMoneyException *e) { delete e; } break; - case 1: // category + case 1: // payee try { - if(m_transaction->isLoanPayment()) { - txt = i18n("Loan payment"); - } else if(m_transaction->splitCount() > 2) - txt = i18n("Split transaction"); - else { - MyMoneySplit split = m_transaction->splitByAccount(m_split.accountId(), false); - txt = MyMoneyFile::instance()->accountToCategory(split.accountId()); + if(!m_split.payeeId().isEmpty()) { + MyMoneyPayee payee; + payee = MyMoneyFile::instance()->payee(m_split.payeeId()); + txt = payee.name(); } } catch(MyMoneyException *e) { delete e;