Commit Graph

1058 Commits

Author SHA1 Message Date
Nabin Hait
6182b929bf set default value as blank insead of None through manage account 2011-12-29 12:56:55 +05:30
Anand Doshi
ac20eb2107 Changes in Permission Manager to exclude doctype of 'Core' module and mark Profile as not in create 2011-12-23 13:50:28 +05:30
Anand Doshi
bd269cdbe7 Fix: Email digest gets deleted if even one is disabled. 2011-12-23 11:55:00 +05:30
Anand Doshi
f5d5f10ff3 Remove "Add Recipients" button from Email Digest (again!) 2011-12-22 19:02:15 +05:30
Anand Doshi
a4db9e9b5a Merge pull request #175 from anandpdoshi/master
Added feature: Income Year To Date in Email Digest
2011-12-22 04:33:35 -08:00
Anand Doshi
61a4a498cf Added feature: Income Year To Date in Email Digest 2011-12-22 18:02:36 +05:30
Anand Doshi
6d0be02364 Merge pull request #174 from anandpdoshi/master
Fixed issue: If account of type "Bank or Cash" is not associated to a GL Entry, then it displays an alert in the email digest email body
2011-12-22 04:06:35 -08:00
Anand Doshi
94a18109d7 Fixed issue: If account of type "Bank or Cash" is not associated to any GL Entry, then it displays an alert in the email digest email body 2011-12-22 17:34:11 +05:30
Anand Doshi
3ca92bb3e4 Merge pull request #173 from anandpdoshi/master
Dont show bank balance if no ledger of type "Bank or Cash"
2011-12-22 03:54:48 -08:00
Anand Doshi
7792d08408 Dont show bank balance if no ledger of type "Bank or Cash" 2011-12-22 17:23:11 +05:30
Nabin Hait
b9e8a41cd2 Account and cost center get_query changes for other charges table 2011-12-21 17:33:57 +05:30
Nijil Y
2c19960996 account conflict 2011-12-21 13:30:09 +05:30
Nabin Hait
da9e2e6898 Company master link in global defaults 2011-12-21 13:24:10 +05:30
Nijil Y
0f9eaeaa3c updation Merge branch 'master' of git://github.com/webnotes/erpnext
Conflicts:
	erpnext/projects/doctype/ticket/ticket.py
2011-12-21 12:34:13 +05:30
Nabin Hait
7c03cfad6a Default Price List Currency fld added in Global Defaults 2011-12-20 18:50:41 +05:30
Nijil Y
8dd861bda5 Auto Indent creation when stock reaches re-order level 2011-12-20 17:17:51 +05:30
Nabin Hait
74fcb69b13 Error fixed in cust group 2011-12-20 11:48:27 +05:30
Anand Doshi
48d8d36b79 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-15 14:28:02 +05:30
Anand Doshi
7f18dd3b94 Patches for email digest and remove page break from defaults 2011-12-15 14:24:55 +05:30
Nabin Hait
b3081fafb6 Merge pull request #160 from nijil/master
Accounts Default Form Fix
2011-12-14 22:28:52 -08:00
Anand Doshi
21c649527a Provides better error message to the user 2011-12-14 20:35:19 +05:30
Anand Doshi
e7982f0f85 Merge branch 'master' of github.com:anandpdoshi/erpnext
Conflicts:
	erpnext/setup/doctype/email_digest/email_digest.py
