Merge branch 'next' into release/3.1.2

1 files changed, 10 insertions, 4 deletions

diff --git a/src/xact.cc b/src/xact.cc
index d29072d4..10a7106a 100644
--- a/src/xact.cc
+++ b/src/xact.cc
@@ -395,10 +395,12 @@ bool xact_base_t::finalize()
         some_null = true;
       }
 
-      if (post->has_flags(POST_DEFERRED))
-          post->account->add_deferred_post(id(), post);
-        else
-          post->account->add_post(post);
+      if (post->has_flags(POST_DEFERRED)) {
+        if (!post->amount.is_null())
+            post->account->add_deferred_post(id(), post);
+      } else {
+        post->account->add_post(post);
+      }
 
       post->xdata().add_flags(POST_EXT_VISITED);
       post->account->xdata().add_flags(ACCOUNT_EXT_VISITED);
@@ -806,6 +808,10 @@ void auto_xact_t::extend_xact(xact_base_t& xact, parse_context_t& context)
         xact.add_post(new_post);
         new_post->account->add_post(new_post);
 
+        // Add flags so this post updates the account balance
+        new_post->xdata().add_flags(POST_EXT_VISITED);
+        new_post->account->xdata().add_flags(ACCOUNT_EXT_VISITED);
+
         if (new_post->must_balance())
           needs_further_verification = true;
       }