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

fix: dependent codes updated

Browse Source
This commit is contained in:
rahib-hassan 2022-04-14 15:48:55 +05:30
parent 0eff74c650
commit 01fde15bd5
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -669,7 +669,7 @@ class PurchaseInvoice(BuyingController):
exchange_rate_map, net_rate_map = get_purchase_document_details(self) exchange_rate_map, net_rate_map = get_purchase_document_details(self)
enable_discount_accounting = cint( enable_discount_accounting = cint(
frappe.db.get_single_value("Accounts Settings", "enable_discount_accounting") frappe.db.get_single_value("Buying Settings", "enable_discount_accounting")
) )
provisional_accounting_for_non_stock_items = cint( provisional_accounting_for_non_stock_items = cint(
frappe.db.get_value( frappe.db.get_value(
@ -1157,7 +1157,7 @@ class PurchaseInvoice(BuyingController):
# tax table gl entries # tax table gl entries
valuation_tax = {} valuation_tax = {}
enable_discount_accounting = cint( enable_discount_accounting = cint(
frappe.db.get_single_value("Accounts Settings", "enable_discount_accounting") frappe.db.get_single_value("Buying Settings", "enable_discount_accounting")
) )
for tax in self.get("taxes"): for tax in self.get("taxes"):
@ -1250,7 +1250,7 @@ class PurchaseInvoice(BuyingController):
def enable_discount_accounting(self): def enable_discount_accounting(self):
if not hasattr(self, "_enable_discount_accounting"): if not hasattr(self, "_enable_discount_accounting"):
self._enable_discount_accounting = cint( self._enable_discount_accounting = cint(
frappe.db.get_single_value("Accounts Settings", "enable_discount_accounting") frappe.db.get_single_value("Buying Settings", "enable_discount_accounting")
) )
return self._enable_discount_accounting return self._enable_discount_accounting

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

@ -1051,7 +1051,7 @@ class SalesInvoice(SellingController):
def make_tax_gl_entries(self, gl_entries): def make_tax_gl_entries(self, gl_entries):
enable_discount_accounting = cint( enable_discount_accounting = cint(
frappe.db.get_single_value("Accounts Settings", "enable_discount_accounting") frappe.db.get_single_value("Selling Settings", "enable_discount_accounting")
) )
for tax in self.get("taxes"): for tax in self.get("taxes"):
@ -1097,7 +1097,7 @@ class SalesInvoice(SellingController):
def make_item_gl_entries(self, gl_entries): def make_item_gl_entries(self, gl_entries):
# income account gl entries # income account gl entries
enable_discount_accounting = cint( enable_discount_accounting = cint(
frappe.db.get_single_value("Accounts Settings", "enable_discount_accounting") frappe.db.get_single_value("Selling Settings", "enable_discount_accounting")
) )
for item in self.get("items"): for item in self.get("items"):
@ -1276,7 +1276,7 @@ class SalesInvoice(SellingController):
def enable_discount_accounting(self): def enable_discount_accounting(self):
if not hasattr(self, "_enable_discount_accounting"): if not hasattr(self, "_enable_discount_accounting"):
self._enable_discount_accounting = cint( self._enable_discount_accounting = cint(
frappe.db.get_single_value("Accounts Settings", "enable_discount_accounting") frappe.db.get_single_value("Selling Settings", "enable_discount_accounting")
) )
return self._enable_discount_accounting return self._enable_discount_accounting

2
erpnext/controllers/accounts_controller.py
View File

@ -1080,7 +1080,7 @@ class AccountsController(TransactionBase):
def make_discount_gl_entries(self, gl_entries): def make_discount_gl_entries(self, gl_entries):
enable_discount_accounting = cint( enable_discount_accounting = cint(
frappe.db.get_single_value("Accounts Settings", "enable_discount_accounting") frappe.db.get_single_value("Selling Settings", "enable_discount_accounting")
) )
if enable_discount_accounting: if enable_discount_accounting: