Commit Graph

74 Commits

Author SHA1 Message Date
Laurent Destailleur
2113a944ce Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-14 23:14:56 +02:00
Laurent Destailleur
0c82ce1b69 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-14 23:04:36 +02:00
Laurent Destailleur
02a3cfbb5f Update paymentsalary.class.php 2022-04-14 21:43:55 +02:00
kevin
f4023b4e44 Add missing entity on salary's payment 2022-04-12 11:08:50 +02:00
Laurent Destailleur
e2a957c738 Clean some trigger names 2022-04-02 16:08:04 +02:00
Frédéric FRANCE
a613553f37 Merge branch 'hookgetnomurl' into patch-1 2022-02-15 18:44:06 +01:00
Laurent Destailleur
ef56631c80 FIX #yogosha8186 2022-01-03 18:15:19 +01:00
Laurent Destailleur
72998cd8fe Debug v15 2022-01-03 12:26:57 +01:00
Laurent Destailleur
5cebaae235 Fix can close a salary if paid partially. 2021-11-29 19:39:03 +01:00
Frédéric FRANCE
dc3bfcfb87 can modify tooltip by reference 2021-11-22 19:57:26 +01:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Laurent Destailleur
51a4d7630f Clean code 2021-08-28 00:56:37 +02:00
Laurent Destailleur
2dd91bf312 Clean code 2021-08-27 23:36:06 +02:00
Laurent Destailleur
3b6559b1a6 Clean code by adding cast int. 2021-08-27 18:53:45 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
Laurent Destailleur
d0c57dac34 FIx #18217 - Salary - link 'salary' of bank_url not managed 2021-08-03 15:02:09 +02:00
Laurent Destailleur
0dce34f527 Fix trans 2021-07-01 19:06:16 +02:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
stickler-ci
762378c044 Fixing style errors. 2021-04-28 11:12:01 +00:00
Gauthier PC portable 024
c25b044da5 FIX : several fixes on salary and vat 2021-04-28 11:56:07 +02:00
Gauthier PC portable 024
5ef22327a2 FIX : last modif date for salary 2021-04-26 12:29:17 +02:00
Laurent Destailleur
c4f27cc29f Debug module salary 2021-04-18 16:43:09 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
be6bb3a756 FIX #yogosha5746 - next step (work in progress) 2021-03-30 19:12:07 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
Laurent Destailleur
fb84608586 Clean sql 2021-03-30 03:37:54 +02:00
Laurent Destailleur
6063b02bf4 Fix #ygosha5698 2021-03-22 12:47:23 +01:00
Laurent Destailleur
6a0e0f4c06 Fix #ygosha5698 2021-03-22 12:10:51 +01:00
Frédéric FRANCE
0afd05c664 fix php8 warning 2021-03-14 23:56:04 +01:00
Laurent Destailleur
cc10106a21 Fix protection on int 2021-03-14 12:20:23 +01:00
Laurent Destailleur
12f50a76d7 Fix yogosha #5627 2021-03-14 11:48:39 +01:00
Laurent Destailleur
e015f66936 Fix filter on employee 2021-03-10 17:31:33 +01:00
Gauthier PC portable 024
e7c030f576 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into FIX_salaries2 2021-03-08 09:16:00 +01:00
Gauthier PC portable 024
ff97a41386 FIX : num_payment on llx_salary is useless 2021-03-08 09:00:52 +01:00
Laurent Destailleur
aee6d78928 Debug split of payment salary into salary + payment 2021-03-04 21:33:29 +01:00
Laurent Destailleur
c044b43b66 Fix phpcs 2021-03-04 19:20:16 +01:00
Laurent Destailleur
59f205596e Fix phpcs 2021-03-04 17:46:34 +01:00
Gauthier PC portable 024
6da28f5e44 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-03-01 11:12:03 +01:00
Frédéric FRANCE
ebfba19778 code syntax s... t.. dir 2021-02-26 21:17:52 +01:00
Gauthier PC portable 024
3b8e804412 Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-09 16:07:41 +01:00
Gauthier PC portable 024
3761dfe8bc FIX : table llx_salary_extrafield deosn't exists for the moment 2021-02-09 16:05:25 +01:00
Gauthier PC portable 024
14f0b225bb Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-09 11:27:21 +01:00
Gauthier PC portable 024
9b18b15d8a FIX : several fixes 2021-02-09 11:25:30 +01:00
Gauthier PC portable 024
fe468ed710 Merge branch 'NEW/add_real_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-05 13:53:20 +01:00
Gauthier PC portable 024
736a546786 FIX : php doc 2021-02-05 13:52:57 +01:00
stickler-ci
9bfb7a5cbd Fixing style errors. 2021-02-05 12:08:05 +00:00
Gauthier PC portable 024
24b26b8980 Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-05 12:49:23 +01:00
Gauthier PC portable 024
bed723aec0 FIX : getNomUrl() 2021-02-05 12:47:20 +01:00