nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-28 01:14:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rushabh Mehta
2012-10-15 09:15:32 +02:00
parent a3a55f6ab4 1a2f23254b
commit 2551a5e6f6
2 changed files with 42 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
accounts/doctype/gl_control/gl_control.py
View File

@@ -438,14 +438,15 @@ def manage_recurring_invoices():
def notify_errors(inv, owner): def notify_errors(inv, owner):
from webnotes.utils import get_request_site_address
exception_msg = """ exception_msg = """
Dear User, Dear User,
An error occured while creating recurring invoice from %s. An error occured while creating recurring invoice from %s (at %s).
May be there are some invalid email ids mentioned in the invoice. May be there are some invalid email ids mentioned in the invoice.
To stop sending repetitive error notifications from the system, we have unchecked \ To stop sending repetitive error notifications from the system, we have unchecked
"Convert into Recurring" field in the invoice %s. "Convert into Recurring" field in the invoice %s.
@@ -458,11 +459,11 @@ def notify_errors(inv, owner):
Regards, Regards,
Administrator Administrator
""" % (inv, inv) """ % (inv, get_request_site_address(), inv)
subj = "[Urgent] Error while creating recurring invoice from %s" % inv subj = "[Urgent] Error while creating recurring invoice from %s" % inv
import webnotes.utils import webnotes.utils
recipients = webnotes.utils.get_system_managers_list() recipients = webnotes.utils.get_system_managers_list()
recipients += ['support@erpnext.com', owner] recipients += [webnotes.conn.get_value("Profile", owner, "email")]
assign_task_to_owner(inv, exception_msg, recipients) assign_task_to_owner(inv, exception_msg, recipients)
sendmail(recipients, subject=subj, msg = exception_msg) sendmail(recipients, subject=subj, msg = exception_msg)

48
accounts/doctype/journal_voucher/journal_voucher.txt
View File

@@ -3,9 +3,9 @@
# These values are common in all dictionaries # These values are common in all dictionaries
{ {
u'creation': '2012-05-04 10:21:24', u'creation': '2012-10-02 18:51:46',
u'docstatus': 0, u'docstatus': 0,
u'modified': '2012-10-02 16:43:51', u'modified': '2012-10-15 12:38:42',
u'modified_by': u'Administrator', u'modified_by': u'Administrator',
u'owner': u'Administrator' u'owner': u'Administrator'
}, },
@@ -235,11 +235,13 @@
# DocField # DocField
{ {
'colour': u'White:FFF',
'description': u'eg. Cheque Number',
u'doctype': u'DocField', u'doctype': u'DocField',
'fieldname': u'cheque_no', 'fieldname': u'cheque_no',
'fieldtype': u'Data', 'fieldtype': u'Data',
'in_filter': 1, 'in_filter': 1,
'label': u'Cheque No', 'label': u'Reference Number',
'no_copy': 1, 'no_copy': 1,
'oldfieldname': u'cheque_no', 'oldfieldname': u'cheque_no',
'oldfieldtype': u'Data', 'oldfieldtype': u'Data',
@@ -252,7 +254,7 @@
u'doctype': u'DocField', u'doctype': u'DocField',
'fieldname': u'cheque_date', 'fieldname': u'cheque_date',
'fieldtype': u'Date', 'fieldtype': u'Date',
'label': u'Cheque Date', 'label': u'Reference Date',
'no_copy': 1, 'no_copy': 1,
'oldfieldname': u'cheque_date', 'oldfieldname': u'cheque_date',
'oldfieldtype': u'Date', 'oldfieldtype': u'Date',
@@ -743,6 +745,30 @@
'trigger': u'Client' 'trigger': u'Client'
}, },
# DocPerm
{
'amend': 1,
'cancel': 1,
'create': 1,
u'doctype': u'DocPerm',
'permlevel': 0,
'role': u'Accounts User',
'submit': 1,
'write': 1
},
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
u'doctype': u'DocPerm',
'permlevel': 1,
'role': u'Accounts User',
'submit': 0,
'write': 0
},
# DocPerm # DocPerm
{ {
'amend': 0, 'amend': 0,
@@ -769,14 +795,14 @@
# DocPerm # DocPerm
{ {
'amend': 1, 'amend': 0,
'cancel': 1, 'cancel': 0,
'create': 1, 'create': 0,
u'doctype': u'DocPerm', u'doctype': u'DocPerm',
'permlevel': 0, 'permlevel': 0,
'role': u'Accounts User', 'role': u'Auditor',
'submit': 1, 'submit': 0,
'write': 1 'write': 0
}, },
# DocPerm # DocPerm
@@ -786,7 +812,7 @@
'create': 0, 'create': 0,
u'doctype': u'DocPerm', u'doctype': u'DocPerm',
'permlevel': 1, 'permlevel': 1,
'role': u'Accounts User', 'role': u'Auditor',
'submit': 0, 'submit': 0,
'write': 0 'write': 0
} }