nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 15:42:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42337 from frappe/mergify/bp/version-14-hotfix/pr-42294

Browse Source 
refactor: make reposting implicit (backport #42294)
This commit is contained in:
ruthra kumar
2024-07-15 15:41:23 +05:30
committed by GitHub
parent ccc2a47e73 b96b3b51b6
commit 2ce7300c3c
4 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -601,6 +601,7 @@ class PurchaseInvoice(BuyingController):
if self.needs_repost: if self.needs_repost:
self.validate_for_repost() self.validate_for_repost()
self.db_set("repost_required", self.needs_repost) self.db_set("repost_required", self.needs_repost)
self.repost_accounting_entries()
def make_gl_entries(self, gl_entries=None, from_repost=False): def make_gl_entries(self, gl_entries=None, from_repost=False):
update_outstanding = "No" if (cint(self.is_paid) or self.write_off_account) else "Yes" update_outstanding = "No" if (cint(self.is_paid) or self.write_off_account) else "Yes"

3
erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
View File

@@ -1908,10 +1908,9 @@ class TestPurchaseInvoice(FrappeTestCase, StockTestMixin):
check_gl_entries(self, pi.name, expected_gle, nowdate()) check_gl_entries(self, pi.name, expected_gle, nowdate())
pi.items[0].expense_account = "Service - _TC" pi.items[0].expense_account = "Service - _TC"
# Ledger reposted implicitly upon 'Update After Submit'
pi.save() pi.save()
pi.load_from_db() pi.load_from_db()
self.assertTrue(pi.repost_required)
pi.repost_accounting_entries()
expected_gle = [ expected_gle = [
["Creditors - _TC", 0.0, 1000, nowdate()], ["Creditors - _TC", 0.0, 1000, nowdate()],

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

@@ -549,6 +549,7 @@ class SalesInvoice(SellingController):
if self.needs_repost: if self.needs_repost:
self.validate_for_repost() self.validate_for_repost()
self.db_set("repost_required", self.needs_repost) self.db_set("repost_required", self.needs_repost)
self.repost_accounting_entries()
def set_paid_amount(self): def set_paid_amount(self):
paid_amount = 0.0 paid_amount = 0.0

6
erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
View File

@@ -2884,13 +2884,9 @@ class TestSalesInvoice(FrappeTestCase):
si.items[0].income_account = "Service - _TC" si.items[0].income_account = "Service - _TC"
si.additional_discount_account = "_Test Account Sales - _TC" si.additional_discount_account = "_Test Account Sales - _TC"
si.taxes[0].account_head = "TDS Payable - _TC" si.taxes[0].account_head = "TDS Payable - _TC"
# Ledger reposted implicitly upon 'Update After Submit'
si.save() si.save()
si.load_from_db()
self.assertTrue(si.repost_required)
si.repost_accounting_entries()
expected_gle = [ expected_gle = [
["_Test Account Sales - _TC", 22.0, 0.0, nowdate()], ["_Test Account Sales - _TC", 22.0, 0.0, nowdate()],
["Debtors - _TC", 88, 0.0, nowdate()], ["Debtors - _TC", 88, 0.0, nowdate()],