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

fix: Conflicts

Browse Source
This commit is contained in:
Deepesh Garg 2022-01-07 18:11:38 +05:30 committed by GitHub
parent bf5930c4bb
commit 00055bb159
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
View File

@ -4,12 +4,7 @@
import frappe import frappe
from frappe import _, scrub from frappe import _, scrub
<<<<<<< HEAD
from frappe.utils import cint
=======
from frappe.utils import cint, flt from frappe.utils import cint, flt
from six import iteritems
>>>>>>> 1d270dca05 (fix: Show GL balance in Accounts Receivable and payable summary)
from erpnext.accounts.party import get_partywise_advanced_payment_amount from erpnext.accounts.party import get_partywise_advanced_payment_amount
from erpnext.accounts.report.accounts_receivable.accounts_receivable import ReceivablePayableReport from erpnext.accounts.report.accounts_receivable.accounts_receivable import ReceivablePayableReport
@ -41,14 +36,10 @@ class AccountsReceivableSummary(ReceivablePayableReport):
party_advance_amount = get_partywise_advanced_payment_amount(self.party_type, party_advance_amount = get_partywise_advanced_payment_amount(self.party_type,
self.filters.report_date, self.filters.show_future_payments, self.filters.company) or {} self.filters.report_date, self.filters.show_future_payments, self.filters.company) or {}
<<<<<<< HEAD
for party, party_dict in self.party_total.items():
=======
if self.filters.show_gl_balance: if self.filters.show_gl_balance:
gl_balance_map = get_gl_balance(self.filters.report_date) gl_balance_map = get_gl_balance(self.filters.report_date)
for party, party_dict in iteritems(self.party_total): for party, party_dict in iteritems(self.party_total):
>>>>>>> 1d270dca05 (fix: Show GL balance in Accounts Receivable and payable summary)
if party_dict.outstanding == 0: if party_dict.outstanding == 0:
continue continue