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
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
e4bbdbbfe1
fix: get data from request directly ( #21954 )
2020-05-27 11:47:26 +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
Rohit Waghchaure
1e04b455f0
fix: manufacturing dashboard and work order summary chart
2020-05-26 23:14:21 +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
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
Deepesh Garg
5fa207f020
fix(UAE): Incorrect VAT rate display in Sales Invoice ( #21882 )
2020-05-26 18:02:21 +05:30
Anurag Mishra
752ca63fea
fix: Was showing opening on date not remaimning leave ( #21899 )
2020-05-26 18:01:03 +05:30
Anurag Mishra
93e15c5f5c
fix: showing Wrong balance on allocation boundary dates ( #21904 )
2020-05-26 18:00:37 +05:30
Mangesh-Khairnar
7402451b96
fix: shopify error message on failure of sales order creation ( #21924 )
2020-05-26 17:56:40 +05:30
Mangesh-Khairnar
ddc170521f
fix: check for warehouse in the woocommerce settings ( #21925 )
2020-05-26 17:55:56 +05:30
Rucha Mahabal
c52bbd79bf
fix(Healthcare): set company in healthcare service unit setup ( #21929 )
2020-05-26 17:54:46 +05:30
Marica
74a910ae92
fix: title for onboarding step ( #21933 )
...
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
2020-05-26 17:49:34 +05:30
Prssanna Desai
ee70d7a7eb
fix: fix function import ( #21927 )
2020-05-26 17:02:51 +05:30
Anurag Mishra
a7f42f7256
fix: showing wrong record ( #21884 )
2020-05-25 19:23:17 +05:30
Anupam Kumar
0a147d5c76
fix: adding dashboard in course and assessment plan ( #21889 )
...
* Adding dashboards
* adding dashboard in course and assessment plan
2020-05-25 19:21:48 +05:30
Saqib
48e4abf43f
fix: fetch depreciation amount only if depr entry is made ( #21893 )
2020-05-25 19:21:08 +05:30
Rucha Mahabal
4dd6b9986f
fix(healthcare): patient vitals undefined ( #21906 )
2020-05-25 18:42:01 +05:30
Rucha Mahabal
316d136aca
fix(Healthcare): unhide company field in Sample Collection, add field in Rehab DocTypes ( #21907 )
...
* fix: unhide company field in Sample Collection
* fix: add and set company field in rehab doctypes
2020-05-25 18:41:47 +05:30
Anurag Mishra
8a1cf45473
fix: Validation for dates ( #21886 )
2020-05-25 18:39:19 +05:30
Marica
1392489b60
fix: Item Price and Add to Cart not showing on Website ( #21903 )
...
* fix: Item Price and Add to Cart not showing on Website
* fix: Use None as default argument
2020-05-25 18:26:01 +05:30
Marica
07f305a1d6
refactor: open link in new tab ( #21910 )
2020-05-25 16:30:59 +05:30
Rohan
e5395c3ae8
fix: filter batches based on item and warehouse in Pick List ( #21780 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-05-25 15:25:21 +05:30
Vishal Dhayagude
6ff11de2f0
fix: Added gram, pound to ounce conversion ( #21709 )
...
* fix: pound, grams to Ounce converion factor added
* fix: patch date updated for UOM Conversion Factor
* fix: grams move to gram
* fix: duplicate entry of uom converion factor and patch added
* fix: typo fix
* fix: minor changes
* Update patches.txt
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-05-25 14:54:19 +05:30
Rucha Mahabal
28d1d6c91f
Merge pull request #21895 from deepeshgarg007/healthcare_dashboard_fix
...
fix: Company query for number cards
2020-05-24 22:12:18 +05:30
Deepesh Garg
9f963a2ac7
fix: Company query for number cards
2020-05-24 21:55:47 +05:30
Deepesh Garg
8f34cf59f8
Merge pull request #21891 from Thunderbottom/process-deferred-accounting-fix
...
fix: set default posting_date value to None
2020-05-24 12:51:00 +05:30
Chinmay D. Pai
0d147b011e
fix: set default posting_date value to None
...
using mutable python defaults, and especially function calls, inside
function definitions causes bugs that can be really hard to debug
sometimes. please refrain from using such defaults.
instead, using None is almost always a sane default. the values can
then be manipulated inside the function instead.
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-05-24 00:54:04 +05:30
Deepesh Garg
0b5e990751
Merge pull request #21877 from scmmishra/rename-loan
...
feat: rename loan management to loan on Desk Page
2020-05-22 16:06:53 +05:30
sahil28297
2b277a7eec
fix(patch): rerun remove_duplicate_leave_ledger_entries ( #21878 )
2020-05-22 15:52:15 +05:30
Shivam Mishra
5cf90baf16
feat: rename loan management to loan on Desk Page
2020-05-22 15:09:57 +05:30
Nabin Hait
78a6b6b45d
fix: Remove duplicate leave ledger entry ( #21871 )
...
* fix: Remove duplicate leave ledger entry
* fix: Remove duplicate leave ledger entry
2020-05-22 13:13:17 +05:30
Deepesh Garg
8d7f5d342d
fix: Item tax template not getting mapped from source to traget doc ( #21862 )
2020-05-22 12:28:45 +05:30
Deepesh Garg
d1d54ebe41
Merge pull request #21853 from anupamvs/edu-card-report
...
feat: Added card for reports on education desk
2020-05-22 11:52:39 +05:30
Michelle Alva
1763d3e706
fix: expense account error message in DN ( #21851 )
...
Changed error message if expense account not set for item in Delivery Note.
Earlier: Expense or Difference account is mandatory for Item IT - 6 as it impacts overall stock value
After fix: Expense Account not set for Item IT - 6. Please set an Expense Account for the item in the Items table
2020-05-22 10:51:19 +05:30
Chinmay Pai
baef43977b
fix: set customer and supplier details using sql ( #21846 )
...
* fix: set customer and supplier details using sql
instead of slowing down the query with get_doc and save()
we can just use sql to update the required values for
customer and supplier
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
* chore: remove extra quote
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
* fix: update sql query to include tabPrice List
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
2020-05-22 10:50:13 +05:30
Marica
dd3e52184c
fix: Added Inactive serial no status ( #21848 )
2020-05-22 10:48:35 +05:30
Deepesh Garg
f131260895
Merge pull request #21804 from netchampfaris/move-address-and-contact-templates-to-frappe
...
fix: Move address and contact templates to frappe
2020-05-22 09:27:33 +05:30
Anupam K
d7d4bed0b1
adding report card in education desk
2020-05-22 01:10:55 +05:30
