+
{{ account.account.group }}
{% endif %}
@@ -12,11 +12,11 @@
-
{% translate 'projected income' %}
+
{% translate 'projected income' %}
{% if account.income_projected != 0 %}
-
+
{% if account.exchanged and account.exchanged.income_projected %}
-
+
-
{% translate 'projected expenses' %}
+
{% translate 'projected expenses' %}
{% if account.expense_projected != 0 %}
-
+
{% if account.exchanged and account.exchanged.expense_projected %}
-
+
-
{% translate 'projected total' %}
+
{% translate 'projected total' %}
{% if account.exchanged.total_projected and account.exchanged.total_projected %}
-
+
-
{% translate 'current income' %}
+
{% translate 'current income' %}
{% if account.income_current != 0 %}
-
+
{% if account.exchanged and account.exchanged.income_current %}
-
+
-
{% translate 'current expenses' %}
+
{% translate 'current expenses' %}
{% if account.expense_current != 0 %}
-
+
{% if account.exchanged and account.exchanged.expense_current %}
-
+
-
{% translate 'current total' %}
+
{% translate 'current total' %}
@@ -156,7 +156,7 @@
{% if account.exchanged and account.exchanged.total_current %}
-
+
-
{% translate 'final total' %}
+
{% translate 'final total' %}
@@ -181,7 +181,7 @@
{% if account.exchanged and account.exchanged.total_final %}
-
+
+
\ No newline at end of file
+
diff --git a/app/templates/cotton/ui/currency_card.html b/app/templates/cotton/ui/currency_card.html
index e30ea3b..db2f4c4 100644
--- a/app/templates/cotton/ui/currency_card.html
+++ b/app/templates/cotton/ui/currency_card.html
@@ -7,11 +7,11 @@
-
{% translate 'projected income' %}
+
{% translate 'projected income' %}
{% if currency.income_projected != 0 %}
-
+
{% if currency.exchanged and currency.exchanged.income_projected %}
-
+
-
{% translate 'projected expenses' %}
+
{% translate 'projected expenses' %}
{% if currency.expense_projected != 0 %}
-
+
{% if currency.exchanged and currency.exchanged.expense_projected %}
-
+
-
{% translate 'projected total' %}
+
{% translate 'projected total' %}
@@ -74,7 +74,7 @@
{% if currency.exchanged.total_projected and currency.exchanged.total_projected %}
-
+
-
{% translate 'current income' %}
+
{% translate 'current income' %}
{% if currency.income_current != 0 %}
-
+
{% if currency.exchanged and currency.exchanged.income_current %}
-
+
-
{% translate 'current expenses' %}
+
{% translate 'current expenses' %}
{% if currency.expense_current != 0 %}
-
+
{% if currency.exchanged and currency.exchanged.expense_current %}
-
+
-
{% translate 'current total' %}
+
{% translate 'current total' %}
@@ -150,7 +150,7 @@
{% if currency.exchanged and currency.exchanged.total_current %}
-
+
-
{% translate 'final total' %}
+
{% translate 'final total' %}
@@ -175,7 +175,7 @@
{% if currency.exchanged and currency.exchanged.total_final %}
-
+
-
- {% translate 'Select All' %}
+ {% translate 'Select All' %}
-
- {% translate 'Unselect All' %}
+ {% translate 'Unselect All' %}
-
+
-
+
-
+
{% trans "Flat Total" %}
-