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

chellow/templates/e/mop_batch_upload_file.html

@@ -7,9 +7,8 @@
 
 {% block nav %}
 	<a href="/e/mop_contracts">MOP Contracts</a> &raquo; 
-	<a href="/e/mop_contracts/{{batch.contract.id}}">{{batch.contract.name}}</a>
- 	&raquo; 
-	<a href="/e/mop_batches?mop_contract_id={{batch.contract.id}}">Batches</a> &raquo;
+	<a href="/e/mop_contracts/{{batch.contract.id}}">{{batch.contract.name}}</a> &raquo; 
+	<a href="/e/mop_contracts/{{batch.contract.id}}/batches">Batches</a> &raquo;
 	<a href="/e/mop_batches/{{batch.id}}">{{batch.reference}}</a> &raquo; 
  	Upload Bill File
 {% endblock %}
@@ -31,8 +30,6 @@
 		</fieldset>
 	</form>
 
-	<br>
-
 	<table>
 		<caption>The '.csv' Format</caption>
 		<tbody>
@@ -49,6 +46,75 @@
 				<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>

chellow/templates/e/mop_batches.html

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

chellow/templates/e/mop_batches_edit.html

@@ -0,0 +1,26 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» MOP Contracts » {{contract.name}} » Batches
+{% endblock %}
+
+{% block nav %}
+	<a href="/e/mop_contracts">MOP Contracts</a> &raquo; 
+	<a href="/e/mop_contracts/{{contract.id}}">{{contract.name}}</a> &raquo; 
+	<a href="/e/mop_contracts/{{contract.id}}/batches">Batches</a> &raquo;
+	Edit
+{% endblock %}
+
+{% block content %}
+	<form hx-post="/e/mop_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/mop_bill.html

@@ -7,20 +7,16 @@
 
 {% block nav %}
 	<a href="/e/mop_contracts">MOP Contracts</a> &raquo; 
-	<a
-			href="/e/mop_contracts/{{bill.batch.contract.id}}"
-			>{{bill.batch.contract.name}}</a> &raquo; 
-	<a href="/e/mop_batches?mop_contract_id={{bill.batch.contract.id}}">Batches</a>
-	&raquo; 
-	<a href="/e/mop_batches/{{bill.batch.id}}">{{bill.batch.reference}}</a>
-	&raquo; {{bill.reference}}
+	<a href="/e/mop_contracts/{{bill.batch.contract.id}}">{{bill.batch.contract.name}}</a> &raquo; 
+	<a href="/e/mop_contracts/{{bill.batch.contract.id}}/batches">Batches</a> &raquo; 
+	<a href="/e/mop_batches/{{bill.batch.id}}">{{bill.batch.reference}}</a> &raquo; {{bill.reference}}
 	[<a href="/e/mop_bills/{{bill.id}}/edit">edit</a>]
 {% endblock %}
 
 {% block content %}
 	<table>
+		<caption>Bill</caption>	
 		<thead>
-			<caption>Bill</caption>	
 			<tr>
 				<th>Supply</th>
 				<th>Reference</th>
@@ -58,6 +54,33 @@
 		</tbody>
 	</table>
 
+	<table>
+		<caption>Elements [<a href="/e/mop_bills/{{bill.id}}/add_element">add</a>]</caption>	
+		<thead>
+			<tr>
+				<th>Edit</th>
+				<th>Name</th>
+    		<th>Start Date</th>
+				<th>Finish Date</th>
+				<th>Net GBP</th>
+				<th>Breakdown</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for element in elements %}
+				<tr>
+					<td>[<a href="/e/mop_elements/{{element.id}}/edit">edit</a>]</td>
+					<td>{{element.name}}</td>
+					<td>{{element.start_date|hh_format}}</td>
+					<td>{{element.finish_date|hh_format}}</td>
+					<td style="text-align: right">{{element.net}}</td>
+					<td>{{element.breakdown}}</td>
+				</tr>
+			{% endfor %}
+		</tbody>
+	</table>
+
+
 	<h2>Breakdown</h2>	
 
 	<pre>{%- for line in raw_lines -%}

chellow/templates/e/mop_bill_add.html

@@ -5,19 +5,10 @@
  	{{batch.reference}} » Add Bill
 {% endblock %}
 
-{% block inside_head %}
-	<style>
-		label {
-			width: 6em;
-			float: left;
-		}
-	</style>
-{% endblock %}
-
 {% block nav %}
 	<a href="/e/mop_contracts">MOP Contracts</a> &raquo; 
 	<a href="/e/mop_contracts/{{batch.contract.id}}">{{batch.contract.name}}</a> &raquo; 
