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

Merge branch 'master' into edge

Browse Source 
Conflicts:
	setup/doctype/backup_manager/backup_dropbox.py
This commit is contained in:
Anand Doshi
2013-03-22 18:43:47 +05:30
parent 3f725308e1 b632ba5f51
commit aeed499d12
10 changed files with 64 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
website/utils.py
View File

@@ -143,6 +143,7 @@ def prepare_args(page_name):
args.update(webnotes.get_method(target)())
else:
args.obj = webnotes.bean(page_settings_map[page_name]).obj
else:
args = get_doc_fields(page_name)