Commit Graph

7270 Commits

Author SHA1 Message Date
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
Akhilesh Darjee
dd68de824d Merge branch 'master' of github.com:akhileshdarjee/erpnext 2013-09-23 12:37:28 +05:30
Akhilesh Darjee
e318c93405 [fix] patch merge conflict fixed 2013-09-23 12:34:22 +05:30
Akhilesh Darjee
f624ffa40a [pos] refresh() to be called at minimum 2013-09-23 12:27:16 +05:30
Akhilesh Darjee
4e1b7dcc08 Merge branch 'master' of github.com:webnotes/erpnext 2013-09-23 11:53:30 +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
Akhilesh Darjee
e947081552 [pos] pos view in all sales & purchase cycle finished 2013-09-19 19:09:15 +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
Akhilesh Darjee
4259f7278a [fix] set qty=1 for all purchase cycle 2013-09-19 16:14:16 +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
Nabin Hait
6911bb244e [fix] [minor] fixes in voucher import tool 2013-09-19 11:57:05 +05:30
Akhilesh Darjee
680ba8d912 Merge branch 'master' of github.com:webnotes/erpnext 2013-09-19 11:31:43 +05:30
Priya
3a18b0fc95 Merge branch 'master' of github.com:webnotes/erpnext 2013-09-19 11:10:06 +05:30
Nabin Hait
ad6ce4ee11 [fix] [minor] ignore permission while deleting event through code 2013-09-19 11:02:24 +05:30
Nabin Hait
aa67e7ed29 [minor] field reordered in lead 2013-09-19 10:39:59 +05:30
Nabin Hait
068ef97032 -am 2013-09-19 10:27:18 +05:30
Nabin Hait
752067c8f1 [fix] [minor] make debit note from purchase return 2013-09-18 23:25:50 +05:30
Pratik Vyas
7782e83d33 refactor upload attendance for doclist global 2013-09-18 18:52:10 +05:30
Pratik Vyas
ea810509d3 refactor newsletter for naming_series global 2013-09-18 18:35:47 +05:30
Akhilesh Darjee
f83576bf9c [pos] pos.js included in all selling & purchase cycle 2013-09-18 18:35:12 +05:30
Pratik Vyas
16371b7212 refactor stock ledger to be thread safe 2013-09-18 18:31:03 +05:30
Anand Doshi
e122121dc4 [fix] [minor] stock uom and price list currency in webshop 2013-09-18 17:28:06 +05:30
Priya
d922940fc5 [docs] images added 2013-09-18 16:00:01 +05:30
Priya
815b0e9bdb Merge branch 'master' of github.com:webnotes/erpnext 2013-09-18 15:58:52 +05:30
Nabin Hait
82d2001312 [minor] [docs] documentation for perpetual inventory 2013-09-18 15:51:31 +05:30
Nabin Hait
9efd70ec53 [minor] [docs] documentation for perpetual inventory 2013-09-18 15:49:57 +05:30
Nabin Hait
d9d25ca2e3 [minor] [docs] documentation for perpetual inventory 2013-09-18 15:46:41 +05:30
Nabin Hait
a3df58a264 Merge branch 'master' into perpetual 2013-09-18 15:22:04 +05:30
Nabin Hait
9d1d7bafe1 [minor] [docs] docs for perpetual inventory 2013-09-18 15:20:44 +05:30
Pratik Vyas
5e16a69b35 mass replace sql with webnotes.conn.sql 2013-09-18 12:20:53 +05:30
Pratik Vyas
e55fbfc090 remove sql = 2013-09-18 11:10:59 +05:30