Delthair
9ab1f56f83
Update expensereport.lib.php ( #28553 )
...
ISSUE #28552
2024-03-01 18:49:37 +01:00
Laurent Destailleur
88da45d9dd
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2024-02-22 00:16:14 +01:00
Laurent Destailleur
a76eafa0d4
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2024-02-22 00:15:35 +01:00
Laurent Destailleur
8c2a910a94
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2024-02-22 00:13:59 +01:00
Saami PERDRIX
52646ee9f5
fix aperçu/dl fichier quand il est dans {userid}/temp ( #27211 )
2024-02-22 00:10:04 +01:00
Laurent Destailleur
792606925f
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
...
Conflicts:
htdocs/core/class/extrafields.class.php
2024-02-07 17:50:38 +01:00
Laurent Destailleur
5a756ffc4c
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
...
Conflicts:
htdocs/takepos/invoice.php
2024-02-07 17:44:39 +01:00
Laurent Destailleur
ab585b6efc
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2024-02-01 12:11:25 +01:00
Eric Seigne
1f21e1a945
fix #27883 : zero could be a value stored
2024-01-30 21:42:57 +01:00
Laurent Destailleur
fcf024ef4f
Merge pull request #27742 from FHenry/17_fix_online_link
...
fix: onligne Signaturelink is bad for locaorexternal
2024-01-23 17:13:44 +01:00
Florian HENRY
a5422d2fc4
fix: onligne Signaturelink is bad for locaorexternal
2024-01-23 11:37:44 +01:00
Florian HENRY
26bb72d12f
FIX: filter by entity on contact is missing
2024-01-19 09:17:21 +01:00
Florian HENRY
d04cfa89ce
FIX: filter by entity on contact is missing
2024-01-19 09:15:30 +01:00
Laurent Destailleur
a2cdfa5492
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2024-01-18 15:59:40 +01:00
Laurent Destailleur
387a06fdc5
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2024-01-18 15:59:10 +01:00
Laurent Destailleur
7c0ccba344
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2024-01-18 15:58:19 +01:00
Eric Seigne
5a04b2393d
end fix #10417 : custom payment number for supplier invoices
2024-01-15 18:43:17 +01:00
Laurent Destailleur
3294b721ac
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2023-11-23 18:46:57 +01:00
atm-jonathan
48ba0ec2d0
FIX warning param $lineID getSpecialCode is negatif ( #26826 )
...
* FIX warning param $lineID getSpecialCode is negatif
* retour de PR
---------
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr >
2023-11-23 17:12:57 +01:00
atm-jonathan
253ebd0a8b
FIX warning php8.2 undefined_array_key ( #26830 )
2023-11-23 17:08:07 +01:00
Laurent Destailleur
d1a80920ff
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2023-11-20 19:53:50 +01:00
Maxime Kohlhaas
ef1916f0db
Fix : translated product desc was overwriting desc even if text was added after ( #26687 )
2023-11-18 14:15:34 +01:00
Laurent Destailleur
1b91a9f83b
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2023-11-18 01:24:59 +01:00
Maxime Kohlhaas
a680d1e34d
Fix strpos inversion for expedition and receipt in files.lib ( #26701 )
2023-11-18 00:42:15 +01:00
Maxime Kohlhaas
de0b733430
Fix : missing getEntity for hrm public holiday ( #26627 )
2023-11-16 23:27:20 +01:00
Laurent Destailleur
bd2285ab91
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2023-11-12 22:58:37 +01:00
Laurent Destailleur
1dbb3f1f34
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
...
Conflicts:
htdocs/product/stock/stockatdate.php
2023-11-12 22:58:23 +01:00
Laurent Destailleur
17ca6f651c
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2023-11-12 22:18:06 +01:00
lvessiller-opendsi
785c85205b
FIX substitute project variables in invoice documents ( #26445 )
...
* FIX substitute project variables in invoice documents
* Keep key to substitute if no link with project
2023-11-08 17:32:23 +01:00
Laurent Destailleur
1a2e49cebe
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2023-11-05 19:45:42 +01:00
Laurent Destailleur
9c7381601f
Backport or better module compatibility
2023-11-05 19:35:34 +01:00
HENRY Florian
7e3b098f78
fix: when option MAIN_USE_COMPANY_NAME_OF_CONTACT is set the VAT num have to be the VAT num of thirdparty of contact ( #26371 )
2023-10-26 12:28:00 +02:00
Andrés Maldonado
54a0245c4d
FIX: modification of complementary attributes in commercial proposals
...
The db object must not be cloned in order to avoid a PHP Fatal error: Uncaught Exception: Serialization of 'PgSql\Connection' is not allowed
This commit replaces the dol_clone function by the one in the 17.0 branch
2023-10-04 17:48:30 +02:00
Laurent Destailleur
2a96ac6428
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2023-10-04 13:02:09 +02:00
Laurent Destailleur
342cdc81ac
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2023-10-04 13:01:09 +02:00
Laurent Destailleur
a201f54777
css
2023-10-04 12:59:00 +02:00
Laurent Destailleur
a2ea4d77c3
Merge
2023-10-04 10:43:14 +02:00
Laurent Destailleur
0a015a82b4
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2023-10-04 10:39:40 +02:00
Laurent Destailleur
9ac5270626
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
...
Conflicts:
htdocs/core/lib/signature.lib.php
2023-10-04 10:38:46 +02:00
Laurent Destailleur
8fc2beda1f
Fix regression
2023-10-04 10:36:07 +02:00
Laurent Destailleur
f6f25e1117
Fix regression
2023-10-04 10:34:47 +02:00
Laurent Destailleur
517b19cc6f
Fix regression
2023-10-04 10:33:38 +02:00
Laurent Destailleur
726258ff4f
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
...
Conflicts:
htdocs/core/lib/signature.lib.php
2023-10-04 10:32:24 +02:00
Laurent Destailleur
4298150413
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/lib/signature.lib.php
2023-10-04 10:22:33 +02:00
Laurent Destailleur
74f486bd60
Merge pull request #26034 from atm-quentin/FIX_rights_paiement_sc
...
FIX rights paymentsc paiementcharge
2023-10-04 09:47:49 +02:00
Eric Seigne
563cdcefb3
fix #26104 : remove global object
2023-10-04 00:10:19 +02:00
Laurent Destailleur
5e76fea64d
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2023-10-01 15:53:36 +02:00
Laurent Destailleur
5560aab98e
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2023-10-01 15:50:25 +02:00
Laurent Destailleur
b0b3d0e1e0
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2023-10-01 15:43:40 +02:00
Quentin VIAL-GOUTEYRON
f4c6beac74
FIX rights paymentsc paiementcharge
2023-09-26 14:54:15 +02:00