lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
113,473 Commits 43 Branches 150 Tags 886 MiB
16dce2001d
Commit Graph

7907 Commits

Author SHA1 Message Date
This Charlène
2d8c629200
if we set another view list mode, we keep it 
if we set another view list mode, we keep it (till we change one more time)
 2022-08-11 09:01:55 +02:00
Laurent Destailleur
97e198c4ec
Merge pull request #21704 from frederic34/patch-5 
fix php8 warning
 2022-08-11 01:29:54 +02:00
Frédéric FRANCE
8465c08253
fix php8 warning 2022-08-10 14:29:13 +02:00
Frédéric FRANCE
f704d1feb2 Merge remote-tracking branch 'upstream/develop' into outh2forswiftmailer 2022-08-10 13:27:18 +02:00
Laurent Destailleur
95b1b3f990 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/emailcollector/class/emailcollector.class.php
	htdocs/index.php
	htdocs/website/index.php
 2022-08-10 13:16:02 +02:00
Laurent Destailleur
9e55377f0a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-08-10 13:10:52 +02:00
Frédéric FRANCE
32c617b786 add oauth2 for swiftmailer 2022-08-10 09:54:14 +02:00
Frédéric FRANCE
b1814a45ce add oauth2 for swiftmailer 2022-08-10 09:33:58 +02:00
Laurent Destailleur
3f62cd27eb
Merge pull request #21632 from fboitel/NEW-smtp-by-oauth2 
NEW smtp by oauth2
 2022-08-10 05:26:31 +02:00
Regis Houssin
bbe74c5d77 FIX errors when search by code 2022-08-06 13:44:56 +02:00
Laurent Destailleur
4a9c9a97e5 WIP Implement a generic handler for OAuth. 2022-08-04 15:58:00 +02:00
Laurent Destailleur
1093084e9b Better doc 2022-08-04 14:00:04 +02:00
Laurent Destailleur
39dccc4fdf FIX Scan IMAP must not be done automatically 2022-08-04 13:46:47 +02:00
Laurent Destailleur
a7a1c70c65 FIX Scan IMAP must not be done automatically 2022-08-04 13:42:57 +02:00
Faustin
f06de750eb oauth provider now showed in small caps 2022-08-03 21:14:38 +02:00
Faustin
29bb03a25b Conflict 2022-08-03 20:07:16 +02:00
Faustin
868d07ae96 New prop : select auth type with radio box 2022-08-03 20:01:13 +02:00
Laurent Destailleur
ad17d39da4
Merge pull request #21592 from bb2a/FIX---php-V8-admin-stock 
FIX - php V8 setup module stock
 2022-08-03 18:37:54 +02:00
Laurent Destailleur
064c95baef CSS 2022-08-03 18:26:06 +02:00
Laurent Destailleur
e70bdc099f
Merge pull request #21581 from badre-agtaib/backupwizard2 
FIX #21473
 2022-08-03 18:03:12 +02:00
