46 Commits

Author	SHA1	Message	Date
Anand Doshi	a6de55e2e6	fixed selection of field names in filters, such that if two tables have the same fieldnames, it doesn't cause conflict	2012-08-16 15:45:28 +05:30
Rushabh Mehta	c7dbe293c3	updates to kb: unanswered questions show in desktop, questions query moved to server-side	2012-08-07 12:12:55 +05:30
Rushabh Mehta	5d4a9f8554	date format bug fixed	2012-08-06 14:20:15 +05:30
Rushabh Mehta	0c5b438623	framework updates	2012-08-03 14:12:14 +05:30
Nabin Hait	7839ea9687	fixes in new report: same fieldname in multiple table	2012-07-23 16:05:16 +05:30
Nabin Hait	39b8ec0ed8	fixes in new report: same fieldname in multiple table	2012-07-23 15:03:57 +05:30
Anand Doshi	9ec8024db7	show order type icon in sales order list view	2012-07-13 16:46:12 +05:30
Anand Doshi	d68dceb791	Merge branch 'master' of github.com:webnotes/erpnext into cms2	2012-07-12 18:53:35 +05:30
Nabin Hait	179f01af17	hong kong added in country list	2012-07-12 11:03:39 +05:30
Anand Doshi	1522f5d76b	Merge branch 'master' of github.com:webnotes/erpnext into cms2	2012-07-11 14:27:22 +05:30
Nabin Hait	cb2e76a79c	delete row issue in grid fixed	2012-07-05 14:44:39 +05:30
Anand Doshi	1731786a61	Merge branch 'master' of github.com:webnotes/erpnext into cms2	2012-07-03 15:51:11 +05:30
Anand Doshi	bba4db1627	product listing and pages	2012-06-27 12:06:45 +05:30
Anand Doshi	8ae5ba9abf	fixes related to --> clear locals and then sync locals when whole doclist is passed	2012-06-25 20:05:35 +05:30
Anand Doshi	72c945b7c6	template based web page loading using web.py	2012-06-22 20:01:07 +05:30
Anand Doshi	9078f652c3	Merge branch 'master' into cms2	2012-06-21 11:50:44 +05:30
Anand Doshi	be7c426e15	add parent column in filter list	2012-06-19 17:52:37 +05:30
Rushabh Mehta	bd7f7231f2	cms now powered by jinja2	2012-06-15 14:00:06 +05:30
Anand Doshi	f71d63fda0	fix in back button after save/submit	2012-06-12 15:45:44 +05:30
Anand Doshi	dbb84a271e	Merge branch 'master' of github.com:webnotes/erpnext into comm_log ... Conflicts: erpnext/selling/doctype/lead/lead.js erpnext/setup/doctype/contact_control/contact_control.js	2012-06-05 18:37:17 +05:30
Rushabh Mehta	a660dd9d49	Merge branch 'master' of github.com:webnotes/erpnext	2012-06-04 13:21:03 +05:30
Rushabh Mehta	983c551796	gantt chart fixes	2012-06-04 13:20:42 +05:30
Anand Doshi	bfc52b99fd	Merge branch 'master' of github.com:webnotes/erpnext	2012-06-04 13:07:03 +05:30
Anand Doshi	fdc20fdf69	fix in get_base_url of dom.js	2012-06-04 13:06:38 +05:30
Rushabh Mehta	07c94ce9c0	update in Task, notification and layout	2012-06-04 12:57:23 +05:30
Anand Doshi	c5d857896e	fixes in communication doctype	2012-05-31 18:23:16 +05:30
Anand Doshi	a6708fb748	new doctype: communication	2012-05-31 14:53:55 +05:30
Anand Doshi	1aae261490	delete button in doclistview	2012-05-21 14:31:03 +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	ae4fc41e61	Merge branch 'shf_rename'	2012-05-16 14:35:15 +05:30
Anand Doshi	328cd2e868	do not refresh toolbar on set value	2012-05-16 12:21:45 +05:30
Anand Doshi	d5f8b91a49	Merge branch 'shf_rename'	2012-05-16 12:21:28 +05:30
Anand Doshi	ddc4cdd8f9	include button.js in all-web.js	2012-05-15 11:35:21 +05:30
Anand Doshi	f295591168	Merge branch 'shf_rename'	2012-05-14 18:03:45 +05:30
Rushabh Mehta	6598b6276b	fixes to website settings and linking import data in setup	2012-05-14 15:02:35 +05:30
Rushabh Mehta	5997e507d9	time fix	2012-05-11 17:50:34 +05:30
Rushabh Mehta	7483ae9573	fix in button disablity leading to double click	2012-05-11 16:23:41 +05:30
Rushabh Mehta	0eb790a0ae	cleaned up imports, doc	2012-05-11 15:53:37 +05:30
Rushabh Mehta	7f523ac33c	merge	2012-05-10 19:11:00 +05:30
Rushabh Mehta	ea7ba72397	data import and upload issues	2012-05-10 19:07:53 +05:30
Anand Doshi	951d8ec342	fix in issues arising due to wn.require	2012-05-10 14:19:11 +05:30
Rushabh Mehta	e0f2df9506	cms fixes	2012-05-09 14:50:00 +05:30
Rushabh Mehta	3efd3ce475	cms fixes	2012-05-09 14:48:52 +05:30
Rushabh Mehta	b9483d1809	cms updates	2012-05-09 11:42:52 +05:30
Rushabh Mehta	5ab8163140	fixes to routing and activating web page	2012-05-08 12:58:32 +05:30
Rushabh Mehta	a920943e43	new cms with public folder	2012-05-07 18:00:57 +05:30