hsoft / moneyguru / changeset / a00d52a70d9b

hsoft / moneyguru (http://hardcoded.net/moneyguru)

Future-aware personal finance application for Mac OS X and Windows.

Clone this repository (size: 8.3 MB): HTTPS / SSH

$ hg clone http://hg.hardcoded.net/moneyguru

$ hg clone ssh://hg@bitbucket.org/hsoft/moneyguru

commit 985:	a00d52a70d9b
parent 984:	860ab60351f1
branch:	default

[#80 state:fixed] Added Debit/Credit visibility options for the entry table.

Changed (Δ15.1 KB):

raw changeset »

cocoa/controllers/account/MGEntryTable.m (8 lines added, 0 lines removed)

cocoa/de.lproj/ViewOptions.strings (3 lines added, 0 lines removed)

cocoa/de.lproj/ViewOptions.xib (59 lines added, 2 lines removed)

cocoa/en.lproj/ViewOptions.strings (binary file changed)

cocoa/en.lproj/ViewOptions.xib (59 lines added, 2 lines removed)

cocoa/fr.lproj/ViewOptions.strings (3 lines added, 0 lines removed)

cocoa/fr.lproj/ViewOptions.xib (59 lines added, 2 lines removed)

cocoa/mg_cocoa.py (8 lines added, 0 lines removed)

core/gui/balance_sheet.py (5 lines added, 5 lines removed)

core/gui/column.py (9 lines added, 11 lines removed)

core/gui/entry_table.py (54 lines added, 31 lines removed)

core/gui/income_statement.py (5 lines added, 5 lines removed)

core/gui/schedule_table.py (3 lines added, 3 lines removed)

core/gui/transaction_table.py (3 lines added, 3 lines removed)

core/gui/view_options.py (14 lines added, 0 lines removed)

core/tests/gui/entry_table_test.py (23 lines added, 0 lines removed)

qt/controller/account/table.py (2 lines added, 0 lines removed)

qt/controller/view_options.py (1 lines added, 0 lines removed)

qt/lang/de.ts (16 lines added, 0 lines removed)

qt/lang/fr.ts (16 lines added, 0 lines removed)

qt/ui/view_options_dialog.ui (14 lines added, 7 lines removed)

Up to file-list cocoa/controllers/account/MGEntryTable.m:

@@ -40,6 +40,8 @@ http://www.hardcoded.net/licenses/hs_lic
         {@"transfer", @"Transfer", 140, 80, 0, YES, [MGTextFieldCell class]},
         {@"increase", @"Increase", 80, 80, 0, YES, nil},
         {@"decrease", @"Decrease", 80, 80, 0, YES, nil},
         {@"debit", @"Debit", 80, 80, 0, YES, nil},
         {@"credit", @"Credit", 80, 80, 0, YES, nil},
         {@"balance", @"Balance", 90, 90, 0, YES, nil},
         nil
     };
@@ -54,6 +56,12 @@ http://www.hardcoded.net/licenses/hs_lic
     c = [[self tableView] tableColumnWithIdentifier:@"decrease"];
     [[c headerCell] setAlignment:NSRightTextAlignment];
     [[c dataCell] setAlignment:NSRightTextAlignment];
     c = [[self tableView] tableColumnWithIdentifier:@"debit"];
     [[c headerCell] setAlignment:NSRightTextAlignment];
     [[c dataCell] setAlignment:NSRightTextAlignment];
     c = [[self tableView] tableColumnWithIdentifier:@"credit"];
     [[c headerCell] setAlignment:NSRightTextAlignment];
     [[c dataCell] setAlignment:NSRightTextAlignment];
     c = [[self tableView] tableColumnWithIdentifier:@"balance"];
     [[c headerCell] setAlignment:NSRightTextAlignment];
     [[c dataCell] setAlignment:NSRightTextAlignment];

Up to file-list cocoa/de.lproj/ViewOptions.strings:

 /* Class = "NSButtonCell"; title = "Account #"; ObjectID = "103"; */
 "103.title" = "Konto #";
 /* Class = "NSButtonCell"; title = "Debit/Credit"; ObjectID = "147"; */
 "147.title" = "Debit/kredit";

Up to file-list cocoa/de.lproj/ViewOptions.xib:

 								<int key="NSPeriodicInterval">25</int>
 							</object>
 						</object>
 						<object class="NSButton" id="197912605">
 							<reference key="NSNextResponder" ref="45188462"/>
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{150, 123}, {266, 18}}</string>
 							<reference key="NSSuperview" ref="45188462"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="465207099">
 								<int key="NSCellFlags">67239424</int>
 								<int key="NSCellFlags2">131072</int>
 								<string key="NSContents">Debit/kredit</string>
 								<reference key="NSSupport" ref="26"/>
 								<reference key="NSControlView" ref="197912605"/>
 								<int key="NSButtonFlags">1211912703</int>
 								<int key="NSButtonFlags2">2</int>
 								<reference key="NSNormalImage" ref="329833725"/>
 								<reference key="NSAlternateImage" ref="141542944"/>
 								<string key="NSAlternateContents"/>
 								<string key="NSKeyEquivalent"/>
 								<int key="NSPeriodicDelay">200</int>
 								<int key="NSPeriodicInterval">25</int>
 							</object>
 						</object>
 						<object class="NSButton" id="256661265">
 							<reference key="NSNextResponder" ref="45188462"/>
 							<int key="NSvFlags">268</int>
 						<object class="NSButton" id="304444806">
 							<reference key="NSNextResponder" ref="45188462"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{151, 123}, {265, 18}}</string>