lmarcouiller
c7652af3bc New : Add DoS security on GETPOST with img 2022-08-03 14:24:27 +02:00
Laurent Destailleur
528d54ba79 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-02 20:28:07 +02:00
Faustin
d21fbd5a0f fix GETPOST on none 2022-08-01 13:11:57 +02:00
Faustin
809c6acf44 fix GETPOST on none 2022-08-01 12:03:33 +02:00
Faustin
a990480ba6 Use of oauth for smtp is available (tested only with google) 2022-08-01 11:31:32 +02:00
Laurent Destailleur
5d2d0384f8 Debug v16 2022-07-29 17:05:02 +02:00
Laurent Destailleur
51d022914b Fix missing auto increment key. Fix error duplicate of type of contact. 2022-07-29 16:03:21 +02:00
Laurent Destailleur
b6a6dd91d8 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-07-28 18:52:44 +02:00
Laurent Destailleur
eac926e01d Fix phpv8 2022-07-28 18:30:26 +02:00
bagtaib
f1b3f51b3a add missing </tr> 2022-07-27 14:14:34 +02:00
Laurent Destailleur
fc9b3e3d70 Factorize code into a function dolJSToSetRandomPassword() 2022-07-27 13:42:43 +02:00
stickler-ci
1d8b39260b Fixing style errors. 2022-07-27 09:50:43 +00:00
bagtaib
26033b9297 changed the button to a link 2022-07-27 11:50:18 +02:00
Anthony Berton
f8a7f0290e FIX - php V8 setup module stock 2022-07-27 11:50:05 +02:00
bagtaib
3f81d21c7c make a button look like a link 2022-07-26 18:32:48 +02:00
bagtaib
4776c9fdaa change button position 2022-07-26 16:30:21 +02:00
Laurent Destailleur
5903a9f87f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-07-26 12:24:24 +02:00
Laurent Destailleur
41bb01339a Fix warning 2022-07-25 12:09:27 +02:00
Laurent Destailleur
122c27885f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-25 10:29:11 +02:00
Laurent Destailleur
8fb7d129c9 Trans 2022-07-25 00:36:38 +02:00
Laurent Destailleur
ab81492fa4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formwebsite.class.php
	htdocs/core/lib/cron.lib.php
 2022-07-24 22:17:25 +02:00
Laurent Destailleur
adde84a508
Merge pull request #21232 from defrance/patch-207 
php V8 warning
 2022-07-24 20:32:22 +02:00
Laurent Destailleur
d622bfd774
Update modulehelp.php 2022-07-24 20:32:06 +02:00
Laurent Destailleur
60117bbaee Debug v16 2022-07-24 19:45:37 +02:00
Laurent Destailleur
e465c0f34b Debug v16 2022-07-24 19:05:55 +02:00
Laurent Destailleur
fe7346a9c6 Hide var not usefull and dangerous 2022-07-24 18:31:55 +02:00
Laurent Destailleur
40ae516034 Debug v16 2022-07-24 17:37:02 +02:00
Laurent Destailleur
2503b37bdd Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-24 14:33:55 +02:00
Laurent Destailleur
0bcc03cd5d css 2022-07-24 14:32:13 +02:00
Laurent Destailleur
cf0a1d1e14 Merge 2022-07-24 11:26:10 +02:00
Laurent Destailleur
56a8912c9b Fix do not erase global option when configuring ticket 2022-07-22 19:47:59 +02:00
Laurent Destailleur
ca323f99ba Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-22 19:37:55 +02:00
Laurent Destailleur
16c087e04c Clean htmlentities 2022-07-22 19:25:15 +02:00
Laurent Destailleur
5e4eb58a43 FIX phpv8 2022-07-21 11:09:35 +02:00
Laurent Destailleur
3079ab2737 FIX phpv8 2022-07-21 10:59:15 +02:00
Laurent Destailleur
36226c7b4b FIX Picto google plus 2022-07-18 13:17:37 +02:00
Laurent Destailleur
95ee25660e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-18 13:16:25 +02:00
Laurent Destailleur
311d69da4e FIX Picto google plus 2022-07-18 11:07:48 +02:00
Laurent Destailleur
1855236027 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2022-07-16 02:26:35 +02:00
Laurent Destailleur
f63281ffef php8 2022-07-16 02:10:21 +02:00
Laurent Destailleur
07216577e4 FIX #yogosha11806 2022-07-16 02:03:38 +02:00
Laurent Destailleur
4f54fb4f00 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-14 11:54:30 +02:00
Laurent Destailleur
71045cbe83 Fix popup message 2022-07-13 14:00:19 +02:00
Laurent Destailleur
97acf949fc Clean message on email limit 2022-07-13 13:39:16 +02:00
This Charlène
7205cb0c21
Update modulehelp.php 2022-07-12 08:30:51 +02:00
Laurent Destailleur
25e034721c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-11 00:06:57 +02:00
Laurent Destailleur
24dc936000 Revert "default to create on card.php if $action is empty" 
This reverts commit e0b664066b.
 2022-07-11 00:05:50 +02:00
