Commit Graph

1099 Commits

Author SHA1 Message Date
Nabin Hait
185991d547 [fix] [minor] rounding error in purchase invoice gl entry 2013-10-16 13:08:53 +05:30
Nabin Hait
a012ffedd1 Merge branch 'master' of github.com:webnotes/erpnext 2013-10-16 11:48:39 +05:30
Nabin Hait
fc75d96abd [fix] [minor] Purchase Invoice - Amount for Stock received but not billed 2013-10-16 11:48:15 +05:30
Akhilesh Darjee
61b5c59e70 [fix] fixed conversion rate for mapping any documents 2013-10-15 20:24:34 +05:30
Nabin Hait
b6f37b8195 Merge branch 'master' of github.com:webnotes/erpnext 2013-10-15 16:55:54 +05:30
Nabin Hait
b338b6ed24 [fix] [minor] validate converion rate 2013-10-15 16:55:24 +05:30
Akhilesh Darjee
8f90e1c8f4 Merge branch 'master' of github.com:webnotes/erpnext 2013-10-15 16:26:38 +05:30
Akhilesh Darjee
dd6ebc1a4d [cleanup] comminified copy_account_in_all_row and removed conversion rate from pos setting 2013-10-15 15:54:31 +05:30
Akhilesh Darjee
1dfcc7557a [fix] fetch difference account and cost center on selecting item in stock entry 2013-10-15 13:54:39 +05:30
Nabin Hait
3ceba11208 Merge branch 'master' of github.com:webnotes/erpnext 2013-10-15 12:19:47 +05:30
Nabin Hait
f8924bcf6f [fix] [minor] update serial no in sle while creating auto serial no 2013-10-15 12:19:25 +05:30
Akhilesh Darjee
bfeae2da70 [cleanup] [minor] removed conversion rate from pos setting 2013-10-15 11:16:38 +05:30
Akhilesh Darjee
7837827e30 [fix] [minor] conversion arte related fixes 2013-10-11 19:06:30 +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
3235e787c4 [fix] [minor] Pick cost_center from tax table for expense included in valuation 2013-10-09 12:04:41 +05:30
Nabin Hait
6ec7d9d3f9 [fix] [minor] item-wose tax in item-wise sales register 2013-10-09 11:46:50 +05:30
Nabin Hait
77f37e6b7c Update Serial No details through serial_no controller 2013-10-08 17:11:33 +05:30
Nabin Hait
0352f9b827 [fix] [minor] gl entry cancellation 2013-10-05 15:38:43 +05:30
Anand Doshi
d1809e30e9 [minor] [fix] due date in sales invoice 2013-10-03 18:58:11 +05:30
Nabin Hait
cf3011839f [fix] [minor] bind onclick function based on docstatus in pos 2013-10-01 18:14:16 +05:30
Nabin Hait
a3e9d0a83d Merge pull request #921 from akhileshdarjee/master
[fix] [minor] new grid to hide delete button on new row & added description
2013-09-30 22:30:15 -07:00
Akhilesh Darjee
4233ae2258 [pos] pos related fixes 2013-09-30 18:18:19 +05:30
Nabin Hait
300ae0cdf4 [fix] [minor] dont call is_pos trigger in onload of pos invoice 2013-09-30 17:57:22 +05:30
Nabin Hait
a3d12bde9d [fix] [minor] gross profit report 2013-09-27 16:33:22 +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
Akhilesh Darjee
2428e8d1b7 [pos] [minor] fix for cur_frm 2013-09-27 12:32:26 +05:30
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
625da79e9f item-wise price list rate, editable report 2013-09-25 10:32:51 +05:30
Nabin Hait
04a3feecf6 [minor] perpetual inventory fix 2013-09-24 15:16:01 +05:30
Nabin Hait
11f41955c9 [minor] fixed conflict while merging perpetual branch into master 2013-09-24 14:36:55 +05:30
Nabin Hait
66adb3c0cf [minor] Frozen Accounts Modifier fixes 2013-09-24 12:10:37 +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
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
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
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
f83576bf9c [pos] pos.js included in all selling & purchase cycle 2013-09-18 18:35:12 +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
83de391efc Merge branch 'akhileshdarjee-master' into website-wip 2013-09-17 16:09:15 +05:30
Anand Doshi
2840620070 [fix] [minor] [website] 2013-09-17 15:28:58 +05:30
Nabin Hait
142007a226 [fix] [minor] perpetual inventory: account for each warehouse 2013-09-17 15:15:16 +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
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
Akhilesh Darjee
cb45b8f631 Merge branch 'master' of github.com:webnotes/erpnext 2013-09-16 11:06:46 +05:30