2
0
forked from Wavyzz/dolibarr
Commit Graph

9151 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
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