From 8eaec0a0f2858dfb0b1cc9e1808c0bd1ca8a0638 Mon Sep 17 00:00:00 2001
From: Vincent Texier <vit@free.fr>
Date: Sun, 10 Jan 2016 11:51:06 +0100
Subject: [PATCH] refs #335 Fix units name displayed for differential values in
ZSUM referentials
ZSUM referentials are subsets of Relative and Quantitative referentials.
Differential values are not ZSUM values and must display the units of their parent referential.
---
src/sakia/core/money/quant_zerosum.py | 5 +++--
src/sakia/core/money/quantitative.py | 1 +
src/sakia/core/money/relative.py | 3 ++-
src/sakia/core/money/relative_zerosum.py | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/sakia/core/money/quant_zerosum.py b/src/sakia/core/money/quant_zerosum.py
index 9bb7e211..703441e6 100644
--- a/src/sakia/core/money/quant_zerosum.py
+++ b/src/sakia/core/money/quant_zerosum.py
@@ -2,6 +2,7 @@ from PyQt5.QtCore import QCoreApplication, QT_TRANSLATE_NOOP, QLocale
from . import Quantitative
import asyncio
+
class QuantitativeZSum:
_NAME_STR_ = QT_TRANSLATE_NOOP('QuantitativeZSum', 'Quant Z-sum')
_REF_STR_ = QT_TRANSLATE_NOOP('QuantitativeZSum', "{0} Q0 {1}")
@@ -22,7 +23,7 @@ class QuantitativeZSum:
@classmethod
def diff_units(cls, currency):
- return QuantitativeZSum.units(currency)
+ return Quantitative.units(currency)
@asyncio.coroutine
def value(self):
@@ -63,4 +64,4 @@ class QuantitativeZSum:
@asyncio.coroutine
def diff_localized(self, units=False, international_system=False):
localized = yield from Quantitative(self.amount, self.community, self.app).localized(units, international_system)
- return localized
\ No newline at end of file
+ return localized
diff --git a/src/sakia/core/money/quantitative.py b/src/sakia/core/money/quantitative.py
index e0072fbf..c54dd74e 100644
--- a/src/sakia/core/money/quantitative.py
+++ b/src/sakia/core/money/quantitative.py
@@ -1,6 +1,7 @@
from PyQt5.QtCore import QCoreApplication, QT_TRANSLATE_NOOP, QObject, QLocale
import asyncio
+
class Quantitative():
_NAME_STR_ = QT_TRANSLATE_NOOP('Quantitative', 'Units')
_REF_STR_ = QT_TRANSLATE_NOOP('Quantitative', "{0} {1}{2}")
diff --git a/src/sakia/core/money/relative.py b/src/sakia/core/money/relative.py
index 30d83ff4..eae0781f 100644
--- a/src/sakia/core/money/relative.py
+++ b/src/sakia/core/money/relative.py
@@ -1,7 +1,8 @@
from PyQt5.QtCore import QObject, QCoreApplication, QT_TRANSLATE_NOOP, QLocale
import asyncio
-class Relative():
+
+class Relative:
_NAME_STR_ = QT_TRANSLATE_NOOP('Relative', 'UD')
_REF_STR_ = QT_TRANSLATE_NOOP('Relative', "{0} {1}UD {2}")
_UNITS_STR_ = QT_TRANSLATE_NOOP('Relative', "UD {0}")
diff --git a/src/sakia/core/money/relative_zerosum.py b/src/sakia/core/money/relative_zerosum.py
index f32b5274..79d3a9f6 100644
--- a/src/sakia/core/money/relative_zerosum.py
+++ b/src/sakia/core/money/relative_zerosum.py
@@ -22,7 +22,7 @@ class RelativeZSum:
@classmethod
def diff_units(cls, currency):
- return RelativeZSum.units(currency)
+ return Relative.units(currency)
@asyncio.coroutine
def value(self):
--
GitLab