[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [skrooge] /: Group on suboperations must display min, average and maw amounts
From:       Stephane Mankowski <stephane () mankowski ! fr>
Date:       2016-12-08 22:50:15
Message-ID: E1cF7W3-0001rb-6j () code ! kde ! org
[Download RAW message or body]

Git commit ab2ff3578a7adbc5865afb2fea5aa4662c748ddb by Stephane Mankowski.
Committed on 08/12/2016 at 22:50.
Pushed by smankowski into branch 'master'.

Group on suboperations must display min, average and maw amounts \
(https://forum.kde.org/viewtopic.php?f=210&t=137569)

M  +1    -0    CHANGELOG
M  +3    -0    skgbasegui/skgobjectmodelbase.cpp

https://commits.kde.org/skrooge/ab2ff3578a7adbc5865afb2fea5aa4662c748ddb

diff --git a/CHANGELOG b/CHANGELOG
index ffff59eb..86a2ce67 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -23,6 +23,7 @@ skrooge (2.6.0)
   *Correction: Skrooge is now able to download addition stuff (monthly report template, quote source) \
                with knewstuff
   *Correction: Open file property fails when the property name contains the full path \
                (https://forum.kde.org/viewtopic.php?f=210&t=137528)
   *Correction: Avoid duplicated operation when importing attached accounts with weboob
+  *Correction: Group on suboperations must display min, average and maw amounts \
                (https://forum.kde.org/viewtopic.php?f=210&t=137569)
   *New feature: Addition of "nocolor" to the "money" Grantlee filter
   *New feature: Remove .skg in backup file name if .skg is added in the prefix \
                (https://forum.kde.org/viewtopic.php?f=210&t=136518&p=366065#p366065)
   *New feature: "Alarm" dashboard widget is now compliant with QML mode
diff --git a/skgbasegui/skgobjectmodelbase.cpp b/skgbasegui/skgobjectmodelbase.cpp
index 7b83c77c..eb797e1b 100644
--- a/skgbasegui/skgobjectmodelbase.cpp
+++ b/skgbasegui/skgobjectmodelbase.cpp
@@ -653,6 +653,9 @@ QVariant SKGObjectModelBase::computeData(const QModelIndex& iIndex, int iRole) c
 
                     // Is it possible to compute sums of f_CURRENTAMOUNT ?
                     int posAmount = m_listAttibutes.indexOf(QStringLiteral("f_CURRENTAMOUNT"));
+                    if(posAmount==-1) {
+                        posAmount = m_listAttibutes.indexOf(QStringLiteral("f_REALCURRENTAMOUNT"));
+                    }
                     if (posAmount != -1 && nb > 0) {
                         // Compute sums
                         double sum = 0.0;


[prev in list] [next in list] [prev in thread] [next in thread]