Nabin Hait a6b7886175 resolved conflict while merging with master

2012-04-26 13:02:36 +05:30

..

accounts

resolved conflict while merging with master

2012-04-26 13:02:36 +05:30

buying

resolved conflict while merging with master

2012-04-26 13:02:36 +05:30

home

minor fixes

2012-04-17 18:43:29 +05:30

hr

hr home: changed Allocate Leaves --> Leave Allocation Tool

2012-04-18 18:35:30 +05:30

patches

resolved conflict while merging with master

2012-04-26 13:02:36 +05:30

production

Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename

2012-04-20 13:59:22 +05:30

projects

fixed conflict while merging with master branch

2012-04-20 13:58:43 +05:30

sandbox

rename dt first cut

2012-03-30 12:29:06 +05:30

selling

Merge branch 'master' of github.com:webnotes/erpnext

2012-04-26 12:47:30 +05:30

setup

resolved conflict while merging with master

2012-04-26 13:02:36 +05:30

startup

fixes in production, porjects, packing slip

2012-04-20 11:21:47 +05:30

stock

resolved conflict while merging with master

2012-04-26 13:02:36 +05:30

support

fixes in customize form, naming series form loading

2012-04-18 16:04:02 +05:30

utilities

purchase invoice with write off feature

2012-04-23 12:47:12 +05:30

website

knowledge base cleanup

2012-04-18 16:55:43 +05:30

.no_timestamps

first cut for lazy loading framework

2011-09-05 18:43:09 +05:30