diff --git a/app/templates/transactions/fragments/monthly_summary.html b/app/templates/transactions/fragments/monthly_summary.html index d2b31a7..cd71d57 100644 --- a/app/templates/transactions/fragments/monthly_summary.html +++ b/app/templates/transactions/fragments/monthly_summary.html @@ -4,11 +4,12 @@

{% translate "Summary" %}


-

{% translate "Presente" %}

+

{% translate "Income" %}

-
{% translate "Earned Income" %}
+
+ {% translate "Current Income" %}
{% for entry in totals.paid_income %} @@ -21,7 +22,9 @@
-
{% translate "Projected Income" %}
+
+ {% translate "Projected Income" %} +
{% for entry in totals.projected_income %} @@ -34,14 +37,15 @@

-

{% translate "Projected" %}

+

{% translate "Expenses" %}

-
{% translate "Total Expenses" %}
+
+ {% translate "Current Expenses" %}
- {% for entry in totals.paid_expense %} + {% for entry in totals.paid_expenses %}
{% entry_amount entry %}
{% empty %}
-
@@ -51,10 +55,12 @@
-
{% translate "Projected Expenses" %}
+
+ {% translate "Projected Expenses" %} +
- {% for entry in totals.projected_expense %} + {% for entry in totals.projected_expenses %}
{% entry_amount entry %}
{% empty %}
-
@@ -64,14 +70,16 @@

-

{% translate "Total" %}

+

{% translate "Totals" %}

-
{% translate "Total Expenses" %}
+
+ {% translate "Current Total" %} +
- {% for entry in totals.paid_expense %} + {% for entry in totals.total_current %}
{% entry_amount entry %}
{% empty %}
-
@@ -81,10 +89,27 @@
-
{% translate "Projected Expenses" %}
+
+ {% translate "Projected Total" %} +
- {% for entry in totals.projected_expense %} + {% for entry in totals.total_projected %} +
{% entry_amount entry %}
+ {% empty %} +
-
+ {% endfor %} +
+
+
+
+
+
+ {% translate "Final Total" %} +
+
+
+ {% for entry in totals.total_final %}
{% entry_amount entry %}
{% empty %}
-
@@ -94,25 +119,12 @@

-
-
-
{% translate "Total Expenses" %}
-
-
- {% for entry in totals.paid_expense %} -
{% entry_amount entry %}
- {% empty %} -
-
- {% endfor %} -
-
-
{% translate "Daily Spending Allowance" %}
- {% for entry in totals.projected_expense %} + {% for entry in totals.daily_spending_allowance %}
{% entry_amount entry %}
{% empty %}
-