Commit Graph

1600 Commits

Author SHA1 Message Date
Nabin Hait
5c1de3a639 fixed conflict 2012-05-31 11:47:09 +05:30
Nabin Hait
353bc313a6 Link to Sales/accounts browser fixed 2012-05-31 11:43:14 +05:30
Nabin Hait
4aaaa8af7b Merge branch 'master' of github.com:webnotes/erpnext 2012-05-23 16:22:41 +05:30
Nabin Hait
2b06b903a5 Merge branch 'shf_rename' 2012-05-23 16:22:24 +05:30
Nabin Hait
517eacf9e3 packing list code updated for duplicate items in item table 2012-05-23 16:21:39 +05:30
Anand Doshi
9327bb9585 fix in tag viewing in doclistview 2012-05-23 15:12:22 +05:30
Nabin Hait
ea538bb9c7 fixed conflict 2012-05-23 12:57:05 +05:30
Nabin Hait
97bb6ce88b create report manager role patch 2012-05-23 12:55:11 +05:30
Nabin Hait
86df78aabc fixed conflict 2012-05-23 11:33:28 +05:30
Nabin Hait
53dab4ac40 validation in customer 2012-05-23 11:29:13 +05:30
Anand Doshi
38830ddae1 removed console log in customer.js 2012-05-23 10:55:59 +05:30
Nabin Hait
611157447f sms fix 2012-05-22 17:25:39 +05:30
Anand Doshi
6033d96a56 fixes in style settings 2012-05-22 17:21:24 +05:30
Anand Doshi
e780f661a7 fix in transaction history 2012-05-22 17:04:33 +05:30
Nabin Hait
df9f8a363e Balance on chart of accounts 2012-05-22 16:54:46 +05:30
Nabin Hait
78b62cd865 Maintain same rate throughout pur cycle: in global defaults, by default set true 2012-05-22 16:23:27 +05:30
Nabin Hait
a21d2a9b38 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-22 14:54:25 +05:30
Nabin Hait
b695f73293 Maintain same rate throughout pur cycle: in global defaults, by default set true 2012-05-22 14:53:40 +05:30
Anand Doshi
f0babb7f0f fixes in cms 2012-05-22 13:41:51 +05:30
Anand Doshi
d287962cd9 removed the double check box in support ticket list 2012-05-21 19:36:47 +05:30
Rushabh Mehta
ceb2ab35e6 fixes in cms page generation 2012-05-21 15:56:50 +02:00
Anand Doshi
cb909d518c Merge branch 'shf_rename' 2012-05-21 18:44:19 +05:30
Anand Doshi
dedd8cc510 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-21 18:41:57 +05:30
Anand Doshi
2c4cd08844 more listviews 2012-05-21 18:40:53 +05:30
Nabin Hait
86375f089a Merge branch 'shf_rename'
Conflicts:
	erpnext/patches/patch_list.py
2012-05-21 15:48:21 +05:30
Nabin Hait
cba9c716f2 Remove all those parent items from packing details which are no longer present in main item table 2012-05-21 15:35:23 +05:30
Nabin Hait
ee2201cc68 forced export limit increased to 2000 2012-05-21 15:13:57 +05:30
Anand Doshi
6420e602e0 make server side custom script readonly for system manager 2012-05-21 15:11:36 +05:30
Anand Doshi
8db7ff3b36 hide domain list field, as it is not functional currently 2012-05-21 14:59:45 +05:30
Nabin Hait
d429a20c6e Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-21 14:51:04 +05:30
Nabin Hait
8b426a6142 customer issue cleanup 2012-05-21 14:50:28 +05:30
Nabin Hait
fec3f783af custom field included in docfield query 2012-05-21 14:40:25 +05:30
Anand Doshi
1aae261490 delete button in doclistview 2012-05-21 14:31:03 +05:30
Nabin Hait
d9742a6a58 on_trash modified for item group, territory, customer group, and sales person 2012-05-21 13:33:09 +05:30
Anand Doshi
881f154275 change session cache storage as json 2012-05-21 13:13:10 +05:30
Rushabh Mehta
03a26f2ed2 list blogs based on creation date 2012-05-19 10:53:15 +05:30
Nabin Hait
c68635d70a Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-18 18:37:28 +05:30
Nabin Hait
3b8d4776a2 company validation 2012-05-18 18:36:56 +05:30
Anand Doshi
df914991c4 Merge branch 'shf_rename' 2012-05-18 18:21:43 +05:30
Anand Doshi
bde13a655f moved uom next to qty in quotation item 2012-05-18 18:21:29 +05:30
Anand Doshi
fd3b19defa Merge branch 'shf_rename' 2012-05-18 18:08:44 +05:30
Anand Doshi
67a2e0123c moved po number and po date to basic info section of delivery note 2012-05-18 18:08:28 +05:30
Anand Doshi
0f7dd5453d Merge branch 'shf_rename' 2012-05-18 16:55:48 +05:30
Anand Doshi
227e9d3ac6 cleanup customize form 2012-05-18 16:55:20 +05:30
Anand Doshi
00175612ac Merge branch 'shf_rename'
Conflicts:
	erpnext/stock/doctype/item/listview.js
2012-05-18 16:50:35 +05:30
Anand Doshi
d49da9bff1 new listviews 2012-05-18 16:49:36 +05:30
Anand Doshi
d643d367ca Merge branch 'shf_rename'
Conflicts:
	public/js/all-app.js
	public/js/all-web.js
2012-05-18 11:52:31 +05:30
Anand Doshi
acd291a228 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-18 11:50:08 +05:30
Nabin Hait
c1f1702e22 so pending item patch 2012-05-18 11:43:10 +05:30
Nabin Hait
c58fbffc00 so pending item patch 2012-05-18 11:07:04 +05:30