Commit graph

151292 commits

Author SHA1 Message Date
Christophe Battarel
97b4093d22
FIX : allow setDraft on cancelled orders if ORDER_REOPEN_TO_DRAFT is set (#30396)
* Fix missing loading trans file

* FIX : allow setDraft on cancelled orders if ORDER_REOPEN_TO_DRAFT is set

---------

Co-authored-by: Laurent Destailleur <eldy@users.sourceforge.net>
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2024-07-16 21:54:04 +02:00
Francis Appels
82589285e7
Fix missing translation key for orders. (#30395) 2024-07-16 21:52:30 +02:00
Laurent Destailleur
1624e38c3e Add missing comment 2024-07-16 21:48:51 +02:00
sonikf
2060103af3
translation better syntax (#30402)
* Better syntax

* better syntax
2024-07-16 21:40:55 +02:00
Laurent Destailleur
d9962e22ee FIX Import of date with type field from excel files does not work. 2024-07-16 21:38:40 +02:00
Laurent Destailleur
dd93065f41 WIP AI 2024-07-16 18:20:23 +02:00
Laurent Destailleur
547b1d2b25 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-16 18:08:43 +02:00
Laurent Destailleur
811f4b6c15 WIP Work on custom local bridge AI 2024-07-16 18:08:26 +02:00
Shanty
8c4f3534cc
NEW #28871 signed_status to commande (#30359)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-16 15:22:54 +02:00
Laurent Destailleur
2db22206ec Debug v20 2024-07-16 15:22:05 +02:00
Laurent Destailleur
7e172c95b0 css 2024-07-16 15:07:43 +02:00
Alex BORDARAUD
1983c09ba4
Update list.php (#30254)
* Update list.php

Added condition to include client code in the search when the global variable SOCIETE_ADD_REF_IN_LIST is set to 1.

- Modified the SQL query to include 's.code_client' in the search conditions.
- Added check for the global variable SOCIETE_ADD_REF_IN_LIST.
- If SOCIETE_ADD_REF_IN_LIST is 1, 's.code_client' is included in the search along with 's.nom' and 's.name_alias'.
- Ensured that 's.code_client' is searched separately only when SOCIETE_ADD_REF_IN_LIST is 1 and 'search_societe' is not defined.

* Update list.php

* Update list.php

* Update list.php

Refactor: Replace conf->global->SOCIETE_ADD_REF_IN_LIST with getDolGlobalString('SOCIETE_ADD_REF_IN_LIST')

* Update list.php

Simplified SOCIETE_ADD_REF_IN_LIST retrieval

Replaced conditional retrieval with getDolGlobalInt('SOCIETE_ADD_REF_IN_LIST') to simplify code and pass tests.
2024-07-16 14:54:36 +02:00
Laurent Destailleur
19462bf5d5 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-16 14:49:25 +02:00
Laurent Destailleur
3b9681287c Sync transifex 2024-07-16 13:52:22 +02:00
Regis Houssin
f7fff4aae7
FIX missing entity field in holiday types dict (#30392)
* FIX missing entity field in holiday types dict

* FIX sql syntax error
2024-07-16 13:36:49 +02:00
Regis Houssin
eabe6a4b4b
FIX phan error: $nboflines of type int but \urlencode() (#30394)
* FIX phan error: $nboflines of type int but \urlencode()

* FIX same phan error
2024-07-16 13:34:07 +02:00
Bahfir Abbes
c4b21bf741 Fix: position of select key is 2 not 4 (#30374)
Fix: position of select key is 2 not 4
2024-07-16 13:01:08 +02:00
Laurent Destailleur
6e42c6ea9b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-16 13:00:18 +02:00
Bahfir Abbes
6d52e55702
Fix: position of select key is 2 not 4 (#30374)
Fix: position of select key is 2 not 4
2024-07-16 13:00:02 +02:00
Laurent Destailleur
6012418737 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-16 12:53:23 +02:00
Florent Poinsaut
5bee1b43b0 FIX #30377 An external user can see invoices of all compagnies (#30378) 2024-07-16 12:51:04 +02:00
Florent Poinsaut
a3edc5db66
FIX #30377 An external user can see invoices of all compagnies (#30378) 2024-07-16 12:50:37 +02:00
Mohamed DAOUD
e0a8cba937
fix salary (#30388) 2024-07-16 12:42:28 +02:00
Alexandre SPANGARO
99e391302b
Add llxHeader to loans (#30370) 2024-07-16 12:41:53 +02:00
Regis Houssin
226ce3f311
FIX dictionary can not have entity = 0 (#30393) 2024-07-16 12:41:08 +02:00
Sylvain Legrand
8d6d17c18d
fix missing value on fetch (#30390)
info_bits value is missing when fetching rows
2024-07-16 12:39:06 +02:00
Laurent Destailleur
791741cc71 Debug v20 - fix param for filter on boolean 2024-07-16 10:27:51 +02:00
Laurent Destailleur
daa883de63 Sync transifex 2024-07-16 10:20:34 +02:00
Laurent Destailleur
2eae0ca176 Debug v20 - Fix import 2024-07-16 10:18:03 +02:00
Laurent Destailleur
197f7a1632 Trans 2024-07-16 09:58:10 +02:00
Laurent Destailleur
cabe506077 Fix phpunit 2024-07-16 09:51:50 +02:00
Laurent Destailleur
827ae168d5 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-16 09:50:23 +02:00
Laurent Destailleur
6734bd1208 Debug v20 2024-07-16 09:49:54 +02:00
Laurent Destailleur
0a7df365fc Sync transifex 2024-07-16 04:59:25 +02:00
Laurent Destailleur
b943999c34 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-16 04:32:57 +02:00
Laurent Destailleur
5eb090143e Fix link to click to validate expense report 2024-07-16 04:32:24 +02:00
Laurent Destailleur
76a9668e7f Fix page to view translations 2024-07-16 04:12:35 +02:00
Laurent Destailleur
77c2e0a9b1 Sync transifex 2024-07-16 03:18:30 +02:00
Laurent Destailleur
41fe48e465 Transifex sync 2024-07-16 03:03:30 +02:00
Alexandre SPANGARO
20c19080d1
Add llxHeader body css for Holiday (#30375)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-15 23:58:55 +02:00
atm-lena
9bf04d6447
NEW llxHeader CSS Body facture_fourn (#30383)
Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-15 23:58:32 +02:00
Laurent Destailleur
6c5fb300ca Fix tooltip 2024-07-15 23:38:34 +02:00
Laurent Destailleur
ada98813b3 Debug 2024-07-15 22:24:16 +02:00
lamrani abdelwadoud
de5f5f6e35
NEW updating for stock blacklist of words (#30385)
* add input to stock blacklist on ai prompt

* Fix CTI errors

* Fix functionality to add blacklist words

* Update custom_prompt.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-15 21:42:25 +02:00
thibdrev
b020603cd5
qual: use isProduct() and isService() for better code readability (#30387)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-15 21:22:50 +02:00
Noé Cendrier
d2d764f96a FIX: please compare strings with strings (#30345)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-15 21:13:11 +02:00
Noé Cendrier
bd8dd23f58
FIX: please compare strings with strings (#30345)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-15 21:11:50 +02:00
MaximilienR-easya
75d40e6b72
Fix d'une erreur qui survient quand on ne selection aucun entrepot lors d'une recherche avec l'option alerte stock. on fini avec deux conditions d'entrepot qui se contredisent et qui font comme si tous les produits n'avaient aucun stocks (#30382) 2024-07-15 21:07:09 +02:00
atm-lena
061f221bc0
NEW llxHeader CSS body (#30380)
Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
2024-07-15 20:55:13 +02:00
Alexandre SPANGARO
8c9bf40538
Add llxHeader body css for supplier proposals (#30371) 2024-07-15 20:54:51 +02:00