Commit Graph

122559 Commits

Author SHA1 Message Date
Laurent Destailleur
925691ed5c Merge pull request #25108 from frederic34/patch-2
add revision in custom css link
2023-06-16 00:28:19 +02:00
Laurent Destailleur
3f2bd21add Merge pull request #25109 from frederic34/patch-6
add @since doc
2023-06-16 00:26:01 +02:00
Laurent Destailleur
2140e989f8 Merge pull request #25112 from OPEN-DSI/10.4_fix_accountancy_journal_menu
FIX: Fix main and left menu info for the root menu of the list of accountancy journal
2023-06-16 00:25:26 +02:00
Laurent Destailleur
8fa4f4eb9f Merge pull request #25115 from grandoc/new_branch_15_06_23
Fix : Warning: Undefined array key -1 in /home/httpd/vhosts/doliweb.com/htt…
2023-06-16 00:08:47 +02:00
Laurent Destailleur
f1beb265ac Fix compatibility with PHP 7.0 2023-06-15 21:44:54 +02:00
Frédéric France
bd2f54c924 use user hasRight 2023-06-15 20:28:43 +02:00
Frédéric France
c38d851944 Merge remote-tracking branch 'upstream/develop' into 20230614 2023-06-15 20:22:27 +02:00
Philippe GRAND
0686b5c366 Warning: Undefined array key -1 in /home/httpd/vhosts/doliweb.com/httpdocs/projet/graph_opportunities.inc.php on line 91 2023-06-15 16:59:45 +02:00
Laurent Destailleur
dc69e568e1 Fix look and feel v18 2023-06-15 15:05:15 +02:00
kkhelifa
3009cfa628 FIX: Fix main and left menu info for the root menu of the list of accountancy journal 2023-06-15 14:22:07 +02:00
Frédéric FRANCE
5715f3f01b add @since doc 2023-06-15 13:37:42 +02:00
Laurent Destailleur
897bbe8688 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-06-15 13:20:06 +02:00
Laurent Destailleur
f5ee615c9f FIX default value for condition of payment on proposal 2023-06-15 13:19:52 +02:00
Frédéric FRANCE
332098a094 add revision in css link 2023-06-15 12:59:37 +02:00
Laurent Destailleur
886eaa9117 Fix error management and better merging behaviour 2023-06-15 12:48:12 +02:00
Laurent Destailleur
1c2f307812 Merge pull request #25105 from Hystepik/develop_v17#1
Fix : bug with object id -1 in security check
2023-06-15 11:39:50 +02:00
Hystepik
6607dda4a7 Fix : bug with object id -1 in security check 2023-06-15 11:29:14 +02:00
Frédéric FRANCE
0118b4ac89 use user hasRgiht 2023-06-14 20:23:21 +02:00
Frédéric FRANCE
740ac26277 use user hasRight 2023-06-14 19:54:16 +02:00
Hystepik
33f76025f9 Fix #24154 : Description adds linebreak at every Save update 2023-06-14 16:51:23 +02:00
Laurent Destailleur
07ab69150a Fix shortcut key for search 2023-06-14 15:59:53 +02:00
Lamrani Abdel
04ba3e8883 fix path of api file 2023-06-14 15:36:43 +02:00
Benjamin Falière
f3c45d1966 add name 2023-06-14 15:30:28 +02:00
Benjamin Falière
53a5fbd937 NEW hooks in product composition card 2023-06-14 15:27:58 +02:00
Laurent Destailleur
5efe801624 Debug v18 2023-06-14 15:16:27 +02:00
Laurent Destailleur
c67ea96e19 FIX Multicompany for SEPA file generation 2023-06-14 15:09:36 +02:00
Laurent Destailleur
feba323283 Debug v18 2023-06-14 14:09:35 +02:00
Hystepik
afbcaa6f91 match eldy adviced 2023-06-14 10:10:55 +02:00
Laurent Destailleur
1fab0431cb Merge pull request #24989 from ATM-Consulting/FIX_modulebuilder_misc
FIX CommonObject::getRights()
2023-06-13 23:25:40 +02:00
Laurent Destailleur
392393b8c6 Merge pull request #25083 from frederic34/20230612
use user hasRight
2023-06-13 23:20:07 +02:00
Laurent Destailleur
bc12cf8f62 Merge pull request #25085 from MaximilienR-easya/dev_Fix_commonDocGenerator
Fix the function fill_substitutionarray_with_extrafields when the type is datetime
2023-06-13 23:18:52 +02:00
Laurent Destailleur
af5b12a35e Merge pull request #25088 from OPEN-DSI/develop_fix_dol_textishtml_with_hr
FIX: Add the hr balise to detect if the text is a html content
2023-06-13 23:17:14 +02:00
Laurent Destailleur
786c7466fc Merge pull request #25089 from defrance/patch-264
php V8 warning (sql2 and sql3 not declared)
2023-06-13 23:16:32 +02:00
Laurent Destailleur
1f01d0a617 Merge pull request #25092 from grandoc/new_branch_13_06_2023
fix : Warning: Undefined array key cat_fk in /home/httpd/vhosts/doliw…
2023-06-13 23:11:22 +02:00
Frédéric France
a4bcf0eeaf use user hasRight 2023-06-13 20:47:33 +02:00
Frédéric France
afdbe42586 use user hasRight 2023-06-13 20:20:58 +02:00
Philippe GRAND
f660e13f20 fix : Warning: Undefined array key cat_fk in /home/httpd/vhosts/doliweb.com/httpdocs/categories/class/categorie.class.php on line 289 2023-06-13 19:47:21 +02:00
Laurent Destailleur
9c2d8f5d55 Look and feel v18 2023-06-13 19:35:18 +02:00
Hystepik
e28de18a9b Fix : deprecated warnings on various pages 2023-06-13 16:01:52 +02:00
Charlène Benke
d446cb2626 php V8 warning 2023-06-13 15:08:22 +02:00
Charlène Benke
b4c8da9994 php V8 warning 2023-06-13 15:07:25 +02:00
kkhelifa
b1f13ebf92 FIX: Add the hr balise to detect if the text is a html content 2023-06-13 14:24:30 +02:00
Laurent Destailleur
164a10c8d2 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-06-13 11:49:46 +02:00
Laurent Destailleur
b6843e7c0e FIX Showing bank account on list for direct debit 2023-06-13 11:49:12 +02:00
Maximilien Rozniecki
d48bf37d69 Fix the function fill_substitutionarray_with_extrafields where "label" was used instead of "type" which caused "datetime" type to not work correctly 2023-06-13 09:39:37 +02:00
Laurent Destailleur
ea167579ca Debug v18 2023-06-13 02:51:22 +02:00
Laurent Destailleur
9d03985fc7 Default setup 2023-06-13 00:56:36 +02:00
Frédéric France
44d3270a48 use user hasRight 2023-06-12 20:43:28 +02:00
Frédéric France
eaad829b6f use user hasRight 2023-06-12 20:31:34 +02:00
Frédéric France
f9a1fbf410 use user hasRight 2023-06-12 20:25:51 +02:00