schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: incorrect against_account upon reposting

Browse Source
This commit is contained in:
ruthra kumar
2024-06-21 17:21:32 +05:30
parent c76f466528
commit 20c4098399
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -578,7 +578,7 @@ class PurchaseInvoice(BuyingController):
for item in self.get("items"): for item in self.get("items"):
validate_account_head(item.idx, item.expense_account, self.company, "Expense") validate_account_head(item.idx, item.expense_account, self.company, "Expense")
def set_against_expense_account(self): def set_against_expense_account(self, force=False):
against_accounts = [] against_accounts = []
for item in self.get("items"): for item in self.get("items"):
if item.expense_account and (item.expense_account not in against_accounts): if item.expense_account and (item.expense_account not in against_accounts):
@@ -586,6 +586,10 @@ class PurchaseInvoice(BuyingController):
self.against_expense_account = ",".join(against_accounts) self.against_expense_account = ",".join(against_accounts)
def force_set_against_expense_account(self):
self.set_against_expense_account()
frappe.db.set_value(self.doctype, self.name, "against_expense_account", self.against_expense_account)
def po_required(self): def po_required(self):
if frappe.db.get_single_value("Buying Settings", "po_required") == "Yes": if frappe.db.get_single_value("Buying Settings", "po_required") == "Yes":
if frappe.get_value( if frappe.get_value(

4
erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py
View File

@@ -167,6 +167,10 @@ def start_repost(account_repost_doc=str) -> None:
doc.make_gl_entries_on_cancel() doc.make_gl_entries_on_cancel()
doc.docstatus = 1 doc.docstatus = 1
if doc.doctype == "Sales Invoice":
doc.force_set_against_income_account()
else:
doc.force_set_against_expense_account()
doc.make_gl_entries() doc.make_gl_entries()
elif doc.doctype in ["Payment Entry", "Journal Entry", "Expense Claim"]: elif doc.doctype in ["Payment Entry", "Journal Entry", "Expense Claim"]:

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

@@ -959,6 +959,10 @@ class SalesInvoice(SellingController):
against_acc.append(d.income_account) against_acc.append(d.income_account)
self.against_income_account = ",".join(against_acc) self.against_income_account = ",".join(against_acc)
def force_set_against_income_account(self):
self.set_against_income_account()
frappe.db.set_value(self.doctype, self.name, "against_income_account", self.against_income_account)
def add_remarks(self): def add_remarks(self):
if not self.remarks: if not self.remarks:
if self.po_no and self.po_date: if self.po_no and self.po_date: