nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-17 02:26:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'shf_rename'

Browse Source
This commit is contained in:
Anand Doshi
2012-05-14 18:03:45 +05:30
parent 79af963aef 4ce0cd7274
commit f295591168
7 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/Print Format/Sales Invoice Classic/Sales Invoice Classic.txt
View File

File diff suppressed because one or more lines are too long

6
erpnext/accounts/Print Format/Sales Invoice Modern/Sales Invoice Modern.txt
View File

File diff suppressed because one or more lines are too long

6
erpnext/accounts/Print Format/Sales Invoice Spartan/Sales Invoice Spartan.txt
View File

File diff suppressed because one or more lines are too long

5
erpnext/accounts/doctype/sales_invoice/sales_invoice.txt
View File

@@ -5,7 +5,7 @@
{
'creation': '2012-04-13 11:56:18',
'docstatus': 0,
'modified': '2012-05-08 17:17:51',
'modified': '2012-05-14 14:09:43',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -859,7 +859,8 @@
'fieldname': u'write_off_outstanding_amount_automatically',
'fieldtype': u'Check',
'label': u'Write Off Outstanding Amount Automatically',
'permlevel': 0
'permlevel': 0,
'print_hide': 1
},
# DocField

5
erpnext/support/doctype/support_ticket/__init__.py
View File

@@ -171,5 +171,6 @@ def get_support_mails():
"""
Gets new emails from support inbox and updates / creates Support Ticket records
"""
SupportMailbox().get_messages()
import webnotes
if webnotes.conn.get_value('Email Settings', None, 'sync_support_mails'):
SupportMailbox().get_messages()