Commit Graph

7073 Commits

Author SHA1 Message Date
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
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
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
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
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
Akhilesh Darjee
f83576bf9c [pos] pos.js included in all selling & purchase cycle 2013-09-18 18:35:12 +05:30
Anand Doshi
e122121dc4 [fix] [minor] stock uom and price list currency in webshop 2013-09-18 17:28:06 +05:30
Nabin Hait
82d2001312 [minor] [docs] documentation for perpetual inventory 2013-09-18 15:51:31 +05:30
Nabin Hait
d9d25ca2e3 [minor] [docs] documentation for perpetual inventory 2013-09-18 15:46:41 +05:30
Akhilesh Darjee
a550e7443f [pos] moved pos realted code from sales_invoice.js to transaction.js 2013-09-17 18:52:00 +05:30
Anand Doshi
20a8b1302d [fix] [minor] price list patch 2013-09-17 17:19:03 +05:30
Anand Doshi
e0038e95db [fix] [minor] get_url and fixes due to addition of create permission check 2013-09-17 16:51:41 +05:30
Anand Doshi
83de391efc Merge branch 'akhileshdarjee-master' into website-wip 2013-09-17 16:09:15 +05:30
Anand Doshi
8c002491d0 [fix] [minor] show missing currency message in shopping cart settings 2013-09-17 15:57:17 +05:30
Anand Doshi
2840620070 [fix] [minor] [website] 2013-09-17 15:28:58 +05:30
Akhilesh Darjee
0dc627d9b1 [fix] [minor] price list patch fixed 2013-09-17 13:52:22 +05:30
Anand Doshi
619ed5e949 [fix] [minor] [website] 2013-09-17 13:46:50 +05:30
Akhilesh Darjee
06713d997e [fix] [minor] price list patch of june 2013 update fixed 2013-09-17 13:44:22 +05:30
Akhilesh Darjee
6773bc2512 [pos] [minor] added pos in sales order for testing 2013-09-17 11:56:17 +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
42573bcc90 [fix] [minor] fixed order of execution 2013-09-17 10:38:04 +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