Merge branch 'develop' into refactor/qb/pick-list

This commit is contained in:
Sagar Sharma 2023-01-18 17:52:23 +05:30 committed by GitHub
commit f89600aee8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -262,15 +262,17 @@ class SubcontractingReceipt(SubcontractingController):
def get_gl_entries(self, warehouse_account=None): def get_gl_entries(self, warehouse_account=None):
from erpnext.accounts.general_ledger import process_gl_map from erpnext.accounts.general_ledger import process_gl_map
if not erpnext.is_perpetual_inventory_enabled(self.company):
return []
gl_entries = [] gl_entries = []
self.make_item_gl_entries(gl_entries, warehouse_account) self.make_item_gl_entries(gl_entries, warehouse_account)
return process_gl_map(gl_entries) return process_gl_map(gl_entries)
def make_item_gl_entries(self, gl_entries, warehouse_account=None): def make_item_gl_entries(self, gl_entries, warehouse_account=None):
if erpnext.is_perpetual_inventory_enabled(self.company): stock_rbnb = self.get_company_default("stock_received_but_not_billed")
stock_rbnb = self.get_company_default("stock_received_but_not_billed") expenses_included_in_valuation = self.get_company_default("expenses_included_in_valuation")
expenses_included_in_valuation = self.get_company_default("expenses_included_in_valuation")
warehouse_with_no_account = [] warehouse_with_no_account = []