Christian Foellmann
e0b664066b default to create on card.php if $action is empty 2022-07-11 00:01:42 +02:00
Laurent Destailleur
2ce695f939 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-10 19:48:20 +02:00
Laurent Destailleur
5de434eb37 css 2022-07-10 19:14:33 +02:00
Laurent Destailleur
c71616f45d css 2022-07-10 19:13:09 +02:00
Laurent Destailleur
c0977e5ee8
Merge pull request #21469 from cfoellmann/PR/card-empty-action 
FIX default to create on card.php if $action is empty
 2022-07-10 18:50:48 +02:00
Christian Foellmann
aaca9bc03d default to create on card.php if $action is empty 2022-07-08 09:16:02 +02:00
bagtaib
147140bdc2 Show/hide advanced Options 2022-07-08 05:55:23 +02:00
Laurent Destailleur
6365bdb35c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-06 19:10:45 +02:00
Laurent Destailleur
9a10e3f971
Merge branch 'develop' into NEW#21395 2022-07-06 15:53:22 +02:00
Laurent Destailleur
c0c97286f5
Merge pull request #21407 from fboitel/NEW#21397 
NEW #21397
 2022-07-06 15:51:09 +02:00
Laurent Destailleur
aba782057f Fix bad link 2022-07-05 09:44:42 +02:00
Laurent Destailleur
a61e5c854c Fix link 2022-07-05 09:41:53 +02:00
stickler-ci
6d796fc820 Fixing style errors. 2022-07-03 19:52:56 +00:00
UT from dolibit
08881a0e87
Update accountant.php 2022-07-03 21:47:37 +02:00
Laurent Destailleur
dea9a9e68d
Merge pull request #21409 from aspangaro/16p5-php8 
PHP8 Warning
 2022-07-01 16:35:40 +02:00
Laurent Destailleur
cfca565189 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-01 11:39:52 +02:00
Laurent Destailleur
68ca43c848
Merge pull request #21422 from bb2a/FIX---php-V8-admin-translation 
FIX - php V8 admin translation
 2022-07-01 11:36:28 +02:00
Laurent Destailleur
014a9cab9d
Update translation.php 2022-07-01 11:36:12 +02:00
Laurent Destailleur
591b7bae43 Fix var 2022-07-01 11:24:52 +02:00
Laurent Destailleur
69a900b260 FIX unset of default template for users. 2022-07-01 10:53:31 +02:00
Laurent Destailleur
0d43069220 Force creation of dir 2022-07-01 10:45:36 +02:00
BB2A Anthony Berton
80ce80f7cc FIX - php V8 admin translation 2022-06-30 17:29:02 +02:00
Laurent Destailleur
07aebba254 Debug v16 2022-06-30 01:55:56 +02:00
Laurent Destailleur
a98599084d Debug v16 2022-06-30 01:34:58 +02:00
Alexandre SPANGARO
d6814b2586 Merge remote-tracking branch 'upstream/develop' into 16p5-php8 2022-06-29 16:31:41 +02:00
Laurent Destailleur
770a160b8b Debug v16 2022-06-29 14:31:21 +02:00
Alexandre SPANGARO
df85137772 PHP8 Warning 2022-06-29 07:32:25 +02:00
Faustin
23cbb5212d NEW #21397 : code intrusion 2022-06-28 16:40:59 +02:00
Faustin
3f7fe8d688 NEW #21397 : small fix 2022-06-28 16:39:34 +02:00
Faustin
811b11cab2 NEW #21397 : added option to auto define barcode numbers for third-parties in barcode module setup 2022-06-28 16:33:00 +02:00
Laurent Destailleur
0e0c9888a2 Typo 2022-06-27 22:43:29 +02:00
Laurent Destailleur
34464ac92b Maxi debug of OAuth module. Solve tons of problems. 2022-06-27 22:35:58 +02:00
Faustin
d7d02fee9a NEW #21395 : Added option for dark theme mode in display - color and theme 2022-06-27 16:08:06 +02:00
Laurent Destailleur
7262a097e3 Better error message 2022-06-26 20:27:51 +02:00
Laurent Destailleur
00649e791c Fix #yogosha11452 2022-06-25 02:18:16 +02:00
Laurent Destailleur
b1ab8ba9b3
Merge branch 'develop' into patch-211 2022-06-23 11:41:09 +02:00
Laurent Destailleur
264f8ab4ce
Merge pull request #21342 from frederic34/useismodenabled 
Use getDolGlobalString
 2022-06-23 09:55:31 +02:00
