From 07dd44af2d0910df753a718cf1f464b063471d56 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 6 Sep 2019 06:24:25 +0200
Subject: [PATCH] Fix #2543

---
 app/Http/Controllers/BillController.php | 13 +++++++++----
 resources/lang/en_US/firefly.php        | 25 +++++++++++++------------
 resources/views/v1/list/bills.twig      |  2 +-
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php
index 006163607b..ff6a517440 100644
--- a/app/Http/Controllers/BillController.php
+++ b/app/Http/Controllers/BillController.php
@@ -434,17 +434,22 @@ class BillController extends Controller
             if (false === $bill['active']) {
                 continue;
             }
+            if (0 === count($bill['pay_dates'])) {
+                continue;
+            }
             /** @var TransactionCurrency $currency */
-            $currencyId                   = $bill['currency_id'];
-            $sums[$currencyId]            = $sums[$currencyId] ?? [
+            $currencyId        = $bill['currency_id'];
+            $sums[$currencyId] = $sums[$currencyId] ?? [
                     'currency_id'             => $currencyId,
                     'currency_code'           => $bill['currency_code'],
                     'currency_name'           => $bill['currency_name'],
                     'currency_symbol'         => $bill['currency_symbol'],
                     'currency_decimal_places' => $bill['currency_decimal_places'],
-                    'avg'                 => '0',
+                    'avg'                     => '0',
                 ];
-            $avg                          = bcdiv(bcadd((string)$bill['amount_min'], (string)$bill['amount_max']), '2');
+
+            $avg                      = bcdiv(bcadd((string)$bill['amount_min'], (string)$bill['amount_max']), '2');
+            $avg                      = bcmul($avg, (string)count($bill['pay_dates']));
             $sums[$currencyId]['avg'] = bcadd($sums[$currencyId]['avg'], $avg);
         }
 
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index a5dacbaf79..ed7e447dd9 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -190,19 +190,20 @@ return [
     'reset_button'                               => 'Reset',
     'want_to_login'                              => 'I want to login',
     'login_page_title'                           => 'Login to Firefly III',
-    'register_page_title'                        => 'Register at Firefly III',
-    'forgot_pw_page_title'                       => 'Forgot your password for Firefly III',
-    'reset_pw_page_title'                        => 'Reset your password for Firefly III',
-    'cannot_reset_demo_user'                     => 'You cannot reset the password of the demo user.',
-    'button_register'                            => 'Register',
-    'authorization'                              => 'Authorization',
-    'active_bills_only'                          => 'active bills only',
-    'average_per_bill'                           => 'average per bill',
-    'expected_total'                             => 'expected total',
+    'register_page_title'         => 'Register at Firefly III',
+    'forgot_pw_page_title'        => 'Forgot your password for Firefly III',
+    'reset_pw_page_title'         => 'Reset your password for Firefly III',
+    'cannot_reset_demo_user'      => 'You cannot reset the password of the demo user.',
+    'button_register'             => 'Register',
+    'authorization'               => 'Authorization',
+    'active_bills_only'           => 'active bills only',
+    'active_exp_bills_only'       => 'active and expected bills only',
+    'average_per_bill'            => 'average per bill',
+    'expected_total'              => 'expected total',
     // API access
-    'authorization_request'                      => 'Firefly III v:version Authorization Request',
-    'authorization_request_intro'                => '<strong>:client</strong> is requesting permission to access your financial administration. Would you like to authorize <strong>:client</strong> to access these records?',
-    'scopes_will_be_able'                        => 'This application will be able to:',
+    'authorization_request'       => 'Firefly III v:version Authorization Request',
+    'authorization_request_intro' => '<strong>:client</strong> is requesting permission to access your financial administration. Would you like to authorize <strong>:client</strong> to access these records?',
+    'scopes_will_be_able'         => 'This application will be able to:',
     'button_authorize'                           => 'Authorize',
     'none_in_select_list'                        => '(none)',
     'name_in_currency'                           => ':name in :currency',
diff --git a/resources/views/v1/list/bills.twig b/resources/views/v1/list/bills.twig
index 6471a32c44..2713bf15cf 100644
--- a/resources/views/v1/list/bills.twig
+++ b/resources/views/v1/list/bills.twig
@@ -119,7 +119,7 @@
     {% for sum in sums %}
         <tr>
             <td style="text-align:right;" colspan="3">
-                {{ 'sum'|_ }} ({{ sum.currency_name }}) ({{ 'active_bills_only'|_ }})<br />
+                {{ 'sum'|_ }} ({{ sum.currency_name }}) ({{ 'active_exp_bills_only'|_ }})<br />
             </td>
             <td style="text-align:right;" colspan="1">
             <span style="margin-right:5px;">