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

8592 Commits

Author SHA1 Message Date
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
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
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
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
Artem Chernitsov
0867c96f61
fix of recruitment module 
- checking file permissions
 2022-06-29 11:48:06 +03:00
bagtaib
253799eb1e NEW #21399 2022-06-29 05:07:32 +02:00
Quatadah Nasdami
3c4183f783 success 2022-06-28 15:51:38 +02:00
Laurent Destailleur
d23426847e css 2022-06-28 13:14:36 +02:00
Yoan Mollard
5998999f18 NEW: Add free membership amounts at the membership type level 2022-06-28 02:33:17 +02:00
Laurent Destailleur
34464ac92b Maxi debug of OAuth module. Solve tons of problems. 2022-06-27 22:35:58 +02:00
Faustin
3e66ca1636 NEW #21395 : Added picto text to inform that option does not work with all themes 2022-06-27 16:18:54 +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
Christian Foellmann
89d1389e2d fix page titles 2022-06-27 12:48:04 +02:00
Laurent Destailleur
9372b69eb4 clean code 2022-06-27 11:52:33 +02:00
Laurent Destailleur
7e94eaac07 Debug v16 2022-06-27 10:53:03 +02:00
Laurent Destailleur
4e46c3f7a2 Clean code 2022-06-27 10:17:14 +02:00
Laurent Destailleur
00649e791c Fix #yogosha11452 2022-06-25 02:18:16 +02:00
Quatadah Nasdami
d6330fd3f7 initialising the smiley function 2022-06-23 19:15:05 +02:00
Quatadah Nasdami
205022b4c8 removing useless block 2022-06-23 18:09:00 +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
Laurent Destailleur
55c6438353
Merge pull request #21349 from frederic34/deprecatedinproject 
fix deprecated in project
 2022-06-22 18:26:57 +02:00
bagtaib
a14b700900 New #19511 2022-06-22 15:09:23 +02:00
Quatadah Nasdami
ce7db0004b two changes to feature request 2022-06-22 14:41:46 +02:00
Florian HENRY
9d20e602d1 fix: remove warning GETPOST 2022-06-22 14:28:33 +02:00
Frédéric France
b46ede5eae fix deprecated in project 2022-06-22 13:50:54 +02:00
Laurent Destailleur
e698d20789
Merge branch 'develop' into develop#6 2022-06-22 12:09:58 +02:00
Laurent Destailleur
c1904f0e5e Debug v16 2022-06-21 11:11:28 +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
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
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
b67c4b39ca Typo 2022-06-14 20:57:58 +02:00
Laurent Destailleur
1aa2e7adc7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-14 20:57:34 +02:00
Laurent Destailleur
c39c3b1cb1
Merge pull request #21271 from fboitel/fboitel-dev-scrutinizer-012 
BUG FIX typo on DiscountAbsolute attribute: ref_invoice_supplier_source
 2022-06-14 20:57:26 +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
ff26031dc6 phpv8 2022-06-14 17:58:41 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Faustin
2666a283c7 BUG FIX typo on ref_invoice_supplier_source 2022-06-14 14:53:14 +02:00
Laurent Destailleur
862ca7cf04 Debug v16 2022-06-14 14:39:32 +02:00
Laurent Destailleur
293b08ab1d Debug v16 2022-06-14 11:47:56 +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
Laurent Destailleur
c2fe5de852
Merge pull request #21195 from frederic34/useismodenabled 
use isModEnabled function
 2022-06-12 11:56:31 +02:00
Laurent Destailleur
04d625cccf
Merge pull request #21213 from rycks/15_add_invoice_template_in_product_used_list 
#21212 : add template invoices stats on products card
 2022-06-12 11:46:17 +02:00
Eric Seigne
c23b5947b3 #21212 : add template invoices stats on products card 2022-06-12 11:05:12 +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
Frédéric France
3fe46c8028 use isModEnabled function 2022-06-09 22:10:51 +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
Laurent Destailleur
1838baaa5c Debug v16 2022-06-08 21:20:12 +02:00
Laurent Destailleur
499d1d2994
Merge pull request #21149 from bb2a/FIX---php-V8-lib-pdf 
FIX - php V8 lib pdf
 2022-06-08 15:01:54 +02:00
BENKE Charlene
5aef26d8cc
Update project.lib.php 2022-06-08 13:11:28 +02:00
BENKE Charlene
dc2979ad4d
php V8 warning 2022-06-08 09:02:24 +02:00
BB2A Anthony Berton
054eefb1f7 FIX - php V8 lib pdf 2022-06-07 18:49:29 +02:00
Laurent Destailleur
32c6daee2f CSS 2022-06-07 18:18:01 +02:00
Laurent Destailleur
a9440c934d FIX #yogosha10825 2022-06-07 16:05:01 +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
BB2A Anthony Berton
59cd2fea98 FIX - php V8 warning lib usergroups topmenu select 2022-06-03 15:20:17 +02:00
Laurent Destailleur
afd9787e99 Help debug cron 2022-06-03 11:52:39 +02:00
Laurent Destailleur
41ce28996c PHP 8.1 #21121 2022-06-03 11:10:08 +02:00
Laurent Destailleur
00c22eff6b
Merge pull request #21106 from frederic34/patch-1 
New isModEnabled function
 2022-06-02 14:45:56 +02:00
lmarcouiller
0bad3664fb fix: php8.0 warnings 2022-06-02 11:14:35 +02:00
Frédéric FRANCE
96bf5a9c8a
New isModEnabled function 2022-06-02 10:21:05 +02:00
Laurent Destailleur
43dedcb2b1 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-06-01 22:29:29 +02:00
Laurent Destailleur
1a51a7d525 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-01 22:14:02 +02:00
Laurent Destailleur
d3fed26d78 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
 2022-06-01 22:13:42 +02:00
Laurent Destailleur
ff450e57fd
Merge branch 'develop' into patch-198 2022-06-01 22:05:03 +02:00
Laurent Destailleur
d2a8dd6925
Merge pull request #21065 from bb2a/FIX-PHP8-files-lib 
php V8 warning files lib
 2022-06-01 20:58:44 +02:00
BB2A Anthony Berton
976f6d42b8 php V8 warning 2022-06-01 09:15:21 +02:00
Laurent Destailleur
21e5189e18 Add phpunit for num2Alpha 2022-05-31 18:17:43 +02:00
Laurent Destailleur
a253938db9 Better error message 2022-05-31 18:08:53 +02:00
Laurent Destailleur
5ada47195a FIX Link to social network 2022-05-31 15:48:50 +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
72b36b5a69 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-31 14:31:20 +02:00