Commit Graph

3696 Commits

Author SHA1 Message Date
Rushabh Mehta
71d6a0ce1d cleaned up leave application 2012-11-30 12:41:46 +05:30
Rushabh Mehta
86adcaa113 fixed employee permissions, fixed bug in import_merge of timestamps 2012-11-30 12:02:00 +05:30
Rushabh Mehta
35c017a78f cleanup of notification control: now in boot 2012-11-30 10:57:28 +05:30
Anand Doshi
c2fb039697 added tax and transaction controller for server-side calculations 2012-11-29 19:55:30 +05:30
Nabin Hait
6aa80071e5 Production plan cleanup and fixes 2012-11-29 19:26:49 +05:30
Anand Doshi
cbdf09438b Merge branch 'master' of github.com:webnotes/erpnext 2012-11-29 18:30:37 +05:30
Anand Doshi
681d21dd1f for tax account, rate is no more mandatory 2012-11-29 18:29:56 +05:30
Rushabh Mehta
e1e4aafd9b communication: check send with attach if from sidebar 2012-11-29 17:00:53 +05:30
Rushabh Mehta
b12d5363bc merge 2012-11-29 16:30:57 +05:30
Rushabh Mehta
64cb05c3c1 form email sending via CommunicationComposer 2012-11-29 16:08:45 +05:30
Nabin Hait
375ba8ef0a Merge branch 'master' of github.com:webnotes/erpnext 2012-11-29 15:24:02 +05:30
Nabin Hait
5f91862aef error fixed in adding answer in knowledge base 2012-11-29 15:23:26 +05:30
Rushabh Mehta
d7fe2bfe1b webnotes.model.doctype (new version) 2012-11-29 11:49:56 +05:30
Anand Doshi
342e3c4616 mark expected delivery date mandatory for Sales Order of type Sales 2012-11-28 18:28:23 +05:30
Anand Doshi
624334aed1 updated latest updates 2012-11-28 17:31:35 +05:30
Anand Doshi
88d522aa51 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-28 17:14:23 +05:30
Anand Doshi
47514097be show Net Profit only when company is selected 2012-11-28 17:12:30 +05:30
Anand Doshi
01bf10b8b6 changed default to Monthly in new grid reports 2012-11-28 17:12:18 +05:30
Nabin Hait
0af1959a63 remove basic info patch not required 2012-11-28 16:56:50 +05:30
Nabin Hait
c62fe40e85 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-28 16:49:53 +05:30
Nabin Hait
c4fb30dc8d Removed basic info section 2012-11-28 16:49:18 +05:30
Anand Doshi
77aa0ef4f6 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-28 16:07:44 +05:30
Anand Doshi
bd36c4fb59 Merge branch 'edge' of github.com:webnotes/erpnext 2012-11-28 16:07:20 +05:30
Anand Doshi
42d37bf6c2 added Net Profit in financial analytis 2012-11-28 16:06:37 +05:30
Anand Doshi
7507303d34 removed Total at the end of PL/BS 2012-11-28 16:03:32 +05:30
Rushabh Mehta
a5d18706b7 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-28 16:02:55 +05:30
Rushabh Mehta
57774c032c contact.js: set customer, supplier 2012-11-28 16:01:58 +05:30
Rushabh Mehta
af45422668 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2012-11-28 15:28:04 +05:30
Nabin Hait
ee48ef747c Merge branch 'master' of github.com:webnotes/erpnext 2012-11-28 15:26:33 +05:30
Nabin Hait
1da6e1b864 patch: update % delievered and % billed in SO if pos made against that so 2012-11-28 15:24:11 +05:30
Rushabh Mehta
40d73ed9db profile: form is now my settings page, removed (Page, profile-settings) 2012-11-28 15:21:04 +05:30
Rushabh Mehta
bd919caa9b profile: form is now my settings page, removed (Page, profile-settings) 2012-11-28 15:19:51 +05:30
Nabin Hait
dcc4ff5ca3 patch: update % delievered and % billed in SO if pos made against that so 2012-11-28 14:12:49 +05:30
Nabin Hait
d9eb526b27 patch: update % delievered and % billed in SO if pos made against that so 2012-11-28 12:40:52 +05:30
Nabin Hait
ef71940d58 Update delivered qty and billed amt in SO, if POS against Sales Order 2012-11-28 12:15:45 +05:30
Rushabh Mehta
d5bf5153fa Merge branch 'master' of github.com:webnotes/erpnext 2012-11-28 10:48:26 +05:30
Rushabh Mehta
cee2b8ff4d support ticket: updated signature, doctype: create py if not exists 2012-11-28 10:47:51 +05:30
Anand Doshi
51b0785529 updated latest updates page 2012-11-27 19:07:35 +05:30
Anand Doshi
55ffa7e14d Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
	patches/patch_list.py
2012-11-27 18:56:32 +05:30
Anand Doshi
a22bd841eb patch to update cancelled BOMs 2012-11-27 18:55:17 +05:30
Rushabh Mehta
dfcdd56ba5 refactored communication and added to Lead / Contact 2012-11-27 18:53:48 +05:30
Rushabh Mehta
1a0c61711c refactored communication and added to Lead / Contact 2012-11-27 18:48:43 +05:30
Rushabh Mehta
33c8d0d3e2 refactored communication and added to Lead / Contact 2012-11-27 18:45:21 +05:30
Rushabh Mehta
fe9707a08a refactored communication and added to Lead / Contact 2012-11-27 18:43:19 +05:30
Rushabh Mehta
e1a433812f refactored communication and added to Lead / Contact 2012-11-27 18:41:42 +05:30
Rushabh Mehta
80127bfb6a refactored communication and added to Lead / Contact 2012-11-27 18:41:35 +05:30
Anand Doshi
ab6848d37b if bom is cancelled, mark it as inactive and uncheck default. also unset it in item 2012-11-27 18:33:39 +05:30
Anand Doshi
8e8f5f0878 fix in support ticket deletion 2012-11-27 17:06:48 +05:30
Anand Doshi
726963c153 minor fixes in overflow percent of sales common 2012-11-27 16:38:43 +05:30
Anand Doshi
7255a9a660 show Total Income as Total Expenses + Profile/Loss in Financial Statements 2012-11-27 16:33:10 +05:30