lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
115,216 Commits 43 Branches 150 Tags 886 MiB
39774e4c87
Commit Graph

8875 Commits

Author SHA1 Message Date
Laurent Destailleur
34da698537 FIX Import in upgrade when using a socialnetwork field. 2022-09-14 16:01:45 +02:00
Laurent Destailleur
7d5d04a30d Doc 2022-09-14 15:24:07 +02:00
Quentin VIAL-GOUTEYRON
ebf35432bd FIX recruitment linked files 2022-09-14 11:30:57 +02:00
Laurent Destailleur
6ecd862a88 Fix restore option MAIN_OPTIMIZEFORCOLORBLIND 2022-09-13 15:37:54 +02:00
Laurent Destailleur
f08f00bda0
Merge pull request #22179 from grandoc/new_branch_10_09_2022 
update code toward php8 compliance
 2022-09-13 02:03:30 +02:00
Laurent Destailleur
7dbde6f934
Merge branch 'develop' into develop_NEW_Service_DefaultWorkstation 2022-09-13 01:38:49 +02:00
Laurent Destailleur
8771dc197b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-12 10:32:50 +02:00
Regis Houssin
e7ea57d183 FIX avoid warning (php7+) 2022-09-11 19:22:51 +02:00
Laurent Destailleur
439bef8e0e NEW Add substitution key __SENDEREMAIL_SIGNATURE__ 2022-09-10 15:55:36 +02:00
Faustin
b66b71817c scrutinizer in core/lib/ftp.lib.php: $localpath never defiened for ftp_get, added it and modify consequently file where the function is called 2022-09-10 15:49:54 +02:00
Frédéric France
705b436494 replace other deprecated 2022-09-10 14:03:47 +02:00
Philippe GRAND
c8a70ba221 update code toward php8 compliance 2022-09-10 11:14:25 +02:00
Philippe GRAND
a2b8dd446b update code toward php8 compliance 2022-09-10 11:13:02 +02:00
Philippe GRAND
e73b8983bf update code toward php8 compliance 2022-09-10 11:07:00 +02:00
Laurent Destailleur
6f77359617 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-09 18:11:06 +02:00
Laurent Destailleur
3b62935435 Fix bad perm 2022-09-09 18:08:43 +02:00
Laurent Destailleur
cf887dba16
Merge pull request #22075 from grandoc/new_branch_04_09_2022 
update code
 2022-09-09 18:03:43 +02:00
Laurent Destailleur
81b12c2814
Merge branch 'develop' into Add_notes_to_productlot 2022-09-09 18:02:02 +02:00
Laurent Destailleur
e0bfd19262
Merge pull request #22127 from frederic34/select2multimatch 
select2 multimatch
 2022-09-09 18:00:39 +02:00
