nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 03:29:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: add LCV flag to determine negative expenses

Browse Source
This commit is contained in:
Gursheen Anand
2024-02-29 09:04:24 +05:30
parent 6f5815e44f
commit baa3fee1bf
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/stock_controller.py
View File

@@ -84,7 +84,7 @@ class StockController(AccountsController):
) )
) )
def make_gl_entries(self, gl_entries=None, from_repost=False): def make_gl_entries(self, gl_entries=None, from_repost=False, via_landed_cost_voucher=False):
if self.docstatus == 2: if self.docstatus == 2:
make_reverse_gl_entries(voucher_type=self.doctype, voucher_no=self.name) make_reverse_gl_entries(voucher_type=self.doctype, voucher_no=self.name)
@@ -105,7 +105,7 @@ class StockController(AccountsController):
if self.docstatus == 1: if self.docstatus == 1:
if not gl_entries: if not gl_entries:
gl_entries = self.get_gl_entries(warehouse_account) gl_entries = self.get_gl_entries(warehouse_account, via_landed_cost_voucher)
make_gl_entries(gl_entries, from_repost=from_repost) make_gl_entries(gl_entries, from_repost=from_repost)
def validate_serialized_batch(self): def validate_serialized_batch(self):

2
erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
View File

@@ -250,7 +250,7 @@ class LandedCostVoucher(Document):
# update stock & gl entries for submit state of PR # update stock & gl entries for submit state of PR
doc.docstatus = 1 doc.docstatus = 1
doc.update_stock_ledger(allow_negative_stock=True, via_landed_cost_voucher=True) doc.update_stock_ledger(allow_negative_stock=True, via_landed_cost_voucher=True)
doc.make_gl_entries() doc.make_gl_entries(via_landed_cost_voucher=True)
doc.repost_future_sle_and_gle() doc.repost_future_sle_and_gle()
def validate_asset_qty_and_status(self, receipt_document_type, receipt_document): def validate_asset_qty_and_status(self, receipt_document_type, receipt_document):

27
erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
View File

@@ -420,13 +420,13 @@ class PurchaseReceipt(BuyingController):
self.delete_auto_created_batches() self.delete_auto_created_batches()
self.set_consumed_qty_in_subcontract_order() self.set_consumed_qty_in_subcontract_order()
def get_gl_entries(self, warehouse_account=None): def get_gl_entries(self, warehouse_account=None, via_landed_cost_voucher=False):
from erpnext.accounts.general_ledger import process_gl_map from erpnext.accounts.general_ledger import process_gl_map
gl_entries = [] gl_entries = []
self.make_item_gl_entries(gl_entries, warehouse_account=warehouse_account) self.make_item_gl_entries(gl_entries, warehouse_account=warehouse_account)
self.make_tax_gl_entries(gl_entries) self.make_tax_gl_entries(gl_entries, via_landed_cost_voucher)
update_regional_gl_entries(gl_entries, self) update_regional_gl_entries(gl_entries, self)
return process_gl_map(gl_entries) return process_gl_map(gl_entries)
@@ -773,7 +773,7 @@ class PurchaseReceipt(BuyingController):
posting_date=posting_date, posting_date=posting_date,
) )
def make_tax_gl_entries(self, gl_entries): def make_tax_gl_entries(self, gl_entries, via_landed_cost_voucher=False):
negative_expense_to_be_booked = sum([flt(d.item_tax_amount) for d in self.get("items")]) negative_expense_to_be_booked = sum([flt(d.item_tax_amount) for d in self.get("items")])
is_asset_pr = any(d.is_fixed_asset for d in self.get("items")) is_asset_pr = any(d.is_fixed_asset for d in self.get("items"))
# Cost center-wise amount breakup for other charges included for valuation # Cost center-wise amount breakup for other charges included for valuation
@@ -808,18 +808,17 @@ class PurchaseReceipt(BuyingController):
i = 1 i = 1
for tax in self.get("taxes"): for tax in self.get("taxes"):
if valuation_tax.get(tax.name): if valuation_tax.get(tax.name):
negative_expense_booked_in_pi = frappe.db.sql( if via_landed_cost_voucher:
"""select name from `tabPurchase Invoice Item` pi
where docstatus = 1 and purchase_receipt=%s
and exists(select name from `tabGL Entry` where voucher_type='Purchase Invoice'
and voucher_no=pi.parent and account=%s)""",
(self.name, tax.account_head),
)
if negative_expense_booked_in_pi:
account = stock_rbnb
else:
account = tax.account_head account = tax.account_head
else:
negative_expense_booked_in_pi = frappe.db.sql(
"""select name from `tabPurchase Invoice Item` pi
where docstatus = 1 and purchase_receipt=%s
and exists(select name from `tabGL Entry` where voucher_type='Purchase Invoice'
and voucher_no=pi.parent and account=%s)""",
(self.name, tax.account_head),
)
account = stock_rbnb if negative_expense_booked_in_pi else tax.account_head
if i == len(valuation_tax): if i == len(valuation_tax):
applicable_amount = amount_including_divisional_loss applicable_amount = amount_including_divisional_loss