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

merged conflict in gl_control.py

Browse Source
This commit is contained in:
Rushabh Mehta
2011-07-13 14:37:17 +05:30
parent 98eb61e6de 6c174a6e35
commit af596344ba
23 changed files with 1517 additions and 664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
home/__init__.py
View File

@@ -91,7 +91,7 @@ def update_feed1(doc):
subject = subject % doc.fields
make_feed(doc, subject, color)
def update_feed(doc, method):
def update_feed(doc, method=None):
"adds a new feed"
if method=='validate':
return