rohitwaghchaure
65c90959d1
fix: renamed manufacturing dashboards to manufacturing ( #21776 )
2020-05-19 15:54:24 +05:30
Rucha Mahabal
7c759d4276
Merge branch 'develop' into healthcare-charts-and-onboarding
2020-05-19 15:39:27 +05:30
Rucha Mahabal
df1cd0ef70
fix: update default dashboard in Healthcare Desk Page
2020-05-19 15:38:46 +05:30
Marica
e50ca69bb9
Merge branch 'develop' into stock-dashboard
2020-05-19 14:39:31 +05:30
Himanshu
19ecde2197
fix: add naming series ( #21769 )
2020-05-19 14:30:42 +05:30
marination
658f29915a
fix: PR and DN trend report charts, group by fixes
2020-05-19 13:58:13 +05:30
Rucha Mahabal
89dab1bc25
refactor: open links in new tab in form tour
2020-05-19 13:46:06 +05:30
Mangesh-Khairnar
e401be2a1a
Merge pull request #21654 from scmmishra/woocommerce-shipping
2020-05-19 13:31:26 +05:30
marination
64b36dba4f
fix: Changed Form Tour order and grammar fixes.
2020-05-19 13:27:10 +05:30
marination
a5fcaf66f9
fix: Added filters in number Cards
2020-05-19 13:05:22 +05:30
rohitwaghchaure
862a596e6f
Merge pull request #21768 from rohitwaghchaure/updated-manufacturing-desk-and-desk
...
fix: updated manufacturing onboarding and desk
2020-05-19 13:04:39 +05:30
Rucha Mahabal
f472a19889
fix: mark onboarding steps as mandatory
2020-05-19 13:03:22 +05:30
Rohit Waghchaure
84011b79d1
fix: updated manufacturing onboarding and desk
2020-05-19 13:00:54 +05:30
Nabin Hait
f2fb9368db
fix: manufacturing dashboard
2020-05-19 12:32:39 +05:30
Rucha Mahabal
0799c679d4
feat: Healthcare Onboarding
2020-05-19 12:07:23 +05:30
Shivam Mishra
afeed27f8f
Merge branch 'develop' into project-refresh
2020-05-19 11:54:50 +05:30
Shivam Mishra
d3d3836943
style: cleaner conditions and returns
2020-05-19 11:53:28 +05:30
Nabin Hait
b03072f83f
fix: merge conflict
2020-05-19 11:35:08 +05:30
Rucha Mahabal
b8db275a35
feat: Department wise Patient Appointments custom chart
2020-05-19 01:46:48 +05:30
Rucha Mahabal
de3751387a
refactor: Lab Tests and Clinical Procedures charts to Percentage type
2020-05-18 19:15:08 +05:30
Rucha Mahabal
5162faa7df
fix: add default filters in Dashboard Charts
2020-05-18 18:59:59 +05:30
Rucha Mahabal
24477d5d06
feat: added Number Cards to Healthcare Dashboard
2020-05-18 18:15:20 +05:30
Nabin Hait
9aae6f4793
feat: accounting dashboard + desk
2020-05-18 18:03:11 +05:30
Rucha Mahabal
fb29714911
feat: Healthcare Dashboard
2020-05-18 16:28:11 +05:30
Marica
c734db5d45
fix: Validate Filters in Sales Funnel. ( #21761 )
...
* fix: Validate Filters in Sales Funnel.
* fix: Style fixes
2020-05-18 14:38:57 +05:30
Himanshu
d94a38eb51
fix: make queries show searchfields ( #21685 )
...
* fix: make queries show searchfields
* Update erpnext/controllers/queries.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
* Update queries.py
* Update erpnext/controllers/queries.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
* Update erpnext/controllers/queries.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
* fix: make fields string for sql
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-18 14:26:26 +05:30
rohitwaghchaure
be750096ed
fix: bom incorrect price list rate for raw material if price list currency is different from company currency ( #21585 )
...
* fix: bom incorrect price list rate for raw material if price list currency is different from company currency
* fixed test cases
* fixed base_rate calculation and added plc_conversion_rate trigger
2020-05-18 14:23:30 +05:30
Shivam Mishra
4cd4109905
Merge branch 'develop' into woocommerce-shipping
2020-05-18 13:50:31 +05:30
Anurag Mishra
57bfee8ea9
fix: dashboard changes
2020-05-18 13:27:15 +05:30
Rucha Mahabal
1ac2512c73
refactor: desk page colors and filters
2020-05-18 12:55:05 +05:30
Rohit Waghchaure
1c9210b303
made changes in the dashboards, renamed number cards
2020-05-18 11:57:25 +05:30
Rohit Waghchaure
366bce678f
added onboarding for manufacturing
2020-05-18 11:57:25 +05:30
Rohit Waghchaure
34f4a2398b
feat: manufacturing dashboards
2020-05-18 11:57:25 +05:30
Nabin Hait
31b8be6c41
Merge branch 'accounts_dashboard' of https://github.com/deepeshgarg007/erpnext into deepeshgarg007-accounts_dashboard
2020-05-18 11:31:30 +05:30
Deepesh Garg
1e7bc3a97e
Merge pull request #21758 from frappe/revert-21655-bugfix/zero-threshold-in-tax-withholding-category
...
Revert "fix(accounting): Allow 0 threshold in Tax Withholding Category"
2020-05-18 11:28:56 +05:30
Deepesh Garg
ec8c28e487
Revert "fix(accounting): Allow 0 threshold in Tax Withholding Category"
2020-05-18 11:27:38 +05:30
Shivam Mishra
2a2937bcbe
Merge branch 'develop' into woocommerce-shipping
2020-05-18 11:19:45 +05:30
Marica
f4f307c36a
fix: Patch to set status in old serial no data ( #21720 )
...
* fix: Patch to set status in old serial no data
* fix: Avoid get_doc in patch
* fix: fetch all values and check status in one query
2020-05-18 11:18:44 +05:30
Nabin Hait
1862f5f29a
feat: Payroll based on employee cost center ( #21609 )
2020-05-18 07:37:04 +05:30
Rucha Mahabal
b6a605864b
Merge pull request #21290 from akurungadam/multi_company
...
feat(Healthcare): support for Multi Company
2020-05-17 23:22:21 +05:30
Rucha Mahabal
9e8414798c
Merge branch 'develop' into multi_company
2020-05-17 22:53:03 +05:30
Rucha Mahabal
53934b7e3b
fix: failing test due to inpatient record
2020-05-17 22:44:19 +05:30
Rucha Mahabal
d3a5df2202
fix: codacy issues
2020-05-17 22:34:42 +05:30
Rucha Mahabal
2888e12dfc
fix: vital signs title field
2020-05-17 22:23:53 +05:30
Rucha Mahabal
30314f18f7
fix: patient appointment title
2020-05-17 22:06:02 +05:30
Rucha Mahabal
40d49306d3
fix: pass ignore_mandatory flag when updating customer from patient
2020-05-17 21:46:42 +05:30
Raffael Meyer
3bce13eaa2
fix: remove guest access ( #21693 )
2020-05-17 20:58:37 +05:30
rohitwaghchaure
8e3fc5ee6e
fix: incorrect stock valuation for repack entry ( #21736 )
2020-05-17 20:28:39 +05:30
Anurag Mishra
779fc898b1
fix: Future date half day validation ( #21718 )
...
* fix: Future date half day validation
* fix: Allow half day attendance only via leave application
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-17 20:18:30 +05:30
Rucha Mahabal
e83d1d221d
Merge branch 'develop' into multi_company
2020-05-17 20:02:12 +05:30
