minor auditor report generation bugfixes:

1 files changed, 11 insertions, 14 deletions

diff --git a/contrib/auditor-report.tex.j2 b/contrib/auditor-report.tex.j2
index 45b049f28..cbecf22e6 100644
--- a/contrib/auditor-report.tex.j2
+++ b/contrib/auditor-report.tex.j2
@@ -282,22 +282,21 @@ compromise resulting in proportional financial losses to the exchange.
   {\bf All withdrawals were covered by sufficient reserve funding.}
 {% else %}
   \begin{longtable}{p{4.5cm}|r}
-  {\bf Reserve} & \multicolumn{2}{|c|}{ {\bf Loss}}  \\ \hline \hline
+  {\bf Reserve} & {\bf Loss}  \\ \hline \hline
 \endfirsthead
-  {\bf Reserve} & \multicolumn{2}{|c|}{ {\bf Loss}}  \\ \hline \hline
+  {\bf Reserve} & {\bf Loss}  \\ \hline \hline
 \endhead
   \hline \hline
-  {\bf Reserve} & \multicolumn{2}{|c|}{ {\bf Loss}}
+  {\bf Reserve} & {\bf Loss}
 \endfoot
   \hline
-  {\bf Total loss}  & &
+  {\bf Total loss} &
   {{ data.total_loss_balance_insufficient }} \\
   \caption{Reserves with withdrawals higher than reserve funding.}
   \label{table:reserve:balance_insufficient}
 \endlastfoot
 {% for item in data.reserve_balance_insufficient_inconsistencies %}
-  \multicolumn{3}{l}{ {\tt {{ item.reserve_pub }} } } \\
-\nopagebreak
+  {\tt {{ item.reserve_pub }} }
   &
   {{ item.loss }} \\ \hline
 {% endfor %}
@@ -436,16 +435,16 @@ incoming wire transfers does not match with that of the bank.
   {\bf All incoming wire transfer amounts and subjects matched up.}
 {% else %}
   \begin{longtable}{p{5.5cm}|r|r}
-  \multicolumn{5}{l}{ {\bf Wire transfer identifier} ({\bf Row}) } \\
+  \multicolumn{2}{l}{ {\bf Wire transfer identifier} ({\bf Row}) } \\
   {\bf Diagnostic} & {\bf Wired} & {\bf Expected}  \\
   \hline \hline
 \endfirsthead
-  \multicolumn{5}{l}{ {\bf Wire transfer identifier} ({\bf Row}) } \\
+  \multicolumn{2}{l}{ {\bf Wire transfer identifier} ({\bf Row}) } \\
   {\bf Diagnostic} & {\bf Wired} & {\bf Expected}  \\
   \hline \hline
 \endhead
   \hline \hline
-  \multicolumn{5}{l}{ {\bf Wire transfer identifier} ({\bf Row}) } \\
+  \multicolumn{2}{l}{ {\bf Wire transfer identifier} ({\bf Row}) } \\
   {\bf Diagnostic} & {\bf Wired} & {\bf Expected}  \\
 \endfoot
   \hline \hline
@@ -456,14 +455,12 @@ incoming wire transfers does not match with that of the bank.
   \label{table:wire_in:transfer_amount_inconsistencies}
 \endlastfoot
 {% for item in wire.reserve_in_amount_inconsistencies %}
-  \multicolumn{5}{l}{ {\tt {{ item.wtid }} } ({{ item.row }}) } \\
+  \multicolumn{2}{l}{ {\tt {{ item.wtid }} } ({{ item.row }}) } \\
 \nopagebreak
   {{ item.timestamp }}: &
   {{ item.amount_wired }} &
-  {{ item.amount_expected }} \\
-  {{ item.diagnostic }}  & & & & \\
-%\nopagebreak
-%  & \multicolumn{4}{|c}{ {{ item.timestamp }} }
+  {{ item.amount_exchange_expected }} \\
+  \multicolumn{3}{l}{ {{ item.diagnostic }} } \\
   \hline
 {% endfor %}
   \end{longtable}