Anand Doshi c97f780940 Merge branch 'master' into dev ...

Conflicts:
	erpnext/patches/patch_list.py
	erpnext/startup/js/complete_setup.js
	erpnext/stock/doctype/item/item.txt
	public/css/all-app.css
	public/js/all-app.js
	public/js/all-web.js

2012-07-12 22:16:19 +05:30

..

accounts

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

2012-07-12 18:01:31 +05:30

buying

contact, address list views and allow their deletion from customer / supplier form

2012-07-02 19:45:35 +05:30

home

update in Task, notification and layout

2012-06-04 12:57:23 +05:30

hr

select employee based on joining and relieving date in salary maanger

2012-07-12 16:25:13 +05:30

patches

Merge branch 'master' into dev

2012-07-12 22:16:19 +05:30

production

packing list introduced in pos invoice

2012-07-11 13:15:57 +05:30

projects

fixes related to --> clear locals and then sync locals when whole doclist is passed

2012-06-25 20:05:35 +05:30

sandbox

rename dt first cut

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

selling

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

2012-07-12 18:01:31 +05:30

setup

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

2012-07-12 18:01:31 +05:30

startup

hong kong added in country list

2012-07-12 11:03:39 +05:30

stock

Merge branch 'master' into dev

2012-07-12 22:16:19 +05:30

support

allow deletion of communication

2012-06-29 16:38:07 +05:30

utilities

fixes to taxes and charges master and naming_series

2012-07-12 16:01:20 +05:30

website

fixes in log comment and web page saving

2012-07-12 20:12:40 +05:30

.no_timestamps

first cut for lazy loading framework

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