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

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

Browse Source
This commit is contained in:
Rushabh Mehta
2012-03-19 12:40:07 +01:00
parent 6498cee998 65ad3b1a0f
commit ffe9d358e8
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/search_criteria/trial_balance/trial_balance.py
View File

@@ -114,8 +114,8 @@ for r in res:
r.append(flt(opening<0 and -opening or 0)) r.append(flt(opening<0 and -opening or 0))
r.append(flt(debit)) r.append(flt(debit))
r.append(flt(credit)) r.append(flt(credit))
r.append(flt(closing>0 and closing or 0)) r.append(flt(closing>0.01 and closing or 0))
r.append(flt(closing<0 and -closing or 0)) r.append(flt(closing<-0.01 and -closing or 0))
out =[] out =[]

4
erpnext/selling/doctype/customer/customer.txt
View File

@@ -203,7 +203,7 @@
# DocField # DocField
{ {
'colour': u'White:FFF', 'colour': u'White:FFF',
'description': u'<a href="javascript:cur_frm.cscript.CGHelp();">To manage Customer Groups, click here</a>', 'description': u'<a href="#!Sales Browser/Customer Group">To manage Customer Groups, click here</a>',
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'customer_group', 'fieldname': u'customer_group',
'fieldtype': u'Link', 'fieldtype': u'Link',
@@ -223,7 +223,7 @@
# DocField # DocField
{ {
'colour': u'White:FFF', 'colour': u'White:FFF',
'description': u'<a href="javascript:cur_frm.cscript.TerritoryHelp();">To manage Territory, click here</a>', 'description': u'<a href="#!Sales Browser/Territory">To manage Territory, click here</a>',
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'territory', 'fieldname': u'territory',
'fieldtype': u'Link', 'fieldtype': u'Link',

6
erpnext/setup/doctype/manage_account/manage_account.txt
View File

@@ -231,7 +231,7 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'HTML', 'fieldtype': 'HTML',
'label': 'IGHelp', 'label': 'IGHelp',
'options': '<a href="javascript:cur_frm.cscript.TreePage(\'Item Group\');">To manage Item Groups, click here</a>' 'options': '<a href="#!Sales Browser/Item Group">To manage Item Groups, click here</a>'
}, },
# DocField # DocField
@@ -391,7 +391,7 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'HTML', 'fieldtype': 'HTML',
'label': 'CGHelp', 'label': 'CGHelp',
'options': '<a href="javascript:cur_frm.cscript.TreePage(\'Customer Group\');">To manage Customer Groups, click here</a>' 'options': '<a href="#!Sales Browser/Customer Group">To manage Customer Groups, click here</a>'
}, },
# DocField # DocField
@@ -408,7 +408,7 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'HTML', 'fieldtype': 'HTML',
'label': 'TerritoryHelp', 'label': 'TerritoryHelp',
'options': '<a href="javascript:cur_frm.cscript.TreePage(\'Territory\');">To manage Territory, click here</a>' 'options': '<a href="#!Sales Browser/Territory">To manage Territory, click here</a>'
}, },
# DocField # DocField

2
erpnext/setup/doctype/sales_person/sales_person.txt
View File

@@ -183,7 +183,7 @@
'idx': 5, 'idx': 5,
'label': 'SPHelp', 'label': 'SPHelp',
'oldfieldtype': 'HTML', 'oldfieldtype': 'HTML',
'options': '<a href="javascript:cur_frm.cscript.TreePage(\'Sales Person\');">To manage Sales Person, click here</a>', 'options': '<a href="#!Sales Browser/Sales Person">To manage Sales Person, click here</a>',
'permlevel': 0 'permlevel': 0
}, },