From b645c2c75ee60dc853a7f82d484f4b8e844b6413 Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Wed, 19 Dec 2018 18:47:36 +0530 Subject: [PATCH] Rebase using staging-fixes and resolved conflicts --- .../accounts_receivable/accounts_receivable.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py index 161f845e4f..a084ae986c 100755 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py @@ -339,25 +339,17 @@ class ReceivablePayableReport(object): pdc_details = ", ".join(pdc_details) 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': # customer LPO row += [self.voucher_details.get(gle.voucher_no, {}).get("po_no")] ->>>>>>> Accounts Receivable report based on payment terms # Delivery Note row += [self.voucher_details.get(gle.voucher_no, {}).get("delivery_note")] # customer territory / supplier group 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": row += [self.get_supplier_group(gle.party)]