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

Rebase using staging-fixes and resolved conflicts

Browse Source
This commit is contained in:
deepeshgarg007 2018-12-19 18:47:36 +05:30
parent 530453e4fc
commit b645c2c75e
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/report/accounts_receivable/accounts_receivable.py
View File

@ -339,25 +339,17 @@ class ReceivablePayableReport(object):
pdc_details = ", ".join(pdc_details) pdc_details = ", ".join(pdc_details)
row += [pdc_details, pdc_amount, remaining_balance] row += [pdc_details, pdc_amount, remaining_balance]
<<<<<<< HEAD
# customer territory / supplier group
if args.get("party_type") == "Customer":
row += [self.get_territory(gle.party), self.get_customer_group(gle.party),
voucher_details.get(gle.voucher_no, {}).get("sales_person")]
if args.get("party_type") == "Supplier":
row += [self.get_supplier_group(gle.party)]
=======
if args.get('party_type') == 'Customer': if args.get('party_type') == 'Customer':
# customer LPO # customer LPO
row += [self.voucher_details.get(gle.voucher_no, {}).get("po_no")] row += [self.voucher_details.get(gle.voucher_no, {}).get("po_no")]
>>>>>>> Accounts Receivable report based on payment terms
# Delivery Note # Delivery Note
row += [self.voucher_details.get(gle.voucher_no, {}).get("delivery_note")] row += [self.voucher_details.get(gle.voucher_no, {}).get("delivery_note")]
# customer territory / supplier group # customer territory / supplier group
if args.get("party_type") == "Customer": if args.get("party_type") == "Customer":
row += [self.get_territory(gle.party), self.get_customer_group(gle.party)] row += [self.get_territory(gle.party), self.get_customer_group(gle.party),
self.voucher_details.get(gle.voucher_no, {}).get("sales_person")]
if args.get("party_type") == "Supplier": if args.get("party_type") == "Supplier":
row += [self.get_supplier_group(gle.party)] row += [self.get_supplier_group(gle.party)]