Anand Doshi a5d19955d1 Merge branch 'master' of github.com:webnotes/erpnext into webshop ...

Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	stock/doctype/item/item.txt

2013-04-24 11:48:28 +05:30

..

doctype

[files] [patch] dropped file_list property and moved links to

2013-04-10 11:08:50 +05:30

page

merge

2013-04-03 16:38:20 +05:30

report

[report] total added in daily time log summary report

2013-04-23 17:49:24 +05:30

search_criteria

changed old type txt to new type txtt

2012-12-11 15:20:53 +05:30

__init__.py

install from txt files, part 1

2013-01-16 17:48:17 +05:30

utils.py

added time log batch

2013-02-28 18:42:46 +05:30