Commit Graph

355 Commits

Author SHA1 Message Date
Nabin Hait
ca471f41a1 [fix] Rename and merge rewrite 2013-11-20 13:14:12 +05:30
Akhilesh Darjee
e0b32824ff [fix] [minor] updated message for conversion rate 2013-11-12 19:27:16 +05:30
Anand Doshi
2ced381976 [minor] fixes in test cases and demo 2013-11-04 14:37:29 +05:30
Akhilesh Darjee
e158cea77a [cleanup] [minor] replaced for territory to applicable territory 2013-10-31 19:50:51 +05:30
Nabin Hait
5048c98911 [utility] repost stock 2013-10-23 12:14:32 +05:30
Nabin Hait
c2caae53dd [utility] repost stock 2013-10-23 12:02:08 +05:30
Nabin Hait
4ed7f68344 [utility] repost stock 2013-10-23 11:50:09 +05:30
Akhilesh Darjee
20659d1346 [docs] [minor] merge conflict fixed 2013-10-15 11:25:57 +05:30
Nabin Hait
1a60fd8906 [fix] [minor] fixes in reposting of ordered, indented and planned qty 2013-10-14 14:27:08 +05:30
Akhilesh Darjee
1c7e5725a3 Merge branch 'master' of github.com:webnotes/erpnext 2013-10-14 13:43:11 +05:30
Akhilesh Darjee
7837827e30 [fix] [minor] conversion arte related fixes 2013-10-11 19:06:30 +05:30
Nabin Hait
eea2b34f4b [production] update planned and produced ty 2013-10-11 18:31:33 +05:30
Akhilesh Darjee
1797cfef63 [fix] removed validation of conversion rate equals 1 from all transaction 2013-10-11 13:34:10 +05:30
Nabin Hait
164d39d12f Merge pull request #883 from akhileshdarjee/master
[feature] pos view added in all sales & purchase cycle
2013-09-27 00:05:15 -07:00
Nabin Hait
1ec5109a1a Reduce ordered qty in Purchase Receipt based on PO warehouse 2013-09-25 19:58:32 +05:30
Akhilesh Darjee
10dce341c8 [pos] pos view fixed for all purchase & sales cycle 2013-09-25 11:09:33 +05:30
Nabin Hait
11f41955c9 [minor] fixed conflict while merging perpetual branch into master 2013-09-24 14:36:55 +05:30
Anand Doshi
12144f339e Merge branch 'website-wip' 2013-09-19 12:27:11 +05:30
Nabin Hait
ad6ce4ee11 [fix] [minor] ignore permission while deleting event through code 2013-09-19 11:02:24 +05:30
Anand Doshi
83de391efc Merge branch 'akhileshdarjee-master' into website-wip 2013-09-17 16:09:15 +05:30
Nabin Hait
142007a226 [fix] [minor] perpetual inventory: account for each warehouse 2013-09-17 15:15:16 +05:30
Anand Doshi
619ed5e949 [fix] [minor] [website] 2013-09-17 13:46:50 +05:30
Anand Doshi
ad0b05060a Merge branch 'master' of github.com:webnotes/erpnext into website-wip 2013-09-17 11:00:24 +05:30
Akhilesh Darjee
2e1f94f222 [fix] [pos] hide custom buttons in pos view 2013-09-13 17:37:23 +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
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
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
Anand Doshi
9686b937bb [fix] [minor] print hide communication table 2013-09-10 10:54:34 +05:30
Rushabh Mehta
e865de01ee [website] [minor] moving to framework 2013-09-09 12:32:35 +05:30
Rushabh Mehta
c59c4e0699 [website] [minor] moving to framework 2013-09-09 12:17:45 +05:30
Anand Doshi
512113ae51 Merge branch 'customer-login' 2013-09-05 12:21:29 +05:30
Anand Doshi
7b044da0e3 [fix] [minor] on_communication, when checking if system user, extract email id and then check 2013-09-04 18:14:20 +05:30
Anand Doshi
53ecddd612 [fix] [communication] on communication send, update status 2013-09-04 17:52:27 +05:30
Anand Doshi
d01f0cb46e [fix] [communication] on communication send, update status 2013-09-04 17:38:29 +05:30
Rushabh Mehta
090d410498 [minor] communication, webnotes/erpnext#790 2013-09-04 16:20:18 +05:30
Anand Doshi
0e23929740 Merge branch 'master' into customer-login 2013-09-03 16:42:21 +05:30
Nabin Hait
d2b87268c9 [fix] [minor] in fetching pos settings 2013-09-02 20:12:53 +05:30
Rushabh Mehta
96690ebd0f [communication] [minor] cleaed model 2013-09-02 17:04:27 +05:30
Anand Doshi
9283b6c59d [demo] [minor] fixes in make demo 2013-09-02 14:58:45 +05:30
Anand Doshi
ddb7c8048e Merge branch 'master' of github.com:webnotes/erpnext into customer-login 2013-09-02 11:13:32 +05:30
Rushabh Mehta
e499a48f85 [demo] [minor] 2013-09-01 11:14:32 +05:30
Rushabh Mehta
0c2fb66051 [demo] [minor] [item] fix 2013-09-01 10:40:12 +05:30
Anand Doshi
c8e39b0965 [fix] [minor] use prop instead of attr to disable a field 2013-08-30 18:22:58 +05:30
Rushabh Mehta
010de37fcb [website] [style] [minor] padding in blog categories 2013-08-29 22:28:58 +05:30
Rushabh Mehta
46ec268e9b [communications] [minor] Code cleanup so it can be extended by custom script 2013-08-29 13:53:36 +05:30
Anand Doshi
85ef479db8 [demo] [minor] disable signup and don't allow editing profile 2013-08-27 23:21:19 +05:30