Commit Graph

8880 Commits

Author SHA1 Message Date
Mélina JOUM
7c20c7a7c0 ADD: Allow import and export of customer prices and price level together 2025-02-20 16:32:36 +01:00
yannis
36a082e543 Fix PDF generation 2025-02-17 17:21:35 +01:00
ldestailleur
415c38ed6b Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-02-16 14:32:33 +01:00
Laurent Destailleur (aka Eldy)
705164cc9f Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-02-13 20:39:19 +01:00
Regis Houssin
8150cc6159 FIX wrong ODT path for multicompany 2025-02-13 18:20:47 +01:00
Regis Houssin
c55eb6773c FIX wrong path for odt models 2025-02-13 17:16:35 +01:00
Laurent Destailleur (aka Eldy)
b6ab2b11d3 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-02-06 16:26:21 +01:00
Laurent Destailleur (aka Eldy)
25b4ae0d33 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-02-06 16:25:56 +01:00
Frédéric FRANCE
7e5a35cb45 asset doesn't have lines 2025-02-06 14:02:17 +01:00
Laurent Destailleur (aka Eldy)
31daa4a2f0 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-02-04 23:25:24 +01:00
Regis Houssin
3da1c1c843 FIX more bugs and warnings 2025-02-04 04:54:54 +01:00
Laurent Destailleur (aka Eldy)
8c4b624541 Debug v21 2025-02-03 17:18:14 +01:00
Laurent Destailleur (aka Eldy)
12da2ba814 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-30 13:12:44 +01:00
Laurent Destailleur (aka Eldy)
ea8de773b6 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-01-30 13:02:03 +01:00
Laurent Destailleur (aka Eldy)
a8d3973a8d Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-01-30 12:58:03 +01:00
Laurent Destailleur (aka Eldy)
3c7327a457 Missing notes 2025-01-29 12:35:27 +01:00
Regis Houssin
837b2ff060 FIX wrong left margin (v18 to develop ?) 2025-01-27 13:59:12 +01:00
Eric Seigne
cbe15c7c71 missing hookmanager like others doc_generic*odt modules 2025-01-22 23:53:16 +01:00
Laurent Destailleur (aka Eldy)
a68f2b5cf5 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-15 14:12:17 +01:00
Laurent Destailleur (aka Eldy)
ac5d29a4f6 Fix phpunit 2025-01-15 14:11:57 +01:00
Laurent Destailleur (aka Eldy)
cf62921762 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-15 13:01:03 +01:00
Laurent Destailleur (aka Eldy)
c58016c2cf Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-01-15 12:46:26 +01:00
Laurent Destailleur (aka Eldy)
0801f91ea7 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-01-15 12:35:42 +01:00
Laurent Destailleur (aka Eldy)
11d4b973e0 Add log 2025-01-14 10:35:44 +01:00
Laurent Destailleur
a46c47c134 Merge pull request #32542 from Al-thi/fix/stock-import
FIX #21294 Stock import sql query
2025-01-13 02:43:37 +01:00
PsyCrow
eebea4ad80 Update modAdherent.class.php
PHP Warning: Deprecated dynamic property $enabled
2025-01-11 00:22:47 -06:00
Laurent Destailleur
2e0950da3d Fix setup of const 2025-01-11 00:30:05 +01:00
Laurent Destailleur
1d3e3232da Merge pull request #32591 from FHenry/20_fix_warning
fix: php warning
2025-01-10 12:25:01 +01:00
Maxime Kohlhaas
1dc3a9796f Merge branch '20.0' of github.com:Dolibarr/dolibarr into 21.0 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
802562a575 Fix regression after a fix 2025-01-09 19:35:01 +01:00
Maxime Kohlhaas
b754994543 Merge branch '19.0' of github.com:Dolibarr/dolibarr into 20.0 2025-01-09 18:18:36 +01:00
Florian HENRY
f0449e349f fix: php warning 2025-01-09 09:59:23 +01:00
Amael-PE
21e997acd7 FIX Continue for eagle_proforma 2025-01-08 17:06:19 +01:00
Amael-PE
ea94370486 FIX Complete wath was started in #17243 for pdf_cannelle 2025-01-08 17:03:15 +01:00
Laurent Destailleur
75c2c93d3b Prepare v21 2025-01-07 11:44:59 +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
Laurent Destailleur
c850581ad8 Debug v21 - Fix import 2025-01-06 02:47:32 +01:00
Laurent Destailleur (aka Eldy)
1cfa3b5803 Fix warning 2025-01-05 18:34:01 +01:00
Joachim Kueter
b0ce1788d4 Backport of fix from v21 to v20
I just tried to fix the same issue and saw that it has already been fixed in develop just 18 hours ago...
2025-01-04 08:21:28 +01:00
Laurent Destailleur (aka Eldy)
14399f8159 Fix error 500 when generating contract pdf document 2025-01-03 14:10:53 +01:00
Frédéric France
ee9a5291cd add fix phpstan 2024-12-31 16:25:57 +01:00
Laurent Destailleur (aka Eldy)
85547f7594 Debug v21 2024-12-30 00:50:33 +01:00
Laurent Destailleur
63ec064552 Merge branch 'develop' into phpstan_2024_12_15 2024-12-17 02:50:52 +01:00
Frédéric FRANCE
4d9b398437 fix phpstan 2024-12-16 11:17:10 +01:00
Frédéric France
8c5160d0aa Merge remote-tracking branch 'upstream/develop' into phpstan_2024_12_15 2024-12-15 09:33:16 +01:00
Frédéric France
2bb990344e fix phpstan 2024-12-15 09:17:08 +01:00
Frédéric France
eff000868b Merge remote-tracking branch 'upstream/develop' into contact_canvas_phpstan 2024-12-15 08:41:44 +01:00
Frédéric France
1dd86e9d32 fix 2024-12-14 09:08:33 +01:00
Charlie Root
912206d99b Correction bug #32365 Warning: Attempt to read property datepaye on string 2024-12-13 23:35:47 +01:00
Laurent Destailleur (aka Eldy)
778b07dabd Debug v21 Fix tooltip on setup pages 2024-12-13 17:22:48 +01:00