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

fix: Partial PLE cancellation

Browse Source
This commit is contained in:
Deepesh Garg 2023-06-29 12:18:25 +05:30
parent 7312827d4d
commit 1e078d03bb
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
View File

@ -13,6 +13,7 @@
"party_type", "party_type",
"party", "party",
"due_date", "due_date",
"voucher_detail_no",
"cost_center", "cost_center",
"finance_book", "finance_book",
"voucher_type", "voucher_type",
@ -142,12 +143,17 @@
"fieldname": "remarks", "fieldname": "remarks",
"fieldtype": "Text", "fieldtype": "Text",
"label": "Remarks" "label": "Remarks"
},
{
"fieldname": "voucher_detail_no",
"fieldtype": "Data",
"label": "Voucher Detail No"
} }
], ],
"in_create": 1, "in_create": 1,
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
"modified": "2022-08-22 15:32:56.629430", "modified": "2023-06-29 12:24:20.500632",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Payment Ledger Entry", "name": "Payment Ledger Entry",

6
erpnext/accounts/general_ledger.py
View File

@ -526,7 +526,11 @@ def make_reverse_gl_entries(
if gl_entries: if gl_entries:
create_payment_ledger_entry( create_payment_ledger_entry(
gl_entries, cancel=1, adv_adj=adv_adj, update_outstanding=update_outstanding gl_entries,
cancel=1,
adv_adj=adv_adj,
update_outstanding=update_outstanding,
partial_cancel=partial_cancel,
) )
validate_accounting_period(gl_entries) validate_accounting_period(gl_entries)
check_freezing_date(gl_entries[0]["posting_date"], adv_adj) check_freezing_date(gl_entries[0]["posting_date"], adv_adj)

11
erpnext/accounts/utils.py
View File

@ -1467,6 +1467,7 @@ def get_payment_ledger_entries(gl_entries, cancel=0):
due_date=gle.due_date, due_date=gle.due_date,
voucher_type=gle.voucher_type, voucher_type=gle.voucher_type,
voucher_no=gle.voucher_no, voucher_no=gle.voucher_no,
voucher_detail_no=gle.voucher_detail_no,
against_voucher_type=gle.against_voucher_type against_voucher_type=gle.against_voucher_type
if gle.against_voucher_type if gle.against_voucher_type
else gle.voucher_type, else gle.voucher_type,
@ -1488,7 +1489,7 @@ def get_payment_ledger_entries(gl_entries, cancel=0):
def create_payment_ledger_entry( def create_payment_ledger_entry(
gl_entries, cancel=0, adv_adj=0, update_outstanding="Yes", from_repost=0 gl_entries, cancel=0, adv_adj=0, update_outstanding="Yes", from_repost=0, partial_cancel=False
): ):
if gl_entries: if gl_entries:
ple_map = get_payment_ledger_entries(gl_entries, cancel=cancel) ple_map = get_payment_ledger_entries(gl_entries, cancel=cancel)
@ -1498,7 +1499,7 @@ def create_payment_ledger_entry(
ple = frappe.get_doc(entry) ple = frappe.get_doc(entry)
if cancel: if cancel:
delink_original_entry(ple) delink_original_entry(ple, partial_cancel=partial_cancel)
ple.flags.ignore_permissions = 1 ple.flags.ignore_permissions = 1
ple.flags.adv_adj = adv_adj ple.flags.adv_adj = adv_adj
@ -1545,7 +1546,7 @@ def update_voucher_outstanding(voucher_type, voucher_no, account, party_type, pa
ref_doc.set_status(update=True) ref_doc.set_status(update=True)
def delink_original_entry(pl_entry): def delink_original_entry(pl_entry, partial_cancel=False):
if pl_entry: if pl_entry:
ple = qb.DocType("Payment Ledger Entry") ple = qb.DocType("Payment Ledger Entry")
query = ( query = (
@ -1565,6 +1566,10 @@ def delink_original_entry(pl_entry):
& (ple.against_voucher_no == pl_entry.against_voucher_no) & (ple.against_voucher_no == pl_entry.against_voucher_no)
) )
) )
if partial_cancel:
query = query.where(ple.voucher_detail_no == pl_entry.voucher_detail_no)
query.run() query.run()