Commit Graph

7256 Commits

Author SHA1 Message Date
Anand Doshi
ad0b05060a Merge branch 'master' of github.com:webnotes/erpnext into website-wip 2013-09-17 11:00:24 +05:30
Nabin Hait
42573bcc90 [fix] [minor] fixed order of execution 2013-09-17 10:38:04 +05:30
Nabin Hait
5cd1d54347 [minor] merged with master branch 2013-09-17 10:30:24 +05:30
Nabin Hait
7a75e10a61 [fix] [minor] perpetual inventory: account for each warehouse 2013-09-17 10:21:20 +05:30
Anand Doshi
3966c4cc5b [fix] [minor] [website] 2013-09-16 19:28:06 +05:30
Akhilesh Darjee
4a0cae8b41 [fix] removed client side validation for conversion rate 2013-09-16 12:25:00 +05:30
Akhilesh Darjee
cb45b8f631 Merge branch 'master' of github.com:webnotes/erpnext 2013-09-16 11:06:46 +05:30
Anand Doshi
80c76fa80d Merge pull request #831 from fogueri/master
[docs] updated toc and added projects docs
2013-09-13 05:48:13 -07:00
Anand Doshi
a29b76fb98 [fix] [minor] install feature setup 2013-09-13 17:42:03 +05:30
Anand Doshi
7255313e84 [fix] [minor] pos invoice print format 2013-09-13 17:41:36 +05:30
Akhilesh Darjee
2e1f94f222 [fix] [pos] hide custom buttons in pos view 2013-09-13 17:37:23 +05:30
Priya
33b2055cab [docs] hr module completed 2013-09-13 15:21:15 +05:30
Anand Doshi
43e2bc84a8 Merge branch 'website-wip' of github.com:webnotes/erpnext into website-wip 2013-09-13 11:50:30 +05:30
Rushabh Mehta
22f4816832 [project] [link-fix] minor 2013-09-13 10:21:46 +05:30
Akhilesh Darjee
c96c13af4e [fix] make demo for price list 2013-09-12 19:19:46 +05:30
Anand Doshi
3a6f4f882a [fix] [minor] communication related cleanup 2013-09-12 19:10:05 +05:30
Anand Doshi
24416f92cc [fix] [minor] Set Purchase Order Date as No Copy 2013-09-12 18:35:23 +05:30
Anand Doshi
31f1f005dd [minor] [patch] fixed old patch 2013-09-12 17:43:38 +05:30
Anand Doshi
94d62a8d9f [minor] [patch] fixed old patch 2013-09-12 17:39:36 +05:30
Anand Doshi
155d985cd4 Merge branch 'master' of github.com:webnotes/erpnext into website-wip
Conflicts:
	patches/patch_list.py
2013-09-12 17:03:21 +05:30
Anand Doshi
3b44ce5fb4 [website] [minor] fixes after moving website module 2013-09-12 16:59:12 +05:30
Nabin Hait
16447005bf [fix] [minor] fixes in old patch 2013-09-12 16:58:54 +05:30
Priya
1364655d2d [docs] minor 2013-09-12 16:32:39 +05:30
Priya
14735c1d9b [docs] workflow page completed 2013-09-12 16:24:26 +05:30
Priya
d31ef4f0e5 Merge branch 'master' of github.com:webnotes/erpnext 2013-09-12 16:21:58 +05:30
Anand Doshi
1be5bb7e6a [portal] [minor] show status for order and invoice 2013-09-12 15:25:47 +05:30
Akhilesh Darjee
b9c12eff17 [fix] [minor] merge conflict fixed 2013-09-12 14:02:37 +05:30
Akhilesh Darjee
a7a06a77dd [fix] journal voucher to fetch company currency 2013-09-12 13:59:06 +05:30
Nabin Hait
6656acff52 [minor] [fix] set stock uom in stock ledger entry through stock reconciliation 2013-09-12 11:46:09 +05:30
Anand Doshi
8a4b21ab8e Merge branch 'master' of github.com:webnotes/erpnext into website-wip 2013-09-11 19:38:38 +05:30
Anand Doshi
fb109aded0 [website] [minor] moving to framework 2013-09-11 18:58:20 +05:30
Priya
34b3256a31 [docs] sms settings page added 2013-09-11 16:33:09 +05:30
Akhilesh Darjee
fb6d410e60 [fix] test cases fix for price list 2013-09-11 16:18:10 +05:30
Anand Doshi
0748cb7d18 [website] [minor] moving to framework 2013-09-11 15:31:58 +05:30
Akhilesh Darjee
c3ec72c991 [fix] [minor] merge conflict fixed 2013-09-11 14:49:38 +05:30
Akhilesh Darjee
db59ffb76d [usability] item price moved to price list 2013-09-11 13:05:24 +05:30
Anand Doshi
b0d996ffb1 [website] [minor] moving to framework 2013-09-10 18:29:39 +05:30
Priya
3abfdd57a4 Merge branch 'master' of github.com:webnotes/erpnext 2013-09-10 17:22:11 +05:30
Priya
040c642fd1 [docs] setup documents 2013-09-10 17:21:26 +05:30
Nabin Hait
6e6ba9de14 [minor] label changed in sms settings 2013-09-10 17:20:42 +05:30
Priya
db633073a2 Merge branch 'master' of github.com:webnotes/erpnext 2013-09-10 17:18:55 +05:30
Nabin Hait
563662916a [fix] [minor] pos setting link validation 2013-09-10 17:15:01 +05:30
Anand Doshi
f2d0255031 Merge branch 'website-wip' of github.com:webnotes/erpnext into website-wip 2013-09-10 15:54:17 +05:30
Anand Doshi
a2eb70c33c Merge github.com:webnotes/erpnext into website-wip 2013-09-10 15:52:34 +05:30
Rushabh Mehta
f4de333267 [website] [minor] moving to framework 2013-09-10 15:49:18 +05:30
Nabin Hait
ee93ee3cb5 [minor] allow import for journal voucher 2013-09-10 14:59:58 +05:30
Rushabh Mehta
13bbf6536b [minor] webutils moved to lib 2013-09-10 14:44:36 +05:30
Anand Doshi
330dae90cb [website] [minor] moving to framework 2013-09-10 13:46:28 +05:30
Anand Doshi
429fd1d3d8 Merge branch 'website-wip' of github.com:webnotes/erpnext into website-wip 2013-09-10 12:54:10 +05:30
Rushabh Mehta
7c2312a74c [website] [minor] moving to framework 2013-09-10 12:51:52 +05:30