From e5d99f5ed1bc98418e254ef3e65225f7e681495e Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 19 Mar 2012 15:15:20 +0530 Subject: [PATCH 1/5] Update erpnext/setup/doctype/manage_account/manage_account.txt --- erpnext/setup/doctype/manage_account/manage_account.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/setup/doctype/manage_account/manage_account.txt b/erpnext/setup/doctype/manage_account/manage_account.txt index 18a9872d1c..1ff58ca525 100644 --- a/erpnext/setup/doctype/manage_account/manage_account.txt +++ b/erpnext/setup/doctype/manage_account/manage_account.txt @@ -231,7 +231,7 @@ 'doctype': 'DocField', 'fieldtype': 'HTML', 'label': 'IGHelp', - 'options': 'To manage Item Groups, click here' + 'options': 'To manage Item Groups, click here' }, # DocField From 9aa3777ba6c0fb9eb5cd7e9fc3ae6c601dae1a74 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 19 Mar 2012 15:21:30 +0530 Subject: [PATCH 2/5] Update erpnext/setup/doctype/sales_person/sales_person.txt --- erpnext/setup/doctype/sales_person/sales_person.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/setup/doctype/sales_person/sales_person.txt b/erpnext/setup/doctype/sales_person/sales_person.txt index 0680c3886f..9ae96bfc33 100644 --- a/erpnext/setup/doctype/sales_person/sales_person.txt +++ b/erpnext/setup/doctype/sales_person/sales_person.txt @@ -183,7 +183,7 @@ 'idx': 5, 'label': 'SPHelp', 'oldfieldtype': 'HTML', - 'options': 'To manage Sales Person, click here', + 'options': 'To manage Sales Person, click here', 'permlevel': 0 }, From 422f7e99db2e8953e8b97e3cac2a3e0028143e40 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 19 Mar 2012 15:37:03 +0530 Subject: [PATCH 3/5] Update erpnext/selling/doctype/customer/customer.txt --- erpnext/selling/doctype/customer/customer.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/selling/doctype/customer/customer.txt b/erpnext/selling/doctype/customer/customer.txt index 346b4d1029..993dc29f5e 100644 --- a/erpnext/selling/doctype/customer/customer.txt +++ b/erpnext/selling/doctype/customer/customer.txt @@ -203,7 +203,7 @@ # DocField { 'colour': u'White:FFF', - 'description': u'To manage Customer Groups, click here', + 'description': u'To manage Customer Groups, click here', 'doctype': u'DocField', 'fieldname': u'customer_group', 'fieldtype': u'Link', @@ -223,7 +223,7 @@ # DocField { 'colour': u'White:FFF', - 'description': u'To manage Territory, click here', + 'description': u'To manage Territory, click here', 'doctype': u'DocField', 'fieldname': u'territory', 'fieldtype': u'Link', From 16d9f4942a781c6383677f4fe5096f0bf45940fe Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 19 Mar 2012 15:48:08 +0530 Subject: [PATCH 4/5] Update erpnext/setup/doctype/manage_account/manage_account.txt --- erpnext/setup/doctype/manage_account/manage_account.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/setup/doctype/manage_account/manage_account.txt b/erpnext/setup/doctype/manage_account/manage_account.txt index 1ff58ca525..4077afe76e 100644 --- a/erpnext/setup/doctype/manage_account/manage_account.txt +++ b/erpnext/setup/doctype/manage_account/manage_account.txt @@ -391,7 +391,7 @@ 'doctype': 'DocField', 'fieldtype': 'HTML', 'label': 'CGHelp', - 'options': 'To manage Customer Groups, click here' + 'options': 'To manage Customer Groups, click here' }, # DocField @@ -408,7 +408,7 @@ 'doctype': 'DocField', 'fieldtype': 'HTML', 'label': 'TerritoryHelp', - 'options': 'To manage Territory, click here' + 'options': 'To manage Territory, click here' }, # DocField From 65ad3b1a0fd65f6b44a05a092fb7ff3683bfb622 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 19 Mar 2012 17:09:14 +0530 Subject: [PATCH 5/5] Update erpnext/accounts/search_criteria/trial_balance/trial_balance.py --- .../accounts/search_criteria/trial_balance/trial_balance.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/search_criteria/trial_balance/trial_balance.py b/erpnext/accounts/search_criteria/trial_balance/trial_balance.py index 34a828a5a2..d9f00d19ec 100644 --- a/erpnext/accounts/search_criteria/trial_balance/trial_balance.py +++ b/erpnext/accounts/search_criteria/trial_balance/trial_balance.py @@ -114,8 +114,8 @@ for r in res: r.append(flt(opening<0 and -opening or 0)) r.append(flt(debit)) r.append(flt(credit)) - r.append(flt(closing>0 and closing or 0)) - r.append(flt(closing<0 and -closing or 0)) + r.append(flt(closing>0.01 and closing or 0)) + r.append(flt(closing<-0.01 and -closing or 0)) out =[]