Fix _blocks_valid_up_incl not actually being "_incl".

diff --git a/src/ledgplom/ledger.py b/src/ledgplom/ledger.py
index 2706125ca210e4f1ed2a18aa86fade3385316284..9af74cb07c3b7f84f1001fbe8944d1a02b49204d 100644 (file)
--- a/src/ledgplom/ledger.py
+++ b/src/ledgplom/ledger.py
@@ -654,7 +654,7 @@ class Ledger:
 
     def _blocks_valid_up_incl(self, block_id: int) -> bool:
         'Whether nothing questionable about blocks until block_id.'
-        for block in self.blocks[:block_id]:
+        for block in self.blocks[:block_id + 1]:
             if block.booking:
                 if block.booking.sink_error:
                     return False

diff --git a/src/tests/full.balance b/src/tests/full.balance
index 4c70e1efad77b819e91a6da4e4ae5c157e471aec..f68cfd41cb190b61285646355a5dd3936322b886 100644 (file)
--- a/src/tests/full.balance
+++ b/src/tests/full.balance
@@ -92,7 +92,7 @@ span.indent {
                     <table>
                     <tbody>
                         <tr>
-                            <td class="balance amount">-18</td>
+                            <td class="balance amount">-19</td>
                             <td class="balance currency">€</td>
                         </tr>
                     </tbody>

diff --git a/src/tests/full.balance.4 b/src/tests/full.balance.4
index c48034afb0eb7bc02a2c28b72c64c4bdf1041669..67856502ced256d0cf3d6187a84c76f0e7a6bb81 100644 (file)
--- a/src/tests/full.balance.4
+++ b/src/tests/full.balance.4
@@ -83,7 +83,7 @@ span.indent {
     |
     balance after <a href="/blocks/4">booking 4 (2001-01-03: test)</a>
 </p>
-<table class="alternating critical">
+<table class="alternating ">
 <tbody>
     <tr>
         <td class="money">
@@ -92,7 +92,7 @@ span.indent {
                     <table>
                     <tbody>
                         <tr>
-                            <td class="balance amount">-9</td>
+                            <td class="balance amount">-10</td>
                             <td class="balance currency">€</td>
                         </tr>
                     </tbody>

diff --git a/src/tests/full.dat b/src/tests/full.dat
index 2bb5747e7db6fd17b267c6e9b7199679f034dfab..080eec25618719c0c7564630f28c579373b03b52 100644 (file)
--- a/src/tests/full.dat
+++ b/src/tests/full.dat
@@ -7,12 +7,10 @@
 2001-01-02 test
     bar   -10 €  ; bar
     baz    10 €
-    baz     x €
 
 
 2001-01-02 test
     bar    20 €
-    bar     1 €
     baz   -20 €  ; baz
 
 2001-01-03 test

diff --git a/src/tests/full.edit_raw.4 b/src/tests/full.edit_raw.4
index c49bb9431bfd1f3229b528165fc50864ab36a836..158fa53e3531dcf6faa3367b9662294e1ca070bf 100644 (file)
--- a/src/tests/full.edit_raw.4
+++ b/src/tests/full.edit_raw.4
@@ -90,7 +90,7 @@ td.direct_target {
 
 </textarea>
 </form>
-<table class="alternating critical">
+<table class="alternating">
 <tbody>
     <tr>
         <th>account</th>
@@ -104,7 +104,7 @@ td.direct_target {
             <table>
             <tbody>
                 <tr>
-                    <td class="balance amount">1</td>
+                    <td class="balance amount">0</td>
                     <td class="balance currency">€</td>
                 </tr>
                 <tr>
@@ -132,7 +132,7 @@ td.direct_target {
             <table>
             <tbody>
                 <tr>
-                    <td class="balance amount">-9</td>
+                    <td class="balance amount">-10</td>
                     <td class="balance currency">€</td>
                 </tr>
                 <tr>

diff --git a/src/tests/full.edit_structured.4 b/src/tests/full.edit_structured.4
index 2445a52e3287d140998c34b4f9827936aa9eb590..46e97f645f681b99bb7d2de6dc4ed122ad565984 100644 (file)
--- a/src/tests/full.edit_structured.4
+++ b/src/tests/full.edit_structured.4
@@ -221,7 +221,7 @@ to
 <option value="foo:x">foo:x</option>
 </datalist>
 <hr>
-<table class="alternating critical">
+<table class="alternating">
 <tbody>
     <tr>
         <th>account</th>
@@ -235,7 +235,7 @@ to
             <table>
             <tbody>
                 <tr>
-                    <td class="balance amount">1</td>
+                    <td class="balance amount">0</td>
                     <td class="balance currency">€</td>
                 </tr>
                 <tr>
@@ -263,7 +263,7 @@ to
             <table>
             <tbody>
                 <tr>
-                    <td class="balance amount">-9</td>
+                    <td class="balance amount">-10</td>
                     <td class="balance currency">€</td>
                 </tr>
                 <tr>

diff --git a/src/tests/full.edit_structured.5 b/src/tests/full.edit_structured.5
index 9a11c67b5a12fcb281522c53215693d16f937a10..9488d592542f47d125d7149ace49d26151fe7861 100644 (file)
--- a/src/tests/full.edit_structured.5
+++ b/src/tests/full.edit_structured.5
@@ -241,7 +241,7 @@ to
             <table>
             <tbody>
                 <tr>
-                    <td class="balance amount">-9</td>
+                    <td class="balance amount">-10</td>
                     <td class="balance currency">€</td>
                 </tr>
                 <tr>
@@ -269,7 +269,7 @@ to
             <table>
             <tbody>
                 <tr>
-                    <td class="balance amount">-18</td>
+                    <td class="balance amount">-19</td>
                     <td class="balance currency">€</td>
                 </tr>
                 <tr>

diff --git a/src/tests/full.ledger_raw b/src/tests/full.ledger_raw
index 9d2d63ab5f38f47c60a4699e1cb431f9a3ec192e..89896b63ae2eeedf70ab91020eab27d251102e2c 100644 (file)
--- a/src/tests/full.ledger_raw
+++ b/src/tests/full.ledger_raw
@@ -93,14 +93,14 @@ Detected redundant empty lines in gaps, <input type="submit" name="remove_redund
     <tr><td>&nbsp;</td></tr>
     <tr></tr><!-- keep the background-color alternation in proper order -->
     <tr id="block_2">
-        <td rowspan="7" class="block_column">
+        <td rowspan="6" class="block_column">
             <input type="submit" name="ledger_moveup_2" value="^" disabled="">
             <br>
             <input type="submit" name="ledger_movedown_2" value="v">
             <br>
             <input type="submit" name="ledger_copy_2" value="C">
         </td>
-        <td rowspan="7" class="block_column">
+        <td rowspan="6" class="block_column">
             [<a href="#block_2">#</a>]<br>
             [<a href="/balance/2">b</a>]<br>
             [<a href="/edit_raw/2">e</a>]
@@ -109,19 +109,18 @@ Detected redundant empty lines in gaps, <input type="submit" name="remove_redund
     <tr><td>2001-01-02 test&nbsp;</td></tr>
     <tr><td>  bar  -10 € ; bar&nbsp;</td></tr>
     <tr><td>  baz  10 €&nbsp;</td></tr>
-    <tr><td class="critical">  baz  x €&nbsp;</td></tr>
     <tr><td>&nbsp;</td></tr>
     <tr><td>&nbsp;</td></tr>
     <tr></tr><!-- keep the background-color alternation in proper order -->
     <tr id="block_3">
-        <td rowspan="6" class="block_column">
+        <td rowspan="5" class="block_column">
             <input type="submit" name="ledger_moveup_3" value="^">
             <br>
             <input type="submit" name="ledger_movedown_3" value="v" disabled="">
             <br>
             <input type="submit" name="ledger_copy_3" value="C">
         </td>
-        <td rowspan="6" class="block_column critical">
+        <td rowspan="5" class="block_column">
             [<a href="#block_3">#</a>]<br>
             [<a href="/balance/3">b</a>]<br>
             [<a href="/edit_raw/3">e</a>]
@@ -129,7 +128,6 @@ Detected redundant empty lines in gaps, <input type="submit" name="remove_redund
     </tr>
     <tr><td>2001-01-02 test&nbsp;</td></tr>
     <tr><td>  bar  20 €&nbsp;</td></tr>
-    <tr><td>  bar  1 €&nbsp;</td></tr>
     <tr><td>  baz  -20 € ; baz&nbsp;</td></tr>
     <tr><td>&nbsp;</td></tr>
     <tr></tr><!-- keep the background-color alternation in proper order -->

diff --git a/src/tests/full.ledger_structured b/src/tests/full.ledger_structured
index 457dbbe800ae28516e11a703c73923f9c6607f3c..cf0ea78586198f5969b8198118fb81bcd9fab658 100644 (file)
--- a/src/tests/full.ledger_structured
+++ b/src/tests/full.ledger_structured
@@ -117,14 +117,14 @@ Detected redundant empty lines in gaps, <input type="submit" name="remove_redund
     </tr>
     <tr></tr><!-- keep the background-color alternation in proper order -->
     <tr id="block_2">
-        <td rowspan="7" class="block_column">
+        <td rowspan="6" class="block_column">
             <input type="submit" name="ledger_moveup_2" value="^" disabled="">
             <br>
             <input type="submit" name="ledger_movedown_2" value="v">
             <br>
             <input type="submit" name="ledger_copy_2" value="C">
         </td>
-        <td rowspan="7" class="block_column">
+        <td rowspan="6" class="block_column">
             [<a href="#block_2">#</a>]<br>
             [<a href="/balance/2">b</a>]<br>
             [<a href="/edit_structured/2">e</a>]
@@ -146,12 +146,6 @@ Detected redundant empty lines in gaps, <input type="submit" name="remove_redund
         <td>baz</td>
         <td></td>
     </tr>
-    <tr>
-        <td class="amount critical">x</td>
-        <td class="currency critical">€</td>
-        <td class="critical">baz</td>
-        <td></td>
-    </tr>
     <tr>
         <td colspan="4">&nbsp;</td>
     </tr>
@@ -160,14 +154,14 @@ Detected redundant empty lines in gaps, <input type="submit" name="remove_redund
     </tr>
     <tr></tr><!-- keep the background-color alternation in proper order -->
     <tr id="block_3">
-        <td rowspan="6" class="block_column">
+        <td rowspan="5" class="block_column">
             <input type="submit" name="ledger_moveup_3" value="^">
             <br>
             <input type="submit" name="ledger_movedown_3" value="v" disabled="">
             <br>
             <input type="submit" name="ledger_copy_3" value="C">
         </td>
-        <td rowspan="6" class="block_column critical">
+        <td rowspan="5" class="block_column">
             [<a href="#block_3">#</a>]<br>
             [<a href="/balance/3">b</a>]<br>
             [<a href="/edit_structured/3">e</a>]
@@ -183,12 +177,6 @@ Detected redundant empty lines in gaps, <input type="submit" name="remove_redund
         <td>bar</td>
         <td></td>
     </tr>
-    <tr>
-        <td class="amount">1.00</td>
-        <td class="currency">€</td>
-        <td>bar</td>
-        <td></td>
-    </tr>
     <tr>
         <td class="amount">-20.00</td>
         <td class="currency">€</td>