+							<string key="NSFrame">{{151, 103}, {265, 18}}</string>
 							<reference key="NSSuperview" ref="45188462"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="262221300">
 					</object>
 					<int key="connectionID">145</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">value: py.entryTableDebitCredit</string>
 						<reference key="source" ref="197912605"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="197912605"/>
 							<reference key="NSDestination" ref="1001"/>
 							<string key="NSLabel">value: py.entryTableDebitCredit</string>
 							<string key="NSBinding">value</string>
 							<string key="NSKeyPath">py.entryTableDebitCredit</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
 					<int key="connectionID">149</int>
 				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
 							<reference ref="386946478"/>
 							<reference ref="732213890"/>
 							<reference ref="304444806"/>
 							<reference ref="197912605"/>
 						</object>
 						<reference key="parent" ref="937315869"/>
 					</object>
 						<reference key="object" ref="72795768"/>
 						<reference key="parent" ref="1019717434"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">146</int>
 						<reference key="object" ref="197912605"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="465207099"/>
 						</object>
 						<reference key="parent" ref="45188462"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">147</int>
 						<reference key="object" ref="465207099"/>
 						<reference key="parent" ref="197912605"/>
 					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
 					<string>103.IBPluginDependency</string>
 					<string>11.IBPluginDependency</string>
 					<string>12.IBPluginDependency</string>
 					<string>146.IBPluginDependency</string>
 					<string>147.IBPluginDependency</string>
 					<string>18.IBPluginDependency</string>
 					<string>19.IBPluginDependency</string>
 					<string>20.IBPluginDependency</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{86, 398}, {434, 453}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{86, 398}, {434, 453}}</string>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">145</int>
+			<int key="maxID">149</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">

Up to file-list cocoa/en.lproj/ViewOptions.strings:

Binary file has changed or diff was empty.

Up to file-list cocoa/en.lproj/ViewOptions.xib:

 								<int key="NSPeriodicInterval">25</int>
 							</object>
 						</object>
 						<object class="NSButton" id="197912605">
 							<reference key="NSNextResponder" ref="45188462"/>
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{150, 123}, {266, 18}}</string>
 							<reference key="NSSuperview" ref="45188462"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="465207099">
 								<int key="NSCellFlags">67239424</int>
 								<int key="NSCellFlags2">131072</int>
 								<string key="NSContents">Debit/Credit</string>
 								<reference key="NSSupport" ref="26"/>
 								<reference key="NSControlView" ref="197912605"/>
 								<int key="NSButtonFlags">1211912703</int>
 								<int key="NSButtonFlags2">2</int>
 								<reference key="NSNormalImage" ref="329833725"/>
 								<reference key="NSAlternateImage" ref="141542944"/>
 								<string key="NSAlternateContents"/>
 								<string key="NSKeyEquivalent"/>
 								<int key="NSPeriodicDelay">200</int>
 								<int key="NSPeriodicInterval">25</int>
 							</object>
 						</object>
 						<object class="NSButton" id="256661265">
 							<reference key="NSNextResponder" ref="45188462"/>
 							<int key="NSvFlags">268</int>
 						<object class="NSButton" id="304444806">
 							<reference key="NSNextResponder" ref="45188462"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{151, 123}, {265, 18}}</string>
