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

Merge branch 'master' of github.com:webnotes/erpnext into shf_rename

Browse Source 
Conflicts:
	erpnext/accounts/doctype/c_form/c_form.txt
	erpnext/patches/patch_list.py
	erpnext/setup/doctype/permission_control/permission_control.py
This commit is contained in:
Anand Doshi
2012-04-09 12:14:53 +05:30
parent 85eb840ab4 3525d92cfb
commit 87a2c5cc69
10 changed files with 103 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/setup/doctype/email_digest/email_digest.py
View File

@@ -240,7 +240,9 @@ class DocType:
Adds common conditions in dictionary "args"
"""
start_date, end_date = self.get_start_end_dates()
fiscal_start_date = webnotes.utils.get_defaults()['year_start_date']
fiscal_year = webnotes.utils.get_defaults()['fiscal_year']
fiscal_start_date = webnotes.conn.get_value('Fiscal Year', fiscal_year,
'year_start_date')
if 'new' in args['type']:
args.update({