Commit Graph

944 Commits

Author SHA1 Message Date
Akhilesh Darjee
1c7e5725a3 Merge branch 'master' of github.com:webnotes/erpnext 2013-10-14 13:43:11 +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
93c836c86d [fix] [minor] validate warehouse user 2013-10-10 19:15:58 +05:30
Nabin Hait
0948b2a9d3 [fix] [minor] repost order qty patch 2013-10-10 19:04:18 +05:30
Nabin Hait
609046990b [fix] [minor] fix in serial no 2013-10-08 17:58:41 +05:30
Nabin Hait
77f37e6b7c Update Serial No details through serial_no controller 2013-10-08 17:11:33 +05:30
Nabin Hait
8f05c05bfb Validate warehouse for allowed users and matched company 2013-10-07 13:08:13 +05:30
Nabin Hait
842e9d60cc [fix] [minor] serial no update 2013-10-05 19:57:39 +05:30
Nabin Hait
ac90ecf946 [patch] [minor] perpetual inventory stock transfer utility 2013-10-04 15:36:29 +05:30
Nabin Hait
5f8477d4ef [patch] [minor] perpetual inventory stock transfer utility 2013-10-04 15:29:36 +05:30
Nabin Hait
a1d1c980bc [minor] fixes in stock balance report, bin uom and sle is_cancelled 2013-10-02 16:29:45 +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
ca77574a66 [fix] [minor] only post sl entries if stock item exists 2013-09-26 16:16:44 +05:30
Nabin Hait
16ec14f9ab [fix] set missing values on creation of stock entry from material request 2013-09-26 14:08:09 +05:30
Nabin Hait
1ec5109a1a Reduce ordered qty in Purchase Receipt based on PO warehouse 2013-09-25 19:58:32 +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
5c464e4a01 [fix] [minor] uom conversion factor mandatory check 2013-09-25 13:24:00 +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
625da79e9f item-wise price list rate, editable report 2013-09-25 10:32:51 +05:30
Nabin Hait
11f41955c9 [minor] fixed conflict while merging perpetual branch into master 2013-09-24 14:36:55 +05:30
Akhilesh Darjee
e318c93405 [fix] patch merge conflict fixed 2013-09-23 12:34:22 +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
12144f339e Merge branch 'website-wip' 2013-09-19 12:27:11 +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
a3df58a264 Merge branch 'master' into perpetual 2013-09-18 15:22:04 +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
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
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
Akhilesh Darjee
b9c12eff17 [fix] [minor] merge conflict fixed 2013-09-12 14:02:37 +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
fb109aded0 [website] [minor] moving to framework 2013-09-11 18:58:20 +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
Anand Doshi
330dae90cb [website] [minor] moving to framework 2013-09-10 13:46:28 +05:30
Rushabh Mehta
7c2312a74c [website] [minor] moving to framework 2013-09-10 12:51:52 +05:30
Rushabh Mehta
bdb846f665 [website] [minor] moving to framework 2013-09-09 17:31:19 +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