2
0
forked from Wavyzz/dolibarr
Commit Graph

8927 Commits

Author SHA1 Message Date
ThomasNgr-OpenDSI
de49d24d1b QUAL Remove duplicate code block (#35591)
* QUAL Remove duplicate code block

* fix PHPStan

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-10-03 10:04:27 +02:00
Laurent Destailleur
d26fb57e52 Fix CI 2025-10-02 16:28:29 +02:00
ldestailleur
fe28e36638 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-09-27 15:42:44 +02:00
Joachim Kueter
16c9d4005f Fix #35208 - Multicurrency fix for discount in invoice (Sponge) (#35506)
* Multicurrency fix for discount

* removed empty line
2025-09-27 12:10:15 +02:00
Benjamin Chanudet
53aae1a4b8 FIX #35147 SQL Error on Beluga Export when ExpenseReport is enabled (#35149)
* Fix SQL error when ExpenseReport module is enabled (#35147)

* fix date filtering that prevents data to be displayed

* add date and amount for expense reports

* Update pdf_beluga.modules.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-01 20:33:12 +02:00
ldestailleur
ec669eef2a Duplicate lines 2025-08-07 16:18:45 +02:00
ldestailleur
990462fb9a Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-08-07 16:18:25 +02:00
Joachim Kueter
da56360404 Fix for issue #34891 - wrong Skonto/Escompte calculation (#34892)
When foreign currency is involved, the wrong total was used, mixing two currencies when calculating the sum.
2025-08-07 12:25:59 +02:00
ldestailleur
6c960ffbaf Fix translation 2025-07-27 13:54:02 +02:00
ldestailleur
17a0ec87fe Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-22 17:25:29 +02:00
ldestailleur
743ca4bb03 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-06-22 17:19:41 +02:00
ldestailleur
5042c0959e Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-06-22 17:16:51 +02:00
Marc
52c827c2bb FIX #34541 (#34597) 2025-06-21 14:35:20 +02:00
sonikf
89c1a741a7 backport #b0b2442 to v. 21 also apply fix for invoices (#34325)
* backport #b0b2442 to v. 21

* backport #b0b2442 to v. 21

* fix shipment contact same as in #b0b2442

* fix shipment contact same as in #b0b2442

* fix shipment contact same as in #b0b2442
2025-06-04 11:15:44 +02:00
ldestailleur
ae94c71a10 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-05-10 13:25:31 +02:00
ldestailleur
445f089556 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-05-10 12:53:37 +02:00
Frédéric FRANCE
223f0c2763 fix translation (#34086) 2025-05-09 23:46:07 +02:00
ldestailleur
a74979bc04 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-05-05 00:04:17 +02:00
Noé Cendrier
7c29f8201b FIX: do not forget extrafields for BOM in export lines (#34020) 2025-05-04 18:42:45 +02:00
ldestailleur
174d6497b3 Signed-off-by: ldestailleur <eldy@destailleur.fr> 2025-04-03 21:04:35 +02:00
atm-irvine
87b254e0fd Fix pdf einstein automatic calculation (#33713)
* fix(pdf-einstein): let automatic calculation for pos

* removed ;
2025-04-03 17:12:28 +02:00
ldestailleur
635ce3de85 Fix bad directory for sql files 2025-03-25 19:05:49 +01:00
Vincent Quintin
7c3aa76fc8 Fix: Correct search_fk_statut=openall (#33523) 2025-03-19 14:14:33 +01:00
ldestailleur
3c4c5f1c75 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-03-14 12:33:40 +01:00
Ferran Marcet
82a598d60c Fix: Not loading langs correctly (#33441) 2025-03-13 23:03:26 +01:00
atm-GregM
8942380605 #FIX : datenextrun for CRON (#30724)
* FIX : datenextrun for CRON

* FIX : CRON datenextrun

* replace by idate

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-13 11:11:17 +01:00
ldestailleur
63dd269dfa SEC FIX Reflected XSS reported by 柏天浩 2025-03-11 10:43:25 +01:00
ldestailleur
7a995646e1 Fix bad property name 2025-03-05 18:13:20 +01:00
omogenot
c562c6ebab Add is_numeric condition to check empty values 2025-03-05 13:39:50 +01:00
omogenot
c0c49f53cb Update export_excel2007.modules.php
Fix Excel Export for zero values
2025-03-05 13:39:29 +01:00
ldestailleur
fd970b582a Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-03 16:58:17 +01:00
ldestailleur
ebe11cde51 Debug pdf (calculation of free text height) 2025-03-03 14:42:15 +01:00
ldestailleur
778482d4be Fix bad link to payment (forum
https://www.dolibarr.fr/forum/t/liens-de-paiement-sur-les-pdf/46733/28)
2025-03-03 03:11:27 +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
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
Laurent Destailleur
c82b0c1d19 Update mod_member_simple.php 2025-02-27 15:25:22 +01:00
Regis Houssin
13d2806f0c FIX invalid input syntax for type integer: '(PROV)' 2025-02-27 08:57:13 +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
ffaa008337 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-02-26 22:51:29 +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
Laurent Destailleur
b21a596cf2 Fix bad constant name PDF_ERATOSTHENE_ADD_POSITION 2025-02-22 20:08:17 +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
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