Laurent Destailleur
e698d20789
Merge branch 'develop' into develop#6 2022-06-22 12:09:58 +02:00
Frédéric France
287f868fbb use getDolGlobalString 2022-06-22 08:36:24 +02:00
Frédéric France
889856d55f use getDolGlobalString 2022-06-21 23:39:31 +02:00
Frédéric France
62c171c26d isModEnabled 2022-06-21 20:54:28 +02:00
Frédéric France
9f32100fef Merge remote-tracking branch 'upstream/develop' into useismodenabled 2022-06-21 20:27:57 +02:00
Frédéric France
1f7fc7a2ae getDolGlobalString 2022-06-21 20:25:25 +02:00
BENKE Charlene
b37d874936
Update expedition.php 2022-06-20 16:01:25 +02:00
Laurent Destailleur
8ee30e067f Rename var 2022-06-20 02:23:37 +02:00
Laurent Destailleur
e97f021380 Fix #yogosha11295 2022-06-19 19:02:16 +02:00
Laurent Destailleur
233d712e39 NEW Support the Swiss QR-Code 2022-06-19 13:06:07 +02:00
Hystepik
45439e055c
Merge branch 'develop' into develop#6 2022-06-17 11:05:12 +02:00
Laurent Destailleur
cef7f6b96b
Merge pull request #21279 from hregis/fix_missing_entity 
FIX missing field entity
 2022-06-14 21:14:56 +02:00
Regis Houssin
abcf77c80a FIX missing field entity 2022-06-14 18:16:41 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Laurent Destailleur
293b08ab1d Debug v16 2022-06-14 11:47:56 +02:00
Laurent Destailleur
bc11cf62f8 FIX #hunterdev2acfc8fe-247c-4f88-aeaa-042b6b8690a0 2022-06-13 10:44:20 +02:00
BENKE Charlene
b6bd8b3619
php V8 warning 2022-06-13 08:20:29 +02:00
Laurent Destailleur
00446a10d7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-12 12:42:01 +02:00
Laurent Destailleur
426c1635c4 Clean code 2022-06-12 12:41:15 +02:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
Frédéric FRANCE
38b18a68d7
Merge branch 'develop' into useismodenabled 2022-06-10 10:07:41 +02:00
Frédéric France
5dcfc28913 use isModEnabled function 2022-06-09 22:41:59 +02:00
Frédéric France
400afc937f use isModEnabled function 2022-06-09 22:16:48 +02:00
Laurent Destailleur
1f26dee554 Fix deprecated functions 2022-06-08 17:19:12 +02:00
Laurent Destailleur
b9e376fb1d Disable option not complete 2022-06-07 10:58:19 +02:00
Laurent Destailleur
93ba5db6d3
Merge pull request #19940 from bb2a/add_option_pdf_global_thirdparty_alias 
NEW - Add option pdf global thirdparty alias
 2022-06-07 10:43:18 +02:00
Laurent Destailleur
418bd481f3 FIX #21128 2022-06-07 09:51:19 +02:00
Laurent Destailleur
166082d3cb Debug v16 2022-06-03 12:53:55 +02:00
Laurent Destailleur
be729ab5f3 Debug v16 2022-06-03 03:10:31 +02:00
Laurent Destailleur
500a81dda1 Clean database 2022-06-03 02:56:25 +02:00
Laurent Destailleur
cd041c9ea1 Clean code 2022-06-03 02:41:00 +02:00
Laurent Destailleur
6cab758841 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/knowledgemanagement/knowledgerecord_list.php
	htdocs/theme/md/style.css.php
 2022-06-01 21:55:36 +02:00
