mergify[bot]
25add7c9bf
crm onboarding typos ( #22008 ) ( #22025 )
...
(cherry picked from commit 8385fed042
)
Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
2020-05-29 09:34:14 +05:30
Sahil Khan
6a93feb9d2
Merge branch 'version-13-beta-pre-release' into version-13-beta
2020-05-28 20:28:09 +05:30
Sahil Khan
f42a37ea43
bumped to version 13.0.0-beta.2
2020-05-28 20:41:41 +05:50
Rucha Mahabal
fb6ad158a6
Merge pull request #22020 from frappe/mergify/bp/version-13-beta-pre-release/pr-22019
...
fix: empty filters in Healthcare Charts (bp #22019 )
2020-05-28 19:25:51 +05:30
Rucha Mahabal
1a1447c2a1
fix: empty filters in Healthcare Charts
...
(cherry picked from commit a3dd75e77f
)
2020-05-28 13:54:39 +00:00
sahil28297
11bd731d16
fix(set_purchase_receipt_delivery_note_detail): commit after every 100 sql updates ( #22018 )
2020-05-28 18:50:13 +05:30
sahil28297
a0f061abd9
fix(rename_bank_reconcilliation): do not delete doc after renaming ( #22014 )
2020-05-28 18:32:34 +05:30
Marica
354baf0c5e
fix: Delete Auto Email Reports ( #22010 )
2020-05-28 18:31:50 +05:30
Shivam Mishra
fa0b73ce25
refactor: clean up desk pages ( #22004 ) ( #22007 )
...
* refactor: clean up desk pages
* refactor: update label for CRM
2020-05-28 15:20:22 +05:30
Deepesh Garg
82c6b9a9be
Merge pull request #22005 from scmmishra/fix-dashboard
...
fix: set fiscal year for Profit and Loss chart
2020-05-28 15:10:27 +05:30
Shivam Mishra
4afda76015
fix: set fiscal year for Profit and Loss chart
2020-05-28 15:06:38 +05:30
mergify[bot]
2f45fad47d
CRM dashboard fixes ( #21989 ) ( #22003 )
...
(cherry picked from commit f10771029a
)
Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
2020-05-28 14:43:38 +05:30
rohitwaghchaure
82de993a69
Merge pull request #21993 from rohitwaghchaure/display-draft-job-card-as-open-job-card
...
refactor: display draft job card as Open job card
2020-05-28 10:11:58 +05:30
Rohit Waghchaure
b8ffaa7f07
refactor: display draft job card as Open job card
2020-05-28 10:10:22 +05:30
rohitwaghchaure
02a2bb77a8
Merge pull request #21992 from rohitwaghchaure/fixed-forecasting-data-and-changed-columns-pre-release
...
refactor: display the order's data for past period
2020-05-28 09:59:23 +05:30
Rohit Waghchaure
5255b714ef
refactor: showing the order's data for past period
2020-05-28 09:57:49 +05:30
rohitwaghchaure
962e9bcd71
fix: raw material warehouse in Production Planning Report ( #21983 )
2020-05-27 21:53:29 +05:30
Deepesh Garg
33bf90db0b
Merge pull request #21981 from frappe/mergify/bp/version-13-beta-pre-release/pr-21972
...
fix: Total for ageing column 121-Above (bp #21972 )
2020-05-27 20:59:19 +05:30
Deepesh Garg
c63b689497
fix: Total for ageing column 121-Above ( #21972 )
...
(cherry picked from commit 152377f84d
)
2020-05-27 15:27:23 +00:00
Marica
8f1aed73fd
fix: Buying Module fixes ( #21966 )
...
* fix: Buying Module fixes
* fix: Delete Report files as well
* fix: Add Purchase Order Analysis to Stock & Accounting
2020-05-27 20:57:02 +05:30
mergify[bot]
8644a7f1fc
fix: Do not allow backdated stock transactions in previous fiscal year ( #21967 ) ( #21980 )
...
(cherry picked from commit 873542bc7f
)
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-05-27 20:50:28 +05:30
mergify[bot]
01dda8a000
fix: Filtering issues in opneing invoice creation tool ( #21969 ) ( #21979 )
...
(cherry picked from commit 0030b95595
)
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-05-27 20:50:20 +05:30
rohitwaghchaure
c77a4b8486
Merge pull request #21978 from scmmishra/work-order-fix-v13-beta
...
fix: compare start and end time to prevent negative diff
2020-05-27 20:41:17 +05:30
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
mergify[bot]
4ea24687fc
fix: Module Onboarding for HR ( #21963 ) ( #21976 )
...
(cherry picked from commit d6d84a3c15
)
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2020-05-27 20:32:11 +05:30
mergify[bot]
97ca1e7e71
onbarding steps fix ( #21959 ) ( #21975 )
...
(cherry picked from commit a77032f926
)
Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
2020-05-27 20:31:43 +05:30
Marica
7634250e78
fix: Grammar fixes ( #21971 )
2020-05-27 20:28:47 +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
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
Rohit Waghchaure
6bb1eb26ff
fix: filters for the manufacturing reports
2020-05-27 15:28:01 +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
)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-05-27 12:52:52 +05:30
mergify[bot]
2cdd572f6b
fix: addtional salary date validation ( #21952 ) ( #21955 )
...
(cherry picked from commit ef0026c06f
)
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2020-05-27 12:44:02 +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
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
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
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
Shivam Mishra
8513d516e3
fix: status label in project summary report ( #21935 )
2020-05-26 18:22:09 +05:30
mergify[bot]
1edca82280
fix(Healthcare): set company in healthcare service unit setup ( #21929 ) ( #21934 )
...
(cherry picked from commit c52bbd79bf
)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-05-26 18:01:20 +05:30
Shivam Mishra
0662a2194c
fix: title for onboarding step ( #21930 )
2020-05-26 17:49:13 +05:30
Suraj Shetty
2d907df96b
Merge pull request #21923 from surajshetty3416/rename-change-log
2020-05-26 10:59:39 +05:30
Suraj Shetty
ccb9ae49aa
fix: Rename change log to fix Invalid version string
2020-05-26 10:58:19 +05:30
Suraj Shetty
9571a0b8b7
Merge pull request #21922 from frappe/surajshetty3416-patch-1
2020-05-26 10:36:13 +05:30
Suraj Shetty
65fa85ed89
Rename v13_0_0_beta_2.md to v13_0_0_beta-2.md
2020-05-26 10:34:20 +05:30
Raffael Meyer
08ed9fc064
Update v13_0_0_beta-1.md
2020-05-26 10:27:08 +05:30
Suraj Shetty
3f09b1fade
chore: Rename change log
2020-05-26 10:26:35 +05:30
mergify[bot]
dba67dc4a5
fix(Healthcare): unhide company field in Sample Collection, add field in Rehab DocTypes ( #21907 ) ( #21917 )
...
* fix: unhide company field in Sample Collection
* fix: add and set company field in rehab doctypes
(cherry picked from commit 316d136aca
)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-05-25 19:18:11 +05:30
mergify[bot]
4771362d39
fix(healthcare): patient vitals undefined ( #21906 ) ( #21918 )
...
(cherry picked from commit 4dd6b9986f
)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-05-25 19:18:01 +05:30