lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
118,596 Commits 43 Branches 150 Tags 886 MiB
1bf000a8da
Commit Graph

3191 Commits

Author SHA1 Message Date
Laurent Destailleur
5cfe40a4bc FIX Can use the WAF of HTML content (dol_htmlwithnojs) for output too 2022-11-28 18:42:59 +01:00
Laurent Destailleur
ba4e5ef245 Enhance phpunit 2022-11-28 16:54:34 +01:00
Laurent Destailleur
75de251402 FIX #yogosha13687 2022-11-28 15:37:38 +01:00
Laurent Destailleur
c62c7e3805 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
 2022-11-26 01:43:09 +01:00
Laurent Destailleur
b231bcb64a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
 2022-11-26 01:21:51 +01:00
Laurent Destailleur
85e9ac1e40 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-26 01:13:58 +01:00
Laurent Destailleur
1ec862b491
Merge pull request #22982 from inovea-conseil/fix_19877 
FIX#19877
 2022-11-25 23:41:18 +01:00
Mathieu
023bc7d20e FIX#19877 2022-11-25 22:29:44 +01:00
Laurent Destailleur
6475c9320d
Merge pull request #22968 from Hystepik/develop#3 
fix : php 8.1 warnings
 2022-11-25 16:28:14 +01:00
hystepik
efc1697c62 fix : php8.1 warnings 2022-11-25 15:34:38 +01:00
Laurent Destailleur
0ccca81f12 Debug v17 - Finish move of type of event into actioncomm 2022-11-25 12:11:51 +01:00
Laurent Destailleur
03e8e49465 Fix responsive 2022-11-23 20:31:26 +01:00
Laurent Destailleur
4c02652d87 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-23 12:07:42 +01:00
Laurent Destailleur
207f56ff64 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-23 12:06:21 +01:00
Laurent Destailleur
2f0880020c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-23 12:02:25 +01:00
Florian HENRY
85aa9f7481 FIX: base64_decode shloud be forbiden in dol_eval 2022-11-16 09:32:14 +01:00
Anthony Berton
7b106e43d7 FIX - php 8 warning function lib 2022-11-12 19:35:01 +01:00
Laurent Destailleur
e466ba0d3a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2022-11-12 00:39:21 +01:00
Laurent Destailleur
d2c101ef52 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-11-11 01:04:59 +01:00
Laurent Destailleur
3fd4403bc7 Can show some tab entries as disabled (greyed link) 2022-11-08 22:34:13 +01:00
Laurent Destailleur
32e1d2b023 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2022-11-07 20:26:22 +01:00
Laurent Destailleur
1069fb0555 forcerounding can accept MU or MT in price function 2022-11-05 13:32:05 +01:00
Laurent Destailleur
1eff913fda Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-11-04 21:02:14 +01:00
Laurent Destailleur
43e153715f Remove non used code for module webhook 2022-11-04 20:49:25 +01:00
Laurent Destailleur
4890a2ada3 Debug v17 2022-11-04 11:37:28 +01:00
Laurent Destailleur
d0a824c5e9 Debug v17 2022-11-03 19:49:57 +01:00
Laurent Destailleur
1e8f5b4753 Rename page of agenda to follow same naming than other elements 2022-10-25 19:39:59 +02:00
Laurent Destailleur
365917b40a
Merge branch 'develop' into NEW#22527-view-message 2022-10-25 17:33:43 +02:00
Laurent Destailleur
a01e628187
Merge branch 'develop' into feature/intervention_ext_download 2022-10-24 19:48:19 +02:00
Laurent Destailleur
77af5f3cc8 Fix old value of lines were not correctly loaded 2022-10-24 12:24:02 +02:00
Laurent Destailleur
87f82c1064 Fix format date 2022-10-22 03:13:47 +02:00
Laurent Destailleur
003df66f6a Clean code 2022-10-22 02:32:43 +02:00
Laurent Destailleur
ce494354e2 NEW Finish removal of code using adodbtime 2022-10-22 01:54:50 +02:00
Laurent Destailleur
330a1199e4 Look and feel v17 2022-10-21 15:08:54 +02:00
Laurent Destailleur
dde7f6f655 Look and feel v17 2022-10-20 23:33:36 +02:00
Laurent Destailleur
510125ceb0 Fix sanitize data 2022-10-20 15:47:44 +02:00
Javier Núñez
eb4a260fca NEW: Add option FICHINTER_ALLOW_EXTERNAL_DOWNLOAD 2022-10-20 13:52:51 +02:00
Laurent Destailleur
c63d310f2f Clean code 2022-10-17 15:26:42 +02:00
Laurent Destailleur
6ae8af440f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-15 14:11:04 +02:00
Laurent Destailleur
ccaa23121e Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-15 13:57:23 +02:00
Laurent Destailleur
7387e535ef Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-10-15 13:51:50 +02:00
Laurent Destailleur
96bf7016c7 Fix filter on membership status and graph 2022-10-13 04:25:20 +02:00
Laurent Destailleur
9fa00c1771 Fix trans in comments 2022-10-12 15:29:30 +02:00
Laurent Destailleur
f516a4b052 FIX filter on categories 2022-10-11 03:48:00 +02:00
Laurent Destailleur
00e7623bb4 Fix warnings 2022-10-10 23:15:06 +02:00
Laurent Destailleur
9660e9f0e0 Fix warning 2022-10-10 23:08:25 +02:00
Laurent Destailleur
201b774d6d Clean code 2022-10-10 20:14:51 +02:00
fboitel
a50b02857a
Merge branch 'Dolibarr:develop' into NEW#22527-view-message 2022-10-10 17:27:57 +02:00
Laurent Destailleur
bc413ee8a9 Fix warnings 2022-10-10 16:06:19 +02:00
Laurent Destailleur
f4dc43914d Remove php8.1 warnings 2022-10-10 14:46:29 +02:00
Laurent Destailleur
b6dbdd6757 Work on php 8.1 compatibility and adodb removal 2022-10-10 14:23:02 +02:00
Ferran Marcet
1aa2427fd2 Fix: Not load project title when sending email from project 2022-10-10 11:26:20 +02:00
Faustin
f85b129cbc NEW #22527: can now view actions in messaging list for projets 2022-10-09 15:16:58 +02:00
Laurent Destailleur
49e68c7fce NEW Bulk action to remove a category in list/search website pages 2022-10-08 17:04:20 +02:00
Laurent Destailleur
dbeb9d8f43
Merge pull request #22510 from grandoc/new_branch_06_10_2022b 
update code towards php8 compliance
 2022-10-07 23:51:34 +02:00