+							<string key="NSFrame">{{151, 103}, {265, 18}}</string>
 							<reference key="NSSuperview" ref="45188462"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="262221300">
 					</object>
 					<int key="connectionID">145</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">value: py.entryTableDebitCredit</string>
 						<reference key="source" ref="197912605"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="197912605"/>
 							<reference key="NSDestination" ref="1001"/>
 							<string key="NSLabel">value: py.entryTableDebitCredit</string>
 							<string key="NSBinding">value</string>
 							<string key="NSKeyPath">py.entryTableDebitCredit</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
 					<int key="connectionID">149</int>
 				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
 							<reference ref="386946478"/>
 							<reference ref="732213890"/>
 							<reference ref="304444806"/>
 							<reference ref="197912605"/>
 						</object>
 						<reference key="parent" ref="937315869"/>
 					</object>
 						<reference key="object" ref="72795768"/>
 						<reference key="parent" ref="1019717434"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">146</int>
 						<reference key="object" ref="197912605"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="465207099"/>
 						</object>
 						<reference key="parent" ref="45188462"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">147</int>
 						<reference key="object" ref="465207099"/>
 						<reference key="parent" ref="197912605"/>
 					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
 					<string>103.IBPluginDependency</string>
 					<string>11.IBPluginDependency</string>
 					<string>12.IBPluginDependency</string>
 					<string>146.IBPluginDependency</string>
 					<string>147.IBPluginDependency</string>
 					<string>18.IBPluginDependency</string>
 					<string>19.IBPluginDependency</string>
 					<string>20.IBPluginDependency</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{86, 398}, {434, 453}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{86, 398}, {434, 453}}</string>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">145</int>
+			<int key="maxID">149</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">

Up to file-list cocoa/fr.lproj/ViewOptions.strings:

 /* Class = "NSButtonCell"; title = "Account #"; ObjectID = "103"; */
 "103.title" = "# Compte";
 /* Class = "NSButtonCell"; title = "Debit/Credit"; ObjectID = "147"; */
 "147.title" = "Débit/Crédit";

Up to file-list cocoa/fr.lproj/ViewOptions.xib:

 								<int key="NSPeriodicInterval">25</int>
 							</object>
 						</object>
 						<object class="NSButton" id="197912605">
 							<reference key="NSNextResponder" ref="45188462"/>
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{150, 123}, {266, 18}}</string>
 							<reference key="NSSuperview" ref="45188462"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="465207099">
 								<int key="NSCellFlags">67239424</int>
 								<int key="NSCellFlags2">131072</int>
 								<string key="NSContents">Débit/Crédit</string>
 								<reference key="NSSupport" ref="26"/>
 								<reference key="NSControlView" ref="197912605"/>
 								<int key="NSButtonFlags">1211912703</int>
 								<int key="NSButtonFlags2">2</int>
 								<reference key="NSNormalImage" ref="329833725"/>
 								<reference key="NSAlternateImage" ref="141542944"/>
 								<string key="NSAlternateContents"/>
 								<string key="NSKeyEquivalent"/>
 								<int key="NSPeriodicDelay">200</int>
 								<int key="NSPeriodicInterval">25</int>
 							</object>
 						</object>
 						<object class="NSButton" id="256661265">
 							<reference key="NSNextResponder" ref="45188462"/>
 							<int key="NSvFlags">268</int>
 						<object class="NSButton" id="304444806">
 							<reference key="NSNextResponder" ref="45188462"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{151, 123}, {265, 18}}</string>