Laurent Destailleur
62ee0ff29c
Merge pull request #21054 from frederic34/patch-1 
force refresh css
 2022-06-01 21:34:23 +02:00
Laurent Destailleur
e3fa24fab2
Merge pull request #18283 from atm-gauthier/NEW_stockstransfers 
NEW : Stocks transfers objects management
 2022-06-01 14:49:21 +02:00
Laurent Destailleur
d6ecbe65b7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/langs/en_US/errors.lang
 2022-05-31 15:16:54 +02:00
Laurent Destailleur
c9eda09964 FIX ODT generation of BOM document 2022-05-31 14:30:47 +02:00
Laurent Destailleur
2d0958ba7f Look and feel v16 2022-05-31 11:00:21 +02:00
Laurent Destailleur
1655890f84 Debug v16 2022-05-31 10:35:36 +02:00
Frédéric FRANCE
489aa22e56
force refresh css 2022-05-30 14:14:18 +02:00
Laurent Destailleur
dc3121dc42
Merge pull request #21043 from defrance/patch-194 
php V8 warning ($conf->global-b*)
 2022-05-29 10:52:50 +02:00
BENKE Charlene
eba9f695c2
fix php 8 warning 2022-05-28 10:02:02 +02:00
BENKE Charlene
b1c4aa07f0
fix php 8 warning 2022-05-28 09:58:54 +02:00
BENKE Charlene
ebfc566698
php V8 warning 2022-05-27 16:16:41 +02:00
Laurent Destailleur
b93b9a784c Trans 2022-05-26 00:30:35 +02:00
Laurent Destailleur
baae99fbb4 Support ZATCA 2022-05-25 09:06:59 +02:00
Laurent Destailleur
58d82841e3 css 2022-05-24 12:11:51 +02:00
Laurent Destailleur
43be070300 PHP8.1 strftime("%Y%m%d%H%M") => dol_print_date(dol_now('gmt'), 
"dayhourlogsmall", 'tzuser')
 2022-05-24 11:55:21 +02:00
Laurent Destailleur
f276c66614 NEWW Add selection of the mode to show icon/text in setup 2022-05-23 09:45:42 +02:00
Laurent Destailleur
bc9859c7bd Fix phpcs 2022-05-23 00:12:16 +02:00
ptibogxiv
648c524eb5
Fix php error 2022-05-22 14:45:56 +02:00
Regis Houssin
82e19879d5 FIX php8.1 warning 2022-05-21 23:43:01 +02:00
Nicolas SILOBRE
2b6154050c
Fix : php warning 8 / backup 2022-05-21 16:16:59 +02:00
Maxime Kohlhaas
6445dd3882
Merge branch 'develop' into NEW_stockstransfers 2022-05-21 16:06:59 +02:00
Laurent Destailleur
c02e3f959f
Merge pull request #20899 from atm-gauthier/NEW/sortorder_on_holiday_type_dictionnary 
New/sortorder on holiday type dictionnary
 2022-05-21 00:43:52 +02:00
Laurent Destailleur
420feba56f
Merge branch 'develop' into develop#6 2022-05-20 23:06:30 +02:00
stickler-ci
8b5c4b02c1 Fixing style errors. 2022-05-19 12:17:45 +00:00
Gauthier PC portable 024
8438c7cd6c FIX : sortorder 2022-05-19 14:09:50 +02:00
Gauthier PC portable 024
1e0972f0a1 NEW : sortorder on holiday type dictionnary 2022-05-19 12:34:05 +02:00
Laurent Destailleur
09cf9e82f8 Debug v16 2022-05-19 11:47:43 +02:00
Laurent Destailleur
5f9ef61d32 Debug v16 2022-05-19 09:36:47 +02:00
Laurent Destailleur
25e70bead8 phpcs 2022-05-18 23:27:26 +02:00
Laurent Destailleur
e1c2968ae7 Look and feel v16 2022-05-18 23:11:59 +02:00
Laurent Destailleur
5736709991 Look and feel v16 2022-05-18 16:55:03 +02:00
Laurent Destailleur
ed2e1bda46 Clean code v16 2022-05-18 11:00:43 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +02:00
Laurent Destailleur
402398912b
Merge pull request #20866 from Easya-Solutions/new-ticket-public-interface 
NEW create third-party with contact if not found on pulic ticket
 2022-05-16 20:44:40 +02:00
