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

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

Browse Source
This commit is contained in:
Nabin Hait
2012-02-14 15:13:52 +05:30
parent 84d73103f8 ec6f9fedd6
commit 461a071dfa
5 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/patches/jan_mar_2012/website/website.py
View File

@@ -44,6 +44,7 @@ def execute():
reload_doc('website', 'page', 'unsubscribe') reload_doc('website', 'page', 'unsubscribe')
create_home_page() create_home_page()
add_website_manager()
def create_home_page(): def create_home_page():
"""create a dummy home page""" """create a dummy home page"""

1
erpnext/setup/doctype/email_settings/email_settings.py
View File

@@ -38,6 +38,7 @@ class DocType:
from webnotes.utils import cint from webnotes.utils import cint
import _socket import _socket
from webnotes.utils.email_lib.send import EMail from webnotes.utils.email_lib.send import EMail
import smtplib
out_email = EMail() out_email = EMail()
out_email.server = self.doc.outgoing_mail_server.encode('utf-8') out_email.server = self.doc.outgoing_mail_server.encode('utf-8')
out_email.port = cint(self.doc.mail_port) out_email.port = cint(self.doc.mail_port)

4
erpnext/startup/feature_setup.js
View File

@@ -24,8 +24,8 @@ pscript.feature_dict = {
'Timesheet': {'timesheet_details':['project_name']} 'Timesheet': {'timesheet_details':['project_name']}
}, },
'fs_packing_details': { 'fs_packing_details': {
'Delivery Note': {'fields':['packing_details','print_packing_slip','packing_checked_by','packed_by','pack_size','shipping_mark'],'delivery_note_details':['no_of_packs','pack_gross_wt','pack_nett_wt','pack_no','pack_unit']}, //'Delivery Note': {'fields':['packing_details','print_packing_slip','packing_checked_by','packed_by','pack_size','shipping_mark'],'delivery_note_details':['no_of_packs','pack_gross_wt','pack_nett_wt','pack_no','pack_unit']},
'Sales Order': {'fields':['packing_details']} //'Sales Order': {'fields':['packing_details']}
}, },
'fs_discounts': { 'fs_discounts': {
'Delivery Note': {'delivery_note_details':['adj_rate']}, 'Delivery Note': {'delivery_note_details':['adj_rate']},

2
js/all-app.js
View File

File diff suppressed because one or more lines are too long

2
version.num
View File

@@ -1 +1 @@
421 422