Commit Graph

393 Commits

Author SHA1 Message Date
Horilla
440880c90f Merge master 2025-10-13 11:28:07 +05:30
Horilla
012a09865f Merge master 2025-10-09 12:30:27 +05:30
Horilla
a1fb59998e Merge master 2025-09-25 16:21:53 +05:30
Horilla
ab462d3667 Merge master 2025-09-22 10:57:28 +05:30
Horilla
08bff6d515 Merge master 2025-09-19 14:37:34 +05:30
Horilla
2c84ca9db7 Merge 1.0 and dev/v2.0 2025-09-16 10:30:40 +05:30
Horilla
a7c3a49790 [UPDT] PMS: Updated MOM column in meetings 2025-09-03 10:56:14 +05:30
Horilla
d3761ca713 Merge master 2025-09-02 17:13:25 +05:30
Horilla
eef88d2fa7 [FIX] PAYROLL: Fix showing python code in filing status 2025-08-28 14:39:08 +05:30
Horilla
2d620ca7d9 CBV code updates: 20th August 2025-08-20 16:13:07 +05:30
Horilla
d441a266d6 [FIX] PAYROLL: #880 2025-08-19 15:44:21 +05:30
Horilla
90c1424c8e [FIX] PAYROLL: Fix typo in function call from calcluate_federal_tax to calculate_federal_tax 2025-08-12 12:55:17 +05:30
Horilla
ad26866aca CBV code updates: 8th August 2025-08-08 14:37:54 +05:30
Horilla
8fe41283ea CBV code updates: 1st August 2025-08-01 17:48:04 +05:30
Horilla
648957ea12 CBV code updates: 4th July 2025-07-04 16:11:12 +05:30
Horilla
0d082e7a2e CBV code updates: 4th June 2025-06-04 11:21:22 +05:30
Horilla
c2f0409e09 CBV code updates: 28th May 2025-05-28 09:42:28 +05:30
Horilla
499fcc8cd8 CBV code updates: 22nd May 2025-05-22 14:47:59 +05:30
Horilla
696f26e57a CBV code updates: 14th May 2025-05-14 11:05:06 +05:30
Horilla
b97976e7b5 CBV code updates: 8th May 2025-05-08 16:43:50 +05:30
Horilla
0e86521c74 CBV code updates: 21st April 2025-04-22 00:15:32 +05:30
Horilla
c405e21ee5 CBV Updates: 7th April 2025-04-07 10:20:47 +05:30
Horilla
02f2ebe78f CBV code updates: 28th March 2025-03-28 11:45:13 +05:30
Horilla
5e908ecb24 CBV code updates 2025-03-24 11:56:55 +05:30
Horilla
03667802a7 CBV code updates 2025-03-21 15:32:45 +05:30
Horilla
b81affff7d [ADD] Class Based Views for Horilla 2025-03-18 13:58:44 +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