Commit graph

118935 commits

Author SHA1 Message Date
Laurent Destailleur
2f1eecd709 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-02-09 19:04:06 +01:00
Laurent Destailleur
027e0334a2 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-02-09 19:03:33 +01:00
Laurent Destailleur
e22dabe59a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-02-09 19:03:26 +01:00
Laurent Destailleur
48c3dfb9eb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-02-09 19:03:03 +01:00
Laurent Destailleur
f5df332d3e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-02-09 19:02:56 +01:00
noec764
2c07bd764d
FIX: Bar code verification should be done by entity because generation does (#28087)
* FIX: Bar code verification should be done by entity because generation does

* FIX: handle Entities shared tables

* FIX: Remove unused global

---------

Co-authored-by: Noé <noe@scopen.fr>
2024-02-09 14:07:04 +01:00
thomas-Ngr
6a8be838be
14.0 fix CVE 2024 23817 (#28090)
* FIX CVE-2024-23817

* FIX syntax error

---------

Co-authored-by: Regis Houssin <regis.houssin@inodbox.com>
2024-02-09 11:37:55 +01:00
Regis Houssin
fb69347ea7
FIX CVE-2024-23817 (#28089)
* FIX CVE-2024-23817

* FIX syntax error
2024-02-09 11:24:57 +01:00
Frédéric FRANCE
b92b8c443d
fix cunits.class.php (backport) (#28068) 2024-02-08 13:09:39 +01:00
Laurent Destailleur
4a0519c674 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
Conflicts:
	htdocs/core/class/extrafields.class.php
2024-02-07 17:54:30 +01:00
Laurent Destailleur
792606925f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
Conflicts:
	htdocs/core/class/extrafields.class.php
2024-02-07 17:50:38 +01:00
Laurent Destailleur
a2f58f1d3d Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/takepos/invoice.php
2024-02-07 17:47:23 +01:00
Laurent Destailleur
5a756ffc4c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/takepos/invoice.php
2024-02-07 17:44:39 +01:00
noec764
015546b07c
FIX: line special_code never saved (#28051)
Co-authored-by: Noé <noe@scopen.fr>
2024-02-07 16:20:34 +01:00
MDW
72305a9218
Qual: pre-commit: run phpcs on all files in 'main' branches. (#28018)
This change to the workflow will run phpcs on all files in develop,
17.0, 18.0, ... (rule== branch ends in .0).

This ensures that phpcs is run in a github workflow for fast phpcs
issue detection in the develop and other main branches.

Ultimately, this means that the PHPCS action can be disabled
in branches where it is active.  But I propose to verify that
the updated action does the job as expected (tested in a fork
it is ok).
2024-02-05 13:35:20 +01:00
MDW
ed3bfb152a
Qual: Backport pre-commit to 17.0 (#27948)
Backport the pre-commit tool to bring extra checks to the older versions
so that they are fixed earlier before merging in upper versions.

Other PRs will be created for backporting to 18.0 and 19.0.
The PRs should be accepted in reverse order:
- develop;
- 19.0:
- 18.0;
- 17.0.

That should avoid merge conflicts and ensure that options (and ignored
messages or steps) are adapted to the version branch.
2024-02-03 00:10:49 +01:00
Laurent Destailleur
a237f5dc54 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-02-01 12:17:02 +01:00
Laurent Destailleur
7b178844e8 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-02-01 12:16:50 +01:00
Laurent Destailleur
5f24f79b4d Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-02-01 12:14:50 +01:00
Laurent Destailleur
07d0093fbc Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-02-01 12:14:30 +01:00
Laurent Destailleur
efa977bd21 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-02-01 12:11:39 +01:00
Laurent Destailleur
ab585b6efc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-02-01 12:11:25 +01:00
Laurent Destailleur
662ab45037
Merge pull request #27904 from rycks/14.0_fix_zero_could_be_a_value_into_conf_global_key
fix #27883 : zero could be a value stored
2024-02-01 10:59:11 +01:00
Laurent Destailleur
c67b34ed35
Merge pull request #27921 from ATM-Nicolas/fix_17_missing_begin_transaction
FIX : Missing begin transaction
2024-01-31 11:58:58 +01:00
Laurent Destailleur
0d545313cd
Merge pull request #27922 from ATM-Nicolas/fix_17_sql_concatenation_error
FIX : SQL concatenation error
2024-01-31 11:58:06 +01:00
ATM-Nicolas
318aed668d
FIX : SQL concatenation error 2024-01-31 11:24:37 +01:00
ATM-Nicolas
39f3fe4606
FIX : Missing begin transaction when updating supplier recurring invoice 2024-01-31 11:04:23 +01:00
Laurent Destailleur
356bb80676
Merge pull request #27903 from rycks/14.0_fix_datehour_to_datetime_comment
fix comment about datehour -> datetime
2024-01-30 23:47:44 +01:00
Eric Seigne
1f21e1a945 fix #27883 : zero could be a value stored 2024-01-30 21:42:57 +01:00
Eric Seigne
8d9ddf4a51 fix comment about datehour -> datetime 2024-01-30 21:35:19 +01:00
Laurent Destailleur
4c5ac44621
Merge pull request #27896 from altairisfr/takeprice
FIX : [TAKEPOS] display prices with or without taxes depending on setup (TAKEPOS_CHANGE_PRICE_HT)
2024-01-30 18:08:54 +01:00
Christophe Battarel
fa104b6613 automatic fixes 2024-01-30 17:55:13 +01:00
Laurent Destailleur
9e89499fba
Merge pull request #27891 from ATM-Consulting/FIX_17.0_warnings_php8_commonobject
FIX 17.0 - php8 warnings: test for $field existence before checking is_null
2024-01-30 16:48:34 +01:00
atm-florian
101c5a2dca FIX 17.0 - php8 warnings: test for $field existence before checking if it is null or empty 2024-01-30 16:21:51 +01:00
Laurent Destailleur
d34f9ffece Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-01-29 01:25:37 +01:00
Laurent Destailleur
bbf765c535 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/takepos/invoice.php
2024-01-29 01:25:12 +01:00
Laurent Destailleur
2420794b94 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-01-29 01:10:46 +01:00
Laurent Destailleur
2f18dc1b9c
Merge pull request #27834 from Easya-Solutions/14.0_takepos_display_errors_on_payment_error
Takepos : display errors on payment error
2024-01-28 12:44:37 +01:00
tnegre
9c638968ff Takepos : display errors on payment error 2024-01-26 16:23:24 +01:00
Laurent Destailleur
dacea0db8a
Merge pull request #27809 from atm-quentin/FIX_generation_multicompany_crabe
FIX : crabe PDF is generating in conf->entity instead of object->entity
2024-01-26 00:35:52 +01:00
Quentin VIAL-GOUTEYRON
bb2f13aed4 FIX : crabe PDF is generating in conf->entity instead of object->entity 2024-01-25 14:40:11 +01:00
Laurent Destailleur
0592e639c0 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-01-23 22:02:57 +01:00
Laurent Destailleur
43b37ead7c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-01-23 22:02:27 +01:00
Laurent Destailleur
9778e4ad08 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-01-23 22:02:01 +01:00
Laurent Destailleur
f5b6b8ece9 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-01-23 21:33:52 +01:00
Laurent Destailleur
41da70f494 Fix repair 2024-01-23 21:33:10 +01:00
Laurent Destailleur
18b896f034
Merge pull request #27740 from MaximilienR-easya/14.0_Fix_expedition_filter
Fix expedition list filter on product category
2024-01-23 17:14:03 +01:00
Laurent Destailleur
fcf024ef4f
Merge pull request #27742 from FHenry/17_fix_online_link
fix: onligne Signaturelink is bad for locaorexternal
2024-01-23 17:13:44 +01:00
Florian HENRY
a5422d2fc4 fix: onligne Signaturelink is bad for locaorexternal 2024-01-23 11:37:44 +01:00
mrozniecki
951535a3d5 Fix expedition list filter on product category 2024-01-23 09:36:15 +01:00