-	<a href="/e/mop_batches?mop_contract_id={{batch.contract.id}}">Batches</a> &raquo; 
+	<a href="/e/mop_contracts/{{batch.contract.id}}/batches">Batches</a> &raquo; 
 	<a href="/e/mop_batches/{{batch.id}}">{{batch.reference}}</a>
  	&raquo; Add Bill
 {% endblock %}
@@ -29,24 +20,13 @@
 			<legend>Add A Bill</legend>
 			<label>MPAN Core</label> {{input_text('mpan_core')}}
 			<label>Reference</label> {{input_text('reference')}}
-			<fieldset>
-				<legend>Issue Date</legend>
-				{{input_date('issue')}}
-			</fieldset>
-				
-			<fieldset>
-				<legend>Start Date</legend>
-				{{input_date('start')}}
-			</fieldset>
-				
-			<fieldset>
-				<legend>Finish Date</legend>
-				{{input_date('finish')}}
-			</fieldset>
+			<label>Issue Date</label> {{input_date('issue')}}
+			<label>Start Date</label> {{input_date('start')}}
+			<label>Finish Date</label> {{input_date('finish')}}
 			<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/mop_bill_import.html

@@ -10,7 +10,7 @@
 	<a href="/e/mop_contracts">MOP Contracts</a> &raquo;
 	<a href="/e/mop_contracts/{{batch.contract.id}}">{{batch.contract.name}}</a>
  	&raquo;
-	<a href="/e/mop_batches?mop_contract_id={{batch.contract.id}}">Batches</a> &raquo;
+	<a href="/e/mop_batches/{{batch.contract.id}}/batches">Batches</a> &raquo;
 	<a href="/e/mop_batches/{{batch.id}}">{{batch.reference}}</a> &raquo;
  	Import {{importer_id}}
 {% endblock %}

chellow/templates/e/mop_bill_import_contract.html

@@ -0,0 +1,130 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» MOP Contracts » {{contract.name}} » Batches » {{importer_id}}
+{% endblock %}
+
+{% block nav %}
+	<a href="/e/mop_contracts">Supplier Contracts</a> &raquo; 
+	<a href="/e/mop_contracts/{{contract.id}}">{{contract.name}}</a> &raquo; 
+	<a href="/e/mop_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/mop_contract.html

@@ -62,17 +62,16 @@
 	<br>
 	<ul>
 		<li>
-			<a href="/e/mop_batches?mop_contract_id={{contract.id}}">Batches</a>
+			<a href="/e/mop_contracts/{{contract.id}}/batches">Batches</a>
 		</li>
 	</ul>
 	<br>
 	<form action="/reports/231">
 		<fieldset>
-			<input
-					type="hidden" name="mop_contract_id" value="{{contract.id}}">
+			<input type="hidden" name="mop_contract_id" value="{{contract.id}}">
 
-			From {{input_date('start', last_month_start)}} to
-			{{input_date('finish', last_month_finish)}}
+			<label>From</label> {{input_date('start', last_month_start)}}
+			<label>To</label> {{input_date('finish', last_month_finish)}}
 			<input type="submit" value="Download"/>
 		</fieldset>
 	</form>

chellow/templates/e/mop_element.html

@@ -0,0 +1,41 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» MOP Contracts » {{element.bill.batch.contract.name}} »
+ 	Batches » {{element.bill.batch.reference}} » {{element.bill.reference}} »
+	{{element.bill.reference}} » {{element.name}}
+{% endblock %}
+
+{% block nav %}
+	<a href="/e/mop_contracts">MOP Contracts</a> &raquo; 
+	<a href="/e/mop_contracts/{{element.bill.batch.contract.id}}">{{element.bill.batch.contract.name}}</a>
+ 	&raquo; 
+	<a href="/e/mop_contracts/{{element.bill.batch.contract.id}}/batches">Batches</a> &raquo; 
+	<a href="/e/mop_batches/{{element.bill.batch.id}}">{{element.bill.batch.reference}}</a> &raquo; 
+  <a href="/e/mop_bills/{{element.bill.id}}">{{element.bill.reference}}</a> &raquo;
+  {{element.name}}</a> &raquo; [<a href="/e/mop_elements/{{element.id}}/edit">edit</a>]
+{% endblock %}
+
+{% block content %}
+	<table>
+		<caption>Element</caption>	
+		<thead>
+			<tr>
+				<th>Name</th>
+				<th>Start Date</th>
+				<th>Finish Date</th>
+				<th>Net GBP</th>
+				<th>Breakdown</th>
+			</tr>
+		</thead>
+		<tbody>
+			<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>
+		</tbody>
+	</table>
+{% endblock %}

chellow/templates/e/mop_element_add.html

@@ -0,0 +1,36 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» MOP Contracts » {{bill.batch.contract.name}} » Batches » 
+	{{bill.batch.reference}} » {{bill.reference}} » Add Element
+{% endblock %}
+
+{% block nav %}
+	<a href="/e/mop_contracts">MOP Contracts</a> &raquo; 
+	<a href="/e/mop_contracts/{{bill.batch.contract.id}}">{{bill.batch.contract.name}}</a> &raquo; 
+	<a href="/e/mop_contract/{{bill.batch.contract.id}}/batches">Batches</a> &raquo; 
+	<a href="/e/mop_batches/{{bill.batch.id}}">{{bill.batch.reference}}</a> &raquo; 
+	<a href="/e/mop_bills/{{bill.id}}">{{bill.reference}}</a> &raquo;
+ 	Add Element
+{% endblock %}
+
+{% block content %}
+	<form action="/e/mop_bills/{{bill.id}}/add_element" method="post">
+		<fieldset>
+			<legend>Add An Element</legend>
+
+			<label>Name</label> {{input_text('name')}}
+
+			<label>Start Date</label> {{input_date('start', start_date)}}
+
+			<label>Finish Date</label> {{input_date('finish')}}
+
+			<label>Net GBP</label> {{input_text('net', '0.00')}}
+
+			<label>Breakdown</label>
+			{{input_textarea('breakdown', '{}', 10, 80, show_pos=True)}}
+
+			<input type="submit" value="Add">
+		</fieldset>
+	</form>
+{% endblock %}

chellow/templates/e/mop_element_edit.html

@@ -0,0 +1,49 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» MOP Contracts » {{element.bill.batch.contract.name}} »
+ 	Batches » {{element.bill.batch.reference}} » Bills »
+	{{element.bill.reference}} » {{element.name}} » Edit
+{% endblock %}
+
+{% block nav %}
+	<a href="/e/mop_contracts">MOP Contracts</a> &raquo; 
+	<a href="/e/mop_contracts/{{element.bill.batch.contract.id}}">{{element.bill.batch.contract.name}}</a>
+ 	&raquo; 
+	<a href="/e/mop_contracts/{{element.bill.batch.contract.id}}/batches">Batches</a> &raquo; 
+	<a href="/e/mop_batches/{{element.bill.batch.id}}">{{element.bill.batch.reference}}</a> &raquo; 
+	<a href="/e/mop_bills/{{element.bill.id}}">{{element.bill.reference}}</a> &raquo;
+	<a href="/e/mop_elements/{{element.id}}">{{element.name}}</a> &raquo;
+ 	Edit
+{% endblock %}
+
+{% block content %}
+
+	<form method="post" action="/e/mop_elements/{{element.id}}/edit">
+		<fieldset>
+			<legend>Update This Element</legend>	
+			<label>Name</label> {{input_text('name', element.name)}}
+			<label>Start Date</label> {{input_date('start', element.start_date)}}
+			<label>Finish Date</label> {{input_date('finish', element.finish_date)}}
+			<label>Net GBP</label> {{input_text('net', element.net)}}
+			<label>Breakdown</label>
+			{{input_textarea('breakdown', element.breakdown, 10, 80, show_pos=True)}}
+			<input type="submit" name="update" value="Update">
+		</fieldset>
+  </form>
+
+		<h3>Example Breakdown</h3>
+
+		<pre>{
+  "nrg-kwh": 1000,
+  "nrg-rate": 0.1,
+}</pre>
+
+	<form hx-delete="/e/mop_elements/{{element.id}}/edit"
+			hx-confirm="Are you sure you want to delete this element?">
+		<fieldset>
+			<legend>Delete This Element</legend>	
+			<input type="submit" name="confirm_delete" value="Delete">
+		</fieldset>
+	</form>
+{% endblock %}

chellow/templates/e/supplier_batch.html

@@ -7,13 +7,9 @@
 
 {% block nav %}
  	<a href="/e/supplier_contracts">Supplier Contracts</a> &raquo; 
