Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Anurag Mishra 2019-03-04 16:14:53 +05:30
parent 1e4e61bd94
commit 0c9945e0bf
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,7 @@ class JournalEntry(AccountsController):
self.update_inter_company_jv() self.update_inter_company_jv()
def before_print(self): def before_print(self):
self.gl = frappe.get_list("GL Entry",filters={"voucher_type": "Journal Entry", self.gl_entries = frappe.get_list("GL Entry",filters={"voucher_type": "Journal Entry",
"voucher_no": self.name} , "voucher_no": self.name} ,
fields=["account", "party_type", "party", "debit", "credit", "remarks"] fields=["account", "party_type", "party", "debit", "credit", "remarks"]
) )

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

@ -71,7 +71,7 @@ class PaymentEntry(AccountsController):
self.update_expense_claim() self.update_expense_claim()
def before_print(self): def before_print(self):
self.gl = frappe.get_list("GL Entry",filters={"voucher_type": "Payment Entry", self.gl_entries = frappe.get_list("GL Entry",filters={"voucher_type": "Payment Entry",
"voucher_no": self.name} , "voucher_no": self.name} ,
fields=["account", "party_type", "party", "debit", "credit", "remarks"] fields=["account", "party_type", "party", "debit", "credit", "remarks"]
) )

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

@ -54,7 +54,7 @@ class PurchaseInvoice(BuyingController):
self.release_date = '' self.release_date = ''
def before_print(self): def before_print(self):
self.gl = frappe.get_list("GL Entry",filters={"voucher_type": "Purchase Invoice", self.gl_entries = frappe.get_list("GL Entry",filters={"voucher_type": "Purchase Invoice",
"voucher_no": self.name} , "voucher_no": self.name} ,
fields=["account", "party_type", "party", "debit", "credit"] fields=["account", "party_type", "party", "debit", "credit"]
) )

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

@ -206,7 +206,7 @@ class SalesInvoice(SellingController):
self.update_time_sheet(None) self.update_time_sheet(None)
def before_print(self): def before_print(self):
self.gl = frappe.get_list("GL Entry",filters={"voucher_type": "Sales Invoice", self.gl_entries = frappe.get_list("GL Entry",filters={"voucher_type": "Sales Invoice",
"voucher_no": self.name} , "voucher_no": self.name} ,
fields=["account", "party_type", "party", "debit", "credit"] fields=["account", "party_type", "party", "debit", "credit"]
) )

4
erpnext/accounts/print_format/bank_and_cash_payment_voucher/bank_and_cash_payment_voucher.html
View File

@ -34,7 +34,7 @@
<td class="top-bottom" colspan="5"><strong>Credit</strong></td> <td class="top-bottom" colspan="5"><strong>Credit</strong></td>
</tr> </tr>
{% set total_credit = 0 -%} {% set total_credit = 0 -%}
{% for entries in doc.gl %} {% for entries in doc.gl_entries %}
{% if entries.debit == 0.0 %} {% if entries.debit == 0.0 %}
<tr> <tr>
<td class="right top-bottom">{{ entries.account }}</td> <td class="right top-bottom">{{ entries.account }}</td>
@ -59,7 +59,7 @@
<td class="top-bottom" colspan="5"><strong>Debit</strong></td> <td class="top-bottom" colspan="5"><strong>Debit</strong></td>
</tr> </tr>
{% set total_debit = 0 -%} {% set total_debit = 0 -%}
{% for entries in doc.gl %} {% for entries in doc.gl_entries %}
{% if entries.credit == 0.0 %} {% if entries.credit == 0.0 %}
<tr> <tr>
<td class="right top-bottom">{{ entries.account }}</td> <td class="right top-bottom">{{ entries.account }}</td>

4
erpnext/accounts/print_format/journal_auditing_voucher/journal_auditing_voucher.html
View File

@ -34,7 +34,7 @@
<td class="top-bottom" colspan="5"><strong>Credit</strong></td> <td class="top-bottom" colspan="5"><strong>Credit</strong></td>
</tr> </tr>
{% set total_credit = 0 -%} {% set total_credit = 0 -%}
{% for entries in doc.gl %} {% for entries in doc.gl_entries %}
{% if entries.debit == 0.0 %} {% if entries.debit == 0.0 %}
<tr> <tr>
<td class="right top-bottom">{{ entries.account }}</td> <td class="right top-bottom">{{ entries.account }}</td>
@ -56,7 +56,7 @@
<td class="top-bottom" colspan="5"><strong>Debit</strong></td> <td class="top-bottom" colspan="5"><strong>Debit</strong></td>
</tr> </tr>
{% set total_debit = 0 -%} {% set total_debit = 0 -%}
{% for entries in doc.gl %} {% for entries in doc.gl_entries %}
{% if entries.credit == 0.0 %} {% if entries.credit == 0.0 %}
<tr> <tr>
<td class="right top-bottom">{{ entries.account }}</td> <td class="right top-bottom">{{ entries.account }}</td>

2
erpnext/accounts/print_format/purchase_auditing_voucher/purchase_auditing_voucher.html
View File

@ -79,7 +79,7 @@
<th>Credit Amount</th> <th>Credit Amount</th>
<th>Debit Amount</th> <th>Debit Amount</th>
</tr> </tr>
{% for entries in doc.gl %} {% for entries in doc.gl_entries %}
<tr> <tr>
<td>{{ loop.index }}</td> <td>{{ loop.index }}</td>
<td>{{ entries.account }}</td> <td>{{ entries.account }}</td>

2
erpnext/accounts/print_format/sales_auditing_voucher/sales_auditing_voucher.html
View File

@ -73,7 +73,7 @@
<th>Credit Amount</th> <th>Credit Amount</th>
<th>Debit Amount</th> <th>Debit Amount</th>
</tr> </tr>
{% for entries in doc.gl %} {% for entries in doc.gl_entries %}
<tr> <tr>
<td>{{ loop.index }}</td> <td>{{ loop.index }}</td>
<td>{{ entries.account }}</td> <td>{{ entries.account }}</td>