+							<string key="NSFrame">{{151, 103}, {265, 18}}</string>
 							<reference key="NSSuperview" ref="45188462"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="262221300">
 					</object>
 					<int key="connectionID">145</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">value: py.entryTableDebitCredit</string>
 						<reference key="source" ref="197912605"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="197912605"/>
 							<reference key="NSDestination" ref="1001"/>
 							<string key="NSLabel">value: py.entryTableDebitCredit</string>
 							<string key="NSBinding">value</string>
 							<string key="NSKeyPath">py.entryTableDebitCredit</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
 					<int key="connectionID">149</int>
 				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
 							<reference ref="386946478"/>
 							<reference ref="732213890"/>
 							<reference ref="304444806"/>
 							<reference ref="197912605"/>
 						</object>
 						<reference key="parent" ref="937315869"/>
 					</object>
 						<reference key="object" ref="72795768"/>
 						<reference key="parent" ref="1019717434"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">146</int>
 						<reference key="object" ref="197912605"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="465207099"/>
 						</object>
 						<reference key="parent" ref="45188462"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">147</int>
 						<reference key="object" ref="465207099"/>
 						<reference key="parent" ref="197912605"/>
 					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
 					<string>103.IBPluginDependency</string>
 					<string>11.IBPluginDependency</string>
 					<string>12.IBPluginDependency</string>
 					<string>146.IBPluginDependency</string>
 					<string>147.IBPluginDependency</string>
 					<string>18.IBPluginDependency</string>
 					<string>19.IBPluginDependency</string>
 					<string>20.IBPluginDependency</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{86, 398}, {434, 453}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{86, 398}, {434, 453}}</string>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">145</int>
+			<int key="maxID">149</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">

Up to file-list cocoa/mg_cocoa.py:

@@ -1664,6 +1664,14 @@ class PyViewOptions(PyGUIObject):
     def setEntryTableReconciliationDate_(self, value):
         self.py.entry_table_reconciliation_date = bool(value)
     @signature('i@:')
     def entryTableDebitCredit(self):
         return self.py.entry_table_debit_credit
     @signature('v@:i')
     def setEntryTableDebitCredit_(self, value):
         self.py.entry_table_debit_credit = bool(value)
     @signature('i@:')
     def scheduleTableDescription(self):

Up to file-list core/gui/balance_sheet.py:

@@ -18,12 +18,12 @@ class BalanceSheet(Report):
     SAVENAME = 'BalanceSheet'
     COLUMNS = [
         Column('name'),
-        Column('account_number', optional=True, visible=False),
+        Column('account_number', visible=False),
         Column('end'),
         Column('delta', optional=True, visible=False),
         Column('delta_perc', optional=True, visible=False),
         Column('start', optional=True),
         Column('budgeted', optional=True),
         Column('delta', visible=False),
         Column('delta_perc', visible=False),
         Column('start'),
         Column('budgeted'),
+    ]
     def __init__(self, view, networth_view):

Up to file-list core/gui/column.py:

 import copy
 class Column(object):
-    def __init__(self, name, optional=False, visible=True):
+    def __init__(self, name, visible=True):
         self.name = name
         self.index = 0
         self.width = 0
         self.optional = optional # If not optional, a column is never restored as invisible
         self.visible = visible
@@ -70,21 +69,20 @@ class Columns(object):
             return
         for col in self.coldata.itervalues():
             pref_name = '{0}.Columns.{1}'.format(self.savename, col.name)
             coldata = self.app.get_default(pref_name)
             if coldata:
                 col.index = coldata.get('index', 0)
                 col.width = coldata.get('width', 0)
                 if col.optional:
                     col.visible = coldata.get('visible', True)
             coldata = self.app.get_default(pref_name, fallback_value={})
             if 'index' in coldata:
                 col.index = coldata['index']
             if 'width' in coldata:
                 col.width = coldata['width']
             if 'visible' in coldata:
                 col.visible = coldata['visible']
     def save_columns(self):
         if not (self.savename and self.coldata):
             return
         for col in self.coldata.itervalues():
             pref_name = '{0}.Columns.{1}'.format(self.savename, col.name)
             coldata = {'index': col.index, 'width': col.width}
             if col.optional:
-                coldata['visible'] = col.visible
+            coldata = {'index': col.index, 'width': col.width, 'visible': col.visible}
             self.app.set_default(pref_name, coldata)
     def set_column_order(self, colnames):

Up to file-list core/gui/entry_table.py:

@@ -22,13 +22,15 @@ class EntryTable(TransactionTableBase):
     COLUMNS = [
         Column('status'),
         Column('date'),
         Column('reconciliation_date', optional=True, visible=False),
         Column('checkno', optional=True, visible=False),
         Column('description', optional=True),
         Column('payee', optional=True, visible=False),
         Column('reconciliation_date', visible=False),
         Column('checkno', visible=False),
         Column('description'),
         Column('payee', visible=False),
         Column('transfer'),
         Column('increase'),
         Column('decrease'),
         Column('debit', visible=False),
         Column('credit', visible=False),
         Column('balance'),
+    ]
     INVALIDATING_MESSAGES = TransactionTableBase.INVALIDATING_MESSAGES | set(['shown_account_changed'])
@@ -70,15 +72,15 @@ class EntryTable(TransactionTableBase):
                 balance = prev_entry.balance
                 rbalance = prev_entry.reconciled_balance
                 self.header = PreviousBalanceRow(self, date_range.start, balance, rbalance, account)
         total_increase = 0
         total_decrease = 0
         total_debit = 0
         total_credit = 0
         for entry in self.parent_view.visible_entries:
             row = EntryTableRow(self, entry, account)
             self.append(row)
             convert = lambda a: convert_amount(a, account.currency, entry.date)
             total_increase += convert(row._increase)
             total_decrease += convert(row._decrease)
-        self.footer = TotalRow(self, date_range.end, total_increase, total_decrease)
+            total_debit += convert(row._debit)
             total_credit += convert(row._credit)
         self.footer = TotalRow(self, date_range.end, total_debit, total_credit)
         balance_visible = account.is_balance_sheet_account()
         self.columns.set_column_visible('balance', balance_visible)
@@ -291,6 +293,14 @@ class BaseEntryTableRow(RowWithDebitAndC
         return self.table.document.app.format_amount(self._decrease, blank_zero=True)
     @property
     def debit(self):
         return self.table.document.app.format_amount(self._debit, blank_zero=True)
     @property
     def credit(self):
         return self.table.document.app.format_amount(self._credit, blank_zero=True)
     @property
     def balance(self):
         account_currency = self.table.account.currency
         return self.table.document.app.format_amount(self._the_balance(), zero_currency=account_currency)
@@ -351,6 +361,15 @@ class EntryTableRow(RowWithDate, BaseEnt
                 continue
             yield EntryTableRow(self.table, entry, self.account)
     def _set_amount_property(self, propname, stramount):
         try:
             currency = self.table.mainwindow.shown_account.currency
             parsed = self.table.document.app.parse_amount(stramount, default_currency=currency)
         except ValueError:
             return
         if parsed != getattr(self, propname):
             setattr(self, propname, parsed)
     def can_edit(self):
         return not self.is_budget
@@ -410,25 +429,19 @@ class EntryTableRow(RowWithDate, BaseEnt
     @BaseEntryTableRow.increase.setter
     def increase(self, value):
         try:
             currency = self.table.mainwindow.shown_account.currency
             increase = self.table.document.app.parse_amount(value, default_currency=currency)
         except ValueError:
             return
         if increase == self._increase:
             return
         self._increase = increase
         self._set_amount_property('_increase', value)
     @BaseEntryTableRow.decrease.setter
     def decrease(self, value):
         try:
             currency = self.table.mainwindow.shown_account.currency
             decrease = self.table.document.app.parse_amount(value, default_currency=currency)
         except ValueError:
             return
         if decrease == self._decrease:
             return
         self._decrease = decrease
         self._set_amount_property('_decrease', value)
     @BaseEntryTableRow.debit.setter
     def debit(self, value):
         self._set_amount_property('_debit', value)
     @BaseEntryTableRow.credit.setter
     def credit(self, value):
         self._set_amount_property('_credit', value)
     @property
     def can_edit_transfer(self):
@@ -449,15 +462,17 @@ class PreviousBalanceRow(BaseEntryTableR
 class TotalRow(BaseEntryTableRow):
-    def __init__(self, table, date, total_increase, total_decrease):
+    def __init__(self, table, date, total_debit, total_credit):
         super(TotalRow, self).__init__(table)
         self._date = date
         self._description = tr('TOTAL')
         # don't touch _increase and _decrease, they trigger editing.
         self._increase_fmt = table.document.app.format_amount(total_increase, blank_zero=True)
         self._decrease_fmt = table.document.app.format_amount(total_decrease, blank_zero=True)
-        delta = total_increase - total_decrease
+        self._debit_fmt = table.document.app.format_amount(total_debit, blank_zero=True)
         self._credit_fmt = table.document.app.format_amount(total_credit, blank_zero=True)
         delta = total_debit - total_credit
         if delta:
             if self.table.account.is_credit_account():
                 delta *= -1
             positive = delta > 0
             delta_fmt = table.document.app.format_amount(abs(delta))
             delta_fmt = ('+' if positive else '-') + delta_fmt
@@ -468,11 +483,19 @@ class TotalRow(BaseEntryTableRow):
     @property
     def increase(self):
-        return self._increase_fmt
+        return self._credit_fmt if self.table.account.is_credit_account() else self._debit_fmt
     @property
     def decrease(self):
-        return self._decrease_fmt
+        return self._debit_fmt if self.table.account.is_credit_account() else self._credit_fmt
     @property
     def debit(self):
         return self._debit_fmt
     @property
     def credit(self):
         return self._credit_fmt
     @property
     def balance(self):

Up to file-list core/gui/income_statement.py:

@@ -13,12 +13,12 @@ class IncomeStatement(Report):
     SAVENAME = 'IncomeStatement'
     COLUMNS = [
         Column('name'),
-        Column('account_number', optional=True, visible=False),
+        Column('account_number', visible=False),
         Column('cash_flow'),
         Column('delta', optional=True, visible=False),
         Column('delta_perc', optional=True, visible=False),
         Column('last_cash_flow', optional=True),
         Column('budgeted', optional=True),
         Column('delta', visible=False),
         Column('delta_perc', visible=False),
         Column('last_cash_flow'),
         Column('budgeted'),
+    ]
     def __init__(self, view, profit_view):

Up to file-list core/gui/schedule_table.py:

@@ -21,9 +21,9 @@ class ScheduleTable(GUITable, ViewChild)
         Column('stop_date'),
         Column('repeat_type'),
         Column('interval'),
         Column('checkno', optional=True, visible=False),
         Column('description', optional=True),
-        Column('payee', optional=True, visible=False),
+        Column('checkno', visible=False),
         Column('description'),
         Column('payee', visible=False),
         Column('from'),
         Column('to'),
         Column('amount'),

Up to file-list core/gui/transaction_table.py:

@@ -22,9 +22,9 @@ class TransactionTable(TransactionTableB
     COLUMNS = [
         Column('status'),
         Column('date'),
         Column('checkno', optional=True, visible=False),
         Column('description', optional=True),
-        Column('payee', optional=True, visible=False),
+        Column('checkno', visible=False),
         Column('description'),
         Column('payee', visible=False),
         Column('from'),
         Column('to'),
         Column('amount'),

Up to file-list core/gui/view_options.py:

@@ -51,3 +51,17 @@ class ViewOptions(DocumentGUIObject):
     schedule_table_description = column_prop('scview', 'sctable', 'description')
     schedule_table_payee = column_prop('scview', 'sctable', 'payee')
     schedule_table_checkno = column_prop('scview', 'sctable', 'checkno')
     @property
     def entry_table_debit_credit(self):
         columns = self.mainwindow.aview.etable.columns
         return columns.column_is_visible('credit') and columns.column_is_visible('debit')
     @entry_table_debit_credit.setter
     def entry_table_debit_credit(self, value):
         columns = self.mainwindow.aview.etable.columns
         columns.set_column_visible('increase', not value)
         columns.set_column_visible('decrease', not value)
         columns.set_column_visible('debit', value)
         columns.set_column_visible('credit', value)

Up to file-list core/tests/gui/entry_table_test.py:

@@ -201,6 +201,29 @@ def test_change_transfer(app):
     app.etable.save_edits()
 @with_app(app_one_entry)
 def test_debit_credit_columns(app):
     # when enabling the credit/debit columns option, increase/decrease columns are replaced with
     # credit/debit columns
     app.vopts.entry_table_debit_credit = True
     assert app.etable.columns.column_is_visible('debit')
     assert app.etable.columns.column_is_visible('credit')
     assert not app.etable.columns.column_is_visible('increase')
     assert not app.etable.columns.column_is_visible('decrease')
     eq_(app.etable[0].credit, '42.00')
     eq_(app.etable[0].debit, '')
     # credit/debit in total row works too
     eq_(app.etable.footer.credit, '42.00')
 @with_app(app_one_entry)
 def test_debit_credit_columns_edit(app):
     # editing a debit/credit columns work
     app.vopts.entry_table_debit_credit = True
     app.etable[0].debit = '43'
     app.etable.save_edits()
     app.vopts.entry_table_debit_credit = False
     eq_(app.etable[0].increase, '43.00')
 @with_app(app_one_entry)
 def test_delete_when_entry_selected(app):
     # Before deleting an entry, make sure the entry table is not in edition mode.
     app.etable.delete()

Up to file-list qt/controller/account/table.py:

@@ -44,6 +44,8 @@ class EntryTable(TableWithTransactions):
         Column('transfer', tr('Transfer'), 120, editor=ACCOUNT_EDIT),
         Column('increase', tr('Increase'), 95, alignment=Qt.AlignRight),
         Column('decrease', tr('Decrease'), 95, alignment=Qt.AlignRight),
         Column('debit', tr('Debit'), 95, alignment=Qt.AlignRight),
         Column('credit', tr('Credit'), 95, alignment=Qt.AlignRight),
         Column('balance', tr('Balance'), 110, alignment=Qt.AlignRight),
+    ]

Up to file-list qt/controller/view_options.py:

@@ -41,6 +41,7 @@ class ViewOptionsDialog(QDialog, Ui_View
         'accPayeeCheckBox': 'entry_table_payee',
         'accChecknoCheckBox': 'entry_table_checkno',
         'accReconciliationDateCheckBox': 'entry_table_reconciliation_date',
         'accDebitCreditCheckBox': 'entry_table_debit_credit',
         'schDescriptionCheckBox': 'schedule_table_description',
         'schPayeeCheckBox': 'schedule_table_payee',
         'schChecknoCheckBox': 'schedule_table_checkno',

Up to file-list qt/lang/de.ts:

         <source>To</source>
         <translation>nach</translation>
     </message>
     <message>
         <source>Memo</source>
         <translation>Memo</translation>
     </message>
     <message>
         <source>Debit</source>
         <translation>Debit</translation>
     </message>
     <message>
         <source>Credit</source>
         <translation>Kredit</translation>
     </message>
 </context>
 <context>
     <name>AccountPanel</name>
         <translation>Wertstellungsdatum</translation>
     </message>
     <message>
         <source>Debit/Credit</source>
         <translation>Debit/Kredit</translation>
     </message>
     <message>
         <location filename="view_options_dialog.ui" line="223"/>
         <source>Schedules</source>
         <translation>Wiederholung</translation>

Up to file-list qt/lang/fr.ts:

         <source>To</source>
         <translation>Cp. débités</translation>
     </message>
     <message>
         <source>Memo</source>
         <translation>Mémo</translation>
     </message>
     <message>
         <source>Debit</source>
         <translation>Débit</translation>
     </message>
     <message>
         <source>Credit</source>
         <translation>Crédit</translation>
     </message>
 </context>
 <context>
     <name>AccountPanel</name>
         <source>Reconciliation Date</source>
         <translation>Date réconciliation</translation>
     </message>
 		<message>
         <source>Debit/Credit</source>
         <translation>Débit/Crédit</translation>
     </message>
     <message>
         <location filename="view_options_dialog.ui" line="223"/>
         <source>Schedules</source>

Up to file-list qt/ui/view_options_dialog.ui:

        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QCheckBox" name="accReconciliationDateCheckBox">
         <property name="text">
          <string>Reconciliation Date</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QCheckBox" name="accDebitCreditCheckBox">
         <property name="text">
          <string>Debit/Credit</string>
         </property>
        </widget>
       </item>
       <item row="1" column="2">
        <widget class="QCheckBox" name="accGraphCheckBox">
         <property name="text">
          <string>Graph</string>
         </property>
        </widget>
       </item>
       <item row="0" column="3">
        <widget class="QCheckBox" name="accReconciliationDateCheckBox">
         <property name="text">
          <string>Reconciliation Date</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>