Commit Graph

110296 Commits

Author SHA1 Message Date
Laurent Destailleur
f4997d052d
Merge pull request #21326 from defrance/patch-209
php V8 warning, no soc associated with storage
2022-06-23 12:39:05 +02:00
Laurent Destailleur
bfd417bf6f
Merge pull request #21327 from defrance/patch-210
php V8 warning
2022-06-23 12:38:00 +02:00
Laurent Destailleur
540cd43596
Merge branch 'develop' into patch-210 2022-06-23 12:37:47 +02:00
Laurent Destailleur
4b79d91437 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-23 12:35:24 +02:00
Laurent Destailleur
b2603c9b53 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/fournisseurs.php
2022-06-23 12:26:26 +02:00
Laurent Destailleur
24c0e5a5bf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-23 12:24:55 +02:00
Laurent Destailleur
c0240ae996 Merge 2022-06-23 12:24:34 +02:00
Laurent Destailleur
cc898d0468
Merge pull request #21360 from atm-lena/develop_FIX_CompatibilityPHP8_CompareemptystringAndnumberzero
FIX compatibility php 8 : compare empty string and zero int for recep…
2022-06-23 12:17:09 +02:00
atm-lena
fe09423d20 FIX compatibility php 8 : compare empty string and zero int for reception 2022-06-23 11:55:20 +02:00
Laurent Destailleur
d60d296dd0 phpcs 2022-06-23 11:49:40 +02:00
Laurent Destailleur
3b8f83f3d1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-23 11:44:45 +02:00
Laurent Destailleur
d93e60bbd4
Merge pull request #21348 from FHenry/15_fix_graph_ficheinter_status
FIX: 15 fix graph ficheinter status
2022-06-23 11:44:18 +02:00
Laurent Destailleur
d87f8d874b
Merge pull request #21328 from defrance/patch-211
expedition setting php V8 warning
2022-06-23 11:41:17 +02:00
Laurent Destailleur
b1ab8ba9b3
Merge branch 'develop' into patch-211 2022-06-23 11:41:09 +02:00
Laurent Destailleur
41e9a0ded8
Merge pull request #21329 from defrance/patch-212
fix $fk_product instead $this->fk_product
2022-06-23 11:38:38 +02:00
Laurent Destailleur
04f2a41509
Merge pull request #21337 from atm-lena/14.0_FIX_productfournprice_saveextrafieldsvalues
Save extrafields didn't work with all types (ex : date)
2022-06-23 10:59:10 +02:00
Laurent Destailleur
ce8f6b0983
Merge pull request #21338 from dolibit-ut/patch-401
Update llx_adherent_type.sql
2022-06-23 10:58:18 +02:00
Florian HENRY
a12e7d1734 Merge branch '15_fix_graph_ficheinter_status' of github.com:FHenry/dolibarr into 15_fix_graph_ficheinter_status 2022-06-23 10:20:50 +02:00
Florian HENRY
d409a534d7 Ok better 2022-06-23 10:20:26 +02:00
Florian HENRY
c702d8a4ac Merge branch '15.0' of https://github.com/Dolibarr/dolibarr into 15_fix_graph_ficheinter_status 2022-06-23 10:14:43 +02:00
Laurent Destailleur
9fcf1343ec
Merge pull request #21340 from dolibit-ut/patch-402
Update 15.0.0-16.0.0.sql
2022-06-23 09:56:11 +02:00
Laurent Destailleur
264f8ab4ce
Merge pull request #21342 from frederic34/useismodenabled
Use getDolGlobalString
2022-06-23 09:55:31 +02:00
Laurent Destailleur
43c8895fa0
Merge pull request #21345 from atm-steve/Invoice_rec_default_date_to_yes_with_hidden_conf
New invoice rec default to yes
2022-06-23 09:54:23 +02:00
Laurent Destailleur
78a8b30213
Merge pull request #21346 from FHenry/15_fix_fichinter_box
FIX: Index page for "Sales" give wrong URL link to Intervention
2022-06-23 09:53:16 +02:00
Laurent Destailleur
c19464d3c4
Merge pull request #21347 from frederic34/holidaydocuments
remove unused code
2022-06-23 09:52:28 +02:00
Laurent Destailleur
895c16a63b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-23 09:51:47 +02:00
Laurent Destailleur
886b958550
Merge pull request #21356 from turrisxyz/Pinned-Dependencies-GitHub
chore: Set permissions for GitHub actions
2022-06-23 09:51:23 +02:00
neilnaveen
da97012190 chore: Set permissions for GitHub actions
Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much.

- Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions

https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions

https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs

[Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/)

Signed-off-by: neilnaveen <42328488+neilnaveen@users.noreply.github.com>
2022-06-23 01:11:00 +00:00
Laurent Destailleur
7bc0265a06 Trans 2022-06-22 22:24:48 +02:00
Laurent Destailleur
e9153cd9e1 Fix creation 2022-06-22 22:21:05 +02:00
Laurent Destailleur
55326331b9 Fix reposition 2022-06-22 22:14:08 +02:00
Laurent Destailleur
fb573030c8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-22 22:13:58 +02:00
Laurent Destailleur
ff4911384e Debug new import tool 2022-06-22 21:52:00 +02:00
Laurent Destailleur
55c6438353
Merge pull request #21349 from frederic34/deprecatedinproject
fix deprecated in project
2022-06-22 18:26:57 +02:00
Laurent Destailleur
e4797c9184
Merge pull request #21353 from FHenry/15_fix_badcall_massaction_delete_on_actioncomm
fix: 15 fix bad call massaction delete on actioncomm delete parameters
2022-06-22 18:25:46 +02:00
Laurent Destailleur
e73bd1bf1f
Merge pull request #21350 from FHenry/15_fix_search_user
fix: 15 fix search user
2022-06-22 18:23:59 +02:00
Laurent Destailleur
1cdd702ccc Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-22 18:14:26 +02:00
Laurent Destailleur
879a5260d5
Merge pull request #21324 from atm-GregM/FIX_V15_linkedObjectBlock_center_order_date
FIX : v15 linked object block center order date
2022-06-22 18:13:05 +02:00
Laurent Destailleur
8075a40bd9 FIX #21323 2022-06-22 18:12:36 +02:00
Laurent Destailleur
a3052a7ae1
Merge pull request #21239 from fboitel/fboitel-dev-scrutinizer-003
BUG FIX variable "projet" is no longer used on Conf, replaced by "project"
2022-06-22 15:40:22 +02:00
Laurent Destailleur
313cff77d0
Merge pull request #21255 from aspangaro/16b4-php8_1
PHP 8 in social contribution
2022-06-22 15:39:29 +02:00
Florian HENRY
98ee53c4b1 fix: massaction delete on actioncomm list do not call delete with good paramters 2022-06-22 15:13:13 +02:00
Florian HENRY
9d20e602d1 fix: remove warning GETPOST 2022-06-22 14:28:33 +02:00
atm-steve
267e150118
Update objectline_create.tpl.php 2022-06-22 14:10:47 +02:00
stickler-ci
e908118db8 Fixing style errors. 2022-06-22 11:52:58 +00:00
Frédéric France
b46ede5eae fix deprecated in project 2022-06-22 13:50:54 +02:00
Florian HENRY
c5101f4bd7 FIX: Fiche inter graph by status on ficheinter Index page 2022-06-22 13:45:06 +02:00
Florian HENRY
abdfc90eae FIX: Fiche inter graph by status on ficheinter Index page 2022-06-22 13:43:07 +02:00
stickler-ci
df585c21ee Fixing style errors. 2022-06-22 11:31:47 +00:00
Frédéric France
b7e539a90a remove unused code 2022-06-22 13:31:35 +02:00