2011-12-14 20:05:16 +05:30
Anand Doshi
ddf4c2655d Resolved bug: if account of type 'Bank or Cash' does not exists, then it shows error in the email digest email but does not raise exception 2011-12-14 20:04:04 +05:30
Anand Doshi
3fe9795020 Resolved bug: if account of type 'Bank or Cash' does not exists, then it shows error in the email digest email but does not raise exception 2011-12-14 20:00:55 +05:30
Anand Doshi
ad42e558df Merge branch 'master' of github.com:webnotes/erpnext 2011-12-14 16:10:44 +05:30
Anand Doshi
ed73fb2b26 Fixed bug regarding setting of banner 2011-12-14 16:09:59 +05:30
Nijil Y
d18153e413 Account Default settings form fix 2011-12-14 15:28:51 +05:30
Anand Doshi
e47be26682 Merge pull request #159 from anandpdoshi/master
Commented print statement in email_digest.py
2011-12-13 23:07:30 -08:00
Anand Doshi
8875d91a8e Commented print statement while inserting record in scheduler 2011-12-14 12:35:07 +05:30
Nabin Hait
9e4d5b9649 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-14 11:27:50 +05:30
Nabin Hait
3a2fcba15f Purchase Discount option in Features Setup 2011-12-14 11:26:46 +05:30
Anand Doshi
17c1a7d9ed Merge branch 'master' of github.com:webnotes/erpnext into edigest 2011-12-08 19:36:54 +05:30
Anand Doshi
633edbef46 Email Digest - ready to be deployed 2011-12-08 19:34:01 +05:30
Nabin Hait
cde8bec0a6 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-06 19:05:14 +05:30
Nabin Hait
38d24534d7 Recurring invoice checkbox added in features setup 2011-12-06 19:04:21 +05:30
Anand Doshi
590448aaef Changes in email digest 2011-12-06 18:51:14 +05:30
Anand Doshi
41e542ce4d Email Digest changes 2011-12-06 10:41:54 +05:30
Anand Doshi
adf2f777d3 Removed print format option. Instead show html code. 2011-12-05 12:16:31 +05:30
Anand Doshi
393f5e6078 Queries to get new records in a particular doctype 2011-12-02 19:20:10 +05:30
Anand Doshi
f10ad98ebf Refactored queries to be more clean 2011-12-02 17:53:08 +05:30
Anand Doshi
7057cbf9e5 Started with email digest 2011-12-02 15:15:38 +05:30
Anand Doshi
ed825062f1 Hide programming error messages from user on update_security 2011-11-30 15:23:37 +05:30
Anand Doshi
6e5e30c420 Merge pull request #147 from anandpdoshi/master
Added Customize Form View and Print Formats to Setup Page
2011-11-23 04:35:20 -08:00
Anand Doshi
a04afc9b3b Added Customize Form View (DocLayer) and Print Formats(docbrowser) to Setup Page 2011-11-23 13:51:52 +05:30
Nabin Hait
ed6b489715 filter property changed in address 2011-11-23 13:17:54 +05:30
Nabin Hait
3addd27f2c Address is added in setup for deleting purpose 2011-11-23 13:11:15 +05:30
Nabin Hait
685564f71d Resolved conflict after merging with master 2011-10-11 14:42:34 +05:30
Ravi Dey
24ef523cac Issue fixed in setup control 2011-10-10 18:39:49 +05:30
Nabin Hait
da50c0859c features by default on 2011-10-05 12:10:08 +05:30
Nabin Hait
b30c4a6611 Fieldname changed in Features Setup 2011-10-05 11:36:16 +05:30
Nabin Hait
525887fd8a Error fixed in auth control 2011-09-27 17:00:01 +05:30
Nabin Hait
5941ae3b75 Default account creation order changed 2011-09-22 16:10:43 +05:30
Nabin Hait
e10900115e updated company on_trash function 2011-09-16 15:50:45 +05:30
Rushabh Mehta
1e11cb486d merging from master and usability fixes to setup 2011-09-14 13:25:10 +05:30
Rushabh Mehta
5f50617121 removed readme 2011-09-13 15:48:51 +05:30
Rushabh Mehta
8cf45175a7 Merge branch 'master' of github.com:webnotes/erpnext 2011-09-08 14:17:41 +05:30
Rushabh Mehta
5ede3e8411 fixes to home (multiple loading) 2011-09-08 14:16:34 +05:30
Rushabh Mehta
66ac2b018a first cut for lazy loading framework 2011-09-05 18:43:09 +05:30