Rushabh Mehta
|
ca4c663e07
|
Merge branch 'develop'
|
2015-12-03 17:58:58 +05:30 |
|
Rushabh Mehta
|
275b3eec0d
|
bumped to version 6.12.3
|
2015-12-03 18:28:57 +06:00 |
|
Rushabh Mehta
|
acaef538c2
|
Merge pull request #4420 from rmehta/stock-entry-fix
[minor] allow stock entry for manufacture without production order
|
2015-12-03 17:58:07 +05:30 |
|
Rushabh Mehta
|
041b062014
|
Merge pull request #4419 from nabinhait/salary_payment_days
[fix] Payment Days and holidays considering joining and relieving dates
|
2015-12-03 17:57:24 +05:30 |
|
Rushabh Mehta
|
39e603a154
|
Merge pull request #4413 from nabinhait/bank_transfer_exchange_rate
Bank transfer exchange rate and account balance in COA
|
2015-12-03 17:56:03 +05:30 |
|
Nabin Hait
|
a4eeb919e6
|
[fix] Set payment days considering joinging date, reliving date and applicable holidays
|
2015-12-03 15:10:30 +05:30 |
|
Nabin Hait
|
c4d9554a05
|
[fix] Payment Days and holidays considering joining and relieving dates
|
2015-12-03 15:10:30 +05:30 |
|
Rushabh Mehta
|
2e1c8f27c4
|
Merge pull request #4421 from nabinhait/tax_rule_fix
[fix] Toggle required for sales and purchase tax template based on tax type
|
2015-12-03 11:50:09 +05:30 |
|
Nabin Hait
|
4c7a32e446
|
[fix] Toggle required for sales and purchase tax template based on tax type
|
2015-12-03 11:47:38 +05:30 |
|
Rushabh Mehta
|
2c069a418a
|
[minor] allow stock entry for manufacture without production order
|
2015-12-03 11:10:23 +05:30 |
|
Rushabh Mehta
|
ba2596a7e0
|
[minor] validate email id before inviting user
|
2015-12-03 10:35:11 +05:30 |
|
Rushabh Mehta
|
f7911687a0
|
[minor] fixes to patch
|
2015-12-03 08:09:42 +05:30 |
|
Rushabh Mehta
|
ceb82324ad
|
Merge branch 'develop'
|
2015-12-02 14:54:45 +05:30 |
|
Rushabh Mehta
|
5dd1aa9f31
|
bumped to version 6.12.2
|
2015-12-02 15:24:45 +06:00 |
|
Rushabh Mehta
|
80ada3eddd
|
Merge pull request #4415 from nabinhait/salary_slip_fix
[fix] Inactive salary structure validation
|
2015-12-02 14:52:11 +05:30 |
|
Nabin Hait
|
8df5900f98
|
[fix] Inactive salary structure validation
|
2015-12-02 14:50:08 +05:30 |
|
Nabin Hait
|
f58a3726a7
|
Balance in chart of accounts in both company and account currency
|
2015-12-02 12:28:06 +05:30 |
|
Nabin Hait
|
1c77506e80
|
[fix] Don't overwrite exchange rate on saving for bank transfer
|
2015-12-02 12:28:06 +05:30 |
|
Rushabh Mehta
|
f1f556c0ac
|
Merge pull request #4409 from nabinhait/reorder_level
[fix] Reorder Qty mandatory if reorder level entered
|
2015-12-02 12:25:09 +05:30 |
|
Rushabh Mehta
|
4a1b9ac793
|
Merge pull request #4407 from nabinhait/develop
[fix] Mapping allowed for negative quantity
|
2015-12-02 12:24:49 +05:30 |
|
Nabin Hait
|
20abc2d0e8
|
[fix] Reorder Qty mandatory if reorder level entered
|
2015-12-01 19:01:19 +05:30 |
|
Rushabh Mehta
|
4f9fe9c856
|
Merge branch 'develop'
|
2015-12-01 18:18:28 +05:30 |
|
Rushabh Mehta
|
4496cc1e80
|
bumped to version 6.12.1
|
2015-12-01 18:48:28 +06:00 |
|
Rushabh Mehta
|
29cca2352c
|
[hot] [fix] trial balance report
|
2015-12-01 18:17:33 +05:30 |
|
Nabin Hait
|
d793fc9446
|
[fix] Mapping allowed for negative quantity
|
2015-12-01 17:28:12 +05:30 |
|
Rushabh Mehta
|
84f44ad5eb
|
Merge pull request #4345 from nabinhait/stock_reco
[fix] Get items in stock reconciliation based on default warehouse
|
2015-12-01 16:50:32 +05:30 |
|
Nabin Hait
|
5b73dea9f6
|
[fix] Get items in stock reconciliation based on default warehouse or existing bin
|
2015-12-01 16:47:17 +05:30 |
|
Rushabh Mehta
|
cd90478c6d
|
Merge pull request #4406 from nabinhait/recurring_test_fix
[fix] Recurring test case fixed for the 1st day of the month
|
2015-12-01 16:43:27 +05:30 |
|
Nabin Hait
|
c4edcf1532
|
[fix] Recurring test case fixed for the 1st day of the month
|
2015-12-01 16:28:35 +05:30 |
|
Rushabh Mehta
|
70885f63a5
|
Merge branch 'develop'
|
2015-12-01 16:24:13 +05:30 |
|
Rushabh Mehta
|
48b1633ff5
|
bumped to version 6.12.0
|
2015-12-01 16:54:13 +06:00 |
|
Rushabh Mehta
|
4140fa59c5
|
[translations]
|
2015-12-01 16:02:15 +05:30 |
|
Rushabh Mehta
|
afacc3d779
|
[minor] catch illegal reference, via error report
|
2015-12-01 15:53:07 +05:30 |
|
Rushabh Mehta
|
87b0bec2cf
|
Merge pull request #4405 from rmehta/get-product-bundle-fixes
[fixes] [ux] get product bundle items only on po, mr and button on toolbar
|
2015-12-01 15:14:23 +05:30 |
|
Rushabh Mehta
|
29f9f6c147
|
[fixes] [ux] get product bundle items only on po, mr and button on toolbar
|
2015-12-01 11:36:22 +05:30 |
|
Rushabh Mehta
|
37d9d6fdea
|
Merge pull request #4402 from nabinhait/allow_root_accounts
[feature] Allowed custom root accounts in Chart of Accounts
|
2015-12-01 10:59:44 +05:30 |
|
Rushabh Mehta
|
0cc177f73c
|
Merge pull request #4400 from nabinhait/total_amount_in_jv
[fix] Total Amount in Journal Entry in bank currency
|
2015-12-01 10:58:34 +05:30 |
|
Nabin Hait
|
8c4e043747
|
[feature] Allowed custom root accounts in Chart of Accounts
|
2015-12-01 10:34:43 +05:30 |
|
Rushabh Mehta
|
3617942ff7
|
Merge pull request #4395 from nabinhait/drop_ship
[fix] Invoicing against drop-ship Purchase Order
|
2015-12-01 10:26:25 +05:30 |
|
Nabin Hait
|
ddc295b4b3
|
[minor] Set expense account as Stock RBNB for perpetual inventory after mapping
|
2015-11-30 18:40:28 +05:30 |
|
Nabin Hait
|
621f4cd7c9
|
[fix] Invoicing against drop-ship Purchase Order
|
2015-11-30 18:40:28 +05:30 |
|
Rushabh Mehta
|
4750b1fdb7
|
Merge pull request #4397 from rmehta/setup-wizard-fixes
[minor] system settings in setup wizard moved to frappe
|
2015-11-30 17:17:16 +05:30 |
|
Rushabh Mehta
|
e7bb6544f5
|
Merge pull request #4401 from nabinhait/pr-for-non-stock-items
[fix] Show 'Make Purchase Receipt' button in PO even if all items are non-stock items
|
2015-11-30 16:56:28 +05:30 |
|
Nabin Hait
|
72e348daf5
|
[fix] Show 'Make Purchase Receipt' button in PO even if all items are non-stock items
|
2015-11-30 16:26:49 +05:30 |
|
Nabin Hait
|
6c173e9730
|
[fix] Total Amount in Journal Entry in bank currency
|
2015-11-30 16:13:42 +05:30 |
|
Rushabh Mehta
|
0547a7668e
|
Merge pull request #4398 from nabinhait/bank_reco
[fix] Bank Reconciliation in account currency
|
2015-11-30 16:06:06 +05:30 |
|
Nabin Hait
|
ec1695dbe3
|
[fix] Bank Reconciliation in account currency
|
2015-11-30 15:23:46 +05:30 |
|
Rushabh Mehta
|
7909102edd
|
[minor] system settings in setup wizard moved to frappe
|
2015-11-30 15:12:45 +05:30 |
|
Rushabh Mehta
|
3f10e0ba2d
|
Merge pull request #4396 from rmehta/stock-reco-fixes
[fixes] stock reco, must always set qty and rate
|
2015-11-30 14:18:09 +05:30 |
|
Rushabh Mehta
|
9f7de868ef
|
[fixes] stock reco, must always set qty and rate
|
2015-11-30 14:16:36 +05:30 |
|