8 Commits

Author	SHA1	Message	Date
Ravi Dey	7d7d68e563	Merge branch 'master' of github.com:webnotes/erpnext	2011-06-28 19:01:32 +05:30
Ravi Dey	5708da5a9f	Default currency for company fixed	2011-06-28 19:01:02 +05:30
nabinhait	78f5bf6498	fixed conflict	2011-06-28 16:21:58 +05:30
nabinhait	53e6b81322	synced to upstream	2011-06-28 14:44:27 +05:30
Rushabh Mehta	ab24d950bb	added sample tests	2011-06-28 13:26:02 +05:30
Ravi Dey	74c9c4d476	Added Company in HR Module	2011-06-27 11:26:39 +05:30
nabinhait	b9d6fa5068	removed code related to Badge	2011-06-16 14:51:52 +05:30
Pratik Vyas	c1e6e4c752	Sourced wnframework-modules from Google Code as erpnext	2011-06-08 14:37:15 +05:30