Commit Graph

26417 Commits

Author SHA1 Message Date
Mangesh-Khairnar
74f31c6677 fix(employee-advance): update employee advance on change in expense claim (#18589)
* fix(employee-advance): update employee advance on rejection/cancellation of expense claim

* fix(expense-claim): display appropriate buttons only if linked transactions are valid

* Update employee_advance.py
2019-08-05 10:03:32 +05:30
Deepesh Garg
7589b9f822 Merge pull request #18575 from deepeshgarg007/taxes_and_totals_v11
fix: Error handling in taxes and totals
2019-08-03 18:27:52 +05:30
deepeshgarg007
b761169976 fix: Error handling in taxes and totals 2019-08-03 13:40:37 +05:30
Suraj Shetty
537c3a79ab fix: Show correct label instead of showing undefined (#18561) 2019-08-02 21:46:11 +05:30
Sahil Khan
0510988b3e Merge branch 'version-11-hotfix' into version-11 v11.1.52 2019-08-02 14:24:50 +05:30
Sahil Khan
79c389a48f bumped to version 11.1.52 2019-08-02 14:44:50 +05:50
Suraj Shetty
239779dad0 fix: Check zero valuation rate only for valid doctypes (#18530)
fix: Check zero valuation rate only for valid doctypes
2019-08-02 11:23:01 +05:30
Suraj Shetty
37a7ab9d0e Merge branch 'version-11-hotfix' into stock-ledger-fix_v11 2019-08-02 08:42:58 +05:30
Deepesh Garg
17ea15eb91 fix: Enhancement in credit note (#18534)
* fix: Credit note enhancement

* Fix: Print format for Sales Invoice Return

* fix: Zero quantity validation fix for credit note
2019-07-31 15:59:34 +05:30
rohitwaghchaure
ddaf81051e Merge pull request #18532 from rohitwaghchaure/scrap_item_not_adding_v11_hotfix
fix: scrap item not adding while making finished good entry
2019-07-31 12:09:52 +05:30
Rohit Waghchaure
d06f3882e9 fix: scrap item not adding while making finished good entry 2019-07-31 00:00:47 +05:30
deepeshgarg007
523994c2cf fix: Check zero valuation rate only for valid doctypes 2019-07-30 19:06:06 +05:30
Sahil Khan
00219ab7f0 Merge branch 'version-11-hotfix' into version-11 v11.1.51 2019-07-30 13:06:37 +05:30
Sahil Khan
0c4f1e5e67 bumped to version 11.1.51 2019-07-30 13:26:37 +05:50
rohitwaghchaure
29e3cfd60f Merge pull request #18456 from rohitwaghchaure/bank_reco_consider_incorrect_paid_amount_field
fix: multi currency bank reconciliation issue
2019-07-29 11:40:25 +05:30
Mangesh-Khairnar
95058eac21 fix(payroll-entry): show make bank entry button when manually submitting salary slip (#18499) 2019-07-27 10:04:18 +05:30
Sahil Khan
4b963be8c4 Merge branch 'version-11-hotfix' into version-11 v11.1.50 2019-07-26 12:43:33 +05:30
Sahil Khan
a4434b1a50 bumped to version 11.1.50 2019-07-26 13:03:33 +05:50
Deepesh Garg
d3dc241878 Merge pull request #18492 from adityahase/faster-version-11
perf(travis): Faster Builds
2019-07-26 12:40:27 +05:30
Deepesh Garg
012e617c55 Merge pull request #18479 from deepeshgarg007/bank_reco
fix: Dynamic link issue fix in Bank reconciliation statement
2019-07-26 08:49:14 +05:30
Deepesh Garg
bee135c8c6 Merge pull request #18472 from deepeshgarg007/gstr-1-query
fix: GSTR-1 report fixes
2019-07-26 08:46:24 +05:30
Aditya Hase
8a19cd1096 perf(tests): Remove unnecessary tearDown code 2019-07-26 06:03:21 +05:30
Aditya Hase
5b14ca081c perf(travis): Use setUpClass instead of setUp 2019-07-26 06:03:21 +05:30
Aditya Hase
4fbf03c760 perf(tests): Use country with lesser fixtures 2019-07-26 06:00:51 +05:30
Aditya Hase
503d1d3291 perf(tests): Do not unnecessarily create companies 2019-07-26 05:59:31 +05:30
Aditya Hase
e2108d75dc perf(tests): Use setUpClass and tearDownClass instead of setUp and tearDown 2019-07-26 05:59:31 +05:30
Aditya Hase
9a009a1d1c fix(travis): Install wkhtmltopdf 2019-07-26 05:59:30 +05:30
Aditya Hase
61211486bc fix(travis): Remove redundant arguments 2019-07-26 05:59:30 +05:30
Aditya Hase
42fd7451bf fix(travis): Use --site parameter 2019-07-26 05:59:30 +05:30
Aditya Hase
70a1c1bdac fix(travis): Merge install and before_script 2019-07-26 05:59:30 +05:30
Aditya Hase
eb6d74217c fix(travis): Execute get-app before bench start 2019-07-26 05:59:30 +05:30
Aditya Hase
172a8f1cea perf(travis): Use travis optimizations 2019-07-26 05:59:30 +05:30
Aditya Hase
164057fa5b perf(travis): Do not build assets 2019-07-26 05:59:30 +05:30
Aditya Hase
3c21ac6bb6 perf(travis): Remove unnecessary processes from Procfile 2019-07-26 05:59:30 +05:30
Aditya Hase
ad2585e1b7 fix(travis): Use MariaDB credentials from site_config.json 2019-07-26 05:59:30 +05:30
Aditya Hase
09fe604452 perf(travis): Do not waste 10 seconds 2019-07-26 05:59:30 +05:30
Aditya Hase
28d836cfea fix(travis): Execute get-app and reinstall after bench start 2019-07-26 05:59:30 +05:30
Aditya Hase
8005f350ae fix(travis): Do not disable scheduler using CLI 2019-07-26 05:59:30 +05:30
Aditya Hase
3168ae7dcc fix(travis): Do not use use_site 2019-07-26 05:59:30 +05:30
Aditya Hase
447b8dab96 fix(travis): Setup MariaDB 2019-07-26 05:59:30 +05:30
Aditya Hase
6408949d43 fix(travis): Remove unused files 2019-07-26 05:59:30 +05:30
Aditya Hase
5fe2272861 fix(travis): Remove travis/bench_init.sh 2019-07-26 05:58:21 +05:30
Aditya Hase
7165a5d1f8 fix(travis): Do not execute install.py 2019-07-26 05:58:21 +05:30
Aditya Hase
2ec21fa9fb fix(travis): Install coverall after tests 2019-07-26 05:58:21 +05:30
Aditya Hase
a162f560dd fix(travis): Use MariaDB 10.3 2019-07-26 05:58:21 +05:30
Aditya Hase
c3c168a70d fix(travis): Restructure build matrix 2019-07-26 05:58:21 +05:30
Aditya Hase
b5ac3b8a53 fix(travis): Remove unnecessary commands 2019-07-26 05:58:21 +05:30
deepeshgarg007
30452a8bcd Dynamic link issue fix in Bank reconciliation statement 2019-07-25 12:23:40 +05:30
deepeshgarg007
36676effd9 fix: Query for b2b 2019-07-24 21:19:08 +05:30
deepeshgarg007
f31ff74a75 fix: GSTR-1 report fixes 2019-07-24 20:52:25 +05:30