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

chore: fix conflicts

Browse Source 
Removed unused method reset_repost_only_accounting_ledgers and fixed the validate method to set default posting time.
This commit is contained in:
rohitwaghchaure
2026-04-09 14:24:07 +05:30
committed by GitHub
parent 6e438e71eb
commit 2df574baae
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
View File

@@ -74,11 +74,7 @@ class RepostItemValuation(Document):
repost(self) repost(self)
def validate(self): def validate(self):
<<<<<<< HEAD
=======
self.set_default_posting_time() self.set_default_posting_time()
self.reset_repost_only_accounting_ledgers()
>>>>>>> a7ece65536 (fix: set default posting time in RIV)
self.set_company() self.set_company()
self.validate_update_stock() self.validate_update_stock()
self.validate_period_closing_voucher() self.validate_period_closing_voucher()
@@ -88,8 +84,6 @@ class RepostItemValuation(Document):
self.reset_recreate_stock_ledgers() self.reset_recreate_stock_ledgers()
self.validate_recreate_stock_ledgers() self.validate_recreate_stock_ledgers()
<<<<<<< HEAD
=======
def set_default_posting_time(self): def set_default_posting_time(self):
if not self.posting_time: if not self.posting_time:
self.posting_time = nowtime() self.posting_time = nowtime()
@@ -97,11 +91,6 @@ class RepostItemValuation(Document):
if not self.posting_date: if not self.posting_date:
frappe.throw(_("Posting date is required")) frappe.throw(_("Posting date is required"))
def reset_repost_only_accounting_ledgers(self):
if self.repost_only_accounting_ledgers and self.based_on != "Transaction":
self.repost_only_accounting_ledgers = 0
>>>>>>> a7ece65536 (fix: set default posting time in RIV)
def validate_update_stock(self): def validate_update_stock(self):
if self.voucher_type in ["Sales Invoice", "Purchase Invoice"]: if self.voucher_type in ["Sales Invoice", "Purchase Invoice"]:
update_stock = frappe.get_value(self.voucher_type, self.voucher_no, "update_stock") update_stock = frappe.get_value(self.voucher_type, self.voucher_no, "update_stock")