Commit Graph

9144 Commits

Author SHA1 Message Date
Alexandre SPANGARO
e22f2d5cbf Merge branch 'develop' into 22_catinvoice 2025-03-02 22:21:05 +01:00
Laurent Destailleur
677a2dc3cc Merge pull request #33290 from frederic34/patch-11
fix CI branch 21.0
2025-03-02 17:02:41 +01:00
Laurent Destailleur
7cf7afcddc Merge pull request #33283 from frederic34/phpstan_collab
fix phpstan
2025-03-02 17:00:34 +01:00
ldestailleur
ac5d5aeb91 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-03-02 15:29:14 +01:00
ldestailleur
1fb748bb91 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-02 13:36:53 +01:00
Frédéric FRANCE
1418bb9157 fix CI branch 21.0 2025-03-02 11:51:53 +01:00
Frédéric France
45e3a92b0e fix phan 2025-03-01 20:41:58 +01:00
Frédéric France
13b1705503 fix phan 2025-03-01 20:32:33 +01:00
Frédéric France
9b4dbc2282 fix phan 2025-03-01 20:21:51 +01:00
Frédéric France
d94333fa75 fix phan 2025-03-01 20:09:52 +01:00
Frédéric France
43d9a7d086 fix phan 2025-03-01 20:00:51 +01:00
Frédéric France
598af6576c fix phan 2025-03-01 20:00:34 +01:00
MDW
116913abeb Qual: Fix unmatchedArgment* 2025-03-01 11:48:28 +01:00
Alexandre SPANGARO
a71ae83f2a Merge branch 'develop' into 22_catinvoice 2025-03-01 10:30:08 +01:00
Laurent Destailleur
e3b52283af Merge pull request #33225 from OPEN-DSI/develop_new_customer_price_period_and_discount
NEW: Add management of date begin/end and discount for a customer price (Code)
2025-03-01 00:44:26 +01:00
Laurent Destailleur
3badfffd9f Merge pull request #33267 from mdeweerd/fix/phan/dolibarrmodules
Qual: Fix DolibarrModules::_init phpdoc type
2025-03-01 00:17:09 +01:00
JonathanBtq
ee8fe3a324 New hooks expedition PDF espadon
I add the PrintPDFline hook on expedition espadon PDF
2025-02-28 10:57:36 +01:00
Kamel Khelifa
ce1b38e984 Corrections 2025-02-28 09:48:29 +01:00
MDW
1608b66742 Qual: Fix DolibarrModules::_init phpdoc type 2025-02-27 18:57:03 +01:00
omogenot
9bc2d08ab1 Update export_excel2007.modules.php
Fix Excel Export for zero values
2025-02-27 17:21:31 +01:00
Laurent Destailleur
1941404e19 Merge branch 'develop' into 22_catinvoice 2025-02-27 15:27:11 +01:00
Laurent Destailleur
c82b0c1d19 Update mod_member_simple.php 2025-02-27 15:25:22 +01:00
Frédéric FRANCE
dbcfd2eadb Update pdf_cornas.modules.php 2025-02-27 14:17:30 +01:00
Frédéric FRANCE
6be225c373 fix CI 2025-02-27 12:13:01 +01:00
Alexandre SPANGARO
7eb0f22084 CI 2025-02-27 10:01:05 +01:00
Alexandre SPANGARO
fab5a0693a CI 2025-02-27 09:37:55 +01:00
Regis Houssin
13d2806f0c FIX invalid input syntax for type integer: '(PROV)' 2025-02-27 08:57:13 +01:00
Alexandre SPANGARO
d58fbd8eb4 NEW Add invoice tags 2025-02-27 06:51:00 +01:00
Laurent Destailleur
65a194650b Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-27 02:28:28 +01:00
Laurent Destailleur
3a79a0b6c2 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-02-27 02:26:29 +01:00
Laurent Destailleur
0b3d3c3a2b Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-27 02:06:35 +01:00
Laurent Destailleur
ffaa008337 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-02-26 22:51:29 +01:00
ldestailleur
05e0462a9a NEW Module WebPortal is moved as stable 2025-02-25 16:51:03 +01:00
Kamel Khelifa
7ba21bd23d NEW: Add management of date begin/end and discount for a customer price (Code) 2025-02-25 15:09:05 +01:00
ldestailleur
e1e8a76805 Fix regression after removal of $conf 2025-02-24 16:45:13 +01:00
Noé Cendrier
1167ea5d82 Merge pull request #28 from altairis-melina/import_export_customer_level_price
ADD: Add to the import of price level extrafields, to be able to export customer price extrafields, to be able to choose the price level by having the customer prices
2025-02-24 15:49:33 +01:00
Mélina JOUM
50dcd9a3cf ADD: Import the price level extrafields and export the customer price extrafields 2025-02-24 10:03:51 +01:00
ldestailleur
abcd0d2cf2 Qual: Clean code related to categories 2025-02-23 19:42:49 +01:00
Laurent Destailleur
b21a596cf2 Fix bad constant name PDF_ERATOSTHENE_ADD_POSITION 2025-02-22 20:08:17 +01:00
ldestailleur
f199d3fd61 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-21 15:46:33 +01:00
ldestailleur
344eca46ef Debug v21 - Fix pb with detection of situation invoices 2025-02-21 15:34:58 +01:00
Laurent Destailleur
15e11d731e Merge branch '20.0' into FIX/20/PDFCornas_FIXPageBreak 2025-02-21 11:54:41 +01:00
ldestailleur
0dd57bdada Fix signature 2025-02-21 11:53:57 +01:00
Mélina JOUM
7c20c7a7c0 ADD: Allow import and export of customer prices and price level together 2025-02-20 16:32:36 +01:00
atm-lena
0846a1de2e FIX Corna PDF : error break page 2025-02-20 12:42:53 +01:00
MDW
891e11d692 Qual: Enable and fix phan notices for scripts
# Qual: Enable and fix phan notices for scripts

phpstan is already enable on scripts, so there is no reason to not
enable phan.
This enables phan and fixes the notices at the same time
2025-02-18 16:33:41 +01:00
Laurent Destailleur
fc610a0adf Merge pull request #33092 from mdeweerd/phan/2025.2.14.societe-1
Qual: Fix phan notices (societe)
2025-02-17 19:45:38 +01:00
yannis
36a082e543 Fix PDF generation 2025-02-17 17:21:35 +01:00
Laurent Destailleur
417f10c99d Update modCategorie.class.php 2025-02-17 16:08:20 +01:00
Laurent Destailleur
1e4a9bfe9b Update modCategorie.class.php 2025-02-17 14:41:01 +01:00