Shivam Mishra
48b7a1a20f
fix: use get_datetime instead of getdate
2020-05-27 20:39:52 +05:30
Shivam Mishra
402ed10004
fix: compare start and end time to prevent negative diff ( #21974 )
...
* fix: compare start and end time to prevent negative diff
* feat: parse date when comparing
2020-05-27 20:39:52 +05:30
rohitwaghchaure
dc470b5382
Merge pull request #21977 from scmmishra/work-order-fix-datetime
...
fix: use get_datetime instead of getdate
2020-05-27 20:39:17 +05:30
Shivam Mishra
cb1a7d0fbc
fix: use get_datetime instead of getdate
2020-05-27 20:36:28 +05:30
mergify[bot]
4ea24687fc
fix: Module Onboarding for HR ( #21963 ) ( #21976 )
...
(cherry picked from commit d6d84a3c15
2020-05-27 20:32:11 +05:30
mergify[bot]
97ca1e7e71
onbarding steps fix ( #21959 ) ( #21975 )
...
(cherry picked from commit a77032f926
2020-05-27 20:31:43 +05:30
Shivam Mishra
8fcbf1b90e
fix: compare start and end time to prevent negative diff ( #21974 )
...
* fix: compare start and end time to prevent negative diff
* feat: parse date when comparing
2020-05-27 20:31:30 +05:30
Deepesh Garg
152377f84d
fix: Total for ageing column 121-Above ( #21972 )
2020-05-27 20:29:10 +05:30
Marica
7634250e78
fix: Grammar fixes ( #21971 )
2020-05-27 20:28:47 +05:30
Marica
a49f045d14
fix: Grammar fixes ( #21970 )
2020-05-27 20:28:37 +05:30
Deepesh Garg
0030b95595
fix: Filtering issues in opneing invoice creation tool ( #21969 )
2020-05-27 20:27:33 +05:30
Deepesh Garg
873542bc7f
fix: Do not allow backdated stock transactions in previous fiscal year ( #21967 )
2020-05-27 20:26:38 +05:30
Anurag Mishra
d6d84a3c15
fix: Module Onboarding for HR ( #21963 )
2020-05-27 20:21:15 +05:30
Anupam Kumar
a77032f926
onbarding steps fix ( #21959 )
2020-05-27 20:20:20 +05:30
Deepesh Garg
3258a050d0
Merge pull request #21968 from frappe/mergify/bp/version-13-beta-pre-release/pr-21957
...
fix: label changed in production plan (bp #21957 )
2020-05-27 19:01:24 +05:30
Nabin Hait
310309e816
fix: label changed in production plan
...
(cherry picked from commit 07388495f3
2020-05-27 13:15:58 +00:00
Deepesh Garg
df5f8528e7
Merge pull request #21957 from nabinhait/fix344
...
fix: label changed in production plan
2020-05-27 18:42:12 +05:30
rohitwaghchaure
29bd1c3968
Merge pull request #21960 from rohitwaghchaure/fixed-filters-for-manufacturing-reports
...
fix: filters for the manufacturing reports
2020-05-27 15:38:51 +05:30
rohitwaghchaure
eb29719586
Merge pull request #21961 from rohitwaghchaure/fixed-filters-for-manufacturing-reports-pre-release
...
fix: filters for the manufacturing reports
2020-05-27 15:38:41 +05:30
rohitwaghchaure
9cd2c7c7b2
Merge pull request #21962 from rohitwaghchaure/manufacturing-tour-develop
...
feat: added tour to manufacturing settings
2020-05-27 15:38:28 +05:30
Shivam Mishra
45571b99a8
feat: added tour to manufacturing settings
2020-05-27 15:36:59 +05:30
Rohit Waghchaure
6bb1eb26ff
fix: filters for the manufacturing reports
2020-05-27 15:28:01 +05:30
Rohit Waghchaure
cb1a910538
fix: filters for the manufacturing reports
2020-05-27 15:26:40 +05:30
Andrew McLeod
0fa1cc647f
fix: website_list_for_contact, fix changed frappe.db.exist keyword argument ( #21958 )
2020-05-27 13:36:35 +05:30
Nabin Hait
07388495f3
fix: label changed in production plan
2020-05-27 12:59:03 +05:30
mergify[bot]
5c9469b1ee
fix: titles and order of Healthcare Onboarding steps ( #21948 ) ( #21956 )
...
* fix(Healthcare): title and order of onboarding steps
* refactor: healthcare settings tour
(cherry picked from commit a18c896a56
2020-05-27 12:52:52 +05:30
Deepesh Garg
ed2c1803df
fix: Post Dated unallocated amount not considered in Advance Amount in AR/AP summary ( #21837 )
...
* fix: Post Dated unallocateed amount not considered in Advance Amount in AR/AP summary report
* fix: Add future payment filter in AR/AP summary
* fix: Show unallocated future payments only till current creation date
* fix: Remove extra query
* fix: Remove debug
* fix: Condition
2020-05-27 12:46:12 +05:30
mergify[bot]
2cdd572f6b
fix: addtional salary date validation ( #21952 ) ( #21955 )
...
(cherry picked from commit ef0026c06f
2020-05-27 12:44:02 +05:30
Rucha Mahabal
a18c896a56
fix: titles and order of Healthcare Onboarding steps ( #21948 )
...
* fix(Healthcare): title and order of onboarding steps
* refactor: healthcare settings tour
2020-05-27 12:43:44 +05:30
Anurag Mishra
ef0026c06f
fix: addtional salary date validation ( #21952 )
2020-05-27 12:28:11 +05:30
Anurag Mishra
01bced8c67
fix Report not working on parameter Grade ( #21951 )
2020-05-27 12:26:54 +05:30
mergify[bot]
da95601c12
fix: status label in project summary report ( #21935 ) ( #21938 )
...
(cherry picked from commit 8513d516e3
2020-05-27 12:25:48 +05:30
Shivam Mishra
2a81058f90
refactor: project summary report ( #21943 )
...
* feat: added more filters
* feat: show only first 30 projects in chart
* Update erpnext/projects/report/project_summary/project_summary.js
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-05-27 11:53:48 +05:30
Shivam Mishra
56893ed373
refactor: project summary report ( #21953 )
...
* feat: added more filters
* feat: show only first 30 projects in chart
* fix: status completed
* refactor: allow empty option in status filter
2020-05-27 11:53:06 +05:30
Shivam Mishra
e4bbdbbfe1
fix: get data from request directly ( #21954 )
2020-05-27 11:47:26 +05:30
rohitwaghchaure
84b855d55f
Merge pull request #21942 from scmmishra/manu-tour
...
feat: added tour to manufacturing settings
2020-05-26 23:26:12 +05:30
rohitwaghchaure
07b56610dd
Merge pull request #21946 from rohitwaghchaure/fixed-v13-beta-2-issues-develop
...
fix: manufacturing dashboard and work order summary chart
2020-05-26 23:19:57 +05:30
rohitwaghchaure
ed98796f11
Merge pull request #21945 from rohitwaghchaure/fixed-v13-beta-2-issues
...
fix: manufacturing dashboard and work order summary chart
2020-05-26 23:19:44 +05:30
Rohit Waghchaure
1e04b455f0
fix: manufacturing dashboard and work order summary chart
2020-05-26 23:14:21 +05:30
Rohit Waghchaure
4e9ae53a13
fix: manufacturing dashboard and work order summary chart
2020-05-26 23:13:09 +05:30
Shivam Mishra
41ef0b849e
feat: added tour to manufacturing settings
2020-05-26 20:29:08 +05:30
Deepesh Garg
3a723dd815
Merge pull request #21940 from deepeshgarg007/acc_dim_report_filter
...
fix: Do not add filters in report on accounting dimension creation if it already exists
2020-05-26 19:30:43 +05:30
Deepesh Garg
bcee78d054
fix: Remove console statement
2020-05-26 19:26:47 +05:30
Deepesh Garg
11ea0b1289
fix: Do not add filters in report on accounting dimension creation if it already exists
2020-05-26 19:23:45 +05:30
Abhishek Balam
18e7b60acc
feat(Selling): Gross Profit In Quotation ( #21795 )
...
* added valuation rate and gross_profit in quotation item table
* modified code to not fetch valuation_rate manually, used set_gross_profit from selling controller
2020-05-26 18:37:02 +05:30
Shivam Mishra
8513d516e3
fix: status label in project summary report ( #21935 )
2020-05-26 18:22:09 +05:30
Chinmay Pai
49b2b155b6
fix: sanitize all-products search before displaying results ( #21764 )
...
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-05-26 18:21:11 +05:30
Afshan
c0b4ec52de
fix: UX date range field separated in from and to date fields. ( #21765 )
...
* fix for issue #21419
* changing group by filter to default Group by Voucher (Consolidated)
* divided date range to seperate from and to date
* divided date range to seperate from and to date for purcase and sales register
2020-05-26 18:20:47 +05:30
Rohan
d28854b3c2
fix: throw error if no serial numbers are found in Pick List ( #21915 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-05-26 18:13:25 +05:30
Anurag Mishra
56357fafeb
fix: Added column Expired Leave ( #21857 )
2020-05-26 18:08:22 +05:30
