Commit graph

151292 commits

Author SHA1 Message Date
Laurent Destailleur
fd97cee0ef Debug v21 2025-01-07 11:13:27 +01:00
Laurent Destailleur
3b605c2184 Debug v21 2025-01-07 10:43:45 +01:00
Joachim Kueter
259088c280
Update functions.lib.php
fixed typo...
2025-01-07 09:35:37 +01:00
Joachim Kueter
7689e0b210
Update functions.lib.php
solve indentation
2025-01-07 09:28:17 +01:00
Joachim Kueter
dd41f3f47d
Update functions.lib.php
trying to solve whitespace/indentation issues
2025-01-07 09:25:00 +01:00
Joachim Kueter
48a3393264
Update functions.lib.php
trying to solve indentation
2025-01-07 09:21:46 +01:00
Joachim Kueter
0158b2b832
Update functions.lib.php
trying to solve indentation issue
2025-01-07 09:17:00 +01:00
Joachim Kueter
21607b4f28
Update functions.lib.php 2025-01-07 09:11:01 +01:00
Joachim Kueter
886abc96d1
handle property for delivery date (named differently in different objects)) 2025-01-07 09:03:17 +01:00
Alexandre SPANGARO
931081e645 Fix id_parent 2025-01-07 08:20:37 +01:00
Alexandre SPANGARO
c89398c9be Fix id_parent 2025-01-07 08:13:16 +01:00
Alexandre SPANGARO
aeb4537ef7 Update Chart of account FR_fr PCG14-DEV to PCG25-DEV 2025-01-06 23:50:39 +01:00
Frédéric France
7b1c4e11e4
fix phpstan 2025-01-06 21:10:21 +01:00
Frédéric France
e2a6a94a52
fix phpstan 2025-01-06 21:02:02 +01:00
Frédéric France
ef103e55dd
Merge remote-tracking branch 'upstream/develop' into fix_phpstan_2025_01_05_01 2025-01-06 20:45:37 +01:00
Laurent Destailleur
bd8a839d3e
Merge pull request #32549 from Easya-Solutions/develop_odt_dimensions_substitutions
NEW Add 4 substitutions for ODTs.
2025-01-06 20:22:59 +01:00
Frédéric France
86e1625793
fix phpstan 2025-01-06 18:27:30 +01:00
Frédéric France
a5af79c230
Merge remote-tracking branch 'origin/fix_phpstan_2025_01_05_01' into fix_phpstan_2025_01_05_01 2025-01-06 18:10:01 +01:00
Frédéric France
62a230b047
Merge remote-tracking branch 'upstream/develop' into fix_phpstan_2025_01_05_01 2025-01-06 18:09:12 +01:00
Frédéric FRANCE
0828579216
Merge branch 'develop' into loan_schedule 2025-01-06 18:05:49 +01:00
Laurent Destailleur (aka Eldy)
935e7e6d31 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-06 17:44:06 +01:00
Laurent Destailleur (aka Eldy)
1544aafa51 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-06 17:43:35 +01:00
Laurent Destailleur (aka Eldy)
5a5c9dbe02 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-01-06 17:43:13 +01:00
Laurent Destailleur (aka Eldy)
b4848d90f6 Doc 2025-01-06 17:14:50 +01:00
tnegre
81298d6787 fix Phpstan 2025-01-06 17:09:45 +01:00
tnegre
86913a7681 Add 4 substitutions for ODTs. Reuse logic from PDF generator, but reformat to make it clearer. 2025-01-06 17:02:43 +01:00
Laurent Destailleur (aka Eldy)
7f5939c8c3 Update mysql 2025-01-06 16:53:57 +01:00
Laurent Destailleur
6d01a36a26
Merge pull request #32523 from hregis/fix_20_add_todo
FIX $this->origin_object can not be instanceof CommandeFournisseur if it is already an instanceof CommonObject
2025-01-06 16:47:26 +01:00
Frédéric FRANCE
b6c6d10eb0
Merge branch 'develop' into fix_phpstan_2025_01_05_01 2025-01-06 16:42:14 +01:00
Laurent Destailleur (aka Eldy)
cbd677040e Port #32544 in develop 2025-01-06 16:36:10 +01:00
Laurent Destailleur
76c314569c
Merge pull request #32547 from Dolibarr/revert-32544-fix_21_missing_entity_field
Revert "FIX missing entity field in llx_holiday_config"
2025-01-06 16:33:22 +01:00
Laurent Destailleur (aka Eldy)
3987fc6289 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-06 16:18:42 +01:00
Laurent Destailleur (aka Eldy)
b965ee3519 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-01-06 16:11:48 +01:00
Laurent Destailleur
87fb7eec65
Revert "FIX missing entity field in llx_holiday_config" 2025-01-06 16:10:38 +01:00
Laurent Destailleur
03f4b69e81
Merge pull request #32544 from hregis/fix_21_missing_entity_field
FIX missing entity field in llx_holiday_config
2025-01-06 16:10:01 +01:00
Laurent Destailleur
8d8a714d64
Merge pull request #32546 from atm-lucasmantegari/FIX/EmptyChildWarehouse
Empty child warehouse sql error
2025-01-06 16:08:29 +01:00
Laurent Destailleur (aka Eldy)
c3c054cc7e Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-01-06 16:07:36 +01:00
Laurent Destailleur (aka Eldy)
40e59d853b FIX: switch on/off status of a page of the second website. 2025-01-06 16:07:15 +01:00
ATM-Lucas
39108e70c4 php error 2025-01-06 15:36:56 +01:00
ATM-Lucas
584a0a8afe Empty child warehouse sql error 2025-01-06 15:28:46 +01:00
Regis Houssin
f42fbb6399 FIX missing entity field in llx_holiday_config 2025-01-06 15:17:47 +01:00
Alexis Thietard
b7cb799af0 FIX #21294 Stock import sql query
To respect the PostgreSQL update statement syntax, cf.
https://www.postgresql.org/docs/17/sql-update.html

```
column_name
    The name of a column in the table named by table_name. The column name can
    be qualified with a subfield name or array subscript, if needed. Do not
    include the table's name in the specification of a target column — for
    example, UPDATE table_name SET table_name.col = 1 is invalid.
```

Signed-off-by: Alexis Thietard <alexis.thietard@rtone.fr>
2025-01-06 14:36:50 +01:00
Alexandre SPANGARO
510d622f15 Remove DOL_URL_ROOT already present in backtopage 2025-01-06 14:16:36 +01:00
Alexandre SPANGARO
68226d4399 Merge branch 'develop' into 22accreturn 2025-01-06 14:12:02 +01:00
Alexandre SPANGARO
fa71c76b16 Merge branch 'develop' into 22accreturn 2025-01-06 14:11:51 +01:00
Regis Houssin
a3193a08bc FIX merge problem 2025-01-06 13:56:32 +01:00
Regis Houssin
d443446838 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into
fix_20_wrong_value_of_socid
2025-01-06 13:53:22 +01:00
Laurent Destailleur (aka Eldy)
b9f15e4c93 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-06 12:56:38 +01:00
Laurent Destailleur (aka Eldy)
3bfd6c1e30 Debug MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY 2025-01-06 12:56:24 +01:00
Laurent Destailleur
4042e64735
Merge pull request #32540 from aspangaro/21PCG25
Update Chart of account FR_fr PCG14-DEV to PCG25-DEV
2025-01-06 12:48:57 +01:00