Florian HENRY
0425becc03 add c_action_trigger and fix travis 2022-05-13 11:23:49 +02:00
lvessiller
d624a1e25e FIX stickler-ci 2022-05-13 08:57:08 +02:00
lvessiller
94dcee622b FIX stickler 2022-05-12 17:58:31 +02:00
lvessiller
7c17f6b1cf NEW create third-party with contact if not found on public ticket 2022-05-12 16:52:02 +02:00
Anthony Berton
273f119631
Update pdf.php 2022-05-10 16:14:37 +02:00
Laurent Destailleur
86b4c97287
Merge branch 'develop' into develop#6 2022-05-10 11:43:27 +02:00
Laurent Destailleur
d0c95d87af Debug v16 2022-05-09 18:59:11 +02:00
Laurent Destailleur
720a09dacb Fix regression 2022-05-09 15:57:10 +02:00
Gauthier PC portable 024
60defe4108 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-05-09 13:29:46 +02:00
Laurent Destailleur
e9d7e216e2 Debug v16 2022-05-09 12:13:31 +02:00
Laurent Destailleur
c3c24fe342 NEW The 'reposition' class works on ajax constantonoff that redirects 2022-05-09 11:52:19 +02:00
Laurent Destailleur
7c32ac2f42 Debug v16 2022-05-09 11:16:58 +02:00
Laurent Destailleur
104b4dcfe5 Trans 2022-05-09 09:31:43 +02:00
Laurent Destailleur
b3b6337c4c
Merge branch 'develop' into NEW_deposit_payment_terms 2022-05-08 23:09:06 +02:00
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +02:00
Laurent Destailleur
f52a7a26f6 Debug v16 - Fix for postgresql - Fix for sql loading per module - php8 2022-05-08 15:18:34 +02:00
Gauthier PC portable 024
2c840e80fb Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-05-06 11:41:18 +02:00
Laurent Destailleur
e0a690bead Clean code 2022-05-05 19:51:19 +02:00
Laurent Destailleur
62dd7244a3 css 2022-05-05 18:29:36 +02:00
Laurent Destailleur
935b3c300a Debug v16 2022-05-05 16:41:21 +02:00
Laurent Destailleur
207373d37d FIX sending email on payment of registration of event 2022-05-03 20:07:21 +02:00
Laurent Destailleur
51e9a7c251 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2022-05-03 13:05:51 +02:00
Laurent Destailleur
9f379dfcf4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/modules/modCashDesk.class.php
	htdocs/debugbar/class/DataCollector/DolLogsCollector.php
	htdocs/langs/en_US/admin.lang
 2022-05-03 12:17:54 +02:00
Laurent Destailleur
affde55169 FIX deprecated module are not more viewed as external modules 
Trans debugbar
 2022-05-03 12:08:24 +02:00
lmarcouiller
1dba611907 Merge branch 'develop#6' of github.com:Hystepik/dolibarr into develop#6 2022-05-02 15:42:43 +02:00
lmarcouiller
ce41d3ed09 remove target extrafields 2022-05-02 15:42:26 +02:00
Hystepik
0be15e3c74
Merge branch 'develop' into develop#6 2022-05-02 15:16:15 +02:00
Laurent Destailleur
08d78dd33b NEW More feature that can be modifed after module generation 2022-05-01 15:05:25 +02:00
Laurent Destailleur
22a2aa55e2 Show tooltip on nb of translation files 2022-05-01 13:39:22 +02:00
Laurent Destailleur
48342cd3c5 Fix td balance 2022-05-01 12:49:53 +02:00