Commit Graph

30062 Commits

Author SHA1 Message Date
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 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 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 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 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 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 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 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
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