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
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
MDW
5035580e56
Qual: Fix phan notices (societe)
2025-02-17 09:44:12 +01:00
Laurent Destailleur
8402394e5b
Merge branch 'develop' into feat-order-tags
2025-02-17 04:06:32 +01:00
ldestailleur
7fc8136362
Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop
2025-02-16 14:50:09 +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
Florent Poinsaut
fa512af180
NEW #22848 FIx phpstan alert
2025-02-14 15:46:40 +01:00
Florent Poinsaut
c8cc7884e4
NEW #22848 Fix CI
2025-02-14 14:35:44 +01:00
Florent Poinsaut
05a11b7cef
NEW Dolibarr#22848 typo
2025-02-14 14:35:36 +01:00
Florent Poinsaut
941e703e34
NEW #22848 Fix doc
2025-02-14 14:34:42 +01:00
Florent Poinsaut
6dcb53f4c3
NEW #22848 Fix link between invoice and order and tags export / import
2025-02-14 14:34:23 +01:00
Florent Poinsaut
8152d88b00
NEW #22848 Add import and export functions
2025-02-14 14:30:40 +01:00
Laurent Destailleur (aka Eldy)
d223f8a0b9
Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop
2025-02-13 20:42:23 +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
Lucas Marcouiller
4b45e7ac64
Merge branch 'develop' into new-duplicate-pdf-configuration-for-order-in-sepcific-page
2025-02-13 11:42:52 +01:00
Laurent Destailleur
335da91c65
Merge branch 'develop' into fix_time_pdf_time_spent
2025-02-12 22:59:10 +01:00
Laurent Destailleur (aka Eldy)
073a6eeae3
NEW Add options PDF_XXX_SHOW_PRICE_INCL_TAX into PDF setup
2025-02-12 21:02:50 +01:00
Noé Cendrier
96fdc43e8b
Merge branch 'develop' into fix_time_pdf_time_spent
2025-02-12 10:37:28 +01:00
Hystepik
64cbc2ca22
fix to be more constant
2025-02-12 10:32:35 +01:00
Noé Cendrier
630caa0562
FIX: project time spent in ODT template
2025-02-12 10:13:29 +01:00
Hystepik
9675b95fa3
New duplicate order's pdf / terms and condition of sale configuration in order module configuration
2025-02-12 10:02:39 +01:00
Mélina JOUM
517959f7cf
FIX: Time spent for timespent PDF
2025-02-11 16:59:38 +01:00
Lucas Marcouiller
9efeead27b
Merge branch 'develop' into new-move-of-pdf-configuration-in-sepcific-page
2025-02-11 11:44:05 +01:00
Lucas Marcouiller
a0812cf7be
Merge branch 'develop' into new-move-of-pdf-configuration-in-sepcific-page
2025-02-11 09:18:47 +01:00
MDW
928402c847
Qual: Fix phan (project-1)
2025-02-11 00:22:39 +01:00
MDW
076399b11b
Qual: Fix phan (stock-2)
2025-02-10 21:20:32 +01:00
Hystepik
996109e9be
New move pdf configuration in propal module configuration
2025-02-10 15:12:55 +01:00
MDW
2130f1395a
Qual: Fix phan (product-part-1) implies fixing unit types
2025-02-09 20:14:20 +01:00
MDW
8a2a1331f7
Qual: Fix phan (printing)
2025-02-08 14:24:26 +01:00