Commit 95a9eb87 authored by Patrick Kimber's avatar Patrick Kimber

List of invoice issues

parent a9b0eb85
<thead>
<tr valign="top">
<th>Number</th>
<th>Issue</th>
<th>Status</th>
</tr>
</thead>
<tbody>
{% for issue in invoiceissue_list %}
<tr valign="top">
<td>
<a href="{% url 'invoice.detail' issue.pk %}">
{{ issue.invoice.invoice_number }}
</a>
</td>
<td>
<ul>
{% for description in issue.lines %}
<li>
{{ description }}
</li>
{% endfor %}
</ul>
</td>
<td>
<a href="{% url 'invoice.issue.update' issue.pk %}">
{% if issue.confirmed %}
<i class="fa fa-check"></i>
Confirmed
{% else %}
<i class="fa fa-edit"></i>
Resolve
{% endif %}
{% if issue.comment %}
<small>
({{ issue.comment|truncatewords_html:10 }})
</small>
{% endif %}
</a>
</td>
</tr>
{% endfor %}
</tbody>
......@@ -14,50 +14,17 @@
</div>
<h1>Issues</h1>
{% if issues %}
<div class="pure-g">
<div class="pure-u-1">
<table class="pure-table pure-table-bordered" width="100%">
<thead>
<tr valign="top">
<th>Number</th>
<th>Issue</th>
<th>Status</th>
</tr>
</thead>
<tbody>
{% for issue in issues %}
<tr valign="top">
<td>
<a href="{% url 'invoice.detail' issue.pk %}">
{{ issue.invoice.invoice_number }}
</a>
</td>
<td>{{ issue.description }}</td>
<td>
<a href="{% url 'invoice.issue.update' issue.pk %}">
{% if issue.confirmed %}
<i class="fa fa-check"></i>
Confirmed
{% else %}
<i class="fa fa-edit"></i>
{% endif %}
{% if issue.comment %}
<small>{{ issue.comment|truncatewords_html:10 }}</small>
{% else %}
Resolve
{% endif %}
</a>
</td>
</tr>
{% endfor %}
</tbody>
</table>
{% if invoiceissue_list %}
<div class="pure-g">
<div class="pure-u-1">
<table class="pure-table pure-table-bordered" width="100%">
{% include 'invoice/_invoice_issue_list.html' %}
</table>
</div>
</div>
</div>
{% else %} No invoice issues {% endif %}
{% else %}
No invoice issues
{% endif %}
<h1>Batches</h1>
{% if batches %}
......@@ -189,4 +156,4 @@
</table>
</div>
</div>
{% else %} No credit notes {% endif %} {% endblock content %}
\ No newline at end of file
{% else %} No credit notes {% endif %} {% endblock content %}
......@@ -1018,7 +1018,6 @@ class ReconcileDayView(
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
batch_date = self._date()
batches = self._batches()
batch_net, batch_gross = self.batch_net_and_gross()
......@@ -1030,7 +1029,6 @@ class ReconcileDayView(
credit_notes = self._credit_notes()
yesturday = self.different_day(batch_date, -1)
tomorrow = self.different_day(batch_date, 1)
context.update(
dict(
batch_date=batch_date,
......@@ -1043,7 +1041,7 @@ class ReconcileDayView(
credit_notes=credit_notes,
yesturday=yesturday,
tomorrow=tomorrow,
issues=issues,
invoiceissue_list=issues,
)
)
return context
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment