Anand Doshi 5b004ff8a7 Merge branch 'master' of github.com:webnotes/erpnext into wsgi ... Conflicts: accounts/doctype/account/account.py accounts/doctype/gl_entry/gl_entry.py accounts/doctype/period_closing_voucher/period_closing_voucher.py stock/doctype/delivery_note/delivery_note.py stock/doctype/landed_cost_wizard/landed_cost_wizard.py stock/doctype/purchase_receipt/purchase_receipt.py stock/doctype/stock_ledger/stock_ledger.py stock/doctype/warehouse/warehouse.py stock/stock_ledger.py		2013-09-25 19:55:41 +05:30
..
demo_docs	[minor] remove send_invite_email field from demo docs	2013-09-23 16:04:50 +05:30
__init__.py	[demo] New ERPNext Demo	2013-08-26 16:17:50 +05:30
demo_control_panel.py	[minor] fixes for import conf	2013-09-24 17:17:39 +05:30
demo-login.css	[demo] New ERPNext Demo	2013-08-26 16:17:50 +05:30
demo-login.html	[website] [style] [minor] padding in blog categories	2013-08-29 22:28:58 +05:30
demo-login.js	[fix] [minor] use prop instead of attr to disable a field	2013-08-30 18:22:58 +05:30
make_demo.py	Merge branch 'master' of github.com:webnotes/erpnext into wsgi	2013-09-25 19:55:41 +05:30
make_erpnext_demo.py	[minor] fixes for import conf	2013-09-24 17:17:39 +05:30