Commit Graph

4017 Commits

Author SHA1 Message Date
Rushabh Mehta
c81b914f98 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-28 13:03:37 +01:00
Anand Doshi
624334aed1 updated latest updates 2012-11-28 17:31:35 +05:30
Rushabh Mehta
f579e93c98 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-28 13:00:31 +01:00
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
Rushabh Mehta
42bd645dea Merge branch 'master' of github.com:webnotes/erpnext 2012-11-28 11:35:07 +01:00
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
84e3938bca Merge branch 'master' of github.com:webnotes/erpnext 2012-11-28 11:01:35 +01:00
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
3c67b3dae8 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-28 10:53:36 +01:00
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
Rushabh Mehta
6ad005f636 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-28 09:43:34 +01:00
Nabin Hait
dcc4ff5ca3 patch: update % delievered and % billed in SO if pos made against that so 2012-11-28 14:12:49 +05:30
Rushabh Mehta
fa668cdd3b Merge branch 'master' of github.com:webnotes/erpnext 2012-11-28 09:23:23 +01:00
Rushabh Mehta
9ddad9c6e7 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-28 08:16:21 +01:00
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
Rushabh Mehta
d52df14f54 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-27 14:39:17 +01:00
Anand Doshi
51b0785529 updated latest updates page 2012-11-27 19:07:35 +05:30
Rushabh Mehta
d547aee201 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-27 14:27:11 +01:00
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
Rushabh Mehta
acf0e13f88 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-27 14:04:19 +01:00
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
Rushabh Mehta
8f72b49eff Merge branch 'master' of github.com:webnotes/erpnext 2012-11-27 12:37:18 +01:00
Anand Doshi
8e8f5f0878 fix in support ticket deletion 2012-11-27 17:06:48 +05:30
Rushabh Mehta
84e5b5de25 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-27 12:09:13 +01:00
Anand Doshi
726963c153 minor fixes in overflow percent of sales common 2012-11-27 16:38:43 +05:30
Rushabh Mehta
ecc70e88fa Merge branch 'master' of github.com:webnotes/erpnext 2012-11-27 12:04:16 +01:00
Anand Doshi
7255a9a660 show Total Income as Total Expenses + Profile/Loss in Financial Statements 2012-11-27 16:33:10 +05:30