Commit Graph

226 Commits

Author SHA1 Message Date
Nabin Hait
239e79038f Customer/customer group wise price list 2012-04-20 10:25:03 +05:30
Anand Doshi
24e18569d9 fixes in install docs for roles 2012-04-17 11:45:35 +05:30
Anand Doshi
45a4edc9c9 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
Conflicts:
	css/all-app.css
	version.num
2012-04-17 11:19:15 +05:30
Nabin Hait
fe127c216c fixed issue in stock 2012-04-16 16:01:02 +05:30
Nabin Hait
6f89f1eb86 fixes in sales cycle 2012-04-16 14:44:47 +05:30
Rushabh Mehta
cabfc65fe0 lib/py/webnotes/defs.py -> conf.py (see sample in lib/conf/conf.py) 2012-04-14 16:08:45 +05:30
Anand Doshi
a0f6a3eab7 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 15:34:27 +05:30
Nabin Hait
f3348c5136 Merge branch 'master' into shf_rename 2012-04-13 14:41:56 +05:30
Nabin Hait
781a3c9b1f Merge branch 'master' of github.com:webnotes/erpnext 2012-04-13 14:41:45 +05:30
Nabin Hait
82c53871c7 fixes in se js 2012-04-13 14:39:04 +05:30
Nabin Hait
1c9061eff6 fixed conflict using theirs 2012-04-13 14:24:35 +05:30
Nabin Hait
6c615d9527 Merge branch 'master' of github.com:webnotes/erpnext 2012-04-13 14:14:39 +05:30
Nabin Hait
b09b3bc253 all fields visible if any other custom purpose in stock entry 2012-04-13 14:13:02 +05:30
Anand Doshi
b3ab90a01a field changes in sp return tool 2012-04-13 12:38:34 +05:30
Nabin Hait
b176e94b92 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 11:53:35 +05:30
Nabin Hait
e77164955b removed repair fn, fixes in reports 2012-04-13 11:53:06 +05:30
Rushabh Mehta
97ae17eaf7 merge 2012-04-13 11:42:56 +05:30
Rushabh Mehta
f1264a7f76 listing, module pages in appframe 2012-04-13 11:41:43 +05:30
Anand Doshi
83808267d5 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 11:40:38 +05:30
Anand Doshi
1c2ac00a82 fixes in sales cycle 2012-04-13 11:38:01 +05:30
Anand Doshi
f31fc22ef0 fixes in doctype 2012-04-13 11:37:19 +05:30
Nabin Hait
a73b2965aa cleanup and fixes 2012-04-13 11:02:26 +05:30
Anand Doshi
2424387651 fixes after sync testing 2012-04-10 19:14:37 +05:30
Nabin Hait
0a8a487230 Update erpnext/stock/doctype/item/item.js 2012-04-10 16:50:23 +05:30
Anand Doshi
82042f1cff fixes after sync 2012-04-06 17:54:17 +05:30
Anand Doshi
7e0479bc4c cleanup of search criteria 2012-04-05 18:27:56 +05:30
Anand Doshi
fa0cd89a7c change from labels to fieldname in cur_frm.cscript 2012-04-05 13:03:35 +05:30
Anand Doshi
5112b5b6b8 rerun of rename_dt 2012-04-02 19:12:29 +05:30
Rushabh Mehta
c7f1e5a54a patch fixes 2012-04-02 14:24:35 +05:30
Rushabh Mehta
5475a3ca66 patch fixes 2012-04-02 14:06:46 +05:30
Anand Doshi
0442bc5d63 fix in patch list 2012-04-02 13:09:20 +05:30
Anand Doshi
c88ae2be4d rename dt second cut 2012-03-30 18:18:36 +05:30
Anand Doshi
fedfd89e4a rename dt first cut 2012-03-30 12:29:06 +05:30
Anand Doshi
37fb9c8f27 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_rename
Conflicts:
	version.num
2012-03-29 15:35:08 +05:30
Anand Doshi
7ff696fb12 Merge branch 'renamedt' into shf_rename
Conflicts:
	erpnext/patches/patch_list.py
2012-03-29 15:31:17 +05:30
Anand Doshi
fddb782a82 Merge branch 'renamedt' of github.com:webnotes/erpnext into renamedt 2012-03-29 15:28:16 +05:30
Anand Doshi
0442b4e207 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-29 15:22:15 +05:30
Anand Doshi
66722dfe69 some buying listviews 2012-03-29 15:20:35 +05:30
Nabin Hait
dc8ce0190d Merge branch 'master' into renamedt 2012-03-29 11:53:02 +05:30
Rushabh Mehta
635f359a71 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-28 15:18:28 +02:00
Rushabh Mehta
43d64c6116 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-28 15:17:59 +02:00
Anand Doshi
2f74d2e7bd Merge branch 'master' of github.com:webnotes/erpnext 2012-03-28 18:34:50 +05:30
Anand Doshi
779a365420 fix in print hide of amount in words 2012-03-28 18:31:26 +05:30
Anand Doshi
18ffd2a1b8 Merge branch 'master' into handlerupdate 2012-03-28 17:56:33 +05:30
Anand Doshi
c9456c18dc listviews 2012-03-28 17:48:30 +05:30
Rushabh Mehta
bb769c5461 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-28 08:04:17 +02:00
Nabin Hait
13f789701e erro fixed in reorder_item 2012-03-28 11:33:25 +05:30
Nabin Hait
df77a1f619 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-28 11:32:58 +05:30
Nabin Hait
6ed0450dba reload mapper for checking ref value 2012-03-28 11:32:44 +05:30
Anand Doshi
2513e50dc4 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_merge
Conflicts:
	erpnext/website/doctype/style_settings/style_settings.txt
	version.num
2012-03-27 19:37:10 +05:30