Commit Graph

84339 Commits

Author SHA1 Message Date
Laurent Destailleur
aee6d78928 Debug split of payment salary into salary + payment 2021-03-04 21:33:29 +01:00
Laurent Destailleur
d0ba10efe5 Fix phpcs 2021-03-04 19:48:50 +01:00
Laurent Destailleur
c55932090a Fix phpcs 2021-03-04 19:48:08 +01:00
Laurent Destailleur
c044b43b66 Fix phpcs 2021-03-04 19:20:16 +01:00
Laurent Destailleur
525d643915 Fix debug split of payment salary into salary + payment 2021-03-04 18:57:03 +01:00
Laurent Destailleur
fa03cde0a5 Better migration script 2021-03-04 18:23:29 +01:00
Laurent Destailleur
69f76d2f9d Fix migration to fill llx_salary table 2021-03-04 18:22:21 +01:00
Laurent Destailleur
036c4bc730 Fix phpcs 2021-03-04 18:01:41 +01:00
Laurent Destailleur
b5def91b46 Fix phpcs 2021-03-04 17:57:08 +01:00
Laurent Destailleur
59f205596e Fix phpcs 2021-03-04 17:46:34 +01:00
Laurent Destailleur
d56890de17 Fix phpcs 2021-03-04 17:24:58 +01:00
Laurent Destailleur
d5e0a8be56 Fix phpcs 2021-03-04 17:24:13 +01:00
Laurent Destailleur
6eafc3b774 Clean code 2021-03-04 17:23:12 +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
b92bfb007f
Merge pull request #16520 from FHenry/dev_EventOrganisation
new: working on conference or booth object and event type #FoundationFunding
2021-03-04 17:06:57 +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
Laurent Destailleur
8189106627
Merge pull request #16532 from Hystepik/develop#1
Close #16523 : New column Contact assigned
2021-03-04 16:52:20 +01:00
Laurent Destailleur
87da30d2d9
Update tasks.php 2021-03-04 16:50:39 +01:00
Laurent Destailleur
beb8dbcc01
Update project.lib.php 2021-03-04 16:48:25 +01:00
Gauthier PC portable 024
4fe292c76d FIX : getNomUrl() user in title and travis feedbacks 2021-03-04 16:29:32 +01:00
Laurent Destailleur
87c1e85017
Update mo_production.php 2021-03-04 16:10:50 +01:00
lmarcouiller
33f7f2c7d2 Fix #16525 : new button manufacturing order 2021-03-04 15:02:46 +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
stickler-ci
47dd477c61 Fixing style errors. 2021-03-04 09:36:17 +00:00
lmarcouiller
e94f703f5d Fix #16523 : return to backward compatibility 2021-03-04 10:33:18 +01:00
lmarcouiller
500f192a05 Fix #16523 : New column Contact assigned 2021-03-04 10:15:41 +01:00
Florian HENRY
6844c57413 fix sql 2021-03-04 07:53:32 +01:00
Florian HENRY
ecd1915c0a fix sql 2021-03-04 07:45:27 +01:00
Florian HENRY
c362a16df1 fix sql 2021-03-04 07:45:02 +01:00
Florian HENRY
89bd9c4e05 fix sql 2021-03-04 07:44:31 +01:00
Florian HENRY
879e8fe5f6 fix sql 2021-03-04 07:44:00 +01:00
Florian HENRY
ec52ed445c fix ambigous 2021-03-03 22:18:42 +01:00
Florian HENRY
04c6d5dd8f fix sql 2021-03-03 22:16:35 +01:00
Florian HENRY
91b93ac7ce fix sql 2021-03-03 22:10:17 +01:00
Florian HENRY
9c256ab8a8 fix review 2021-03-03 21:40:37 +01:00
Florian HENRY
5233ad7424 revert wrong code in commonobject 2021-03-03 21:38:43 +01:00
Florian HENRY
4e2f929460 test 2021-03-03 21:11:04 +01:00
Florian HENRY
55e9a6596b test 2021-03-03 21:10:50 +01:00
Florian HENRY
1434e58031 Merge branch 'dev_EventOrganisation' of github.com:FHenry/dolibarr into dev_EventOrganisation 2021-03-03 16:28:31 +01:00
Florian HENRY
1913564b38 fix travis 2021-03-03 16:28:14 +01:00
Florian HENRY
c909306f34 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-03 16:27:05 +01:00
Laurent Destailleur
43e58f70a1
Merge pull request #16528 from frederic34/patch-4
remove unused code
2021-03-03 15:10:58 +01:00
Laurent Destailleur
d22f929779
Merge pull request #16526 from frederic34/patch-3
fix unknown constant and variable
2021-03-03 15:10:38 +01:00
stickler-ci
6cbc979520 Fixing style errors. 2021-03-03 13:52:21 +00:00
Gauthier PC portable 024
3643afd761 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries 2021-03-03 14:49:29 +01:00
Gauthier PC portable 024
ca8d2a671d FIX : conf ajax must be after main form 2021-03-03 14:47:30 +01:00
Gauthier PC portable 024
845b1c6c94 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries 2021-03-03 14:35:38 +01:00
x
049080991d FIX : label must be over user 2021-03-03 14:13:36 +01:00
Frédéric FRANCE
d05c0b749a
remove unused code 2021-03-03 13:11:10 +01:00