Commit Graph

4050 Commits

Author SHA1 Message Date
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
Rushabh Mehta
bc555f2721 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-27 09:03:31 +01:00
Anand Doshi
319ac97963 in communication, on overflowX, provide scroll 2012-11-27 13:30:03 +05:30
Rushabh Mehta
2be7602916 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-26 14:19:40 +01:00
Anand Doshi
58babf93c6 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-26 18:48:11 +05:30
Anand Doshi
ca868e42ae added module icons in grid reports 2012-11-26 18:47:54 +05:30
Rushabh Mehta
e1a1a7f637 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-26 13:48:53 +01:00
Rushabh Mehta
c4e7b6800a separated communication view 2012-11-26 18:18:10 +05:30
Rushabh Mehta
ef998687be Merge branch 'master' of github.com:webnotes/erpnext 2012-11-26 12:31:02 +01:00
Rushabh Mehta
36b586cdfe cleaned up profile settings 2012-11-26 16:51:51 +05:30
Rushabh Mehta
d3df97e2e2 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-26 10:49:15 +01:00
Rushabh Mehta
21df1479a7 reload_doc can now do doctypes, update patch 2012-11-26 15:18:36 +05:30
Rushabh Mehta
f0a19a2763 added on_trash for support ticket 2012-11-26 14:52:13 +05:30
Rushabh Mehta
2d0f78cb54 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-26 10:19:22 +01:00
Rushabh Mehta
1d49c61283 profile: added email signature to outgoing mail and profile settings 2012-11-26 14:09:17 +05:30
Rushabh Mehta
ce0f4660ae profile: added email signature to outgoing mail and profile settings 2012-11-26 14:07:53 +05:30
Rushabh Mehta
4ea398add6 profile: added email signature to outgoing mail and profile settings 2012-11-26 14:02:21 +05:30
Rushabh Mehta
be919b3855 profile: added email signature to outgoing mail and profile settings 2012-11-26 13:54:47 +05:30