Laurent Destailleur
|
2dd91bf312
|
Clean code
|
2021-08-27 23:36:06 +02:00 |
|
Laurent Destailleur
|
46d993c9a6
|
Clean code
|
2021-08-27 22:42:04 +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
|
fb46ece906
|
Fix yogosha 6347
|
2021-06-09 15:36:47 +02:00 |
|
Laurent Destailleur
|
73c482ca64
|
Fix escape
|
2021-04-25 19:36:48 +02:00 |
|
Laurent Destailleur
|
9f03054fc4
|
Fix #yogosha5877
|
2021-04-24 20:52:48 +02:00 |
|
Anthony Berton
|
a612831e28
|
next_change
|
2021-04-14 14:45:55 +02:00 |
|
Laurent Destailleur
|
6bc56b7671
|
Look and feel v14
|
2021-03-29 13:41:28 +02:00 |
|
Laurent Destailleur
|
b929641fe1
|
Look and feel v14
|
2021-03-29 13:00:17 +02:00 |
|
Laurent Destailleur
|
d9108362ba
|
War against $_POST
|
2021-03-25 16:59:47 +01:00 |
|
Laurent Destailleur
|
ca1715df96
|
Add some protection for SQL injection
|
2021-03-22 13:31:06 +01:00 |
|
Laurent Destailleur
|
ebf409f831
|
FIX #yogosha5668
|
2021-03-19 12:08:40 +01:00 |
|
Laurent Destailleur
|
d2ef4b0506
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/bank/bankentries_list.php
htdocs/opensurvey/card.php
htdocs/opensurvey/index.php
htdocs/opensurvey/results.php
|
2021-03-18 12:24:34 +01:00 |
|
Laurent Destailleur
|
26dc3ef1b0
|
FIX Filter on debit/credit
Conflicts:
htdocs/compta/bank/bankentries_list.php
|
2021-03-16 18:59:28 +01:00 |
|
Laurent Destailleur
|
9ea7c92b1b
|
FIX Filter on debit/credit
|
2021-03-16 18:56:10 +01:00 |
|
Laurent Destailleur
|
10a6774ede
|
Merge pull request #16534 from atm-lena/develop_FIX_OrderBy_UserThirdParty_BankEntries
Bank Entries : Error order by user/thirdparty
|
2021-03-04 17:08:12 +01:00 |
|
Laurent Destailleur
|
7d20df8054
|
Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries
NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
|
2021-03-04 16:53:54 +01:00 |
|
atm-lena
|
cd1c1c54d4
|
Merge branch 'FIX_BankEntries_OrderByUserSoc' of github.com:atm-lena/dolibarr into develop_FIX_OrderBy_UserThirdParty_BankEntries
|
2021-03-04 11:50:08 +01:00 |
|
atm-lena
|
0cce782a21
|
No orderby for user/thirdparty in bankentries list
|
2021-03-04 11:42:47 +01:00 |
|
Frédéric FRANCE
|
a4e25359e7
|
add missing rule
|
2021-03-01 20:37:16 +01:00 |
|
Gauthier PC portable 024
|
c996871f98
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
|
2021-02-26 11:50:18 +01:00 |
|
Frédéric FRANCE
|
61600a9e65
|
code syntax compta directory
|
2021-02-23 21:09:01 +01:00 |
|
Gauthier PC portable 024
|
939d406ab1
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
|
2021-02-22 09:10:24 +01:00 |
|
Laurent Destailleur
|
0dabbcd7f5
|
Update bankentries_list.php
|
2021-02-19 17:48:15 +01:00 |
|
stickler-ci
|
af32ef266c
|
Fixing style errors.
|
2021-02-19 09:05:04 +00:00 |
|
atm-lena
|
a6999a2be7
|
Clean code
|
2021-02-19 09:54:51 +01:00 |
|
atm-lena
|
12dce74a47
|
Merge branch 'BankEntries_FIX_SearchUSerThirdparty_Reconstruct' of github.com:atm-lena/dolibarr into develop_BankEntries_FIX_SearchUSerThirdparty_Reconstruct
|
2021-02-19 09:46:55 +01:00 |
|
atm-lena
|
687d0556aa
|
Clean code
|
2021-02-19 09:39:06 +01:00 |
|
atm-lena
|
d7c59edd11
|
Clean code
|
2021-02-19 09:36:15 +01:00 |
|
atm-lena
|
a4d9e3b9d3
|
WIP final
|
2021-02-19 09:33:28 +01:00 |
|
atm-lena
|
9cdb6ce31c
|
WIP
|
2021-02-18 17:35:09 +01:00 |
|
Gauthier PC portable 024
|
134d7e00ec
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
|
2021-02-17 16:56:50 +01:00 |
|
atm-lena
|
9f9b7554ed
|
FIX error commit : only type user
|
2021-02-17 11:00:14 +01:00 |
|
atm-lena
|
84c259d87a
|
Merge branch 'FIX_BankEntries_SearchType_Salary' of github.com:atm-lena/dolibarr into develop_FIX_BankEntries_SearchType_Salary
|
2021-02-16 16:26:18 +01:00 |
|
atm-lena
|
aceefa2de1
|
FIX search type salary too for bank entries users
|
2021-02-16 16:19:35 +01:00 |
|
stickler-ci
|
6f7a223a8d
|
Fixing style errors.
|
2021-02-12 10:17:03 +00:00 |
|
atm-lena
|
b3c1bb9706
|
Merge branch 'NEW_BankEntries_TaxSalarySocial_DisplayUser' of github.com:atm-lena/dolibarr into develop_NEW_BankEntries_TaxSalarySocial_DisplayUser
|
2021-02-12 11:13:14 +01:00 |
|
atm-lena
|
1f56166801
|
FIX ret : fetch user instead of search with main sql request
|
2021-02-12 11:05:15 +01:00 |
|
Laurent Destailleur
|
3b5e6b1140
|
Update bankentries_list.php
|
2021-02-11 18:45:06 +01:00 |
|
stickler-ci
|
84e17753eb
|
Fixing style errors.
|
2021-02-11 10:35:15 +00:00 |
|
atm-lena
|
b83e2dc77a
|
Merge branch 'NEW_BankEntries_TaxSalarySocial_DisplayUser' of github.com:atm-lena/dolibarr into develop_NEW_BankEntries_TaxSalarySocial_DisplayUser
|
2021-02-11 09:52:59 +01:00 |
|
atm-lena
|
2e14b9832d
|
Clean code
|
2021-02-10 17:00:50 +01:00 |
|
atm-lena
|
3aef987f3f
|
Display or not users in terms of user rights
|
2021-02-10 16:24:45 +01:00 |
|
atm-lena
|
64ab2fa3b1
|
Bank Entries : add user search
|
2021-02-10 12:19:50 +01:00 |
|
atm-lena
|
c0354c5e93
|
NEW Bank Entries : display user linked to salary and social taxes
|
2021-02-10 12:07:09 +01:00 |
|
Gauthier PC portable 024
|
d106fe7e90
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
|
2021-02-09 09:50:46 +01:00 |
|
Laurent Destailleur
|
c9f34cc0d4
|
Prepare button to the bank conciliation pages
|
2021-02-08 22:42:21 +01:00 |
|
stickler-ci
|
9bfb7a5cbd
|
Fixing style errors.
|
2021-02-05 12:08:05 +00:00 |
|
Gauthier PC portable 024
|
bed723aec0
|
FIX : getNomUrl()
|
2021-02-05 12:47:20 +01:00 |
|
Gauthier PC portable 024
|
e188ec6cd7
|
NEW : add real payments on salaries objects
|
2021-02-04 17:21:08 +01:00 |
|