Commit Graph

2100 Commits

Author SHA1 Message Date
Rohit Waghchaure
5949a7ecff fix: default clear repost logs 2022-12-01 23:35:21 +05:30
Deepesh Garg
a9cf9e5a88
Merge pull request #33107 from barredterra/german-tax-templates
feat: german tax templates
2022-11-28 21:54:08 +05:30
barredterra
7fd2639e68 feat: german tax templates 2022-11-25 00:21:33 +01:00
barredterra
a5966b6f84 feat: add connections to Incoterm doctype 2022-11-17 22:37:04 +01:00
barredterra
ce83f02f24 feat: create Incoterm records after install 2022-11-17 22:17:19 +01:00
barredterra
1a1bfc8db9 feat: add doctype Incoterm 2022-11-17 22:14:30 +01:00
Ankush Menat
1bd886387b chore: hardcode doctype 2022-11-17 11:58:35 +05:30
Ankush Menat
7e1742956c
refactor: Remove usage of deprecated methods (#32914)
Warn: Just used regex to replace all usage.
```regex
s/frappe.db.set(\(.*\),\(.*\),\(.*\))/\1.db_set(\2, \3)/g
```

Required after: https://github.com/frappe/frappe/pull/18815
2022-11-09 20:09:06 +05:30
Sagar Sharma
7da32c7db3 fix: Brand Defaults filters 2022-10-12 12:15:07 +05:30
Nabin Hait
cbf973d90f fix: always set default expense account in company 2022-09-15 11:19:06 +05:30
Rucha Mahabal
eb01f9729d
fix(Employee): shorter tab titles (#32192) 2022-09-13 10:34:35 +05:30
Rucha Mahabal
5ab5811770
feat: tabbed view for Employee form (#31940) 2022-09-06 10:18:14 +05:30
Deepesh Garg
9e43c9cff3
Merge pull request #31943 from nabinhait/asset-repair
fix: gl entries for asset repair
2022-08-25 13:24:26 +05:30
Nabin Hait
b4a2eb2e65 fix: gl entries for asset repair 2022-08-24 12:29:15 +05:30
Sagar Vora
aafb735283
perf: use create_custom_fields (#31853)
* perf: use `create_custom_fields`

* fix: default must be a string
2022-08-18 21:01:20 +05:30
Ankush Menat
17b9bfd249
fix(ecommerce): remove query to non-existing field (#31771) 2022-08-03 16:48:27 +05:30
Gavin D'souza
3c26415b6f fix(gd): Scan FY only if current_fiscal_year set 2022-07-25 11:54:49 +05:30
Rucha Mahabal
b30f66c029 chore: use get_single_value in place of get_value 2022-07-19 17:51:03 +05:30
Rucha Mahabal
108cce2785 refactor: rewrite raw sql queries with frappe.qb and database API 2022-07-07 19:00:19 +05:30
Rucha Mahabal
64075cbebc
Merge branch 'develop' into hr-separation 2022-07-07 17:36:01 +05:30
Ankush Menat
bc3f99321a
refactor: department creation (#31548)
- all department creation always fails after first company, this is
handled in exception handling code but better to not attempt this in
first place.
- move department creation to company.py this has nothing to do with
  setup and previous function signature made no sense.
2022-07-07 16:05:18 +05:30
Rucha Mahabal
ef02e58859 Merge branch 'develop' into hr-separation 2022-07-07 13:46:54 +05:30
Rucha Mahabal
694d35e1c4 fix: Add Designation fixtures 2022-07-04 16:17:26 +05:30
Sagar Vora
05351bee8b Merge remote-tracking branch 'upstream/develop' into remove-india 2022-07-03 18:07:44 +05:30
Rucha Mahabal
466bf99835 fix: Remove Expense Claim from Bank Reconciliation
- add hooks `get_matching_queries` and `bank_reconciliation_doctypes` to extend the functionality in other apps
2022-07-01 19:01:17 +05:30
Rucha Mahabal
ef7299470b Merge branch 'develop' into hr-separation 2022-07-01 11:30:25 +05:30
Rucha Mahabal
a1a6810b58 fix: Remove HR & Payroll from Authorization Control and Rules 2022-07-01 11:28:34 +05:30
Rucha Mahabal
7442a886a6 test: fix Employee and Activation test 2022-07-01 10:34:32 +05:30
Rucha Mahabal
9f7511d6bf fix: Remove HR & Payroll Settings from Company master
- moved setup to HRMS app
2022-06-30 18:12:12 +05:30
Devin Slauenwhite
8a13ddc2f2
fix: gain/loss can be income or expense 2022-06-29 12:28:24 -04:00
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
6a65c8aff4 Merge branch 'develop' into hr-separation 2022-06-28 11:51:59 +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
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
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
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
f6fbcc99a3 chore: Removed payroll dependencies from Loan Management, moved to hrms app
- Salary Slip Loan dt moved to hrms, removed from erpnext app

- Repay from Salary field removed from Loan and Loan Repayment, installed on hrms app setup

- fixed references to salary slip loan fields
2022-06-21 18:13:01 +05:30
Sagar Vora
ec9861266e Merge remote-tracking branch 'upstream/develop' into remove-india 2022-06-19 22:57:22 +05:30
Conor
74a782d81d
refactor: DB independent quoting and truthy/falsy values (#31358)
* refactor: DB independent quoting and truthy/falsy values

* style: reformat to black spec

* fix: ifnull -> coalesce

* fix: coalesce -> Coalesce

* fix: revert pypika comparison

* refactor: convert queries to QB

* fix: incorrect value types for query

`=` query makes no sense with list of values

* fix: remove warehouse docstatus condition

* fix: keep using base rate as rate

Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-06-17 17:01:27 +05:30
Rucha Mahabal
fbc1330ab0 chore: Remove HR/Payroll related setups and fixtures
- Fixtures moved to HRMS app

- 'HR' field in Terms and Conditions removed, added via HRMS setup
2022-06-17 16:34:13 +05:30
Rucha Mahabal
39c30f5b01 chore: remove test for employee
- Moved to the HRMS app
2022-06-15 17:26:19 +05:30
Rucha Mahabal
3fe2ef6790 chore: update import paths for HR 2022-06-15 12:43:45 +05:30
Conor
b8f728a40a
refactor: use CURRENT_DATE instead of CURDATE() (#31356)
* refactor: use CURRENT_DATE instead of CURDATE()

* style: reformat to black spec

* refactor: use QB for auto_close queries

Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-06-15 12:07:33 +05:30
Conor
00ef499739
refactor: use db independent offset syntax (#31345)
* chore: use db independent offset syntax

* fix: typo

* style: reformat code to black spec

Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-06-14 10:49:07 +05:30
Rucha Mahabal
85b18e23d7 fix: remove employee reminders, move to HRMS app
- change `erpnext.hr.EmployeeController` to `erpnext.setup.EmployeeController`
2022-06-10 16:26:07 +05:30
Rucha Mahabal
512c82f76d chore: Update imports/paths for doctypes moved to erpnext setup module 2022-06-10 15:06:54 +05:30
Rucha Mahabal
a117af253b fix: remove HR specific fields from depatment and employee
- these will be added to the masters as custom fields on HRMS app setup
2022-06-10 12:42:59 +05:30
Rucha Mahabal
f520f042af chore: move widely used doctypes from HR to Setup module
- Employee: used in Telephony, Stock, Quality, Projects, Manufacturing, Loans, Buying, Assets, Accounts, Dependent Apps: Healthcare

- Holiday List: CRM (Appointment Booking), Projects, Healthcare, Support (SLA), Education (Student's Holiday List)

- Branch: Selling (SMS Center), used widely as an accounting dimension

- Department: Assets, Projects, SMS Center, used widely as an accounting dimension

- Designation: Lead, Healthcare Practitioner, used in Employee master which will now be in core

- Employee Group: Telephony, Communication

- Child Tables for above dts: Employee Group Table (Employee Group), Employee Education (Employee), Employee External Work History (Employee), Employee Internal Work History (Employee), Designation Skill (Designation), Holiday (Holiday List)
2022-06-10 11:02:00 +05:30