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 |
|
Anand Doshi
|
de8b6aadaf
|
[minor] fixes for import conf
|
2013-09-24 17:17:39 +05:30 |
|
Nabin Hait
|
11f41955c9
|
[minor] fixed conflict while merging perpetual branch into master
|
2013-09-24 14:36:55 +05:30 |
|
Pratik Vyas
|
0eb811a518
|
[minor] remove send_invite_email field from demo docs
|
2013-09-23 16:04:50 +05:30 |
|
Pratik Vyas
|
cfed8c44b4
|
conf migration
|
2013-09-21 15:16:47 +05:30 |
|
Anand Doshi
|
83de391efc
|
Merge branch 'akhileshdarjee-master' into website-wip
|
2013-09-17 16:09:15 +05:30 |
|
Nabin Hait
|
142007a226
|
[fix] [minor] perpetual inventory: account for each warehouse
|
2013-09-17 15:15:16 +05:30 |
|
Anand Doshi
|
619ed5e949
|
[fix] [minor] [website]
|
2013-09-17 13:46:50 +05:30 |
|
Akhilesh Darjee
|
2e1f94f222
|
[fix] [pos] hide custom buttons in pos view
|
2013-09-13 17:37:23 +05:30 |
|
Akhilesh Darjee
|
c96c13af4e
|
[fix] make demo for price list
|
2013-09-12 19:19:46 +05:30 |
|
Anand Doshi
|
3b44ce5fb4
|
[website] [minor] fixes after moving website module
|
2013-09-12 16:59:12 +05:30 |
|
Rushabh Mehta
|
c59c4e0699
|
[website] [minor] moving to framework
|
2013-09-09 12:17:45 +05:30 |
|
Anand Doshi
|
0e23929740
|
Merge branch 'master' into customer-login
|
2013-09-03 16:42:21 +05:30 |
|
Anand Doshi
|
9283b6c59d
|
[demo] [minor] fixes in make demo
|
2013-09-02 14:58:45 +05:30 |
|
Anand Doshi
|
ddb7c8048e
|
Merge branch 'master' of github.com:webnotes/erpnext into customer-login
|
2013-09-02 11:13:32 +05:30 |
|
Rushabh Mehta
|
e499a48f85
|
[demo] [minor]
|
2013-09-01 11:14:32 +05:30 |
|
Rushabh Mehta
|
0c2fb66051
|
[demo] [minor] [item] fix
|
2013-09-01 10:40:12 +05:30 |
|
Anand Doshi
|
c8e39b0965
|
[fix] [minor] use prop instead of attr to disable a field
|
2013-08-30 18:22:58 +05:30 |
|
Rushabh Mehta
|
010de37fcb
|
[website] [style] [minor] padding in blog categories
|
2013-08-29 22:28:58 +05:30 |
|
Anand Doshi
|
85ef479db8
|
[demo] [minor] disable signup and don't allow editing profile
|
2013-08-27 23:21:19 +05:30 |
|
Anand Doshi
|
cb4c0ea1d5
|
[minor] [demo] form_dict
|
2013-08-27 15:39:31 +05:30 |
|
Anand Doshi
|
8d2e716697
|
[minor] [demo] form_dict
|
2013-08-27 15:26:12 +05:30 |
|
Anand Doshi
|
ee1044fde5
|
[minor] [demo] show banner on login
|
2013-08-27 14:49:04 +05:30 |
|
Anand Doshi
|
f668f97a6f
|
[minor] [demo]
|
2013-08-26 19:51:24 +05:30 |
|
Anand Doshi
|
c6601cb32d
|
[minor] [demo] do not allow creation of newsletter
|
2013-08-26 18:53:50 +05:30 |
|
Anand Doshi
|
c753d31ba7
|
[fix] [minor] erpnext demo
|
2013-08-26 17:33:50 +05:30 |
|
Anand Doshi
|
3c92b21876
|
[fix] [demo] extend sys path for make_erpnext_demo
|
2013-08-26 16:40:25 +05:30 |
|
Rushabh Mehta
|
acd3367e33
|
[demo] New ERPNext Demo
|
2013-08-26 16:17:50 +05:30 |
|