Commit Graph

100 Commits

Author SHA1 Message Date
Anand Doshi
1ed4ef1946 fixes in setup 2012-04-27 15:30:23 +05:30
Nabin Hait
51834a45a7 purchase invoice with write off feature 2012-04-23 12:47:12 +05:30
Rushabh Mehta
f4a8c87db5 kb bug fix 2012-04-23 10:31:29 +05:30
Anand Doshi
3d9f436ce9 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-20 13:43:05 +05:30
Anand Doshi
0f8e491bdd removed Knowledge Base module, fixed questions page name 2012-04-20 13:42:43 +05:30
Rushabh Mehta
5bce61d58e merge 2012-04-20 13:40:48 +05:30
Anand Doshi
37df8abfc7 knowledge base module removed 2012-04-20 11:17:10 +05:30
Nabin Hait
239e79038f Customer/customer group wise price list 2012-04-20 10:25:03 +05:30
Rushabh Mehta
c8abe5b2ad style cleanups and new builds 2012-04-15 22:31:32 +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
82042f1cff fixes after sync 2012-04-06 17:54:17 +05:30
Anand Doshi
fa0cd89a7c change from labels to fieldname in cur_frm.cscript 2012-04-05 13:03:35 +05:30
Anand Doshi
130dfaee8c fix in todo 2012-04-03 12:18:35 +05:30
Anand Doshi
5112b5b6b8 rerun of rename_dt 2012-04-02 19:12:29 +05:30
Anand Doshi
fedfd89e4a rename dt first cut 2012-03-30 12:29:06 +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
Anand Doshi
a30fbd004e merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
Anand Doshi
4943af6d6c fix in address issue - customer coming in supplied field 2012-03-26 11:42:09 +05:30
Anand Doshi
5f9501d4d8 Merge branch 'sync_file_db' into shf_merge
Conflicts:
	erpnext/projects/doctype/project/project.txt
2012-03-23 14:51:35 +05:30
Anand Doshi
9b56a8ada9 Merge branch 'handlerupdate' into sync_handler_merge
Conflicts:
	js/all-app.js
	version.num
2012-03-23 13:55:20 +05:30
Anand Doshi
134ca41db8 Merge branch 'sync_file_db' of github.com:webnotes/erpnext into sync_file_db 2012-03-23 12:45:05 +05:30
Nabin Hait
f88326ba3f sync ref db 2012-03-22 15:07:05 +05:30
Anand Doshi
7944b4b888 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 14:34:35 +05:30
Anand Doshi
3697534f10 Merge branch 'master' into handlerupdate 2012-03-22 14:32:10 +05:30
Rushabh Mehta
0807227b92 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 09:24:11 +01:00
Rushabh Mehta
fa0e7b6933 listing/messages fix 2012-03-22 13:44:04 +05:30
Rushabh Mehta
cb11585ff1 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 07:08:34 +01:00
Rushabh Mehta
27cf13b541 merge 2012-03-22 11:37:56 +05:30
Rushabh Mehta
3f46696db2 removed slider ui 2012-03-22 11:37:08 +05:30
Rushabh Mehta
421e25c5ae Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 06:48:45 +01:00
Anand Doshi
98f847c01f fix in todo 2012-03-22 11:18:28 +05:30
Rushabh Mehta
a12a28bec6 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
Conflicts:
	version.num
2012-03-22 06:35:35 +01:00
Anand Doshi
06fcfdfcde assign to - allow comments 2012-03-22 11:01:38 +05:30
Nabin Hait
9066dcaba5 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-22 10:26:07 +05:30
Rushabh Mehta
d0f26026af Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 13:34:00 +01:00
Anand Doshi
29ed95ba22 simple fixes in todo 2012-03-21 18:02:17 +05:30
Rushabh Mehta
b1f77d1bde Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 12:39:54 +01:00
Nabin Hait
f676824791 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-21 17:08:35 +05:30
Nabin Hait
653536596d fax added in address display 2012-03-21 17:07:42 +05:30
Nabin Hait
0ad2ef2111 sync with respect to file 2012-03-21 15:02:39 +05:30
Rushabh Mehta
f74ef4c64b Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 07:18:41 +01:00
Rushabh Mehta
454c6ac716 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 05:42:31 +01:00
Nabin Hait
9ff92369ad lead organization fld added in quotation for printing 2012-03-20 16:44:15 +05:30
Rushabh Mehta
9b1afe197d cleanup of form, rename, route, added fonts 2012-03-20 14:37:44 +05:30
Rushabh Mehta
7afaa8665d major reworking of page navigation 2012-03-16 18:28:09 +05:30
Anand Doshi
96188f0310 sync with gateway moved to defs 2012-03-15 11:11:57 +05:30
Rushabh Mehta
08b670bddd listing with stats 2012-03-14 19:06:20 +05:30
Rushabh Mehta
052b7e4049 fixed list->new->onload hooks 2012-03-13 15:19:06 +05:30
Anand Doshi
20f63da794 fix in messages 2012-03-08 12:10:51 +05:30
Anand Doshi
eb55df0aa3 fix in messages 2012-03-08 12:06:27 +05:30