deepeshgarg007
b590f89310
fix: Default Accounting Dimensions in doctypes
2019-07-29 12:14:49 +05:30
rohitwaghchaure
8c8b1f2da6
Merge pull request #18463 from rohitwaghchaure/bank_reco_consider_incorrect_paid_amount_field_v12
...
fix: multi currency bank reconciliation issue
2019-07-29 11:40:40 +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
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
809025c746
Merge pull request #18495 from deepeshgarg007/stock-ageing-v12
...
fix: Enhancement in stock ageing report
2019-07-26 15:45:24 +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
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
b4ecd29015
Merge branch 'version-12-hotfix' into iss_ful_fix_v12
2019-07-26 06:58:59 +00:00
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
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
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
ea56f317c8
Merge pull request #18473 from deepeshgarg007/gstr-1-query-v12
...
fix: GSTR-1 query fix
2019-07-26 08:46:15 +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
Aditya Hase
f4314a25b6
perf(travis): Use setUpClass instead of setUp
2019-07-26 05:54:04 +05:30
Aditya Hase
bd69f43322
fix(stock): Fix travis builds
2019-07-26 05:54:04 +05:30
Aditya Hase
d1bb274c22
perf(tests): Use country with lesser fixtures
2019-07-26 05:54:04 +05:30
Aditya Hase
8773d931be
perf(tests): Do not unnecessarily create companies
2019-07-26 05:54:04 +05:30
Aditya Hase
0d333894c9
perf(tests): Use setUpClass and tearDownClass instead of setUp and tearDown
2019-07-26 05:54:04 +05:30
Aditya Hase
b6906c58d1
fix(travis): Install wkhtmltopdf
2019-07-26 05:54:04 +05:30
Aditya Hase
0046357b86
fix(travis): Remove redundant arguments
2019-07-26 05:54:04 +05:30
Aditya Hase
ac431c8e33
fix(travis): Use --site parameter
2019-07-26 05:54:04 +05:30
Aditya Hase
7b39aa7f91
fix(travis): Merge install and before_script
2019-07-26 05:54:03 +05:30
Aditya Hase
6076443b6b
fix(travis): Execute get-app before bench start
2019-07-26 05:54:03 +05:30
Aditya Hase
50e2d4aa6a
perf(travis): Use travis optimizations
2019-07-26 05:54:03 +05:30
Aditya Hase
e31284189f
perf(travis): Do not build assets
2019-07-26 05:54:03 +05:30
Aditya Hase
30628b016b
perf(travis): Remove unnecessary processes from Procfile
2019-07-26 05:54:03 +05:30
Aditya Hase
7c44adad3e
fix(travis): Use MariaDB credentials from site_config.json
2019-07-26 05:54:03 +05:30
Aditya Hase
e4f78a0b6a
perf(travis): Do not waste 10 seconds
2019-07-26 05:54:03 +05:30
Aditya Hase
903e87899b
fix(travis): Execute get-app and reinstall after bench start
2019-07-26 05:54:03 +05:30
Aditya Hase
1e9e471714
fix(travis): Do not disable scheduler using CLI
2019-07-26 05:54:03 +05:30
Aditya Hase
fb2ec7186d
fix(travis): Do not use use_site
2019-07-26 05:54:03 +05:30
Aditya Hase
185e2a2fd8
fix(travis): Setup MariaDB
2019-07-26 05:54:03 +05:30
Aditya Hase
e2b16e3edb
fix(travis): Remove unused files
2019-07-26 05:54:03 +05:30
Aditya Hase
23f24d13dd
fix(travis): Remove travis/bench_init.sh
2019-07-26 05:54:03 +05:30
Aditya Hase
3f6ac2d993
fix(travis): Do not execute install.py
2019-07-26 05:54:03 +05:30
