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

refactor: post ledger entries based on toggle

Browse Source 
(cherry picked from commit 77aac6f571)
This commit is contained in:
ruthra kumar
2024-03-11 14:49:28 +05:30
committed by Mergify
parent 6d5e595440
commit d1e3b2ab6e
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -838,6 +838,10 @@ class PurchaseInvoice(BuyingController):
) )
if grand_total and not self.is_internal_transfer(): if grand_total and not self.is_internal_transfer():
against_voucher = self.name
if self.is_return and self.return_against and not self.update_outstanding_for_self:
against_voucher = self.return_against
# Did not use base_grand_total to book rounding loss gle # Did not use base_grand_total to book rounding loss gle
gl_entries.append( gl_entries.append(
self.get_gl_dict( self.get_gl_dict(
@@ -851,7 +855,7 @@ class PurchaseInvoice(BuyingController):
"credit_in_account_currency": base_grand_total "credit_in_account_currency": base_grand_total
if self.party_account_currency == self.company_currency if self.party_account_currency == self.company_currency
else grand_total, else grand_total,
"against_voucher": self.name, "against_voucher": against_voucher,
"against_voucher_type": self.doctype, "against_voucher_type": self.doctype,
"project": self.project, "project": self.project,
"cost_center": self.cost_center, "cost_center": self.cost_center,

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

@@ -1247,6 +1247,10 @@ class SalesInvoice(SellingController):
) )
if grand_total and not self.is_internal_transfer(): if grand_total and not self.is_internal_transfer():
against_voucher = self.name
if self.is_return and self.return_against and not self.update_outstanding_for_self:
against_voucher = self.return_against
# Did not use base_grand_total to book rounding loss gle # Did not use base_grand_total to book rounding loss gle
gl_entries.append( gl_entries.append(
self.get_gl_dict( self.get_gl_dict(
@@ -1260,9 +1264,7 @@ class SalesInvoice(SellingController):
"debit_in_account_currency": base_grand_total "debit_in_account_currency": base_grand_total
if self.party_account_currency == self.company_currency if self.party_account_currency == self.company_currency
else grand_total, else grand_total,
"against_voucher": self.name "against_voucher": against_voucher,
if self.is_return and self.return_against and self.update_outstanding_for_self
else self.return_against,
"against_voucher_type": self.doctype, "against_voucher_type": self.doctype,
"cost_center": self.cost_center, "cost_center": self.cost_center,
"project": self.project, "project": self.project,