-	<a href="/e/supplier_contracts/{{batch.contract.id}}"
-		>{{batch.contract.name}}</a> &raquo; 
-	<a
-	 		href="/e/supplier_batches?supplier_contract_id={{batch.contract.id}}"
-			>Batches</a> &raquo; 
-	{{batch.reference}}
-	[<a href="/e/supplier_batches/{{batch.id}}/edit">edit</a>]
+	<a href="/e/supplier_contracts/{{batch.contract.id}}" >{{batch.contract.name}}</a> &raquo; 
+	<a href="/e/supplier_contracts/{{batch.contract.id}}/batches" >Batches</a> &raquo; 
+	{{batch.reference}} [<a href="/e/supplier_batches/{{batch.id}}/edit">edit</a>]
 {% endblock %}
 
 {% block content %}

chellow/templates/e/supplier_batch_add.html

@@ -16,12 +16,12 @@
 {% block nav %}
 	<a href="/e/supplier_contracts">Supplier Contracts</a> &raquo; 
 	<a href="/e/supplier_contracts/{{contract.id}}">{{contract.name}}</a> &raquo; 
-	<a href="/e/supplier_batches?supplier_contract_id={{contract.id}}">Batches</a> &raquo; 
+	<a href="/e/supplier_contracts/{{contract.id}}/batches">Batches</a> &raquo; 
 	Add
 {% endblock %}
 
 {% block content %}
-	<form action="/e/supplier_contracts/{{contract.id}}/add_batch" method="post">
+	<form action="/e/supplier_contracts/{{contract.id}}/batches/add" method="post">
 		<fieldset>
 			<legend>Add a batch</legend>	
 			<label>Reference</label>

chellow/templates/e/supplier_batch_edit.html

@@ -17,7 +17,7 @@
 
 {% block content %}
 	
-<form action="/e/supplier_batches/{{batch.id}}/edit" method="post">
+	<form action="/e/supplier_batches/{{batch.id}}/edit" method="post">
 		<fieldset>
 			<legend>Update batch</legend>
 			<label>Reference</label> {{input_text('reference', batch.reference)}}

chellow/templates/e/supplier_batch_file.html

@@ -9,12 +9,10 @@
 	<a href="/e/supplier_contracts">Supplier Contracts</a> &raquo; 
 	<a href="/e/supplier_contracts/{{batch_file.batch.contract.id}}"
 		>{{batch_file.batch.contract.name}}</a> &raquo; 
-	<a href="/e/supplier_batches?supplier_contract_id={{batch_file.batch.contract.id}}"
+	<a href="/e/supplier_contracts/{{batch_file.batch.contract.id}}/batches"
 		>Batches</a> &raquo; 
-	<a href="/e/supplier_batches/{{batch_file.batch.id}}"
-		>{{batch_file.batch.reference}}</a> &raquo; 
-	{{batch_file.filename}}
-	[<a href="/e/supplier_batch_files/{{batch_file.id}}/edit">edit</a>]
+	<a href="/e/supplier_batches/{{batch_file.batch.id}}">{{batch_file.batch.reference}}</a> &raquo; 
+	{{batch_file.filename}} [<a href="/e/supplier_batch_files/{{batch_file.id}}/edit">edit</a>]
 {% endblock %}
 
 {% block content %}

chellow/templates/e/supplier_batch_file_add.html

@@ -51,17 +51,24 @@
 				<td>VAT</td>
 				<td>Gross</td>
 				<td>Breakdown</td>
-				<td>R1 Meter Serial Number</td>
-				<td>R1 MPAN</td>
-				<td>R1 Coefficient</td>
-				<td>R1 Units (kWh, kW, kVA or kVArh)</td>
-				<td>R1 TPR (Blank if kW or kVA)</td>
-				<td>R1 Previous Read Date</td>
-				<td>R1 Previous Read Value</td>
-				<td>R1 Previous Read Type</td>
-				<td>R1 Present Read Date</td>
-				<td>R1 Present Read Value</td>
-				<td>R1 Present Read Type</td>
+				<td>Following Type (Read or Eelement)</td>
+				<td>Read Serial Number</td>
+				<td>Read MPAN</td>
+				<td>Read Coefficient</td>
+				<td>Read Units (kWh, kW, kVA or kVArh)</td>
+				<td>Read TPR (Blank if kW or kVA)</td>
+				<td>Read Previous Read Date</td>
+				<td>Read Previous Read Value</td>
+				<td>Read Previous Read Type</td>
+				<td>Read Present Read Date</td>
+				<td>Read Present Read Value</td>
+				<td>Read Present Read Type</td>
+				<td>Following Type (Read or Element)</td>
+				<td>Element Name</td>
+				<td>Element Start Date (YYYY-mm-dd HH:MM)</td>
+				<td>Element Finish Date (YYYY-mm-dd HH:MM)</td>
+				<td>Element Net GBP</td>
+				<td>Element Breakdown</td>
 			</tr>
 		</tbody>
 	</table>