Laurent Destailleur
4b60b3d991
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
2024-02-07 18:11:36 +01:00
Laurent Destailleur
e6b165003f
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
2024-02-07 18:01:11 +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
lvessiller-opendsi
cdad15bae3
FIX user filter in per user view of event list ( #28049 )
2024-02-07 16:28:12 +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
Laurent Destailleur
b42fd50a7c
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2024-02-05 01:42:37 +01:00
Alexandre SPANGARO
b0f999fc5a
FIX Accounting files export - Use th instead of td on all title columns ( #28003 )
...
* Remove duplicate lines
* FIX Accounting files export - Use th instead of td on all title columns
* Copyright
2024-02-05 01:40:36 +01:00
Laurent Destailleur
e5d27ead40
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2024-02-03 01:48:16 +01:00
Laurent Destailleur
5dbecd73a0
FIX #27970 #26283 #27970
2024-02-03 01:48:01 +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
JC Prieto
05b824b4d6
FIX: Update loan.class.php ( #27971 )
...
Right stauts paid.
2024-02-02 17:44:56 +01:00
MDW
1e412c7a13
Qual: Backport pre-commit into 18.0 ( #27949 )
...
* Qual: Backport pre-commit to 17.0
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.
* Qual: Backport pre-commit to 18.0
# Qual: Backport pre-commit to 18.0
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-02 13:40:34 +01:00
Laurent Destailleur
13801c6b99
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2024-02-01 12:20:25 +01:00
Laurent Destailleur
9dd1646818
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2024-02-01 12:20:12 +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
2e620ba35a
Merge pull request #27751 from Slordef/18.0-currency-propal-signature
...
FIX: use the currency for propal signature page
2024-01-31 21:08:52 +01:00
Laurent Destailleur
b99efb24df
Merge pull request #27887 from ATM-Consulting/FIX_Ajout_hooks
...
FIX : Adding hooks init
2024-01-31 20:51:25 +01:00
Laurent Destailleur
da3775ee7c
Merge pull request #27928 from AlbanDurrheimer/18.0_Fix_sub_bom_mo_blank_page
...
FIX #26416 BOM_SUB_BOM blank page
2024-01-31 19:19:35 +01:00
Alban Durrheimer
afbb6b6659
Fix blank page with sub MO
2024-01-31 16:32:43 +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
atm-adrien
570fcd9174
FIX : Retours PR
2024-01-31 10:33:25 +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
atm-adrien
dedd0ef20d
FIX : Adding hooks init
2024-01-30 15:15:32 +01:00
Laurent Destailleur
6b5aba1960
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2024-01-29 10:29:40 +01:00
Laurent Destailleur
beaee43eef
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2024-01-29 01:26:18 +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
6d9065ebbe
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2024-01-28 13:45:54 +01:00
Laurent Destailleur
fd39b3270c
Fix css
2024-01-28 13:37:16 +01:00
Laurent Destailleur
284b556019
Merge pull request #27824 from AlbanDurrheimer/18.0_Fix_Docker_MailDev
...
FIX port in Docker MailDev
2024-01-28 12:48:46 +01:00