nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 19:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2673 from nabinhait/fix1

Browse Source 
Multiple fixes
This commit is contained in:
Nabin Hait
2015-02-03 18:32:19 +05:30
parent 11cb9de10a 0c883500bb
commit 06d81822fd
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@@ -405,7 +405,7 @@ def get_expense_account(doctype, txt, searchfield, start, page_len, filters):
# Hence the first condition is an "OR" # Hence the first condition is an "OR"
return frappe.db.sql("""select tabAccount.name from `tabAccount` return frappe.db.sql("""select tabAccount.name from `tabAccount`
where (tabAccount.report_type = "Profit and Loss" 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.group_or_ledger="Ledger"
and tabAccount.docstatus!=2 and tabAccount.docstatus!=2
and ifnull(tabAccount.master_type, "")="" and ifnull(tabAccount.master_type, "")=""

24
erpnext/templates/print_formats/includes/item_grid.html
View File

@@ -6,17 +6,19 @@
<table class="table table-bordered"> <table class="table table-bordered">
<tbody> <tbody>
<tr> {% if data|length -%}
<th style="width: 3%">{{ _("Sr") }}</th> <tr>
<th style="width: 57%">{{ _("Item") }}</th> <th style="width: 3%">{{ _("Sr") }}</th>
<th style="width: 10%;" class="text-right">{{ _(data[0].meta.get_label("qty")) }}</th> <th style="width: 57%">{{ _("Item") }}</th>
{% if not hide_rate -%} <th style="width: 10%;" class="text-right">{{ _(data[0].meta.get_label("qty")) }}</th>
<th style="width: 15%;" class="text-right">{{ _(data[0].meta.get_label("rate")) }}</th> {% if not hide_rate -%}
{%- endif %} <th style="width: 15%;" class="text-right">{{ _(data[0].meta.get_label("rate")) }}</th>
{% if not hide_amount -%} {%- endif %}
<th style="width: 15%;" class="text-right">{{ _(data[0].meta.get_label("amount")) }}</th> {% if not hide_amount -%}
{%- endif %} <th style="width: 15%;" class="text-right">{{ _(data[0].meta.get_label("amount")) }}</th>
</tr> {%- endif %}
</tr>
{%- endif %}
{%- for row in data -%} {%- for row in data -%}
<tr> <tr>
<td>{{ row.idx }}</td> <td>{{ row.idx }}</td>