2
0
forked from Wavyzz/dolibarr
Commit Graph

30861 Commits

Author SHA1 Message Date
Laurent Destailleur
aefe12f01b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-17 16:15:46 +01:00
Laurent Destailleur
711bf2e6a8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-02-17 16:14:23 +01:00
gautier
c7746bd6f1 modification on leftmenu by hook not applied
related to #23916
-usage of $hookmanager->resArray instead of $hookmanager->results
2023-02-17 16:09:56 +01:00
Laurent Destailleur
72f4be364e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-17 16:05:26 +01:00
Laurent Destailleur
e489e10b65 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-17 16:05:12 +01:00
Laurent Destailleur
706b95891e Merge pull request #23942 from atm-gauthier/NEW/develop_objets_referents_lots
NEW : referential objects of batch
2023-02-17 15:51:19 +01:00
Gauthier PC portable 024
13a3075ffb Merge branch 'NEW/develop_objets_referents_lots' of github.com:atm-gauthier/dolibarr into NEW/develop_objets_referents_lots 2023-02-17 10:28:09 +01:00
Gauthier PC portable 024
7022f8217c Merge branch 'NEW/17.0_objets_referents_lots' of github.com:atm-gauthier/dolibarr into NEW/develop_objets_referents_lots 2023-02-17 10:27:11 +01:00
Gauthier PC portable 024
8534a96981 FIX : stickler feedbacks 2023-02-17 10:24:59 +01:00
Eric
81ff493622 Merge branch 'Dolibarr:develop' into new_add_css_editor_to_admin_ihm 2023-02-17 10:18:29 +01:00
Gauthier PC portable 024
8e2998a504 NEW : dev name 2023-02-17 10:12:19 +01:00
stickler-ci
40f52afb9e Fixing style errors. 2023-02-17 09:06:07 +00:00
Gauthier PC portable 024
ebee6ff6c2 Merge branch 'NEW/17.0_objets_referents_lots' of github.com:atm-gauthier/dolibarr into NEW/develop_objets_referents_lots 2023-02-17 09:46:25 +01:00
Gauthier PC portable 024
3b2d3dc6a6 NEW : batch referential objets 2023-02-17 09:44:38 +01:00
Laurent Destailleur
5c0ace0c89 Fix use absolute links for hreflang links 2023-02-17 02:44:33 +01:00
Eric Seigne
3581f14b40 NEW: add customize CSS in admin/ihm settings 2023-02-17 00:29:14 +01:00
Laurent Destailleur
f8c3b9ff5b Fix trans of "d" 2023-02-16 22:11:41 +01:00
Frédéric FRANCE
4a7e9a2076 Update commondocgenerator.class.php 2023-02-16 21:54:42 +01:00
Eric Seigne
bf9a44ac6f msg is not defined 2023-02-16 21:48:55 +01:00
Eric Seigne
86e2f46fe7 addr_bcc could be set 2023-02-16 21:46:27 +01:00
Eric Seigne
3a58e025ba better logs 2023-02-16 21:44:38 +01:00
Laurent Destailleur
d8e59ab19c Merge pull request #23898 from frederic34/membertooltip
enhance member tooltip
2023-02-16 21:42:27 +01:00
Laurent Destailleur
085fdb8749 Merge pull request #23901 from henrydewaziers/patch-1
add on common doc generator user attributs
2023-02-16 21:39:19 +01:00
Laurent Destailleur
8df636c4f6 Update commondocgenerator.class.php 2023-02-16 21:39:06 +01:00
Laurent Destailleur
396c7b5d33 Merge pull request #23904 from hregis/fix_php8_compatibility
FIX multicompany compatibility
2023-02-16 21:36:09 +01:00
Laurent Destailleur
77ada5eebb Merge pull request #23902 from BB2A/FIX---Shipping-address-fetch-thirdparty
FIX - Shipping address fetch-thirdparty
2023-02-16 21:29:53 +01:00
Frédéric FRANCE
8765e00e00 Merge remote-tracking branch 'upstream/develop' into membertooltip 2023-02-16 21:27:56 +01:00
Laurent Destailleur
b0b5d0b2e3 Merge pull request #23907 from frederic34/patch-7
Use recent model by default
2023-02-16 21:23:56 +01:00
Laurent Destailleur
2397fb0125 Merge pull request #23912 from frederic34/fixuserrights
use user->hasRight
2023-02-16 21:12:04 +01:00
Laurent Destailleur
7cefd3c6ec Merge pull request #23919 from hregis/fix_multiple_php8_compatibility
FIX wrong url param name action
2023-02-16 21:10:35 +01:00
Regis Houssin
33e345a280 FIX missing getEntity filter 2023-02-16 15:51:55 +01:00
stickler-ci
2f1afba116 Fixing style errors. 2023-02-16 11:04:59 +00:00
lmarcouiller
b9e3cd9812 add verification if file already uploaded 2023-02-16 12:01:34 +01:00
lmarcouiller
8fe9ebf5be Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop#1 2023-02-16 11:26:21 +01:00
marcusdeangabriel
f39d32255c Merge branch 'Dolibarr:develop' into PROPALE_MODIFY_MARGIN_RATES 2023-02-16 10:28:44 +01:00
Laurent Destailleur
267ef1986d Return better message when decrypt key is empty 2023-02-16 04:25:11 +01:00
Laurent Destailleur
e36ed66c07 Fix warning 2023-02-16 04:21:56 +01:00
Laurent Destailleur
ffa5806648 Add log before sending email 2023-02-16 02:59:29 +01:00
Laurent Destailleur
27552f6706 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-16 02:27:44 +01:00
Laurent Destailleur
a3377113ae Fix warnings 2023-02-16 02:26:08 +01:00
Laurent Destailleur
ec706fa13e CSS 2023-02-16 00:42:19 +01:00
Eric Seigne
6163f84d25 move log after variable updates to get good informations in logs 2023-02-15 22:10:03 +01:00
Frédéric FRANCE
fa3cf47165 Merge remote-tracking branch 'upstream/develop' into membertooltip 2023-02-15 15:46:22 +01:00
stickler-ci
3c7333f3e1 Fixing style errors. 2023-02-15 14:16:18 +00:00
lmarcouiller
5347d900e1 finish flowjs process server side 2023-02-15 15:06:32 +01:00
Regis Houssin
7653a7126b FIX wrong url param name action 2023-02-15 13:50:24 +01:00
Frédéric FRANCE
ed45a41ee8 use isModEnabled 2023-02-14 23:06:13 +01:00
Frédéric FRANCE
03e8ee0e6d use user->hasRight 2023-02-14 23:00:15 +01:00
Frédéric FRANCE
ae48571135 use user->hasRight 2023-02-14 22:56:12 +01:00
Laurent Destailleur
a0c53bc0bc Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-14 21:04:44 +01:00