Alan
7da777880b
fix: add (uom, brand) Item details in an Item Price ( #27561 )
...
* fix: add (uom, brand) and update (uom) Item details in an Item Price
* fix: order of query interpolation args
Co-authored-by: Marica <maricadsouza221197@gmail.com>
* fix: named interpolation, remove item price
* fix: sql error
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-10-05 12:35:23 +05:30
Ganga Manoj
ad03eb25df
fix: Only calculate first_respone_time if SLA is set ( #27789 )
...
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-10-05 12:26:59 +05:30
Saqib
74c8e7bb97
Merge branch 'develop' into pay-received-amt-fix
2021-10-05 11:14:41 +05:30
Saqib
065a2ce983
fix(asset): expected value after useful life validation ( #27539 )
2021-10-05 11:14:16 +05:30
Deepesh Garg
9d9c97ff41
Merge pull request #27785 from GangaManoj/fix-delete-tdr
...
fix: Delete linked Transaction Deletion Record docs on deleting company
2021-10-05 10:49:08 +05:30
GangaManoj
38c7e42f0c
fix: Delete linked Transaction Deletion Record docs on deleting company
2021-10-05 10:14:01 +05:30
Alan
5c372202d5
fix: set item uom as stock_uom if it isn't set ( #27623 )
...
* fix: set item uom as stock_uom if it isn't set
2021-10-04 22:38:04 +05:30
Ankush Menat
4159361d52
ci(Mergify): configuration update ( #27777 )
...
Signed-off-by: Ankush Menat <me@ankush.dev>
2021-10-04 18:02:37 +05:30
Sagar Vora
09ccdee2db
feat: add total_billing_hours
to Sales Invoice (fp #26783 ) ( #27742 )
...
* feat: add `total_billing_hours` to Sales Invoice
* fix: re-save doctypes
* fix: indentation
* fix: replace reference to old function
2021-10-04 16:41:24 +05:30
Rucha Mahabal
5905cf9002
refactor!: Removed healthcare module from ERPNext ( #27362 )
...
* chore: Removed healthcare module
* chore: Removed healthcare demo, patch files
* chore: Rename imports from erpnext to healthcare
* chore: Added healthcare deprecation warning patch
* chore: Removed healthcare module code in other modules
* chore: Code clean up
* refactor: Remove sales invoice custom js related to healthcare
* fix: sider
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-10-04 15:46:40 +05:30
Komal-Saraf0609
b483f173a6
fix: Merge "Accounting Ledger" and "Accounts Receivable" in "View" button ( #27769 )
...
* fix: Added a new button "View" and merged "Accounting Ledger" and "Accounts Receivable" into it
* fix: sider issues
* chore: dead code
2021-10-04 15:42:43 +05:30
Saqib
9051735529
perf: fetching of account balance in chart of accounts ( #27661 )
2021-10-04 11:44:46 +05:30
Saqib Ansari
1b7414e948
fix: cannot add deductions in internal transfer payment entry
2021-10-04 11:24:02 +05:30
Deepesh Garg
4abb43a425
Merge pull request #27749 from GangaManoj/fix-pe-payment-term
...
fix: Display appropriate message for Payment Term discrepancies in Payment Entry
2021-10-04 11:06:20 +05:30
Deepesh Garg
a1c4c62fac
Merge pull request #27739 from nextchamp-saqib/sla-migrate-fix
...
fix: sync_jobs fails
2021-10-04 11:04:12 +05:30
Deepesh Garg
d9599a6a1c
Merge pull request #27755 from frappe/mergify/bp/develop/pr-27712
...
fix(India): Internal transfer check fix (backport #27712 )
2021-10-04 11:01:19 +05:30
Rucha Mahabal
01bea14622
fix: sider
2021-10-04 09:58:38 +05:30
ChillarAnand
a1d3a09d3c
Merge branch 'develop' into care
2021-10-04 09:46:34 +05:30
Deepesh Garg
da47fe2cfb
fix(India): Internal transfer check fix
...
(cherry picked from commit f0af24fc6d26040fa34fd7248bf38301897d9ca1)
2021-10-03 08:09:39 +00:00
Deepesh Garg
ab2adf01c5
Merge pull request #27751 from frappe/mergify/bp/develop/pr-27748
...
fix: Chart Of Accounts import button not visible (backport #27748 )
2021-10-02 22:15:57 +05:30
Deepesh Garg
f109f6fd16
fix: Linting issues
...
(cherry picked from commit ff570f48a0ba56925528eb8696b8b7d862252d8f)
2021-10-02 16:10:09 +00:00
Deepesh Garg
237b1a91de
fix: Remove unwanted comments
...
(cherry picked from commit e4b89d2fcd6c1eb788f94ad5f9563ccec07a0f2a)
2021-10-02 16:10:09 +00:00
Deepesh Garg
9244fe563a
fix: Chart Of Accounts import button not visible
...
(cherry picked from commit 3529622a0d28e9cdd6e602b5450ca79d13cfa0ed)
2021-10-02 16:10:08 +00:00
Deepesh Garg
197e97d9d6
Merge pull request #27665 from nextchamp-saqib/trim-custom-field-length
...
fix: trim sales invoice custom field lengths
2021-10-02 21:36:38 +05:30
GangaManoj
9f14695743
fix: Display appropriate message if different Payment Terms are used in PE and its Payment References
2021-10-02 21:02:07 +05:30
Marica
4e7ec8a068
fix: Hero Slider Control & Alignment fixes ( #27611 )
...
* fix: Creating unique hash for slider id instead of slider name
* fix: Fixed alignment of Title, Subtitle, Action Button
* chore: linter fix
2021-10-02 17:06:33 +05:30
mergify[bot]
418b9f8545
feat(HR): Some Enhancements and Onboarding (backport #25741 ) ( #27741 )
...
* feat(HR): Some Enhancements and Onboarding (#25741 )
* feat: Hr settings restructure
* feat: remove validation and make As warning
* feat: made leave policy Assignment feild read only
* feat: send leave Notification via 'Notification'
* patch: for field name change
* feat: removed defaults value for removed field
* feat: removed leave Notification fields
* feat: better label and description
* feat: Hr Module onboarding and Onboarding slides
* fix: sider, test, translations
* chore: remove unnecessary code formatting changes
* refactor: HR Onboarding
* refactor: HR Settings
* revert: Notification changes
* chore: remove unnecessary descriptions from leave type
* fix: linter issues
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 4837238f3dbbad336bcd21fcbfa19b438cbad16a)
# Conflicts:
# erpnext/hr/doctype/employee/employee.js
* fix: conflicts
* fix: conflicts
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-10-02 13:28:39 +05:30
Saqib Ansari
7ac02de613
fix: sync_jobs fails
2021-10-02 11:34:47 +05:30
Alan
ece446ffe5
fix: update variant qty in BOM, Create Work Order dialog ( #27686 )
2021-10-01 20:32:13 +05:30
Goh Yan Chang
632f7848a3
Update employee_leave_balance.py
...
fix: Employee Leave Balance report showing wrong figures
2021-10-01 16:30:33 +08:00
mergify[bot]
b9942ad639
feat: Tracking Multi-round interview ( #25482 ) ( #27724 )
...
* feat: Tracking Multi-round interview
* fix: releted to scheduler event and formating
* fix: job applicant UI/UX and conflicts
* test: Interview Round
* fix(test): Employee referral, Employee Onboarding, Job Offer
* fix: sider
* feat: set default value in Hr settings
* feat: added validation for designation
* test: Interview
* test: Added validatiolns for skill
* test: Interview feedback
* fix: sider
* fix: remove unnecessary validations and form label cleanups
* chore: clean-up Interview Round and Interview Type doctype
* fix: remove redundant Rating Value, only keep Rating
* fix: update interview details on feedback submission
- make interview feedback submission dialog minimizable
* fix: show submit feedback button only if feedback doesn't exist
* refactor: Interview and Feedback statuses and workflow
* fix(HR Settings): clean up interview settings
* refactor: Interview
* refactor: Interview Feedback, remove unnecessary validations
* chore: update notification messages
* chore: remove unnecessary formatting changes in attendance list and leave application
* refactor: Job Applicant to Interview mapping
* chore: sorted imports
* chore: sorted imports
* fix: sider issues
* fix: linter issues
* fix: sider issues
* fix: tests
* fix: sorted imports
* fix: tests, sider
* fix: therapy plan test
* fix: sider issues
* feat: Include From Time and To Time fields in Interview for cleaner data
* feat: Interview Calendar
* fix: allow renaming masters
* fix: add more fields to list view and standard filter
* fix: validate overlapping interviews
* fix: update tests
* fix: linter issues
* refactor: replace reminder messages with Email Templates
* fix: sider issues
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 57e66f958cd57d66a6fd3b19f6cd3593eab63666)
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2021-10-01 13:15:40 +05:30
Ankush Menat
a04f9c904e
fix: option to limit reposting in certain timeslot ( #27725 )
2021-10-01 13:05:36 +05:30
Rucha Mahabal
9e08229b7b
fix(Org Chart): use attribute selectors instead of ID selector for node IDs with special characters ( #27717 )
...
* fix(Org Chart): use attribute selectors instead of ID selector for node IDs with special chars
* fix: UI tests
2021-09-30 18:32:10 +05:30
Marica
273f3fbe0f
fix: Batch scans get overwritten on the same row ( #27668 )
...
* fix: Batch scans get overwritten on the same row
* fix: Increment batch qty if pre-existing batch is scanned
* fix: Delete accidental __init__.py file
* fix: Add patch to patches.txt for https://github.com/frappe/erpnext/pull/27554
* fix: reload doc in patch
2021-09-30 15:51:54 +05:30
marination
cbffbc3894
fix: reload doc in patch
2021-09-30 14:53:47 +05:30
HENRY Florian
0bc213ed17
Merge branch 'develop' into dev_fix_27359
2021-09-30 11:08:44 +02:00
Marica
b1a4e040be
Merge branch 'develop' into scan-batch
2021-09-30 14:22:45 +05:30
marination
73ac3e0c40
fix: Add patch to patches.txt for https://github.com/frappe/erpnext/pull/27554
2021-09-30 14:22:01 +05:30
Marica
754626a102
fix: Delete accidental __init__.py file
2021-09-30 14:12:19 +05:30
Marica
cc143bca0d
fix: Maintenance Schedule child table status for legacy data ( #27554 )
...
* fix: Maintenance Schedule child table status for legacy data
* fix: Include legacy draft schedules in patch
* fix: Pre-commit formatting
2021-09-30 14:08:45 +05:30
Marica
c75c709114
Merge branch 'develop' into scan-batch
2021-09-30 14:07:54 +05:30
marination
abf450dc70
fix: Increment batch qty if pre-existing batch is scanned
2021-09-30 14:03:40 +05:30
Saqib Ansari
83cc597594
fix: do not set length for date field
2021-09-30 12:37:04 +05:30
mergify[bot]
9df5df4d94
fix: wrong company selected when marking attendance for all employees ( #27685 ) ( #27707 )
...
* fix: wrong company selected when marking attendance for all employees
* fix: enable caching for repeated queries of the same employee
(cherry picked from commit b478e72cefbdffd3e906fdd1ef822becdead78d7)
Co-authored-by: Mohammed Yusuf Shaikh <49878143+mohammedyusufshaikh@users.noreply.github.com>
2021-09-30 12:07:38 +05:30
Ankush Menat
4685ed5a8c
fix: distribution of additional costs in mfg stock entry ( #27629 )
...
* refactor: remove unnecessary list comprehensions
* fix: correct cost distribution logic
While apportioning costs same condition should be present on both sides
so total value is representative of all items to be apportioned.
Here while calculating incoming_items_cost only FG items are considered,
but while apportioning all items with to_warehouse are considered.
Solution: only apportion additional cost on FG items
* test: test cost distribution
* fix: patch for additional cost
fix(patch): consider PCV while patching
- consider Period closing voucher while patching
- recomute rates for SLE of affected stock entries
consider only FG/scrap item SLEs for recomputation of rates
* fix: remove client side logic for addn cost
All of this is done in python code hence removed client side code.
2021-09-30 09:58:59 +05:30
Deepesh Garg
2a1e202e07
Merge pull request #27704 from frappe/mergify/bp/develop/pr-27551
...
fix: Deferred revenue entries post account freezing (backport #27551 )
2021-09-30 09:47:44 +05:30
Deepesh Garg
f1a669c2f7
fix: Test case
...
(cherry picked from commit 23863c7663a94e32e32812301a7efca79575c470)
2021-09-30 03:06:02 +00:00
Deepesh Garg
774cd68f4c
fix: Test Case
...
(cherry picked from commit 846d128c5d536b5003dc3055f3239e6f92a3146c)
2021-09-30 03:06:01 +00:00
Deepesh Garg
13d2e7b198
fix: Deferred revenue entries post account freezing
...
(cherry picked from commit e2eb72eb5ba1aaadddf8278dd77bfe75a178ef01)
2021-09-30 03:06:00 +00:00
rohitwaghchaure
104d107659
Merge pull request #27701 from rohitwaghchaure/minor-added-project-name-in-purchase-order-analysis
...
fix: added project name in the purchase order analysis
2021-09-29 23:41:31 +05:30