Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
140,250 Commits 36 Branches 189 Tags
901b9dab72357dad4e162f94d6b53e1e84d20dd5
Commit Graph

14028 Commits

Author SHA1 Message Date
Laurent Destailleur
c9b92bb32d Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-25 18:21:47 +02:00
Laurent Destailleur
6b076821e3 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-25 18:20:01 +02:00
Laurent Destailleur
f4611fcec9 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-07-25 18:06:37 +02:00
Laurent Destailleur
54e087f8e5 FIX #30467 2024-07-25 18:00:18 +02:00
Laurent Destailleur
f09c99dfc3 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-24 14:17:47 +02:00
Laurent Destailleur
b3016065ba Debug v20 2024-07-24 04:19:47 +02:00
Laurent Destailleur
5513b573b0 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-24 04:06:06 +02:00
Laurent Destailleur
16e48da91e Fix CTI 2024-07-23 19:35:06 +02:00
Laurent Destailleur
0a07681332 Fix label of type of event not consistent between screen 2024-07-23 11:49:06 +02:00
Laurent Destailleur
403fcd234e Debug v20 2024-07-22 21:49:47 +02:00
Laurent Destailleur
6ed6900c79 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-22 16:46:40 +02:00
Laurent Destailleur
3633762298 Fix dolPrintHTML when MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY is off 2024-07-22 16:36:24 +02:00
Laurent Destailleur
8d7e2d7aa0 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-22 13:23:00 +02:00
Laurent Destailleur
940b946dfb Debug v20 2024-07-22 13:19:35 +02:00
Laurent Destailleur
e0d6d2d7c7 Fix bad tooltip when option SERVICE_STRICT_MANDATORY_PERIOD is on 2024-07-22 11:44:00 +02:00
Laurent Destailleur
f1cfbb68c6 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-22 11:23:41 +02:00
Laurent Destailleur
53bca480a1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2024-07-21 14:56:20 +02:00
Laurent Destailleur
1bb6be158b CSS 2024-07-21 02:45:42 +02:00
Eric - CAP-REL
799f9f5e08 new option for elephant (#30273) 
* new option for elephant

* fix typo in comment for codespell check

* Update mod_codeclient_elephant.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-07-21 02:29:03 +02:00
MaximilienR-easya
66d8bc4f01 NEW Module to setup OpenID Connect module (#30317) 
* import openid connect custom module phase 1

* indent fix

* fix ci

* Fix ci

* Fix

* add missing lang file

* lang file

* Multiple fix: callback url overwriten by a js.php from a module, admin page path fix, add a field to set MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM

* windows-ci friendly modification

* windows-ci friendly modification

* comment

* Fix precommit

* Fix precommit

* Fix precommit

* Fix precommit

* Update lang file and conditions

* Update functions_openid_connect.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-07-21 02:12:03 +02:00
Laurent Destailleur
33a2c49e1d Debug v20 - Fix amount of membership payments 2024-07-20 16:01:54 +02:00
Laurent Destailleur
442e798002 Debug v20 - Fix option ADHERENT_CREATE_EXTERNAL_USER_LOGIN. 2024-07-20 13:59:26 +02:00
Laurent Destailleur
23bfc5d153 Fix trans of option 2024-07-20 12:06:05 +02:00
Laurent Destailleur
1496043967 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-18 19:17:46 +02:00
Laurent Destailleur
14f44052ee Fix translation wrong. Missing empty line. 2024-07-18 18:10:14 +02:00
Laurent Destailleur
b303be54fd Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-18 02:41:28 +02:00
lamrani abdelwadoud
56667da139 New Export stock inventory (#30401) 
* New Export stock with correction

* Fix Travis CI errors
 2024-07-18 00:45:23 +02:00
Laurent Destailleur
948fecb9b5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2024-07-17 14:01:44 +02:00
Sami Filali
22def4f35a Fix #30298 - billing contact in supplier proposal (#30404) 
* add external contact with billing code in supplier_proposal pdf

* update with pr returns

* Update pdf_other.php

* fix inversing condition

* Update pdf_other.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-07-16 22:35:09 +02:00
Sami Filali
4aa5e4578a NEW : add option to add external billing contact on the supplier_proposal pdf (#30298) 
* add external contact with billing code in supplier_proposal pdf

* update with pr returns

* Update pdf_other.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-07-16 22:09:39 +02:00
Francis Appels
82589285e7 Fix missing translation key for orders. (#30395) 2024-07-16 21:52:30 +02:00
sonikf
2060103af3 translation better syntax (#30402) 
* Better syntax

* better syntax
 2024-07-16 21:40:55 +02:00
Laurent Destailleur
811f4b6c15 WIP Work on custom local bridge AI 2024-07-16 18:08:26 +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
Laurent Destailleur
daa883de63 Sync transifex 2024-07-16 10:20:34 +02:00
Laurent Destailleur
197f7a1632 Trans 2024-07-16 09:58:10 +02:00
Laurent Destailleur
0a7df365fc Sync transifex 2024-07-16 04:59:25 +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
Laurent Destailleur
6c5fb300ca Fix tooltip 2024-07-15 23:38:34 +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
Laurent Destailleur
bd57bcf617 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-15 19:52:31 +02:00
Laurent Destailleur
78ac402856 Fix css for etrafields text 2024-07-15 18:50:26 +02:00
Laurent Destailleur
ac1704ec49 Clean menu for AI generation modes 2024-07-15 13:40:55 +02:00
Laurent Destailleur
d16101d037 Sync translation 2024-07-14 20:12:46 +02:00
Laurent Destailleur
680a776a26 Better information on security page 2024-07-13 01:09:22 +02:00
Laurent Destailleur
fb5bda01b2 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-06 00:51:24 +02:00