Laurent Destailleur
f58ee62798 Code comment 2022-10-07 23:29:58 +02:00
Philippe GRAND
d6e12d3589 update code towards php8 compliance 2022-10-06 16:44:52 +02:00
Laurent Destailleur
be10cdee95 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-06 16:03:50 +02:00
Laurent Destailleur
8fdf4876d9 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-06 15:39:10 +02:00
Laurent Destailleur
9125ac61a8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-10-06 15:33:59 +02:00
ksar
a72fff4a5d
FIX #22241 2022-10-05 16:39:26 +02:00
Laurent Destailleur
395312737b
Merge pull request #22406 from aspangaro/17p6 
Use isModEnabled
 2022-10-04 18:01:59 +02:00
Laurent Destailleur
013d136bf7 FIX @ must be allowed into dol_eval 2022-10-04 13:57:42 +02:00
Laurent Destailleur
07966f5e6b Clean code 2022-10-01 14:00:43 +02:00
Laurent Destailleur
51c299ffbb NEW Add hidden option MAIN_EMAIL_SUPPORT_ACK 2022-10-01 13:26:11 +02:00
Alexandre SPANGARO
51aa7e8027 Merge remote-tracking branch 'upstream/develop' into 17p6 2022-10-01 07:52:48 +02:00
Laurent Destailleur
dfe5b4ae49 Add picto/link for sending email on ticket 2022-09-30 13:26:09 +02:00
Alexandre SPANGARO
a415fcfe4c Use isModEnabled 2022-09-25 23:06:42 +02:00
Laurent Destailleur
f5e5de1eba Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-09-25 17:12:03 +02:00
Laurent Destailleur
318d78e3b6 Doc 2022-09-25 15:03:36 +02:00
Laurent Destailleur
877c57f6b8
Merge pull request #22281 from atm-lena/16.0_FIX_getunitFromCode_AddFilterType 
Function getUnitFromCode : add filter by type of unit
 2022-09-25 14:19:33 +02:00
Alexandre SPANGARO
e2c7cc13ca Use isModEnabled 2022-09-25 06:15:47 +02:00
Laurent Destailleur
3e246f4399 NEW Add option "Show price on the generated documents for receptions" 2022-09-23 09:21:07 +02:00
Laurent Destailleur
388dd6395b Clean code 2022-09-22 14:06:50 +02:00
Laurent Destailleur
d314ed380b NEW Can edit property css, cssview, csslist on extrafields 2022-09-22 13:01:11 +02:00
Laurent Destailleur
5ef34e93c9 Doc 2022-09-21 11:59:18 +02:00
Laurent Destailleur
2b3f6cc173 Fix compatibility with PHP 8.1 and Psotgresql 2022-09-20 21:16:00 +02:00
Laurent Destailleur
8f1ea59bc6 Fix for travis and PHP 8.1 with PGSQL 2022-09-20 21:13:51 +02:00
Laurent Destailleur
6f0bf07fbe Move tabs of external modules at end 2022-09-15 16:55:52 +02:00
atm-lena
1c14c61064 Function getUnitFromCode : add filter by type of unit 2022-09-15 11:55:08 +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
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
792fe32fee Doc 2022-09-09 17:08:16 +02:00
Laurent Destailleur
b23ab2cb71 FIX #yogosha12266 2022-09-09 13:58:54 +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
Laurent Destailleur
50169bc96a Clean code 2022-09-07 15:50:40 +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
Frédéric FRANCE
9150f5102e Merge remote-tracking branch 'upstream/develop' into pr/grandoc/22009 2022-09-02 11:44:45 +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
6fc7c9bca8 update code 2022-08-31 22:11:46 +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
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
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
Philippe GRAND
f98f0bbf6a FIX php8 compatibility 2022-08-28 13:57:09 +02:00
Laurent Destailleur
63a1daa091 Clean code 2022-08-26 19:27:38 +02:00
Regis Houssin
68994752cd FIX multiple php8 compatibility 2022-08-26 11:08:39 +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
atm-lena
6e5d395ac8 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-08-24 11:38:19 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Laurent Destailleur
6d80b6a710 dolButtonToOpenUrlInDialogPopup works better with nojs=1 2022-08-23 12:25:44 +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
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
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
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
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
atm-lena
2fbba30e2a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-08-11 12:11:41 +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
lmarcouiller
99141928a3 better fix 2022-08-03 17:00:39 +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
ptibogxiv
1ef855e742
Fix display variable substitutions 2022-08-01 19:20:39 +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
atm-lena
462352b957 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-07-29 12:06:43 +02:00
Laurent Destailleur
c5e5f2915e Look and feel v17 2022-07-27 19:01:26 +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
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
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