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

Merge branch 'version-13-pre-release' into version-13

Browse Source
This commit is contained in:
Rohit Waghchaure
2021-08-19 14:35:52 +05:30
parent 8cd3ffc84d f0d3a074e0
commit d4e7c6d679
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
from frappe.utils import getdate from frappe.utils import getdate
__version__ = '13.9.1' __version__ = '13.9.2'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

29
erpnext/patches/v13_0/update_recipient_email_digest.py
View File

@@ -5,17 +5,18 @@ from __future__ import unicode_literals
import frappe import frappe
def execute(): def execute():
frappe.reload_doc("setup", "doctype", "Email Digest") frappe.reload_doc("setup", "doctype", "Email Digest")
frappe.reload_doc("setup", "doctype", "Email Digest Recipient") frappe.reload_doc("setup", "doctype", "Email Digest Recipient")
email_digests = frappe.db.get_list('Email Digest', fields=['name', 'recipient_list']) email_digests = frappe.db.get_list('Email Digest', fields=['name', 'recipient_list'])
for email_digest in email_digests: for email_digest in email_digests:
if email_digest.recipient_list: if email_digest.recipient_list:
for recipient in email_digest.recipient_list.split("\n"): for recipient in email_digest.recipient_list.split("\n"):
doc = frappe.get_doc({ if frappe.db.exists('User', recipient):
'doctype': 'Email Digest Recipient', doc = frappe.get_doc({
'parenttype': 'Email Digest', 'doctype': 'Email Digest Recipient',
'parentfield': 'recipients', 'parenttype': 'Email Digest',
'parent': email_digest.name, 'parentfield': 'recipients',
'recipient': recipient 'parent': email_digest.name,
}) 'recipient': recipient
doc.insert() })
doc.insert()