Merge pull request #2673 from nabinhait/fix1
Multiple fixes
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index 6c7e87f..c9a4ff0 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -405,7 +405,7 @@
# Hence the first condition is an "OR"
return frappe.db.sql("""select tabAccount.name from `tabAccount`
where (tabAccount.report_type = "Profit and Loss"
- or tabAccount.account_type = "Expense Account")
+ or tabAccount.account_type in ("Expense Account", "Fixed Asset"))
and tabAccount.group_or_ledger="Ledger"
and tabAccount.docstatus!=2
and ifnull(tabAccount.master_type, "")=""
diff --git a/erpnext/templates/print_formats/includes/item_grid.html b/erpnext/templates/print_formats/includes/item_grid.html
index 7e1d1a6..0c912ca 100644
--- a/erpnext/templates/print_formats/includes/item_grid.html
+++ b/erpnext/templates/print_formats/includes/item_grid.html
@@ -6,17 +6,19 @@
<table class="table table-bordered">
<tbody>
- <tr>
- <th style="width: 3%">{{ _("Sr") }}</th>
- <th style="width: 57%">{{ _("Item") }}</th>
- <th style="width: 10%;" class="text-right">{{ _(data[0].meta.get_label("qty")) }}</th>
- {% if not hide_rate -%}
- <th style="width: 15%;" class="text-right">{{ _(data[0].meta.get_label("rate")) }}</th>
- {%- endif %}
- {% if not hide_amount -%}
- <th style="width: 15%;" class="text-right">{{ _(data[0].meta.get_label("amount")) }}</th>
- {%- endif %}
- </tr>
+ {% if data|length -%}
+ <tr>
+ <th style="width: 3%">{{ _("Sr") }}</th>
+ <th style="width: 57%">{{ _("Item") }}</th>
+ <th style="width: 10%;" class="text-right">{{ _(data[0].meta.get_label("qty")) }}</th>
+ {% if not hide_rate -%}
+ <th style="width: 15%;" class="text-right">{{ _(data[0].meta.get_label("rate")) }}</th>
+ {%- endif %}
+ {% if not hide_amount -%}
+ <th style="width: 15%;" class="text-right">{{ _(data[0].meta.get_label("amount")) }}</th>
+ {%- endif %}
+ </tr>
+ {%- endif %}
{%- for row in data -%}
<tr>
<td>{{ row.idx }}</td>