aditya singh rawat
17a16f80f3
fixed the duplicate contract issue ( #627 )
2025-03-22 22:25:02 +05:30
Horilla
786dcbfe4d
Merge fix
2025-03-21 15:16:44 +05:30
Horilla
77f4a76103
Pylint updates
2025-03-21 14:29:13 +05:30
aditya singh rawat
46607e65e9
Fixed the column hiding, Added the HorillaDb file in gitignore + using columns instead of rows ( #605 )
...
* Added the HorillaDb file in gitignore + using columns instead of rows in actions tab
* Fixed the typo which was hiding the columns in request table in work type reqest
* Fixed the typo which was hiding the columns in request table in work type reqest
* payslip table should have this as the first parameter for toggleColumns as we are passing id not data attribute , previous PR was wrong
* Fix for column toggling issue
* toggling issue fixed
2025-03-21 12:22:15 +05:30
Dr. Shubham Dipt
ab6584d889
Loading of Test data fails due to unique primary key constraint in Allowance ( #613 )
...
* Ignore Pycharm IDE directory
* init will get executed even if there are no tables, hence migrations cannot be applies at the first step
* Separate loanaccount test data load because primary key conflicts due to post_save signal
* Avoid multiple DB save calls
2025-03-20 17:19:20 +05:30
Horilla
78e958f49e
[FIX] Merge conflict
2025-03-11 14:20:36 +05:30
Horilla
0cad9a5266
[UPDT] PAYROLL: Column toggle
2025-03-10 13:58:54 +05:30
aditya singh rawat
66ba0d4190
Column automatic hiding issue in payslip table ( #574 )
...
* Fixed automatic hiding of columns in payslip table
* Fixed automatic hiding of columns in payslip table
2025-03-10 10:12:18 +05:30
aditya singh rawat
ce95b4a233
modal issue fixed ( #563 )
2025-03-10 10:11:38 +05:30
aditya singh rawat
b4a4227fc2
Update payslip_calc.py ( #542 )
...
Deduction Duplication fixed
2025-03-07 10:57:39 +05:30
Horilla
4004fe730e
[UPDT] PAYROLL: Updated payroll form.html file by adding enctype attribute for the form
2025-03-05 11:19:59 +05:30
Horilla
65e67df954
[UPDT] PAYROLL: Updated payroll form parent class by inherit base app form class
2025-03-04 14:40:02 +05:30
Horilla
add2f4fd33
[UPDT] PAYROLL: Changed signals to signals.py
2025-02-28 18:56:23 +05:30
Horilla
7f824345a5
[FIX] PAYROLL: Type fix sent-> send
2025-02-26 15:30:05 +05:30
aditya singh rawat
294b8e55d6
Update tax_forms.py ( #522 )
...
Make python_code field optional in FilingStatusForm
2025-02-25 12:09:00 +05:30
Horilla
c03cafd14f
[UPDT] HORILLA: Updated horilla global varriable APPS by declare them in every app ready() function
2025-01-31 10:50:59 +05:30
Horilla
afcc436583
[FIX] PAYROLL: Fixed the protected error for filing_status_delete
2025-01-24 14:33:04 +05:30
Horilla
d05c27b0c8
[UPDT] PAYROLL: Added white labelling for email template
2025-01-21 22:28:30 +05:30
Horilla
877d508736
[UPDT] PAYROLL: LOP computation method updates
2025-01-21 15:45:35 +05:30
Horilla
3131204b62
[UPDT] PAYROLL: Updated the allowance form from the employee view and from the individual payslip view
2025-01-14 16:08:41 +05:30
Horilla
4801934303
[FIX] PAYROLL: Debug lines
2025-01-14 12:12:59 +05:30
Horilla
24904032c9
[UPDT] PAYROLL : Updated the name of the pdf template and typo fix
2025-01-14 12:10:38 +05:30
Horilla
3f90b197c7
[UPDT] PAYROLL: Added new design for payslip and method for generating the pdf of payslip and sending it in the mail
2025-01-09 13:25:16 +05:30
Horilla
84952ddf8a
[UPDT] PAYROLL: Employee rate field option when its update compensation deduction
2025-01-09 10:30:51 +05:30
Horilla
d827f6c807
[UPDT] BASE: Updated scheduler add_job function call by adding it in a condition to start
2025-01-07 15:13:47 +05:30
Horilla
2689382aa0
[RMV] PAYROLL: Removed unwanted model OverrideWorkInfo
2025-01-06 16:20:59 +05:30
Horilla
53728e154d
[FIX] PAYROLL: Fixed the amount issue in bonus encahment list view while approving
2025-01-03 15:46:31 +05:30
Horilla
a9d375352d
[FIX] PAYROLL : Bug fix in bonus point view that amount is not displaying based on the settings page bonus point selection and calculation, and loan form view fix
2025-01-01 14:34:39 +05:30
Horilla
899d723234
[RMV] PAYROLL: Debug statements
2024-12-31 19:01:42 +05:30
Horilla
1229cec3b8
[ADD] PAYROLL: Added currency symbol for multiple company cases
2024-12-26 17:00:31 +05:30
Horilla
736619ea5a
[UPDT] PAYROLL: Add more htmx attributes for notice period settings page
2024-12-25 12:03:49 +05:30
Horilla
7d3c9ec65c
[UPDT] PAYROLL: Updated the Payslip pdf with the company logo and address
2024-12-24 15:37:28 +05:30
Horilla
e655589e9a
[UPDT] PAYROLL: Add condition in contract creation signals
2024-12-13 15:34:38 +05:30
Horilla
9feac308aa
[RMV] PAYROLL: Remove unwanted code
2024-12-09 11:13:28 +05:30
Horilla
dc1311cf70
[FIX] PAYROLL: Fixed deduction form select field data not rendering properly
2024-12-09 11:10:00 +05:30
Horilla
36663ceb1d
[FIX] PAYROLL: Some design fixes in dashboard and fixed employee contribution not export issue in dashboard
2024-12-06 15:59:02 +05:30
Horilla
33ed19cd36
[UPDT] PAYROLL: Updated payslip generation to include employer contribution
2024-12-06 15:57:41 +05:30
Horilla
cb11824c0e
[UPDT] PAYROLL: tax_calc method in payroll
2024-11-26 14:25:41 +05:30
Horilla
489eded955
[UPDT] GENERAL: Eval method change ( #397 )
2024-11-26 14:24:55 +05:30
Horilla
e55e87e9b1
[UPDT] PAYROLL: Reimbursement comment section with normal employee permission updates
2024-11-24 10:42:54 +05:30
Horilla
5e24821609
[UPDT] PAYROLL: Normal employee permissions in payroll
2024-11-20 16:22:11 +05:30
Horilla
9bcb06903e
[UPDT] PAYROLL: Add htmx attributes in reimbursement request comment section
2024-11-19 10:51:07 +05:30
Horilla
b00e843707
[FIX] PAYROLL: Deduction form condition issue
2024-10-29 10:37:56 +05:30
Horilla
f78a3b5cbe
[UPDT] PAYROLL: Rmove unused oh-modals and resolved payslip create function date period issues
2024-10-18 10:48:11 +05:30
Horilla
0affcb7390
[UPDT] PAYROLL: Asset fine HTML filter
2024-10-15 14:15:48 +05:30
Horilla
e0fe83377f
[UPDT] BASE: Updated load data function by adding additional json file to load data
2024-10-15 14:14:48 +05:30
Horilla
994e786a4a
[FIX] PAYROLL: Fixed grosspay calculation not taking update compensation
2024-10-04 22:24:19 +05:30
Horilla
028c282ec8
[UPDT] BASE: Currency symbol prefix and postfix
2024-10-04 17:22:15 +05:30
Horilla
afdcec65d0
[FIX] PAYROLL: Fixed payslip grosspay caliculation issue and hourly and daily wage type payslip generation ( #356 )
2024-10-03 15:05:36 +05:30
Horilla
12f7399edc
[RMV] Unwanted files
2024-10-03 15:05:08 +05:30
