Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,221 Commits 3 Branches 0 Tags 1 GiB
6840ef67df
Commit Graph

69 Commits

Author SHA1 Message Date
Rushabh Mehta
764fdb942e updated account url and js version 2012-01-20 12:07:56 +05:30
Anand Doshi
cb1f361461 Fix: Notify via email on new post on my company page 2012-01-12 13:46:46 +05:30
Anand Doshi
06d43bcfe2 Fix: Rounded Total appearing extra in Standard Print Format 2012-01-11 15:05:24 +05:30
Anand Doshi
a8c2f59d1b Escape (') in customer name in authorization control 2012-01-11 12:07:48 +05:30
Anand Doshi
385299903d Escape (') in customer name in authorization control 2012-01-11 12:03:47 +05:30
Anand Doshi
266829f024 Merge branch 'master' into stable 2012-01-10 13:59:14 +05:30
Anand Doshi
a0aa3d5605 Merge branch 'master' of github.com:webnotes/erpnext 2012-01-10 13:59:04 +05:30
Anand Doshi
a9df960494 On Print Hide, hide net_total, rounded_total_export and grand_total_export 2012-01-09 16:55:30 +05:30
Anand Doshi
5e57a39bb1 Merge branch 'master' into stable 2012-01-04 19:32:01 +05:30
Anand Doshi
f80f20f480 Changes in Notifications 2012-01-04 19:31:32 +05:30
Nabin Hait
15e8277a46 Dont update series starts from if no prefix 2012-01-04 16:23:09 +05:30
Nabin Hait
9d8e85c1f5 Dont update series starts from if no prefix 2012-01-04 16:17:18 +05:30
Anand Doshi
6ac1d4bb44 Merge branch 'stable' of github.com:webnotes/erpnext into stable 
Conflicts:
	erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
 2012-01-03 11:45:11 +05:30
Anand Doshi
d56d57d205 Patch system changes, Inclusive Price feature and session cache clear on disabling user or on new login 2012-01-02 16:25:05 +05:30
Anand Doshi
62dbf27780 Merge pull request #192 from anandpdoshi/master 
New transaction entries fix for email digest
 2011-12-30 02:33:05 -08:00
Anand Doshi
34b9f5b1e0 Fix new transaction entries issue 2011-12-30 16:02:03 +05:30
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