mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-01 11:19:09 +00:00
chore: fix conflicts
Removed unused on_discard method and cleaned up code.
This commit is contained in:
@@ -69,15 +69,9 @@ class RepostItemValuation(Document):
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
def on_discard(self):
|
|
||||||
self.db_set("status", "Cancelled")
|
|
||||||
|
|
||||||
def repost_now(self):
|
def repost_now(self):
|
||||||
repost(self)
|
repost(self)
|
||||||
|
|
||||||
>>>>>>> cccd34b06a (fix: not able to submit backdated stock reco)
|
|
||||||
def validate(self):
|
def validate(self):
|
||||||
self.set_company()
|
self.set_company()
|
||||||
self.validate_period_closing_voucher()
|
self.validate_period_closing_voucher()
|
||||||
|
|||||||
Reference in New Issue
Block a user