diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index 6c7e87f0482..c9a4ff090b4 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -405,7 +405,7 @@ def get_expense_account(doctype, txt, searchfield, start, page_len, filters): # 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 7e1d1a62cfb..0c912ca811f 100644 --- a/erpnext/templates/print_formats/includes/item_grid.html +++ b/erpnext/templates/print_formats/includes/item_grid.html @@ -6,17 +6,19 @@
| {{ _("Sr") }} | -{{ _("Item") }} | -{{ _(data[0].meta.get_label("qty")) }} | - {% if not hide_rate -%} -{{ _(data[0].meta.get_label("rate")) }} | - {%- endif %} - {% if not hide_amount -%} -{{ _(data[0].meta.get_label("amount")) }} | - {%- endif %} -
|---|---|---|---|---|
| {{ _("Sr") }} | +{{ _("Item") }} | +{{ _(data[0].meta.get_label("qty")) }} | + {% if not hide_rate -%} +{{ _(data[0].meta.get_label("rate")) }} | + {%- endif %} + {% if not hide_amount -%} +{{ _(data[0].meta.get_label("amount")) }} | + {%- endif %} +
| {{ row.idx }} |