chellow 1757320031.0.0__py3-none-any.whl → 1759411815.0.0__py3-none-any.whl

chellow/templates/e/dc_batch_edit.html

@@ -9,58 +9,54 @@
 	<a href="/e/dc_contracts">DC Contracts</a> &raquo; 
 	<a href="/e/dc_contracts/{{batch.contract.id}}">{{batch.contract.name}}</a>
 	&raquo; 
-	<a href="/e/dc_batches?dc_contract_id={{batch.contract.id}}">Batches</a>
+	<a href="/e/dc_contracts/{{batch.contract.id}}/batches">Batches</a>
 	&raquo; 
 	<a href="/e/dc_batches/{{batch.id}}">{{batch.reference}}</a> &raquo; Edit
 {% endblock %}
 
 {% block content %}
 
-	{% if request.method == 'GET' and request.values.confirm_delete %}
 
-		<form method="post">
-			<fieldset>
-				<legend>Are you sure you want to delete this batch and all its bills?</legend>
-				<input type="submit" name="delete" value="Delete">
-				<a href="/e/dc_batches/{{batch.id}}/edit">Cancel</a>
-			</fieldset>
-		</form>
-						
-	{% elif request.method == 'GET' and request.values.confirm_delete_bills %}
+	<form method="post">
+		<fieldset>
+			<legend>Update batch</legend>
+			<label>Reference</label> {{input_text('reference', batch.reference)}}
+			<label>Description</label> {{input_text('description', batch.description)}}
+			<input type="submit" name="update" value="Update">
+		</fieldset>
+	</form>
+
+	<form hx-post="/e/dc_batches/{{batch.id}}/edit"
+				hx-confirm="Are you sure you want to delete all the bills in this batch?">
+		<fieldset>
+			<legend>Delete All The Bills In This Batch</legend>
+			<input type="submit" name="delete_bills" value="Delete">
+		</fieldset>
+	</form>
+
+	<form hx-post="/e/dc_batches/{{batch.id}}/edit"
+			hx-confirm="Are you sure you want to delete all the bills in this batch and then re-import bills from the files?">
+		<fieldset>
+			<legend>Delete All The Bills In This Batch And Then Re-Import From The Files</legend>
+			<input type="submit" name="delete_import_bills" value="Re-Import">
+		</fieldset>
+	</form>
+
+	<form hx-post="/e/dc_batches/{{batch.id}}/edit" hx-confirm="Are you sure you want to import the bills from the files into this batch?">
+		<fieldset>
+			<legend>
+				Import The Bills From The Files Into This Batch
+			</legend>
+			<input type="submit" name="import_bills" value="Import">
+		</fieldset>
+	</form>
+
+	<form>
+		<fieldset hx-delete="/e/dc_batches/{{batch.id}}/edit"
+		 	  hx-confirm="Are you sure you want to delete this batch and all its bills?">
+			<legend>Delete this batch</legend>
+			<input type="submit" name="delete" value="Delete">
+		</fieldset>
+	</form>
 
-		<form method="post" action="/e/dc_batches/{{batch.id}}/edit">
-			<fieldset>
-				<legend>Are you sure you want to delete all the bills in this batch?</legend>	
-				<input type="submit" name="delete_bills" value="Delete">
-				<a href="/e/dc_batches/{{batch.id}}/edit">Cancel</a>
-			</fieldset>
-		</form>
-
-	{% else %}
-
-		<form method="post">
-			<fieldset>
-				<legend>Update batch</legend>
-				<label>Reference</label> {{input_text('reference', batch.reference)}}
-				<label>Description</label>
-				{{input_text('description', batch.description)}}
-				<input type="submit" name="update" value="Update">
-			</fieldset>
-		</form>
-
-		<form action="/e/dc_batches/{{batch.id}}/edit">
-			<fieldset>
-				<legend>Delete all the bills in this batch</legend>	
-				<input type="submit" name="confirm_delete_bills" value="Delete">
-			</fieldset>
-		</form>
-		
-		<form>
-			<fieldset>
-				<legend>Delete this batch</legend>
-				<input type="submit" name="confirm_delete" value="Delete">
-			</fieldset>
-		</form>
-
-	{% endif %}
 {% endblock %}

chellow/templates/e/dc_batch_file.html

@@ -7,10 +7,9 @@
 
 {% block nav %}
 	<a href="/e/dc_contracts">DC Contracts</a> &raquo; 
-	<a href="/e/dc_contracts/{{batch_file.batch.contract.id}}"
-		>{{batch_file.batch.contract.name}}</a> &raquo; 
-	<a href="/e/dc_batches?dc_contract_id={{batch_file.batch.contract.id}}">Batches</a>
+	<a href="/e/dc_contracts/{{batch_file.batch.contract.id}}">{{batch_file.batch.contract.name}}</a>
  	&raquo; 
+	<a href="/e/dc_contracts/{{batch_file.batch.contract.id}}/batches">Batches</a> &raquo; 
 	<a href="/e/dc_batches/{{batch_file.batch.id}}">{{batch_file.batch.reference}}</a>
  	&raquo; {{batch_file.filename}}
 	[<a href="/e/dc_batch_files/{{batch_file.id}}/edit">edit</a>]

chellow/templates/e/dc_batch_file_edit.html

@@ -19,46 +19,34 @@
 {% endblock %}
 
 {% block content %}
-	{% if request.values.confirm_delete %}
 
-		<form method="post" action="/e/dc_batch_files/{{batch_file.id}}/edit">
-			<fieldset>
-				<legend>Are you sure you want to delete this file?</legend>	
-				<input type="submit" name="delete" value="Delete">
-				<a href="/e/dc_batch_files/{{batch_file.id}}">Cancel</a>
-			</fieldset>
-		</form>
-		
-	{% else %}
-
-		<ul>
-			<li>Filename: {{batch_file.filename}}</li>
-			<li>
-				Upload Timestamp:
-				{{batch_file.upload_timestamp|hh_format}}
-			</li>
-		</ul>
-
-		<form action="/e/dc_batch_files/{{batch_file.id}}/edit" method="post">
-			<fieldset>
-				<legend>Update This Batch File</legend>	
-				<label>Parser</label>
-				<select name="parser_name">
-					{% for parser_name in parser_names  %}
-						{{input_option('bill_parser_name', parser_name, parser_name)}}
-					{% endfor %}
-				</select>
-				<input type="submit" name="update" value="Update">
-			</fieldset>
-		</form>
-
-		<form action="/e/dc_batch_files/{{batch_file.id}}/edit">
-			<fieldset>
-				<legend>Delete This Batch File</legend>	
-				<input type="submit" name="confirm_delete" value="Delete">
-			</fieldset>
-		</form>
-
-	{% endif %}
+	<ul>
+		<li>Filename: {{batch_file.filename}}</li>
+		<li>
+			Upload Timestamp:
+			{{batch_file.upload_timestamp|hh_format}}
+		</li>
+	</ul>
+
+	<form action="/e/dc_batch_files/{{batch_file.id}}/edit" method="post">
+		<fieldset>
+			<legend>Update This Batch File</legend>	
+			<label>Parser</label>
+			<select name="parser_name">
+				{% for parser_name in parser_names  %}
+					{{input_option('bill_parser_name', parser_name, parser_name)}}
+				{% endfor %}
+			</select>
+			<input type="submit" name="update" value="Update">
+		</fieldset>
+	</form>
+
+	<form hx-delete="/e/dc_batch_files/{{batch_file.id}}/edit"
+			hx-confirm="Are you sure you want to delete this file?">	
+		<fieldset>
+			<legend>Delete This Batch File</legend>	
+			<input type="submit" value="Delete">
+		</fieldset>
+	</form>
 
 {% endblock %}

chellow/templates/e/dc_batch_upload_file.html

@@ -47,8 +47,76 @@
 				<td>VAT</td>
 				<td>Gross</td>
 				<td>Breakdown</td>
+				<td>element</td>
+				<td>Name</td>
+				<td>Start Date (YYY-mm-dd HH:MM)</td>
+				<td>Finish Date (YYY-mm-dd HH:MM)</td>
+				<td>Net</td>
+				<td>Breakdown</td>
 			</tr>
 		</tbody>
 	</table>
 		
+	<p>
+		The columns after 'element' can be repeated for each element, or can be left out
+	 	entirely if the bill doesn't have any elements associated with it. Here's an example:
+	</p>
+
+	<table>
+		<caption>Example CSV File</caption>
+		<tbody>
+			<tr>
+				<td>N</td>
+				<td>JJih988</td>
+				<td>22 7338 1192 184</td>
+				<td>jhl449</td>
+				<td>2025-07-13 03:26</td>
+				<td>2025-06-01 00:00</td>
+				<td>2025-06-30 23:30</td>
+				<td>288</td>
+				<td>13.76</td>
+				<td>1.56</td>
+				<td>15.82</td>
+				<td>{}</td>
+				<td>element</td>
+				<td>nrg</td>
+				<td>2025-06-01 00:00</td>
+				<td>2025-06-30 23:30</td>
+				<td>5.88</td>
+				<td>{"kwh": 55, 'rate': 0.05}</td>
+				<td>element</td>
+				<td>ccl</td>
+				<td>2025-06-01 00:00</td>
+				<td>2025-06-30 23:30</td>
+				<td>0.92</td>
+				<td>{"kwh": 55, 'rate': 0.075}</td>
+			</tr>
+			<tr>
+				<td>N</td>
+				<td>jhgjfj8i</td>
+				<td>22 9981 4881 118</td>
+				<td>khghl</td>
+				<td>2025-07-13 03:26</td>
+				<td>2025-06-01 00:00</td>
+				<td>2025-06-30 23:30</td>
+				<td>8892</td>
+				<td>885.71</td>
+				<td>32.87</td>
+				<td>15.82</td>
+				<td>{}</td>
+				<td>element</td>
+				<td>day</td>
+				<td>2025-06-01 00:00</td>
+				<td>2025-06-30 23:30</td>
+				<td>881.77</td>
+				<td>{"kwh": 81, 'rate': 0.12}</td>
+				<td>element</td>
+				<td>aahedc</td>
+				<td>2025-06-01 00:00</td>
+				<td>2025-06-30 23:30</td>
+				<td>88</td>
+				<td>{"kwh": 7754, 'rate': 0.0511}</td>
+			</tr>
+		</tbody>
+	</table>
 {% endblock %}

chellow/templates/e/dc_batches.html

@@ -7,12 +7,13 @@
 {% block nav %}
 	<a href="/e/dc_contracts">DC Contracts</a> &raquo;
 	<a href="/e/dc_contracts/{{contract.id}}">{{contract.name}}</a> &raquo;
- 	Batches [<a href="/e/dc_contracts/{{contract.id}}/add_batch">add</a>]
+ 	Batches [<a href="/e/dc_contracts/{{contract.id}}/batches/edit">edit</a>]
 {% endblock %}
 
 {% block content %}
 
 	<table class="sticky">
+		<caption>Batches [<a href="/e/dc_contracts/{{contract.id}}/batches/add">add</a>]
 		<thead>
 			<tr>
 				<th>Reference</th>

chellow/templates/e/dc_batches_edit.html

@@ -0,0 +1,26 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» DC Contracts » {{contract.name}} » Batches
+{% endblock %}
+
+{% block nav %}
+	<a href="/e/dc_contracts">DC Contracts</a> &raquo; 
+	<a href="/e/dc_contracts/{{contract.id}}">{{contract.name}}</a> &raquo; 
+	<a href="/e/dc_contracts/{{contract.id}}/batches">Batches</a> &raquo;
+	Edit
+{% endblock %}
+
+{% block content %}
+	<form hx-post="/e/dc_contracts/{{contract.id}}/batches/edit"
+			hx-confirm="Are you sure you want to delete all the bills then re-import bills from the files for all batches in the contract that have batch files?"
+	>
+		<fieldset>
+			<legend>
+				For All Batches With At Least One Batch File, Delete All The Bills And Then Re-import Rrom The
+				Files
+			</legend>
+			<button name="delete_import_bills">Re-Import Bills</button>
+		</fieldset>
+	</form>
+{% endblock %}

chellow/templates/e/dc_bill.html

@@ -7,11 +7,8 @@
 
 {% block nav %}
 	<a href="/e/dc_contracts">DC Contracts</a> &raquo; 
-	<a
-			href="/e/dc_contracts/{{bill.batch.contract.id}}"
-			>{{bill.batch.contract.name}}</a> &raquo; 
-	<a href="/e/dc_batches?dc_contract_id={{bill.batch.contract.id}}">Batches</a>
- 	&raquo; 
+	<a href="/e/dc_contracts/{{bill.batch.contract.id}}">{{bill.batch.contract.name}}</a> &raquo; 
+	<a href="/e/dc_contracts/{{bill.batch.contract.id}}/batches">Batches</a> &raquo; 
 	<a href="/e/dc_batches/{{bill.batch.id}}">{{bill.batch.reference}}</a> &raquo;
 	Bill {{bill.id}} [<a href="/e/dc_bills/{{bill.id}}/edit">edit</a>]
 {% endblock %}
