Commit Graph

7186 Commits

Author SHA1 Message Date
Rushabh Mehta
8c2e4e1e1f [wsgi] [minor] fixed webnotes.local.form_dict 2013-10-02 14:34:25 +05:30
Rushabh Mehta
24ca7e4e2e Added Transactions for Import webnotes/erpnext#911 2013-10-02 14:25:36 +05:30
Anand Doshi
8db093b4c6 [minor] update password 2013-09-27 14:08:55 +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
f879a9dc2e [minor] wnf refactor, fixes in demo 2013-09-26 15:56:54 +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
Nabin Hait
7496b528a1 [fix] [minor] validate parent account for warehouse account 2013-09-25 17:32:33 +05:30
Nabin Hait
ee60763b45 [fix] [minor] negative stock balance for batch 2013-09-25 15:59:35 +05:30
Nabin Hait
c6871dc194 [patch] [minor] unsubmit serial nos if submitted 2013-09-25 14:44:06 +05:30
Nabin Hait
a7687e9ab6 [fix] [minor] create default web page only for first company 2013-09-25 13:43:35 +05:30
Nabin Hait
5c464e4a01 [fix] [minor] uom conversion factor mandatory check 2013-09-25 13:24:00 +05:30
Nabin Hait
69a3ee54f2 [fix] [minor] create default warehouse on saving of company if not exists 2013-09-25 13:00:22 +05:30
Nabin Hait
52f6b5a6e8 [fix] [minor] fixes in old patches 2013-09-25 12:52:28 +05:30
Nabin Hait
373b53f222 [fix] [minor] create account for warehouse if not exists with same name 2013-09-25 12:50:46 +05:30
Nabin Hait
c5f9dcfc70 [fix] [minor] fixes in old patches 2013-09-25 12:43:14 +05:30
Pratik Vyas
a80f2e4431 refactor site_path 2013-09-25 12:40:33 +05:30
Pratik Vyas
abf62eacca Merge branch 'wsgi' of github.com:webnotes/erpnext into wsgi 2013-09-25 12:40:16 +05:30
Nabin Hait
4a1008829b [fix] [minor] fixes in old patches 2013-09-25 12:37:13 +05:30
Nabin Hait
37ba2a2486 Merge branch 'master' of github.com:webnotes/erpnext 2013-09-25 12:17:47 +05:30
Nabin Hait
cdf453fbee Merge pull request #896 from fogueri/master
Docs
2013-09-24 23:46:35 -07:00
Nabin Hait
98b6c35265 Merge branch 'master' of github.com:webnotes/erpnext 2013-09-25 12:10:23 +05:30
Priya
500cb6c008 [docs ]minor perpetual inventory page 2013-09-25 11:59:04 +05:30
Anand Doshi
2ad07e1cc1 [minor] [fix] approval status of expense claim to be editable only after first save 2013-09-25 11:42:46 +05:30
Nabin Hait
625da79e9f item-wise price list rate, editable report 2013-09-25 10:32:51 +05:30
Anand Doshi
de8b6aadaf [minor] fixes for import conf 2013-09-24 17:17:39 +05:30
Priya
bb05d2970d [docs] accounting page created 2013-09-24 16:34:22 +05:30
Nabin Hait
04a3feecf6 [minor] perpetual inventory fix 2013-09-24 15:16:01 +05:30
Nabin Hait
11f41955c9 [minor] fixed conflict while merging perpetual branch into master 2013-09-24 14:36:55 +05:30
Priya
200137d152 [docs] minor permissions page completed 2013-09-24 12:50:35 +05:30
Priya
a5b5bfcab0 Merge branch 'master' of github.com:webnotes/erpnext 2013-09-24 12:48:50 +05:30
Pratik Vyas
517b30a11d fix for new wnf path stuff 2013-09-24 12:29:35 +05:30
Nabin Hait
66adb3c0cf [minor] Frozen Accounts Modifier fixes 2013-09-24 12:10:37 +05:30
Nabin Hait
01e6a9cf1e Frozen Accounts Modifier setting in Accounts Settings 2013-09-24 12:08:31 +05:30
Nabin Hait
7031ea72ca Frozen Accounts Modifier setting in Accounts Settings 2013-09-24 12:04:07 +05:30
Nabin Hait
6c66096fa5 [minor] allowed role to edit entries against frozen accounts 2013-09-24 00:10:10 +05:30
Nabin Hait
865e62df61 [minor] quality inspection 2013-09-23 23:28:46 +05:30
Priya
d0c9743063 [docs] minor opening stock added 2013-09-23 17:24:21 +05:30
Priya
04a741972f [docs] new folder knowledge library added 2013-09-23 16:23:38 +05:30
Priya
bbbe499cf6 Merge branch 'master' of github.com:webnotes/erpnext 2013-09-23 16:21:45 +05:30
Pratik Vyas
0eb811a518 [minor] remove send_invite_email field from demo docs 2013-09-23 16:04:50 +05:30
Nabin Hait
dd266fafc3 [fix] [minor] null issue in get price list rate 2013-09-23 13:00:59 +05:30
Priya
b36e617316 Merge branch 'master' of github.com:webnotes/erpnext 2013-09-23 11:42:44 +05:30
Pratik Vyas
cfed8c44b4 conf migration 2013-09-21 15:16:47 +05:30
Anand Doshi
f0fc9a54ee [minor] [patch] removed patches from march to august 2012 2013-09-21 13:43:48 +05:30
Anand Doshi
7cd7fc94ad [minor] [patch] change serial no status only if serial no exists 2013-09-21 13:36:55 +05:30
Nabin Hait
2b9cfcbe0b [fix] [minor] rejected warehouse in purchase receipt item now editable 2013-09-20 11:50:06 +05:30
Anand Doshi
7c2617446e [fix] [minor] 2013-09-19 18:31:52 +05:30
Anand Doshi
7bac6adb42 [fix] [minor] support ticket threading 2013-09-19 17:51:51 +05:30
Anand Doshi
417b23740a [fix] [minor] reload style settings 2013-09-19 13:44:52 +05:30
Anand Doshi
12144f339e Merge branch 'website-wip' 2013-09-19 12:27:11 +05:30