William Mead
02eadb29fc
FIX #25458 intervention localizations (backport v17) ( #26757 )
...
* Fix reopen button localization. Added contributor details.
* Added EN done localization
* Added FR done localization
---------
Co-authored-by: William Mead <william.mead@manchenumerique.fr>
2023-11-20 20:19:43 +01:00
Laurent Destailleur
146c78a3de
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2023-11-20 19:54:27 +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
Florian Mortgat
564d930d33
FIX escape HTML tags in return value of getFullName() ( #26735 )
2023-11-18 23:55:25 +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
IC-Ilies
4d0230a8d4
FIX#25399 ( #26694 )
2023-11-18 12:11:25 +01:00
Maxime Kohlhaas
05884f9b6a
Fix : we can't use the reserved word offset ( #26705 )
2023-11-18 12:10:04 +01:00
Laurent Destailleur
e0bffbb7d9
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2023-11-18 01:25:36 +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
d7851240b4
Fix : on supplier order, vat for all lines wasn't working with 0 value ( #26675 )
2023-11-17 16:27:00 +01:00
Laurent Destailleur
3a0b3fd8a8
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2023-11-17 12:02:36 +01:00
Laurent Destailleur
6ea48ac22a
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2023-11-17 12:02:21 +01:00
HENRY Florian
102356d2c4
fix: When sendmail failed it return false, result is KO, need to say it to user ( #26631 )
...
* fix: When sendmail failed it return false, need to be tested as is
* fix: When sendmail failed it return false, so >=0 do not trigger error
* fix: When sendmail failed it return false, so >=0 do not trigger error
* Update CMailFile.class.php
* Update actions_sendmails.inc.php
* Update actions_sendmails.inc.php
* Update CMailFile.class.php
---------
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-17 12:01:03 +01:00
Laurent Destailleur
7c68dc3d1e
Fix phpcs
2023-11-17 01:17:23 +01:00
Laurent Destailleur
144be811fc
Fix phpcs
2023-11-17 00:54:15 +01:00
Maxime Kohlhaas
de0b733430
Fix : missing getEntity for hrm public holiday ( #26627 )
2023-11-16 23:27:20 +01:00
Laurent Destailleur
bc70788ace
Fix phpcs
2023-11-16 15:49:21 +01:00
MDW
c4542895d7
Fix recurrent supplier invoice generation (title) ( #26601 )
2023-11-16 15:43:48 +01:00
HENRY Florian
7c43aa86c9
fix: mising delete inventory perms with MAIN_USE_ADVANCED_PERMS ( #26617 )
...
* fix: mising delete inventory perms
* fix: mising delete inventory perms
2023-11-16 15:31:20 +01:00
Günter Lukas
06915267a7
Fix #26620 ( #26622 )
...
Fix calculation of total amount of multicurrency
2023-11-16 14:59:07 +01:00
atm-sami
966e26e450
FIX add display of an error when attempting to delete a committed transaction ( #26573 )
...
* add display of an error when attempting to delete a committed transaction
* update
2023-11-14 14:53:40 +01:00
Laurent Destailleur
201ad75360
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
...
Conflicts:
htdocs/accountancy/journal/expensereportsjournal.php
2023-11-12 23:02:18 +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
Alexandre SPANGARO
cc452f2136
FIX Accountancy - Possibility to write in bookkeeping expense report operation with some line not bound ( #26545 )
...
* FIX Accountancy - Possibility to write in bookkeeping expense report operation with some line not bound
* Update expensereportsjournal.php
---------
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-12 22:16:47 +01:00
HENRY Florian
caf41ca9ff
fix: display stock mvt in inventories done ( #26527 )
2023-11-10 18:51:22 +01:00
atm-lena
0946220e9b
Check price base type ( #26503 )
...
Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
2023-11-09 15:41:39 +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
05f42d1341
Fix phpcs
2023-11-08 11:15:23 +01:00
Florian Mortgat
835cf9bbc7
FIX v17: Param $notrigger in $societe->create() causes method to return true regardless of actual result of database functions ( #26499 )
2023-11-07 19:02:18 +01:00
Regis Houssin
56e9df9091
FIX avoid warning : Cannot use a scalar value as an array ( #26437 )
2023-11-07 18:53:37 +01:00
Pichi1966
7a7869aeb3
FIX # Bug Estimated Stock at date value in V14 ( #26479 )
...
In stockatdate page, the estimatedvalue is wrong. Backport of V17 solution as explained in #23782
2023-11-07 18:10:37 +01:00
Benjamin Falière
b5e5b1d4c6
FIX commande context ( #26497 )
...
Co-authored-by: Benjamin Falière <benjamin.faliere@altairis.fr>
2023-11-07 17:50:48 +01:00
Laurent Destailleur
e64d1f6e46
Fix phpcs
2023-11-06 00:16:26 +01:00
Laurent Destailleur
76b48d43c3
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2023-11-05 19:49:32 +01:00
Laurent Destailleur
2f24ccaa19
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2023-11-05 19:48:05 +01:00
Laurent Destailleur
cfe1b17a76
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2023-11-05 19:47:33 +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
2462daf1ed
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2023-11-05 19:36:01 +01:00
Laurent Destailleur
9c7381601f
Backport or better module compatibility
2023-11-05 19:35:34 +01:00
Laurent Destailleur
35a25599e5
FIX Backport memory fix for fatal error when +100000 products
2023-11-05 19:28:04 +01:00
daraelmin
301064afb6
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2023-11-02 01:36:00 +01:00
daraelmin
2ce3ececfb
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2023-11-02 01:35:38 +01:00
atm-adrien
eeca89c75b
FIX : HTML in ODT templates ( #26181 )
...
* FIX : HTML does not work on ODT template
* FIX : add replace
* FIX : Backport V18
* FIX : Modif regexp
* FIX : Add encode parameter
* FIX : PR returns
2023-10-31 12:20:43 +01:00
atm-lena
9bfeb5e424
Add Hook "printFieldListFrom" in supplier order list ( #26376 )
...
Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
2023-10-26 17:13:36 +02:00
Laurent Destailleur
e080261e25
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2023-10-26 13:46:17 +02:00
Laurent Destailleur
54ead1cc84
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2023-10-26 13:45:53 +02:00
Laurent Destailleur
1369867db9
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2023-10-26 13:45:45 +02:00