Laurent Destailleur
a4fbd10032 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-09 17:12:48 +02:00
Laurent Destailleur
792fe32fee Doc 2022-09-09 17:08:16 +02:00
Laurent Destailleur
7a277d9560
Merge branch 'develop' into loaddolibarrenv 2022-09-09 17:02:05 +02:00
Laurent Destailleur
26ad6199e5 NEW The purge of iles can purge only if older than a number of seconds 2022-09-09 15:33:55 +02:00
Laurent Destailleur
b23ab2cb71 FIX #yogosha12266 2022-09-09 13:58:54 +02:00
Laurent Destailleur
999e5861e3 NEW Add method httponly_accessforbidden() 2022-09-09 11:55:45 +02:00
Frédéric France
1c2a89f52d Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv 2022-09-09 08:09:12 +02:00
Laurent Destailleur
da0cf1cbf2 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-08 23:00:10 +02:00
Laurent Destailleur
764e6158eb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-08 22:57:50 +02:00
Laurent Destailleur
1a3ff13808 FIX Restore the option MAIN_OPTIMIZEFORTEXTBROWSER 2022-09-08 20:52:33 +02:00
Frédéric France
da8617e3ff Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv 2022-09-08 18:59:23 +02:00
Laurent Destailleur
4c09252650 Clean code 2022-09-08 12:29:46 +02:00
atm-lena
444ba4bf46 FIX Returns 2022-09-08 11:40:40 +02:00
atm-lena
81ed97e9fc Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-09-08 11:21:05 +02:00
Laurent Destailleur
a079fb3fec CSS 2022-09-07 20:45:02 +02:00
Frédéric France
07e761d115 Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv 2022-09-07 20:37:29 +02:00
Frédéric France
63195e0ca3 fix license 2022-09-07 20:21:01 +02:00
Frédéric FRANCE
8a742df8de select2 multimatch 2022-09-07 18:38:00 +02:00
Laurent Destailleur
50169bc96a Clean code 2022-09-07 15:50:40 +02:00
Lefteris Kotsonis
20e9dc3f07 [NEW][#22048][Added notes to productlot module] 2022-09-05 16:49:57 +02:00
Laurent Destailleur
33ad0de37e NEW Show also shceduled task never finished in scheduled task widget 2022-09-05 12:27:06 +02:00
Laurent Destailleur
9a4a740d4b Doc 2022-09-05 11:13:30 +02:00
Philippe GRAND
2cd48587ed update code 2022-09-04 13:29:29 +02:00
Philippe GRAND
402d52e160 update code 2022-09-04 13:25:54 +02:00
Laurent Destailleur
6406fbdc7e NEW Add a way to enter LICENSE file content in property of website 2022-09-03 19:02:42 +02:00
Laurent Destailleur
760c6e581e
Merge pull request #22060 from grandoc/new_branch_03_09_2022 
Update code
 2022-09-03 11:44:36 +02:00
Laurent Destailleur
6f9fa62c87
Merge pull request #21944 from Hystepik/develop#4 
Fix : php 8.1 warnings
 2022-09-03 11:40:14 +02:00
Philippe GRAND
d96c60ec8b Update code 2022-09-03 11:16:00 +02:00
Frédéric FRANCE
9150f5102e Merge remote-tracking branch 'upstream/develop' into pr/grandoc/22009 2022-09-02 11:44:45 +02:00
Laurent Destailleur
6e5b1af6ec
Merge pull request #22008 from frederic34/productbatch 
fix php8 warnings
 2022-09-02 10:30:19 +02:00
Laurent Destailleur
3b5f907816
Merge pull request #22006 from frederic34/extrafieldsbankline 
add tables for bank lines extrafields
 2022-09-02 10:16:42 +02:00
Laurent Destailleur
027e597776
Merge branch 'develop' into productbatch 2022-09-02 10:11:47 +02:00
Hystepik
cbbc028ffe
Merge branch 'develop' into develop#4 2022-09-01 16:12:01 +02:00
Frédéric FRANCE
4ac4f78a99 add extrafield setup 2022-09-01 15:25:19 +02:00
Radarjr2002
03a39d33b9
Warning in php 8 2022-09-01 13:10:25 +02:00
Frédéric France
bb58f3a18f use isModEnabled 2022-08-31 22:38:53 +02:00
Frédéric France
eb8097d81c use isModEnabled 2022-08-31 22:23:32 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Philippe GRAND
01f3d626f2 update code 2022-08-31 22:12:45 +02:00
Philippe GRAND
886cb4f083 update code 2022-08-31 22:12:10 +02:00
Philippe GRAND
6fc7c9bca8 update code 2022-08-31 22:11:46 +02:00
Philippe GRAND
1530361963 update code 2022-08-31 22:11:06 +02:00
Philippe GRAND
0335970820 update code 2022-08-31 22:10:38 +02:00
Frédéric France
e71692e745 fix php8 warnings 2022-08-31 22:02:31 +02:00
Frédéric France
fc01cc66cd fix php8 warnings 2022-08-31 21:55:55 +02:00
Frédéric France
ece2f5553a fix php8 warnings 2022-08-31 21:49:10 +02:00
Laurent Destailleur
a5c18ea776 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-31 17:57:14 +02:00
Christian Foellmann
5c135b59eb require missing signture.lib.php 2022-08-31 15:51:37 +02:00
Laurent Destailleur
e0b1ad308b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-08-30 19:38:35 +02:00
Christian Foellmann
dabb52d26f require missing signture.lib.php 2022-08-30 09:10:43 +02:00
Laurent Destailleur
28797930fc Clean code 2022-08-29 18:21:35 +02:00
lmarcouiller
d41c6a93d3 Fix : php 8.1 warn,ings 2022-08-29 16:23:33 +02:00
Laurent Destailleur
1b1ebdd636
Merge branch '16.0' into 16p1 2022-08-29 01:05:47 +02:00
Philippe GRAND
9998b11d57 FIX php8 compatibility 2022-08-28 14:00:22 +02:00
Philippe GRAND
f238597c2d FIX php8 compatibility 2022-08-28 13:58:13 +02:00
Philippe GRAND
4e51fca845 FIX php8 compatibility 2022-08-28 13:57:34 +02:00
Philippe GRAND
f98f0bbf6a FIX php8 compatibility 2022-08-28 13:57:09 +02:00
Philippe GRAND
8c59c7f4be FIX php8 compatibility 2022-08-28 13:56:41 +02:00
Laurent Destailleur
96889609e8 Fix restore use of API get when ID = 0 2022-08-27 19:02:05 +02:00
Alexandre SPANGARO
cca9dd6c81 PHP8 Warnings 2022-08-27 05:49:28 +02:00
Laurent Destailleur
63a1daa091 Clean code 2022-08-26 19:27:38 +02:00
Alexandre SPANGARO
ecf4fed1f0 PHP8 Warnings 2022-08-26 17:13:29 +02:00
Regis Houssin
68994752cd FIX multiple php8 compatibility 2022-08-26 11:08:39 +02:00
Laurent Destailleur
7f3c63c975
Merge pull request #21848 from habot-it/pdf_pagefoot 
Add options in function pdf_pagefoot of pdf.lib.php - Revision 2
 2022-08-25 17:41:23 +02:00
Laurent Destailleur
2e905b127a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/accountancy/index.php
	htdocs/product/admin/product.php
 2022-08-25 14:35:08 +02:00
Laurent Destailleur
0d693d723a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/comm/propal/class/api_proposals.class.php
 2022-08-25 14:31:47 +02:00
Laurent Destailleur
a4c0177db0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/user/bank.php
 2022-08-25 14:29:09 +02:00
Laurent Destailleur
ac6a1b0549
Merge pull request #21873 from bb2a/Right-price 
NEW - Add right for read price if const MAIN_USE_ADVANCED_PERMS
 2022-08-25 12:24:35 +02:00
Anthony Berton
b9b3e5ca29 Correction droit 2022-08-25 08:51:39 +02:00
Laurent Destailleur
a7f9ec159b Support Initialisation vector in crypt/decrypt 2022-08-25 02:04:48 +02:00
Laurent Destailleur
17c404e940 Support Initialisation vector in crypt/decrypt 2022-08-24 23:41:26 +02:00
Anthony Berton
6f8de50004 Add right 2022-08-24 19:59:06 +02:00
Laurent Destailleur
33361e7948
Merge pull request #21852 from frederic34/useismodenabled 
use isModEnabled
 2022-08-24 18:12:02 +02:00
Laurent Destailleur
ec45354078
Merge pull request #21867 from frederic34/patch-4 
fix global const and warnings
 2022-08-24 17:58:20 +02:00
Laurent Destailleur
03d086f741 NEW Encrypt all sensitive constants in llx_const 2022-08-24 12:22:11 +02:00
Frédéric FRANCE
d1fee1f83a
Update ticket.lib.php 2022-08-24 11:49:02 +02:00
atm-lena
6e5d395ac8 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-08-24 11:38:19 +02:00
Laurent Destailleur
c60f42b1bf NEW Introduce dolEncrypt and dolDecrypt to be able to encrypt data in db 2022-08-24 04:54:02 +02:00
Frédéric France
86a7a7c8bb use isModEnabled 2022-08-23 20:05:09 +02:00
Frédéric France
582f6b196e use isModEnabled 2022-08-23 20:02:37 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
habot-it
ff342f79f2 Add options in function pdf_pagefoot of pdf.lib.php - Revision 2 2022-08-23 16:26:52 +02:00
Laurent Destailleur
6d80b6a710 dolButtonToOpenUrlInDialogPopup works better with nojs=1 2022-08-23 12:25:44 +02:00
Laurent Destailleur
456c0f8dff
Merge pull request #21833 from defrance/patch-235 
php V8 warning (supplier order)
 2022-08-22 15:10:13 +02:00
Laurent Destailleur
6f77df331c
Update functions2.lib.php 2022-08-22 15:09:38 +02:00
Laurent Destailleur
fd8313702b
Merge pull request #21755 from SylvainLegrand/PR_improve_phone_settings_for_france 
Improve french phone settings (international numbering)
 2022-08-22 14:16:56 +02:00
This Charlène
45c0b74649
Update functions2.lib.php 2022-08-22 14:02:40 +02:00
Laurent Destailleur
5ada158e03 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-22 13:20:10 +02:00
Laurent Destailleur
2b5205b639 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-22 13:05:22 +02:00
Laurent Destailleur
1be8746a78 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-08-22 13:03:39 +02:00
Laurent Destailleur
4e678c5065 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-08-22 13:02:51 +02:00
Laurent Destailleur
88e66ab39a
Merge pull request #21803 from frederic34/ibanForHuman 
iban human readable
 2022-08-22 10:53:20 +02:00
Laurent Destailleur
a01603ac5b
Update admin.lib.php 2022-08-22 10:43:35 +02:00
This Charlène
793de572e6
php V8 warning 2022-08-22 08:00:51 +02:00
Laurent Destailleur
558ae00f66 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/ajax/onlineSign.php
 2022-08-21 23:48:44 +02:00
Frédéric FRANCE
6923bd9c06 iban human readable 2022-08-19 17:21:00 +02:00
Regis Houssin
293ad34ca8 FIX security for Multicompany 2022-08-18 17:02:20 +02:00
Sylvain Legrand
e9181815e8
Update functions.lib.php 2022-08-17 08:02:55 +02:00
Sylvain Legrand
6a27df53f9 Improve settings for phone number (Madagascar) 2022-08-16 20:15:04 +02:00
Laurent Destailleur
3431b6ffc4
Merge pull request #21754 from SylvainLegrand/PR_improve_phone_number_settings_for_madagascar 
Improve settings for phone number (Madagascar)
 2022-08-16 19:54:28 +02:00
Laurent Destailleur
a0d56b6db7 FIX the online signature feature 2022-08-14 19:14:20 +02:00
Sylvain Legrand
f26b0f917f Improve french phone settings (international numbering) 2022-08-14 16:31:34 +02:00
Sylvain Legrand
2e8c9ebd72 Improve settings for phone number (Madagascar) 2022-08-14 16:28:44 +02:00
Laurent Destailleur
b1b708b9ef
Merge pull request #21733 from SylvainLegrand/Fix_improve_date_library 
Fix : improve date library
 2022-08-14 15:31:28 +02:00
stickler-ci
f61000f0c7 Fixing style errors. 2022-08-12 15:25:15 +00:00
Sylvain Legrand
0066dfd87c Fix : improve date library 2022-08-12 17:23:41 +02:00
Laurent Destailleur
533e4f2424 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/fr_FR/accountancy.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/members.lang
	htdocs/langs/fr_FR/products.lang
 2022-08-12 16:03:09 +02:00
Laurent Destailleur
d01d04f704 FIX .jpeg extension was no more supported by dol_imageResizeOrCrop() 2022-08-12 14:31:58 +02:00
atm-lena
2fbba30e2a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-08-11 12:11:41 +02:00
This Charlène
978f1caf1a
Update admin.lib.php 2022-08-11 09:03:17 +02:00
Laurent Destailleur
185980c9c6 Enhance protection on limit of external links 2022-08-10 22:55:09 +02:00
Laurent Destailleur
9b58b61d60 Enhance MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES #yogosha12008 2022-08-10 20:19:43 +02:00
Anthony Berton
17483eb082 Fix 2022-08-05 10:47:00 +02:00
Anthony Berton
9955e51956 NEW - FTP Function mkdir 2022-08-05 09:39:31 +02:00
Anthony Berton
29e64bee8b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW---FTP-function-mkdir 2022-08-05 09:10:45 +02:00
Laurent Destailleur
4a9c9a97e5 WIP Implement a generic handler for OAuth. 2022-08-04 15:58:00 +02:00
Laurent Destailleur
514b216864
Merge pull request #21588 from altairisfr/termname 
NEW : TAKEPOS - setup terminal name
 2022-08-03 18:34:16 +02:00
Laurent Destailleur
b63197fe4a
Merge pull request #21646 from Hystepik/develop#2 
New : Add DoS security on GETPOST with img Yogosha report 11963
 2022-08-03 17:54:13 +02:00
Anthony Berton
e511291228 init function 2022-08-03 17:04:34 +02:00
lmarcouiller
99141928a3 better fix 2022-08-03 17:00:39 +02:00
Laurent Destailleur
0c23ed1e80
Merge pull request #21648 from bb2a/NEW---add-function-ftp-put 
NEW - Add function ftp put
 2022-08-03 16:53:48 +02:00
Anthony Berton
985d9b3624 Function 2022-08-03 15:59:53 +02:00
lmarcouiller
02c0970451 remove error 2022-08-03 14:35:41 +02:00
lmarcouiller
09e47a5a8a Add DoS security on sanitizeVal() with img 2022-08-03 14:27:58 +02:00
lmarcouiller
c7652af3bc New : Add DoS security on GETPOST with img 2022-08-03 14:24:27 +02:00
Laurent Destailleur
4397842ac4
Merge pull request #21620 from Hystepik/develop#3 
Fix : php 8.1 warnings
 2022-08-02 19:41:54 +02:00
Laurent Destailleur
b8dac3a776
Merge pull request #21634 from ptibogxiv/patch-28 
Fix display variable substitutions
 2022-08-02 19:00:32 +02:00
lmarcouiller
c94b7ddd36 Fix : php 8.1 warnings ticket 2022-08-02 18:55:40 +02:00
lmarcouiller
a5a870a327 Fix : php 8.1 warnings ticket 2022-08-02 15:03:28 +02:00
ptibogxiv
1ef855e742
Fix display variable substitutions 2022-08-01 19:20:39 +02:00
Laurent Destailleur
07f9541efd Fix missing migration 2022-08-01 16:42:52 +02:00
Laurent Destailleur
6b5fac432f Add doc 2022-08-01 03:46:15 +02:00
lmarcouiller
05ca9da7e1 Fix : php 8.1 warnings 2022-07-29 15:46:13 +02:00
Laurent Destailleur
8b813d211b
Merge pull request #21613 from bb2a/FIX---php-V8-pdf-lib 
FIX - php V8 pdf lib
 2022-07-29 15:19:57 +02:00
Laurent Destailleur
9796ec22bf
Merge pull request #21615 from bb2a/NEW---FTP-lib-and-lang-file 
NEW - FTP lib
 2022-07-29 15:05:52 +02:00
Laurent Destailleur
f0c8523713 Debug v16 2022-07-29 14:57:11 +02:00
Laurent Destailleur
7404e8fb75 Debug v16 2022-07-29 14:50:21 +02:00
atm-lena
462352b957 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-07-29 12:06:43 +02:00
Anthony Berton
8e7fa102b8 Clean 2022-07-29 11:14:28 +02:00
Anthony Berton
cb59edb58b Fix 2022-07-29 10:06:19 +02:00
Anthony Berton
05c37bb1e9 Add functions 2022-07-29 10:05:54 +02:00
stickler-ci
f54b4baee0 Fixing style errors. 2022-07-28 16:21:53 +00:00
Anthony Berton
ce87eea3ec ErrorFTPNodisconnect 2022-07-28 18:18:04 +02:00
Christophe Battarel
0fe441bc2a use getDolGlobal... 2022-07-28 17:29:09 +02:00
Anthony Berton
915380202c FIX - php V8 pdf lib 2022-07-28 17:09:56 +02:00
Anthony Berton
a778a5ff78 and order lib 2022-07-28 11:50:42 +02:00
Laurent Destailleur
c5e5f2915e Look and feel v17 2022-07-27 19:01:26 +02:00
Laurent Destailleur
73d8477dc8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-27 13:43:36 +02:00
Laurent Destailleur
fc9b3e3d70 Factorize code into a function dolJSToSetRandomPassword() 2022-07-27 13:42:43 +02:00
Christophe Battarel
fd6838776f NEW : TAKEPOS - setup terminal name 2022-07-27 11:09:02 +02:00
Laurent Destailleur
212a0f838a
Merge pull request #21363 from Quatadah/dolicloud-qnasdami-dropdownmenu 
adding dropdown menu in case of a lot of buttons in project
 2022-07-27 10:15:39 +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
d0e74fbbeb Sync transifex 2022-07-26 10:54:03 +02:00
Quatadah Nasdami
873745a178 I included the boolean in the $params and resolved the margin issue. 2022-07-25 20:13:54 +02:00
Laurent Destailleur
aaee8ff0ca Debug v16 2022-07-25 18:03:07 +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
7505e2a1ab Debug v16 2022-07-25 10:26:27 +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
747c10f2ac Css 2022-07-24 22:14:11 +02:00
Laurent Destailleur
db0ef784cd
Merge pull request #21450 from Easya-Solutions/new-mail-template-substitute-project-title 
NEW substitue project title in mail template
 2022-07-24 20:28:37 +02:00
This Charlène
f9cce93fc9 fix php 8 warning (and error) 2022-07-24 20:17:54 +02:00
Laurent Destailleur
54c24dd74a
Merge pull request #21554 from defrance/patch-217 
fix php 8 warning (and error)
 2022-07-24 20:11:07 +02:00
Laurent Destailleur
60117bbaee Debug v16 2022-07-24 19:45:37 +02:00
Laurent Destailleur
89999d0138 Fix update description of skills 2022-07-24 17:31:30 +02:00
Laurent Destailleur
481bd93ab8 Fix var_dump 2022-07-24 15:12:08 +02:00
Laurent Destailleur
e7161edffe Fix missing @ in dolEval 2022-07-24 15:11:00 +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
24f8e9c401 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-22 18:09:38 +02:00
lmarcouiller
bac8efd4c8 Fix : PHP 8.1 warnings 2022-07-22 17:32:18 +02:00
This Charlène
c7c07ef778
fix php 8 warning (and error) 2022-07-22 10:35:54 +02:00
Laurent Destailleur
ed0b4dfb85
Merge pull request #21537 from Hystepik/develop#2 
Fix : PHP 8.1 warnings
 2022-07-21 16:46:24 +02:00
lvessiller
4376afcb32 NEW project label insted of title in substitue variables 2022-07-21 14:41:22 +02:00
lvessiller
c7d6e8278c Merge branch 'develop' of github.com:Dolibarr/dolibarr into new-mail-template-substitute-project-title 2022-07-21 14:20:21 +02:00
Laurent Destailleur
14c8b4b826 FIX doleval with @ 2022-07-21 12:52:30 +02:00
Laurent Destailleur
1f25452d65 FIX doleval with @ 2022-07-21 12:51:58 +02:00
lmarcouiller
eb38875119 Fix : PHP 8.1 warnings 2022-07-20 16:35:51 +02:00
atm-lena
7f1a17bcc9 Change fk_unit service lines management 2022-07-20 15:38:37 +02:00
Laurent Destailleur
cc15923cfb
Merge pull request #21517 from hregis/fix_passing_null_of_type_string_is_deprecated 
FIX avoid Passing null to parameter #1 of type string is deprecated
 2022-07-19 00:57:34 +02:00
Regis Houssin
7db5f7eb1c FIX regression + add $forceentity parameter 2022-07-18 19:26:13 +02:00
Regis Houssin
ade854a469 FIX security breach if we have same ref number in multiple entities 2022-07-18 16:48:53 +02:00
Laurent Destailleur
8edebcf314 FIX Debug v16 2022-07-18 13:17:46 +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
076d93452f FIX Debug v16 2022-07-18 11:59:22 +02:00
Regis Houssin
0c7a868306 FIX avoid Passing null to parameter #1 of type string is deprecated 2022-07-16 16:20:11 +02:00
Laurent Destailleur
a864771974 Debug 2022-07-15 15:51:55 +02:00
Laurent Destailleur
1d0ba05e90 Debug 2022-07-15 15:35:45 +02:00
Laurent Destailleur
b000ee7c50 NEW Add API for partnership module 
Debug module builder
 2022-07-15 13:41:02 +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
abd3f272fa Fix backtopage after a cancel 2022-07-12 19:17:44 +02:00
Laurent Destailleur
8422d3079c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 19:10:08 +02:00
Laurent Destailleur
aa3f77e7cc Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-12 17:54:03 +02:00
Laurent Destailleur
c2712242be Fix css 2022-07-12 17:42:20 +02:00
atm-lena
c7d4abb6a1 Merge branch 'develop_NEW_Service_DefaultWorkstation' of github.com:atm-lena/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-07-12 11:57:17 +02:00
atm-lena
8aa094a631 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-07-12 11:51:13 +02:00
Laurent Destailleur
c804469082 FIX Export of website must not export .old and .back files 2022-07-12 11:20:34 +02:00
Laurent Destailleur
9abff2ff07 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 10:57:11 +02:00
Laurent Destailleur
cf5825687e Debug v16 2022-07-12 10:56:03 +02:00
stickler-ci
a41dee9e06 Fixing style errors. 2022-07-12 08:09:45 +00:00
atm-lena
c068eebc43 Add function "convertDurationtoHour" 2022-07-12 10:03:31 +02:00
Quatadah Nasdami
0da4360b9f almost done 2022-07-11 17:30:11 +02:00
GregM
8e57d04f94 FIX dol_compress_dir names files on archives 2022-07-11 16:18:56 +02:00
stickler-ci
afefc369ed Fixing style errors. 2022-07-11 10:06:31 +00:00
Yoan Mollard
39c9eb8708 Fix: fetch the right amount for membership payment 
It was defaulting to 9.99
 2022-07-11 12:03:24 +02:00
Laurent Destailleur
e29df476e6
Merge branch 'develop' into membership-rework 2022-07-11 10:56:31 +02:00
Laurent Destailleur
30dff96ef4 Fix var_dump 2022-07-11 01:27:19 +02:00
Laurent Destailleur
bce8e28372
Merge pull request #21352 from badre-agtaib/new-#19511 
New #19511
 2022-07-10 19:49:35 +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
9a92c7d9b0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/extrafields.class.php
 2022-07-10 19:28:16 +02:00
Laurent Destailleur
16d04e475b
Merge branch 'develop' into membership-rework 2022-07-10 18:58:49 +02:00
Florian HENRY
56c4817d6d fix: Bad amount calc on Invoice index 2022-07-08 17:30:15 +02:00
Laurent Destailleur
bdfa0536a6 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-08 14:20:44 +02:00
Laurent Destailleur
245580bfa5 FIX Several pb in invoice remind (html detection, no event, transaction) 2022-07-08 14:11:13 +02:00
Laurent Destailleur
61f1595f8c Fix look and feel v15 2022-07-08 11:21:54 +02:00
Yoan Mollard
07b5657ba1 Merge remote-tracking branch 'origin/develop' into HEAD 2022-07-08 10:11:22 +02:00
Christian Foellmann
4c5e05e411 fix page titles 
Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/contact/list.php
	htdocs/product/stock/movement_list.php
	htdocs/user/list.php
 2022-07-06 19:19:08 +02:00
Laurent Destailleur
76e3c10c06
Revert "fix page titles" 2022-07-06 15:56:04 +02:00
Laurent Destailleur
9a10e3f971
Merge branch 'develop' into NEW#21395 2022-07-06 15:53:22 +02:00
Laurent Destailleur
55ba95643b
Merge pull request #21351 from Quatadah/dolicloud-qnasdami-product-allow-external-download 
NEW #19680 Add option PRODUCT_ALLOW_EXTERNAL_DOWNLOAD
 2022-07-06 15:52:19 +02:00
Laurent Destailleur
96ad521d5a
Merge pull request #21408 from badre-agtaib/new-#21399 
NEW #21399
 2022-07-06 15:50:16 +02:00
Laurent Destailleur
a8cd94e0f9
Merge pull request #21405 from Quatadah/adding-smileys 
Management of smileys in website pages #21358
 2022-07-06 14:58:12 +02:00
lvessiller
eab2865765 NEW substitue project title in mail template 2022-07-05 11:39:49 +02:00
bagtaib
b5c0f1ac29 corrected the url of the image 2022-07-04 14:32:40 +02:00
Laurent Destailleur
e6e4017047 Fix debug for php 8.1 2022-07-03 14:29:59 +02:00
Laurent Destailleur
bd28a7e038 Debug v16 2022-07-03 12:54:58 +02:00
Yoan Mollard
1e6df0c6d9 Merge remote-tracking branch 'origin/develop' into membership-rework 2022-07-01 17:38:47 +02:00
Laurent Destailleur
28b60e6c00
Merge pull request #21410 from artemChernitsov/fix-recruitment-module-patch-1 
Add check file permission in recruitment module
 2022-07-01 17:10:38 +02:00
Yoan Mollard
3dcf7db198 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into membership-rework 2022-06-29 16:12:05 +02:00
Laurent Destailleur
770a160b8b Debug v16 2022-06-29 14:31:21 +02:00
stickler-ci
cc1ebbc499 Fixing style errors. 2022-06-29 08:53:55 +00:00
Artem Chernitsov
1d515705b5
add check file permission recruitment module 2022-06-29 11:51:58 +03:00