mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-26 16:34:46 +00:00
Merge branch 'master' of github.com:webnotes/erpnext into 1209
Conflicts: accounts/doctype/account/account.py erpnext/accounts/doctype/journal_voucher/journal_voucher.py patches/patch_list.py startup/event_handlers.py
This commit is contained in:
@@ -30,10 +30,7 @@ def execute():
|
||||
fy_obj = get_obj('Fiscal Year', f[0])
|
||||
fy_obj.doc.past_year = prev_fy
|
||||
fy_obj.doc.company = c[0]
|
||||
fy_obj.doc.save()
|
||||
|
||||
fy_obj = get_obj('Fiscal Year', f[0])
|
||||
fy_obj.repost()
|
||||
prev_fy = f[0]
|
||||
sql("commit")
|
||||
sql("start transaction")
|
||||
webnotes.conn.commit()
|
||||
webnotes.conn.begin()
|
||||
Reference in New Issue
Block a user