deepeshgarg007
4fce891241
Merge branch 'develop' of https://github.com/frappe/erpnext into defaut_accounting_dimension
2019-07-27 18:11:34 +05:30
Sahil Khan
d800f993b0
Merge branch 'version-12-hotfix' into version-12
2019-07-27 12:54:21 +05:30
Sahil Khan
82a9118cb2
bumped to version 12.0.2
2019-07-27 13:14:21 +05:50
Mangesh-Khairnar
f0f4dbd5f8
fix(payroll-entry): show make bank entry button when manually submitting salary slip ( #18498 )
2019-07-27 10:05:33 +05:30
Michelle Alva
e666b882e7
fix: added payroll period in HR module ( #18500 )
2019-07-27 10:03:18 +05:30
Himanshu
e83b0c3599
Merge branch 'version-12-hotfix' into iss_ful_fix_v12
2019-07-26 12:51:55 +00:00
Himanshu
9443e8e85f
Merge branch 'develop' into iss_ful_fix_v13
2019-07-26 12:51:09 +00:00
rohitwaghchaure
0f3281fe43
Merge pull request #18496 from rohitwaghchaure/asset_pro_rata_cal_for_wdv_remaining_amt_v12
...
fix: Pro rata calculation is not working for WDV depreciation method
2019-07-26 16:11:38 +05:30
Deepesh Garg
ce63b1f669
Merge pull request #18317 from deepeshgarg007/stock_ageing_fix
...
fix: Enhancement in stock ageing report
2019-07-26 15:45:48 +05:30
Deepesh Garg
809025c746
Merge pull request #18495 from deepeshgarg007/stock-ageing-v12
...
fix: Enhancement in stock ageing report
2019-07-26 15:45:24 +05:30
Saurabh
af19347376
Merge branch 'develop' into scrap_item_not_adding
2019-07-26 15:10:17 +05:30
Deepesh Garg
64968979b2
Merge branch 'version-12-hotfix' into stock-ageing-v12
2019-07-26 14:42:34 +05:30
Aditya Hase
dc4452ffe3
perf(travis): Faster builds ( #18491 )
...
perf(travis): Faster builds
2019-07-26 13:44:05 +05:30
deepeshgarg007
2f87fd7951
Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into stock-ageing-v12
2019-07-26 13:32:11 +05:30
Suraj Shetty
64f174fcaa
feat: Get item location from reference items
...
- Add option to get items from multiple sales order
- Add some required fiels to Pick TIcket Reference Item
2019-07-26 13:22:05 +05:30
Rohit Waghchaure
53f5e2e066
fixed test cases and the logic for pro rata calculation
2019-07-26 13:21:46 +05:30
Rohit Waghchaure
3844a98c42
fix: Pro rata calculation is not working for WDV depreciation method
2019-07-26 13:21:33 +05:30
Sahil Khan
cbef3f7bd7
Merge branch 'version-12-hotfix' into version-12
2019-07-26 13:09:15 +05:30
Sahil Khan
ecd4d3883e
bumped to version 12.0.1
2019-07-26 13:29:14 +05:50
Himanshu
e87fbcc286
Merge branch 'develop' into iss_ful_fix_v13
2019-07-26 07:31:44 +00:00
Deepesh Garg
941e21092c
Merge branch 'develop' into stock_ageing_fix
2019-07-26 12:47:05 +05:30
Deepesh Garg
c391d65dc3
Merge pull request #18488 from adityahase/faster
...
perf(travis): Faster builds
2019-07-26 12:41:01 +05:30
Himanshu
b4ecd29015
Merge branch 'version-12-hotfix' into iss_ful_fix_v12
2019-07-26 06:58:59 +00:00
Himanshu
0162d0a2ea
Merge branch 'develop' into iss_ful_fix_v13
2019-07-26 06:58:55 +00:00
rohitwaghchaure
ad89b029c2
Merge pull request #18494 from netchampfaris/parent-account-child-account-currency-fp
...
fix(Account): Pass parent currency to child currency
2019-07-26 12:13:27 +05:30
rohitwaghchaure
a312f19fab
Merge pull request #18493 from netchampfaris/parent-account-child-account-currency
...
fix(Account): Pass parent currency to child currency
2019-07-26 12:12:15 +05:30
deepeshgarg007
06f99cae36
fix: Fixes in stock ageing report
2019-07-26 10:32:08 +05:30
deepeshgarg007
15154d4bd0
Merge branch 'develop' of https://github.com/frappe/erpnext into stock_ageing_fix
2019-07-26 10:30:22 +05:30
deepeshgarg007
7fdab021b6
fix: Use get_serial_no and remove batch
2019-07-26 10:26:13 +05:30
deepeshgarg007
1495c9599a
fix: Remove batch
2019-07-26 10:25:54 +05:30
deepeshgarg007
e3a2ab184e
fix: Consider serial no and batches in Stock ageing report
2019-07-26 10:25:15 +05:30
deepeshgarg007
f7733be322
fix: Enhancement in stock ageing report
2019-07-26 10:25:04 +05:30
deepeshgarg007
4d53992b35
fix: Changed columns to new dict form
2019-07-26 10:24:40 +05:30
deepeshgarg007
dda6b5cd53
fix: Add accounting dimensions to subscription and opening invoice tool
2019-07-26 09:14:42 +05:30
deepeshgarg007
aa92df4ddc
fix: Test cases for accounting dimensions
2019-07-26 09:14:42 +05:30
deepeshgarg007
0ce2afc9bc
fix: Test Cases for accounting dimensions
2019-07-26 09:14:42 +05:30
deepeshgarg007
41a1cd954c
fix: Set query fix
2019-07-26 09:14:42 +05:30
deepeshgarg007
b124aff0bb
fix: Codacy Fixes
2019-07-26 09:14:42 +05:30
deepeshgarg007
703fc08467
fix: Patch
2019-07-26 09:14:42 +05:30
deepeshgarg007
6dd5f74671
fix: Remove dimensions from boot
2019-07-26 09:14:42 +05:30
deepeshgarg007
ada1ac8013
fix: Added default dimension and filter in bootinfo
2019-07-26 09:14:42 +05:30
deepeshgarg007
efd6307bc4
fix: Default Accounting Dimensions in doctypes
2019-07-26 09:14:42 +05:30
Faris Ansari
0ec747f57c
fix(Account): Pass parent currency to child currency
...
In a scenario where Parent Company Account's Currency is different
from it's default currency, the Account Currency of Child would be set
from the default currency of Company which might be wrong
2019-07-26 08:55:34 +05:30
Deepesh Garg
6f6f4b9417
Merge pull request #18481 from deepeshgarg007/bank_reco_v12
...
fix: Dynamic link issue fix in Bank reconciliation statement
2019-07-26 08:49:03 +05:30
Deepesh Garg
059c568f08
Merge pull request #18482 from deepeshgarg007/bank_reco_develop
...
fix: Dynamic link issue fix in Bank reconciliation statement
2019-07-26 08:48:49 +05:30
Deepesh Garg
641e8fea02
Merge branch 'develop' into bank_reco_develop
2019-07-26 08:48:02 +05:30
Deepesh Garg
ea56f317c8
Merge pull request #18473 from deepeshgarg007/gstr-1-query-v12
...
fix: GSTR-1 query fix
2019-07-26 08:46:15 +05:30
Deepesh Garg
cd645de4f9
Merge pull request #18474 from deepeshgarg007/gstr-1-query-v13
...
fix: GSTR-1 query fix
2019-07-26 08:45:59 +05:30
Faris Ansari
6998412990
fix(Account): Pass parent currency to child currency
...
In a scenario where Parent Company Account's Currency is different
from it's default currency, the Account Currency of Child would be set
from the default currency of Company which might be wrong
2019-07-26 08:15:45 +05:30
Aditya Hase
f2fb461e40
perf(tests): Remove unnecessary tearDown code
2019-07-26 05:54:04 +05:30
