merged some update from live

This commit is contained in:
Nabin Hait
2011-07-28 15:18:05 +05:30
7 changed files with 93 additions and 97 deletions

View File

@@ -12,7 +12,7 @@
# These values are common for all DocType
{
'_last_update': '1310035501',
'_last_update': '1311622167',
'allow_attach': 1,
'autoname': 'field:rename_doctype',
'colour': 'White:FFF',
@@ -21,7 +21,7 @@
'name': '__common__',
'section_style': 'Simple',
'show_in_menu': 0,
'version': 6
'version': 7
},
# These values are common for all DocField
@@ -96,4 +96,4 @@
'label': 'Rename',
'options': 'do_rename'
}
]
]

View File

@@ -58,7 +58,7 @@ class DocType:
def connect_gateway(self):
"login to gateway"
from webnotes.utils.webservice import FrameworkServer
fw = FrameworkServer('www.erpnext.com', '/', '__system@webnotestech.com', 'password')
fw = FrameworkServer('www.erpnext.com', '/', '__system@webnotestech.com', 'password', https=1)
return fw
def get_sender_name(self):