@@ -57,6 +54,31 @@
 		</tbody>
 	</table>
 
+	<table>
+		<caption>Elements [<a href="/e/dc_bills/{{bill.id}}/add_element">add]</caption>
+		<thead>
+			<tr>
+				<th>Name</th>
+				<th>Start Date</th>
+				<th>Finish Date</th>
+				<th>Net</th>
+				<th>Breakdown</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for element in bill.elements %}
+				<tr>
+					<td>{{element.name}}</td>
+					<td>{{element.start_date|hh_format}}</td>
+					<td>{{element.finish_date|hh_format}}</td>
+					<td>{{element.net}}</td>
+					<td><pre>{{element.breakdown}}</pre></td>
+				</tr>
+			{% endfor %}
+		</tbody>
+	</table>
+
+
 	<h2>Breakdown</h2>	
 
 	<pre>{%- for line in raw_lines -%}

chellow/templates/e/dc_bill_add.html

@@ -8,7 +8,7 @@
 {% block nav %}
 	<a href="/e/dc_contracts">DC Contracts</a> &raquo;
 	<a href="/e/dc_contracts/{{batch.contract.id}}">{{batch.contract.name}}</a> &raquo;
-	<a href="/e/dc_batches?dc_contract_id={{batch.contract.id}}">Batches</a> &raquo;
+	<a href="/e/dc_contracts/{{batch.contract.id}}/batches">Batches</a> &raquo;
 	<a href="/e/dc_batches/{{batch.id}}">{{batch.reference}}</a>
  	&raquo; Add Bill
 {% endblock %}
@@ -35,9 +35,9 @@
 			</fieldset>
 											
 			<label>kWh</label> {{input_text('kwh', '0')}}
-			<label>Net</label> {{input_text('net', '0')}}
-			<label>VAT</label> {{input_text('vat', '0')}}
-			<label>Gross</label> {{input_text('gross', '0')}}
+			<label>Net</label> {{input_text('net', '0.00')}}
+			<label>VAT</label> {{input_text('vat', '0.00')}}
+			<label>Gross</label> {{input_text('gross', '0.00')}}
 			<label>Account</label> {{input_text('account', '0')}}
 			<label>Type</label> 
 			<select name="bill_type_id">

chellow/templates/e/dc_bill_edit.html

@@ -7,66 +7,47 @@
 
 {% block nav %}
 	<a href="/e/dc_contracts">DC Contracts</a> &raquo;
-	<a
-			href="/e/dc_contracts/{{bill.batch.contract.id}}"
-			>{{bill.batch.contract.name}}</a> &raquo;
-	<a
-			href="/e/dc_batches?dc_contract_id={{bill.batch.contract.id}}"
-			>Batches</a> &raquo;
-	<a
-			href="/e/dc_batches/{{bill.batch.id}}"
-			>{{bill.batch.reference}}</a> &raquo;
-
+ 	<a href="/e/dc_contracts/{{bill.batch.contract.id}}">{{bill.batch.contract.name}}</a> &raquo;
+	<a href="/e/dc_contracts/{{bill.batch.contract.id}}/batches">Batches</a> &raquo;
+	<a href="/e/dc_batches/{{bill.batch.id}}">{{bill.batch.reference}}</a> &raquo;
 	<a href="/e/dc_bills/{{bill.id}}">Bill {{bill.id}}</a> &raquo; Edit
 {% endblock %}
 
 {% block content %}
 
-	{% if 'confirm_delete' in request.values %}
+	<p><a href="/e/supplies/{{bill.supply.id}}">Supply</a></p>
 
-		<form method="post">
+	<form action="/e/dc_bills/{{bill.id}}/edit" method="post">
+		<fieldset>
+			<legend>Update This Bill</legend>
+			<label>Reference</label> {{input_text('reference', bill.reference)}}
+			<label>Account</label> {{input_text('account', bill.account)}}
 			<fieldset>
-				<legend>Are you sure you want to delete this bill?</legend>	
-				<input type="submit" name="delete" value="Delete">
-				<a href="/e/dc_bills/{{bill.id}}/edit">Cancel</a>
+				<legend>Issue Date</legend> {{input_date('issue', bill.issue_date)}}
 			</fieldset>
-		</form>
-      
-	{% else %}
-
-		<p><a href="/e/supplies/{{bill.supply.id}}">Supply</a></p>
-
-		<form action="/e/dc_bills/{{bill.id}}/edit" method="post">
+							
+			<fieldset>
+				<legend>Start Date</legend> {{input_date('start', bill.start_date)}}
+			</fieldset>
+							
 			<fieldset>
-				<legend>Update This Bill</legend>
-				<label>Reference</label> {{input_text('reference', bill.reference)}}
-				<label>Account</label> {{input_text('account', bill.account)}}
-				<fieldset>
-					<legend>Issue Date</legend> {{input_date('issue', bill.issue_date)}}
-				</fieldset>
-								
-				<fieldset>
-					<legend>Start Date</legend> {{input_date('start', bill.start_date)}}
-				</fieldset>
-								
-				<fieldset>
-					<legend>Finish Date</legend> {{input_date('finish', bill.finish_date)}}
-				</fieldset>
-								
-				<label>kWh</label> {{input_text('kwh', '' ~ bill.kwh)}}
-				<label>Net</label> {{input_text('net', '' ~ bill.net)}}
-				<label>VAT</label> {{input_text('vat', '' ~ bill.vat)}}
-				<label>Gross</label> {{input_text('gross', '' ~ bill.gross)}}
-				<label>Type</label>
-				<select name="bill_type_id">
-					{% for type in bill_types %}
-						{{input_option('type_id', type.id, type.code + ' ' + type.description, initial=bill.bill_type.id)}}
-					{% endfor %}
-				</select>
-				<label>Breakdown</label>
-				{{input_textarea('breakdown', bill.breakdown, 10, 80)}}
-				<label>Example Breakdown</label>
-				<pre>
+				<legend>Finish Date</legend> {{input_date('finish', bill.finish_date)}}
+			</fieldset>
+							
+			<label>kWh</label> {{input_text('kwh', '' ~ bill.kwh)}}
+			<label>Net</label> {{input_text('net', '' ~ bill.net)}}
+			<label>VAT</label> {{input_text('vat', '' ~ bill.vat)}}
+			<label>Gross</label> {{input_text('gross', '' ~ bill.gross)}}
+			<label>Type</label>
+			<select name="bill_type_id">
+				{% for type in bill_types %}
+					{{input_option('type_id', type.id, type.code + ' ' + type.description, initial=bill.bill_type.id)}}
+				{% endfor %}
+			</select>
+			<label>Breakdown</label>
+			{{input_textarea('breakdown', bill.breakdown, 10, 80)}}
+			<label>Example Breakdown</label>
+			<pre>
 {
 "raw_lines": [
 "'net-gbp', 'unrestricted-kwh', 'unrestricted-rate', 'unrestricted-gbp'",
@@ -74,17 +55,16 @@
 "unrestricted-kwh": 1000,
 "unrestricted-rate": 0.1,
 "unrestricted-gbp": 100}
-				</pre>
-				<input type="submit" name="update" value="Update">
-			</fieldset>
-		</form>
-
-		<form>
-			<fieldset>
-				<legend>Delete This Bill</legend>	
-				<input type="submit" name="confirm_delete" value="Delete">
-			</fieldset>
-		</form>
+			</pre>
+			<input type="submit" name="update" value="Update">
+		</fieldset>
+	</form>
 
-	{% endif %}
+	<form hx-delete="/e/dc_bills/{{bill.id}}/edit"
+	    hx-confirm="Are you sure you want to delete this bill?">
+		<fieldset>
+			<input type="submit" name="delete" value="Delete">
+		</fieldset>
+	</form>
+      
 {% endblock %}

chellow/templates/e/dc_bill_import.html

@@ -10,7 +10,7 @@
 	<a href="/e/dc_contracts">DC Contracts</a> &raquo; 
 	<a href="/e/dc_contracts/{{batch.contract.id}}">{{batch.contract.name}}</a>
  	&raquo; 
-	<a href="/e/dc_batches?dc_contract_id={{batch.contract.id}}">Batches</a> &raquo; 
+	<a href="/e/dc_contracts/{{batch.contract.id}}/batches">Batches</a> &raquo; 
 	<a href="/e/dc_batches/{{batch.id}}">{{batch.reference}}</a> &raquo; 
  	{{importer_id}}
 {% endblock %}

chellow/templates/e/dc_bill_import_contract.html

@@ -0,0 +1,130 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» DC Contracts » {{contract.name}} » Batches » {{importer_id}}
+{% endblock %}
+
+{% block nav %}
+	<a href="/e/dc_contracts">DC Contracts</a> &raquo; 
+	<a href="/e/dc_contracts/{{contract.id}}">{{contract.name}}</a> &raquo; 
+	<a href="/e/dc_contracts/{{contract.id}}/batches">Batches</a> &raquo; 
+ 	{{importer_id}}
+{% endblock %}
+
+{% block content %}
+	<h2>Bill Import</h2>	
+
+	{% if is_alive %}
+		<p>Still running. Refresh the page to see latest progress.</p>
+	{% endif %}
+
+	{% if status %}
+		<p>{{status}}</p>
+	{% endif %}
+
+	<ul>
+		{% for msg in log %}
+			<li>{{msg}}</li>
+		{% endfor %}
+	</ul>
+	
+	{% if failed_bills|length > 0 %}
+		<table class="sticky">
+			<caption>Failed Bills</caption>
+			<thead>
+				<tr>
+					<th>Error</th>
+					<th>MPAN Core</th>
+					<th>Account</th>
+					<th>Reference</th>
+					<th>Bill Type Code</th>
+					<th>Issue Date</th>
+					<th>Start Date</th>
+					<th>Finish Date</th>
+					<th>kWh</th>
+					<th>Net</th>
+					<th>VAT</th>
+					<th>Gross</th>
+					<th>Breakdown</th>
+				</tr>
+			</thead>
+			<tbody>
+				{% for bill in failed_bills %}
+					<tr>
+						<td>{{bill.error}}</td>
+						<td>
+							<a href="/supplies?search_pattern={{bill.mpan_core}}"
+								>{{bill.mpan_core}}</a>
+						</td>
+						<td>{{bill.account}}</td>
+						<td>{{bill.reference}}</td>
+						<td>{{bill.bill_type_code}}</td>
+						<td>
+							{% if 'issue_date' in bill %}
+								{{bill.issue_date|hh_format}}
+							{% endif %}
+						</td>
+						<td>
+							{% if 'start_date' in bill %}
+								{{bill.start_date|hh_format}}
+							{% endif %}
+						</td>
+						<td>
+							{% if 'finish_date' in bill %}
+								{{bill.finish_date|hh_format}}</td>
+							{% endif %}
+						<td>{{bill.kwh}}</td>
+						<td>{{bill.net}}</td>
+						<td>{{bill.vat}}</td>
+						<td>{{bill.gross}}</td>
+						<td>
+							{% if 'breakdown' in bill %}
+								<pre>{{bill.breakdown|dumps}}</pre>
+							{% endif %}
+						</td>
+					</tr>
+				{% endfor %}
+			</tbody>
+		</table>
+	{% endif %}
+
+	{% if successful_bills|length > 0 %}
+		<table class="sticky">
+			<caption>Successful Bills</caption>
+			<thead>
+				<tr>
+					<th>Reference</th>
+					<th>Account</th>
+					<th>Bill Type</th>
+					<th>MPAN Core</th>
+					<th>Issue Date</th>
+					<th>Start Date</th>
+					<th>Finish Date</th>
+					<th>kWh</th>
+					<th>Net</th>
+					<th>VAT</th>
+					<th>Gross</th>
+					<th>Breakdown</th>
+				</tr>
+			</thead>
+			<tbody>
+				{% for bill in successful_bills %}
+					<tr>
+						<td>{{bill.reference}}</td>
+						<td>{{bill.account}}</td>
+						<td>{{bill.bill_type_code}}</td>
+						<td>{{bill.mpan_core}}</td>
+						<td>{{bill.issue_date|hh_format}}</td>
+						<td>{{bill.start_date|hh_format}}</td>
+						<td>{{bill.finish_date|hh_format}}</td>
+						<td>{{bill.kwh}}</td>
+						<td>{{bill.net}}</td>
+						<td>{{bill.vat}}</td>
+						<td>{{bill.gross}}</td>
+						<td><pre>{{bill.breakdown|dumps}}</pre></td>
+					</tr>
+				{% endfor %}
+			</tbody>
+		</table>
+	{% endif %}
+{% endblock %}

chellow/templates/e/dc_contract.html

@@ -70,7 +70,7 @@
 			<a href="/e/dc_contracts/{{dc_contract.id}}/properties">Properties</a>
 		</li>
 		<li>
-			<a href="/e/dc_batches?dc_contract_id={{dc_contract.id}}">Batches</a>
+			<a href="/e/dc_contracts/{{dc_contract.id}}/batches">Batches</a>
 		</li>
 		<li>
 			<a href="/e/channel_snags?dc_contract_id={{dc_contract.id}}&amp;days_hidden=5"