Commit Graph

205 Commits

Author SHA1 Message Date
Akhilesh Darjee
ec0da0b177 [fix] [setup_wizard] fiscal year fix for setup wizard 2013-11-25 19:51:18 +05:30
Rushabh Mehta
ad45e31356 [copyright] added Contributors 2013-11-20 13:00:28 +05:30
Anand Doshi
5da0395779 [minor] [oops] removed print 2013-11-18 16:40:31 +05:30
Rushabh Mehta
04cc5155f7 Added Notification Control for caching notifications probably causing the freezing problem 2013-11-18 13:23:20 +05:30
Anand Doshi
0c26f8116d Merge branch '1310' of github.com:webnotes/erpnext
Conflicts:
	accounts/doctype/account/account.py
	controllers/accounts_controller.py
	patches/patch_list.py
	selling/doctype/sales_common/sales_common.py
	stock/doctype/purchase_receipt/purchase_receipt.py
2013-11-15 19:12:09 +05:30
Nabin Hait
e505fbea54 [fix] [minor] stock balance report for serialized item 2013-11-15 13:38:23 +05:30
Anand Doshi
580bc7c922 [minor] favicon 2013-11-12 11:50:00 +05:30
Anand Doshi
cb72e01e9d [minor] email footer link points to erpnext.org 2013-10-31 19:07:05 +05:30
Rushabh Mehta
ddca90ef7b [communication] [setup wizard] [minor] [fixes] 2013-10-09 16:08:54 +05:30
Rushabh Mehta
5d45557729 [wsgi] [minor] fixed flags 2013-10-08 18:23:05 +05:30
Rushabh Mehta
8c5a5f1ed5 New Setup Wizard 2013-10-08 17:59:11 +05:30
Anand Doshi
c875300fe2 [minor] moved wn-web.js and wn-web.css to memcache 2013-09-26 17:54:51 +05:30
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
cfed8c44b4 conf migration 2013-09-21 15:16:47 +05:30
Anand Doshi
2840620070 [fix] [minor] [website] 2013-09-17 15:28:58 +05:30
Anand Doshi
ad0b05060a Merge branch 'master' of github.com:webnotes/erpnext into website-wip 2013-09-17 11:00:24 +05:30
Nabin Hait
5cd1d54347 [minor] merged with master branch 2013-09-17 10:30:24 +05:30
Anand Doshi
a29b76fb98 [fix] [minor] install feature setup 2013-09-13 17:42:03 +05:30
Anand Doshi
3b44ce5fb4 [website] [minor] fixes after moving website module 2013-09-12 16:59:12 +05:30
Anand Doshi
0748cb7d18 [website] [minor] moving to framework 2013-09-11 15:31:58 +05:30
Anand Doshi
b0d996ffb1 [website] [minor] moving to framework 2013-09-10 18:29:39 +05:30
Rushabh Mehta
f4de333267 [website] [minor] moving to framework 2013-09-10 15:49:18 +05:30
Rushabh Mehta
13bbf6536b [minor] webutils moved to lib 2013-09-10 14:44:36 +05:30
Rushabh Mehta
bdb846f665 [website] [minor] moving to framework 2013-09-09 17:31:19 +05:30
Rushabh Mehta
c59c4e0699 [website] [minor] moving to framework 2013-09-09 12:17:45 +05:30
Rushabh Mehta
46089dbc97 [website] [minor] moving website helper methods to doctypes 2013-09-09 11:32:24 +05:30
Rushabh Mehta
881a47f5c7 [minor] moved developer mode to wn 2013-09-06 12:42:54 +05:30
Rushabh Mehta
230a808367 Merge branch 'master' of github.com:webnotes/erpnext 2013-09-05 19:25:23 +05:30
Rushabh Mehta
73af55ac81 [lang] Added Greek (el) + cleanups relating to translate 2013-09-05 19:24:38 +05:30
Anand Doshi
c7fa9cc4f5 [fix] [minor] show live chat link if commercial_support = 1 in conf.py 2013-09-05 17:50:40 +05:30
Nabin Hait
bf4d27ecf1 [minor] repost future gl entries only for current voucher items 2013-09-04 17:55:45 +05:30
Rushabh Mehta
9dd25b35d7 [minor] [boot] moved load_country_and_currency to framework 2013-09-03 17:36:41 +05:30
Rushabh Mehta
430b4a77b4 [build] move latest update to app via event_handlers.on_build 2013-09-03 17:13:50 +05:30
Rushabh Mehta
d50d924ee5 [docs] custom script examples, [build] move CMS make to app via event_handlers.on_build 2013-09-03 17:04:05 +05:30
Nabin Hait
92b0e777e8 [fix] [minor] merged with master 2013-08-26 16:55:42 +05:30
Rushabh Mehta
16a62fa4be [pos] [cleanup] 2013-08-23 13:16:22 +05:30
Nabin Hait
9b09c95d83 [cleanup] [accounts] delete gl entries on cancellation of accounting transactions 2013-08-21 17:47:11 +05:30
Nabin Hait
4ae729bfd2 [cleanup] [minor] deprecated cancelled stock ledger entry 2013-08-20 12:04:46 +05:30
Rushabh Mehta
0b491b46d3 [lang] [minor] 2013-08-16 14:28:47 +05:30
Rushabh Mehta
7cfefbced5 [bom] [production] Cleaned up BOM, Production Planning Tool, Progress in Demo Builder 2013-08-07 17:46:35 +05:30
Rushabh Mehta
1e81479cb1 [scheduler] Moved scheduler log email report to daily 2013-08-07 10:35:11 +05:30
Rushabh Mehta
e67d1fbcdf [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
Rushabh Mehta
af15a4a496 [event] [minor fixes] 2013-07-26 19:03:04 +05:30
Rushabh Mehta
d65ced5486 [calendar] [feature] Send Daily Digest for Upcoming Events 2013-07-26 16:05:59 +05:30
Rushabh Mehta
152cecc9cd Merge branch 'master' of github.com:webnotes/erpnext 2013-07-25 17:47:38 +05:30
Rushabh Mehta
4dca40195e [feature] Ability to set UOM as Integer-only and related validations. 2013-07-25 17:45:59 +05:30
Anand Doshi
2b1d33f178 [minor] [cleanup] [issue] webnotes/erpnext#438 - change user_type Partner to Website User 2013-07-25 17:17:47 +05:30
Anand Doshi
cefccb921e [minor] [webshop] [fix] 2013-07-15 18:28:14 +05:30