Commit Graph

30208 Commits

Author SHA1 Message Date
snyk-bot
acb84ae64b fix: package.json & yarn.lock to reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-DOTPROP-543489
2020-02-07 04:55:15 +00:00
Snyk bot
075a3403d7
[Snyk] Fix for 1 vulnerabilities (#20484)
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-LODASH-450202


The following vulnerabilities are fixed with a Snyk patch:
- https://snyk.io/vuln/SNYK-JS-LODASH-450202

Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2020-02-07 10:23:51 +05:30
Deepesh Garg
38f7e7b9f0
Merge pull request #20537 from Alchez/dev-wfh-attendance-report
fix: show WFH in monthly attendance sheet report
2020-02-06 18:20:55 +05:30
Rohan Bansal
d64f92cf99 fix: show WFH in monthly attendance sheet report 2020-02-06 17:30:57 +05:30
Rohit Waghchaure
07f3312804 fix: Procurement Tracker report not working 2020-02-06 14:34:11 +05:30
Deepesh Garg
eeb4c3629c
Merge pull request #20529 from nextchamp-saqib/mv-fix-develop
fix: typo; serial no doesn't have amc start date
2020-02-06 13:56:10 +05:30
Deepesh Garg
cf8e2732c9
Merge pull request #20428 from 0Pranav/territory-sales-pipeline
feat: add territory wise sales report
2020-02-06 13:11:07 +05:30
thefalconx33
fcae88a514 fix: typo; serial no doesn't have amc start date 2020-02-06 13:00:47 +05:30
Deepesh Garg
da406d74ef
fix: Remove debug param 2020-02-06 12:55:21 +05:30
Deepesh Garg
a4928f6f5b fix: Add report link in module view and fix date filter 2020-02-06 12:50:25 +05:30
Parth J. Kharwar
830b316543
fix: full day leaves not tagged as half day in attendance (#20487)
* fix: full day leaves not tagged as half day in attendance

* chore: code cleanup for half day date value set
2020-02-05 15:01:13 +05:30
0Pranav
9d9a3d85d8 fix: filters after rename 2020-02-05 14:17:21 +05:30
Anurag Mishra
eacc1bc2dc fix: requested changes 2020-02-05 12:45:43 +05:30
Deepesh Garg
f639e363d6
Merge pull request #20520 from deepeshgarg007/fixnancial_query_fix
fix: SQL query in financial statements
2020-02-05 12:15:25 +05:30
Deepesh Garg
30e766b228 fix: SQL query in financial statements 2020-02-05 12:12:47 +05:30
Ahmad M Abdelrahman
41e7163476
automatic booking of asset depreciation fix
Stop Automatic deprecation is not working
2020-02-05 08:33:53 +02:00
Rucha Mahabal
50b67792ca fix: remove check availability button from form 2020-02-03 23:45:14 +05:30
Rucha Mahabal
513b443861 fix: make check availability as the primary action button 2020-02-03 23:42:21 +05:30
Rucha Mahabal
4d9d51d91c fix: get prescribed procedures button not working 2020-02-03 22:29:32 +05:30
Rucha Mahabal
217e1b41fb refactor: Appointment Type, add dashboard 2020-02-03 21:55:52 +05:30
Rucha Mahabal
6ffdbcbcd7 feat: show Patient Appointment status in List View 2020-02-03 21:23:02 +05:30
Deepesh Garg
d8e57d3d5a
fix: Unable to submit landed cost voucher (#20493)
* fix: Unable to submit landed cost voucher

* fix: Test case for multiple landed cost voucher against a Purchase receipt

* fix: Test Case
2020-02-03 18:53:34 +05:30
Anurag Mishra
1f6cc2b6ec
feat: appointment Letter (#20104)
* feat: appointment Letter

* fix: requested changes

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-03 17:52:42 +05:30
Pranav Nachnekar
6c14a08631
fix: disallow quick entry for doctypes with tree view (#20452) 2020-02-03 17:05:26 +05:30
rohitwaghchaure
716a85d81a
Merge pull request #20485 from rohitwaghchaure/source_warehouse_for_the_work_order
feat: added source warehouse field in the work order
2020-02-03 16:32:19 +05:30
Himanshu
10b3b79c0f
fix(Report): query report for Quality Action (#20424)
* fix: query report for QA

* fix: add QM permission

* fix: add QM permission
2020-02-03 16:16:49 +05:30
Deepesh Garg
9e1fbaf59e
fix: Label and UX fixes while creating payment entry against customer (#20465)
* fix: Label and UX fixes while creating payment entry against customer

* fix: filter
2020-02-03 15:58:50 +05:30
Saqib
4fca6cae34
feat: add tax category in pos profile (#20413)
* feat: add tax category in pos profile

* fix: review fixes
2020-02-03 15:53:27 +05:30
Deepesh Garg
589f2cd16c
fix: Get only specified company accounts in financial statements (#20486) 2020-02-03 15:49:24 +05:30
Saqib
5e6ce88c78
fix: gst permission for gst settings & hsn code (#20500)
* fix: gst permission for gst settings & hsn code

* Fix: typo

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-02-03 15:40:35 +05:30
Frappe PR Bot
ba0712a429
feat: Updated translation (#20490) 2020-02-03 14:58:03 +05:30
Frappe PR Bot
1478282920
feat: Updated translation (#20499) 2020-02-03 14:57:43 +05:30
0Pranav
9c4399e1f2 fix: better syntax for checking empty arrays 2020-02-03 14:57:42 +05:30
Deepesh Garg
943de261bb
Merge pull request #20505 from deepeshgarg007/button_shift
fix: Move E-Way bill button under create
2020-02-03 14:50:54 +05:30
Rucha Mahabal
b010988033 feat: add dashboards to Healthcare Masters 2020-02-02 23:22:02 +05:30
Rucha Mahabal
0a35b2207e refactor: Healthcare masters 2020-02-02 23:21:18 +05:30
Deepesh Garg
cce3ac9f79 fix: Move E-Way bill button under create 2020-02-02 21:25:58 +05:30
Deepesh Garg
c3f28db5b7
Merge pull request #20475 from ParthKharwar/dev-work-from-home-application
feat: request for work from home marked in attendance
2020-02-01 19:06:40 +05:30
Parth Kharwar
823964f3a6 fix: test added to check work from home application 2020-01-31 14:30:38 +05:30
rohitwaghchaure
ffa74ad5c1
Merge pull request #20478 from deepeshgarg007/finance-book-filter-new
fix: Do not show any finance book record if no finance book filter is applied
2020-01-31 13:19:16 +05:30
Rohit Waghchaure
adbe291498 feat: added source warehouse field in the work order 2020-01-31 13:09:06 +05:30
Rucha Mahabal
d089029bb4 fix: disabled practitioner schedule shown as enabled in list view 2020-01-31 12:32:42 +05:30
Deepesh Garg
34c33baa82 fix: Cash flow filter fix 2020-01-31 11:16:30 +05:30
0Pranav
b1473c3de0 fix: return empty array 2020-01-31 10:43:00 +05:30
0Pranav
75adb808e5 various fixes from review
- Rename the report to title case
- Added company filter
- fixed checks in filter and += operator for total
2020-01-31 10:35:47 +05:30
Deepesh Garg
ba44f28202 fix: Filtering fixes in financial statement 2020-01-31 09:08:29 +05:30
Suraj Shetty
f3287585c0
fix(translations): Incorrect syntax (#20471)
fix(translations): Incorrect syntax
2020-01-31 07:11:19 +05:30
Deepesh Garg
ce04526db8 fix: Do not show any finance book record if no finance book filter is applied 2020-01-30 15:33:51 +05:30
Suraj Shetty
0860865763
Merge branch 'develop' into fix-incorrect-translations 2020-01-30 15:12:33 +05:30
Parth Kharwar
5342c846d2 feat: request for work from home marked in attendance 2020-01-30 13:12:56 +05:30