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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Anand Doshi
|
1be5bb7e6a
|
[portal] [minor] show status for order and invoice
|
2013-09-12 15:25:47 +05:30 |
|
Akhilesh Darjee
|
a7a06a77dd
|
[fix] journal voucher to fetch company currency
|
2013-09-12 13:59:06 +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 |
|
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 |
|
Nabin Hait
|
563662916a
|
[fix] [minor] pos setting link validation
|
2013-09-10 17:15:01 +05:30 |
|
Nabin Hait
|
ee93ee3cb5
|
[minor] allow import for journal voucher
|
2013-09-10 14:59:58 +05:30 |
|
Anand Doshi
|
a3f6fda0df
|
[fix] Hide Make Delivery Note button, if Sales Invoice is made from Delivery Note. Hide Make Invoice Button, if Delivery Note is made from Sales Invoice
|
2013-09-06 13:37:52 +05:30 |
|
Nabin Hait
|
87eb4b99a8
|
[fix] [minor] gl entries for purchase invoice
|
2013-09-05 17:03:31 +05:30 |
|
Nabin Hait
|
272410bb87
|
[fix] [minor] fixes in payment reconciiation
|
2013-09-05 15:43:05 +05:30 |
|
Nabin Hait
|
335cdeaf7d
|
[fix] [minor] fixes in test cases for is_pos
|
2013-09-05 14:00:57 +05:30 |
|
Nabin Hait
|
eec9371de7
|
[fix] [minor] gl entries for purchase invoice
|
2013-09-05 13:42:54 +05:30 |
|
Akhilesh Darjee
|
a7b7d2559e
|
[fix] merge conflict
|
2013-09-05 13:18:22 +05:30 |
|
Akhilesh Darjee
|
38e8f989fa
|
[fix] [patch] fixed paid_amount & patch for default pos view check in features setup
|
2013-09-05 12:59:33 +05:30 |
|
Anand Doshi
|
ea55734df5
|
[fix] [minor] delivered items to be billed
|
2013-09-05 12:41:16 +05:30 |
|
Anand Doshi
|
8543469fba
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-09-05 12:22:14 +05:30 |
|
Nabin Hait
|
a653cd3608
|
[minor] fixed conflict while merging with master
|
2013-09-05 10:56:44 +05:30 |
|
Nabin Hait
|
2162fee396
|
Merge pull request #792 from akhileshdarjee/master
[pos][fix] fixed pos view in sales_invoice.js
|
2013-09-04 22:03:42 -07:00 |
|
Akhilesh Darjee
|
734b2aab5c
|
[fix] pos setting link fields validate to specific company
|
2013-09-04 18:48:08 +05:30 |
|
Nabin Hait
|
bf4d27ecf1
|
[minor] repost future gl entries only for current voucher items
|
2013-09-04 17:55:45 +05:30 |
|
Anand Doshi
|
0e23929740
|
Merge branch 'master' into customer-login
|
2013-09-03 16:42:21 +05:30 |
|
Anand Doshi
|
1dadf35fc7
|
[fix] [minor] [query] sales invoice from delivery note
|
2013-09-03 16:21:01 +05:30 |
|
Anand Doshi
|
36b63a44b9
|
[fix] [minor] profile query
|
2013-09-03 15:33:56 +05:30 |
|
Akhilesh Darjee
|
45af0a18b6
|
[pos] [minor] pos setting fix
|
2013-09-02 19:05:55 +05:30 |
|
Akhilesh Darjee
|
7a274e4d2f
|
[pos] [minor] pos print format & pos setting cancel function allowed
|
2013-09-02 18:53:09 +05:30 |
|
Akhilesh Darjee
|
12425ce85e
|
[pos] [minor] pos completed
|
2013-09-02 18:48:39 +05:30 |
|
Nabin Hait
|
da3110fc12
|
[merge] [minor] merged with master
|
2013-09-02 13:07:49 +05:30 |
|
Anand Doshi
|
ddb7c8048e
|
Merge branch 'master' of github.com:webnotes/erpnext into customer-login
|
2013-09-02 11:13:32 +05:30 |
|
Nabin Hait
|
0ddcc6f7cf
|
[fix] [minor] set invoice due date based on credit days
|
2013-08-31 10:19:56 +05:30 |
|
Nabin Hait
|
5836c58a4b
|
[docs] [minor] accounting for stock
|
2013-08-31 10:17:27 +05:30 |
|
Nabin Hait
|
94c90bdbf9
|
[fix] [minor] buying amount for sales bom item
|
2013-08-30 22:48:19 +05:30 |
|
Anand Doshi
|
c8e39b0965
|
[fix] [minor] use prop instead of attr to disable a field
|
2013-08-30 18:22:58 +05:30 |
|