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

3143 Commits

Author SHA1 Message Date
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
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
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
b000ee7c50 NEW Add API for partnership module 
Debug module builder
 2022-07-15 13:41:02 +02:00
Quatadah Nasdami
0da4360b9f almost done 2022-07-11 17:30:11 +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
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
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
lvessiller
eab2865765 NEW substitue project title in mail template 2022-07-05 11:39:49 +02:00
Laurent Destailleur
770a160b8b Debug v16 2022-06-29 14:31:21 +02:00
Laurent Destailleur
34464ac92b Maxi debug of OAuth module. Solve tons of problems. 2022-06-27 22:35:58 +02:00
Laurent Destailleur
9372b69eb4 clean code 2022-06-27 11:52:33 +02:00
Laurent Destailleur
4e46c3f7a2 Clean code 2022-06-27 10:17:14 +02:00
Laurent Destailleur
4b79d91437 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-23 12:35:24 +02:00
bagtaib
a14b700900 New #19511 2022-06-22 15:09:23 +02:00
Florian HENRY
9d20e602d1 fix: remove warning GETPOST 2022-06-22 14:28:33 +02:00
Laurent Destailleur
e698d20789
Merge branch 'develop' into develop#6 2022-06-22 12:09:58 +02:00
Laurent Destailleur
5ef2f1c69f Fix bad name of hook context 2022-06-20 13:48:06 +02:00
Laurent Destailleur
5c82e37517 Debug v16 2022-06-20 13:40:54 +02:00
Laurent Destailleur
233d712e39 NEW Support the Swiss QR-Code 2022-06-19 13:06:07 +02:00
Laurent Destailleur
deb21396c1 Fix getEntity for invoice_supplier 2022-06-17 14:31:51 +02:00
Hystepik
45439e055c
Merge branch 'develop' into develop#6 2022-06-17 11:05:12 +02:00
Laurent Destailleur
f8ac203a4d Doc 2022-06-14 19:55:04 +02:00
Laurent Destailleur
1fc64e66a7
Merge pull request #21256 from bb2a/FIX---Badge-ng-rec-tab 
FIX - Record count badge in custom modules tab
 2022-06-14 19:49:28 +02:00
Laurent Destailleur
9ec077cccc
Merge pull request #21243 from ATM-Consulting/FIX_verifCond_strpos_on_non_string 
FIX: warning / fatal when dol_eval return value is non-empty && non-string
 2022-06-14 18:02:02 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
BB2A Anthony Berton
d1542d9b88 FIX - Record count badge in custom modules tab 2022-06-14 09:54:51 +02:00
atm-florian
4403fdc29c Missing parentheses around or (||) condition 2022-06-14 09:46:15 +02:00
Laurent Destailleur
587f794fdf PHP8 2022-06-13 16:45:30 +02:00
atm-florian
6c9d177040 FIX: warning (php7) / fatal (php8) if dol_eval returns a non-empty, non-string value 2022-06-13 15:17:36 +02:00
Laurent Destailleur
00d3750ab1 Fix infinite loop 2022-06-13 13:10:56 +02:00
Laurent Destailleur
bc11cf62f8 FIX #hunterdev2acfc8fe-247c-4f88-aeaa-042b6b8690a0 2022-06-13 10:44:20 +02:00
Frédéric FRANCE
38b18a68d7
Merge branch 'develop' into useismodenabled 2022-06-10 10:07:41 +02:00
Frédéric France
400afc937f use isModEnabled function 2022-06-09 22:16:48 +02:00
Laurent Destailleur
648f4b1d8e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-09 12:51:02 +02:00
Laurent Destailleur
62d2084237 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-09 12:49:49 +02:00
Laurent Destailleur
a4ca81d4ce FIX #21174 2022-06-09 12:46:13 +02:00