Rucha Mahabal
a24cc982e2
fix: Remove HR validations from Employee master
2022-06-28 18:47:14 +05:30
Rucha Mahabal
26a8de69c9
fix: Remove Designation Skill child table
...
- moved to HRMS app, since it isn't used anywhere in ERPNext
2022-06-28 17:18:02 +05:30
Rucha Mahabal
6bee20c5e3
chore: Add Fleet Management masters in Setup module for Delivery Trip
...
- Driver, Vehicle, Driving License Category (child table)
- Removed Email Account setup for Job Applicant from setup wizard
2022-06-28 13:29:35 +05:30
Rucha Mahabal
3c059de122
chore: Remove links for Employee Hours Utilization Based On Timesheet and Project Profitability from Projects workspace
2022-06-28 12:34:01 +05:30
Rucha Mahabal
6f407d3c62
chore: fix code formatting
2022-06-28 12:29:22 +05:30
Rucha Mahabal
6a65c8aff4
Merge branch 'develop' into hr-separation
2022-06-28 11:51:59 +05:30
Ankush Menat
bedb11ee67
fix: youtube stats background sync failures
2022-06-28 10:50:44 +05:30
Nabin Hait
925b9d985e
fix: open lead and opportunities based on today's event
2022-06-27 22:13:09 +05:30
Nabin Hait
7921a1a605
fix: Restored city, state and country fields
2022-06-27 22:13:09 +05:30
Rucha Mahabal
930e557fc6
fix: remove HR/Payroll patches
2022-06-27 20:25:16 +05:30
Rucha Mahabal
c8712b02f9
patch: Delete HR/Payroll doctypes
2022-06-27 19:59:04 +05:30
Rucha Mahabal
2b255bdddb
fix: Bank Statement loan amount query
2022-06-27 19:18:13 +05:30
Rucha Mahabal
ba8ea0f4fb
chore: Remove HR templates and references from other workspaces
...
- Removed template `employees_to_mark_attendance.html`
- Removed HR references from ERPNext Settings and Home workspaces
2022-06-27 16:56:24 +05:30
Ankush Menat
dd11f26eba
fix: dont update RM items table if not required ( #31408 )
...
Currently on PO update RM item table is auto computed again and again,
if there was any transfer/consumption against that then it will be lost.
This change:
1. Disables updating RM table if no change in qty of FG was made. Since
RM table can't possibly be different with same FG qty.
2. Blocks update completely if qty is changed and RM items are already
transferred.
2022-06-27 15:55:08 +05:30
Ankush Menat
20dac08f5f
refactor: clean up product bundle client side code ( #31455 )
...
refactor: clean up product bundle cient side code
- Remove deprecated CUR_FRM scripts
- Remove client side fetches and move it to doctype schema
2022-06-27 15:54:54 +05:30
Rucha Mahabal
1d5c8660bb
chore: Remove regional HR reports, custom field setups
...
- Removed reports Provident Fund Deductions, Professional Tax Deductions, helper js file `salary_slip_deductions_report_filters.js`
- Removed Gratuity rules setup for India and UAE
- Removed custom field setup for India
- Moved all setups to the HRMS app
2022-06-27 15:12:05 +05:30
Deepesh Garg
173588e169
Merge pull request #31446 from deepeshgarg007/quotation_order_item_syn
...
fix: Quotation and Sales Order item sync
2022-06-27 11:17:48 +05:30
Deepesh Garg
904e69e541
Merge branch 'develop' into quotation_order_item_syn
2022-06-25 19:46:20 +05:30
Deepesh Garg
9c1eb770ba
Merge pull request #31442 from ruthra-kumar/incorrect_outstanding_on_multiple_cost_centers
...
fix: incorrect outstanding for invoice
2022-06-25 19:42:14 +05:30
Nabin Hait
f72d5506de
fix: get_all replace by sql
2022-06-25 15:08:45 +05:30
Nabin Hait
2d226be3c4
fix: Made no of employees a select field
2022-06-25 11:40:23 +05:30
Nabin Hait
483fc420a1
test: invoice from timesheet
2022-06-25 11:40:23 +05:30
Nabin Hait
6a0d0a338d
fix: Test cases removed related to copying comments from opportunity to quotation
2022-06-25 11:40:23 +05:30
Nabin Hait
82bf59e2a3
fix: test case
2022-06-25 11:40:23 +05:30
Nabin Hait
d8163f3e47
fix: set exchange rate
2022-06-25 11:40:23 +05:30
Nabin Hait
f904ac599e
fix: merge conflicts and sider issues
2022-06-25 11:40:23 +05:30
Deepesh Garg
6acd0325be
fix: General Ledger and TB opening entries mismatch issues
2022-06-24 21:45:05 +05:30
Deepesh Garg
58fe220479
fix: Quotation and Sales Order item sync
2022-06-24 19:43:50 +05:30
ruthra kumar
321fea322c
test: invoice outstanding when gl's are split on cost center allocat
2022-06-24 17:47:11 +05:30
Rucha Mahabal
c619b58ba9
fix: remove HR/Payroll references from form dashboards
...
- Employee, Holiday List, Project, Task, Timesheet
2022-06-24 15:03:16 +05:30
ruthra kumar
71f6f78d94
fix: incorrect outstanding for invoice
2022-06-24 13:36:15 +05:30
Rucha Mahabal
39e0d22044
chore: Remove HR related field references from Employee, Department form scripts
...
- removed approver fields and payroll cost center from Employee master
- removed query filter code for HR related fields from employee and department form scripts
- removed `update_approver_role`
2022-06-24 13:14:26 +05:30
Marica
1d683ca9f2
Merge pull request #31421 from s-aga-r/fix/production-plan/test/planned-qty
...
fix: add UOM validation for planned-qty
2022-06-24 12:40:03 +05:30
Rucha Mahabal
eac58abcc5
chore: Remove HR related reports from other modules
...
- Project Profitability report: Projects
- Employee Hours Utilization Based on Timesheet: Projects
- Unpaid Expense Claims: Accounts
2022-06-23 20:50:55 +05:30
Rucha Mahabal
edb528ce41
chore: Remove code for Expense Claim from Project, Task, Delivery Trip
...
- Remove `total_expense_claim` field from Project and Task, will be installed with hrms setup
- Remove Expense Claim calculation from `update_costing` in project
- Remove `update_total_expense_claim` from task
- Remove Expense Claim references from employee form tour
- Remove 'Make Expense Claim' button from Delivery Trip, will only be available if hrms is installed
- Update delivery trip tests
2022-06-23 19:48:42 +05:30
Rucha Mahabal
1ff0e4519f
chore: Extract Expense Claim, FnF, Gratuity, Employee Advance related code from accounting
...
- Added hooks `advance_payment_doctypes`, `invoice_doctypes`, `period_closing_doctypes` for other apps to extend accounting functionality
- Removed `set_query` code from `journal_entry.js` and `payment_entry.js`
- removed `update_status_for_full_and_final_statement` trigger on JE submission/cancellation
- refactored `payment_entry.py`: split functions for validating reference doctypes for easy overriding, removed hrms references from `get_reference_details` and `get_payment_entry`
- removed dead code: functions `get_bill_no_and_update_amounts`, `get_total_amount_exchange_rate_base_on_currency`, `get_total_amount_exchange_rate_for_employee_advance`, `get_amounts_based_on_ref_doc`, `get_amounts_based_on_reference_doctype`
2022-06-23 16:17:34 +05:30
GangaManoj
416d578290
fix: Add missing comma
2022-06-23 15:14:31 +05:30
GangaManoj
1b1786532a
test: Test monthly depreciation by Written Down Value method
2022-06-23 15:14:31 +05:30
GangaManoj
2b7ab72a72
fix: Convert string to datetime object
2022-06-23 15:14:31 +05:30
GangaManoj
e62beaefc1
test: Test if final day of the month is taken if depr_start_date is the last day of its month
2022-06-23 15:14:31 +05:30
GangaManoj
154e258ad0
fix: Get last day of the monthif depr posting date is the last day of its month
2022-06-23 15:14:31 +05:30
GangaManoj
b07aae4da5
fix: Correct pro-rata amount calculation
2022-06-23 15:14:31 +05:30
GangaManoj
2d9153ea30
fix: Remove misleading comment
2022-06-23 15:14:31 +05:30
GangaManoj
ab13a178b5
fix: Replace asset life with total no of depreciations
2022-06-23 15:14:31 +05:30
Sagar Sharma
73a15adc67
Merge branch 'develop' into fix/production-plan/test/planned-qty
2022-06-23 11:20:22 +05:30
Deepesh Garg
79d5d35df9
Merge pull request #31395 from nihantra/bank_clear_summ
...
fix: filter set in Bank Clearance Summary
2022-06-23 10:54:56 +05:30
Sagar Sharma
70bc51a8fc
Merge branch 'develop' into fix/production-plan/test/planned-qty
2022-06-22 15:33:08 +05:30
s-aga-r
00807abe31
fix: add UOM validation for planned-qty
2022-06-22 14:28:17 +05:30
Deepesh Garg
db2484b6b2
Merge pull request #31418 from ruthra-kumar/payment_ledger_migration_logic_bug
...
fix: handle empty values("") in against_voucher columns on gl migration
2022-06-22 12:51:21 +05:30
Marica
4c0749e04a
Merge pull request #31406 from marination/bom-update-log-cleanup-perf
...
chore: Clear Progress section for completed logs & `on_submit` UX
2022-06-22 12:16:06 +05:30