Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-22 09:21:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
123,192 Commits 36 Branches 190 Tags
10726173f7bbf70fdffa438a2d1113c43b7aa3f8
Commit Graph

31879 Commits

Author SHA1 Message Date
Laurent Destailleur
3f1572c7f8 Merge pull request #24793 from daraelmin/patch-1 
Fix PHP 8 Warning in box member type
 2023-05-17 15:21:20 +02:00
Laurent Destailleur
649f09016f Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-05-17 14:23:45 +02:00
Laurent Destailleur
76de309cd9 FIX error management on emoji and utf8 validity by emailcollector 2023-05-17 14:23:14 +02:00
daraelmin
8996e51e68 FIX PHP 8 Warning in adherent categorie view 2023-05-17 14:09:57 +02:00
Timo Scheuer
3c5b385444 fixed access to propal array 2023-05-17 13:04:08 +02:00
daraelmin
95a42312ec Fix PHP 8 Warning in box member type 2023-05-17 12:32:23 +02:00
Frédéric FRANCE
436b23bc1a Update box_members_by_type.php 2023-05-17 12:28:41 +02:00
Laurent Destailleur
aefc34d622 Merge pull request #24719 from altairis-benjamin/ticketModule 
FIX broken feature : send private message by email
 2023-05-17 01:14:58 +02:00
Laurent Destailleur
bc2e095dec Debug v18 2023-05-17 01:09:09 +02:00
Laurent Destailleur
476f95c4f6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/comm/action/index.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
	htdocs/cron/class/cronjob.class.php
	htdocs/eventorganization/class/conferenceorbooth.class.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/public/ticket/list.php
	htdocs/supplier_proposal/list.php
	htdocs/ticket/class/ticket.class.php
 2023-05-17 00:57:17 +02:00
Laurent Destailleur
9d8af9c530 Fix restore option to have non samples stats 2023-05-17 00:04:37 +02:00
Laurent Destailleur
0ec45022ea Merge pull request #24767 from daraelmin/daraelmin-stats-adh-by-status 
NEW : Uniformize member stats in boxes and index
 2023-05-16 23:22:22 +02:00
Laurent Destailleur
ca18bfc587 Merge pull request #24705 from mrbidon/develop 
Add hidden option COMPANY_AQUARIUM_NO_PREFIX to ignore PREFIX
 2023-05-16 20:55:35 +02:00
Laurent Destailleur
df4472b1f4 Merge pull request #24721 from hregis/fix_takepos_php8 
FIX missing constant and avoid submit button conflict
 2023-05-16 20:46:34 +02:00
Laurent Destailleur
da1bd3a725 Merge pull request #24759 from frederic34/patch-5 
add errors-to for swiftmailer
 2023-05-16 20:15:35 +02:00
Laurent Destailleur
a637a9b07c Merge pull request #24781 from altairisfr/masknextvalue 
NEW mask next value sql on mask only
 2023-05-16 19:37:39 +02:00
Laurent Destailleur
f71e53e6b2 Clean vars 2023-05-16 19:21:14 +02:00
hystepik
46012a6520 fix : php 8.1 warnings 2023-05-16 15:36:27 +02:00
Laurent Destailleur
2b55ecceb0 Fix trans key must be short 2023-05-16 12:58:55 +02:00
Laurent Destailleur
b1811ce466 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-05-16 12:38:02 +02:00
Frédéric FRANCE
6caa8549bc fix errors-to with swiftmailer 2023-05-16 09:33:12 +02:00
Christophe Battarel
db00c5a60e FIX mask next value sql string for external modules 2023-05-16 08:36:13 +02:00
Christophe Battarel
1d4b1cebfc Merge branch 'develop' into masknextvalue 2023-05-16 08:33:19 +02:00
Christophe Battarel
edc0fc6ea5 FIX mask next value sql string for external modules 2023-05-16 08:30:15 +02:00
Laurent Destailleur
f959fc73ce Fix css 2023-05-16 03:55:42 +02:00
Laurent Destailleur
a31bec747f Merge pull request #24740 from frederic34/patch-2 
can use isModEnabled("module") in extrafield enabled
 2023-05-16 00:45:07 +02:00
Laurent Destailleur
85e0341257 Merge pull request #24758 from frederic34/patch-1 
doc
 2023-05-16 00:18:33 +02:00
Laurent Destailleur
4750ba1cce Merge pull request #24762 from lainwir3d/add_rest_api_region 
CLOSE #24761 Add REST API to retrieve regions
 2023-05-16 00:06:57 +02:00
Laurent Destailleur
72b5f02d26 Merge pull request #24768 from daraelmin/daraelmin-stats-adh-by-tags 
Fix link, label and badge color status in box_members_by_tags
 2023-05-15 23:51:09 +02:00
Laurent Destailleur
48275b04cf Merge pull request #24770 from atm-jpb/fix-chargesociales 
FIX : add charchesociales in security.lib.php
 2023-05-15 23:49:08 +02:00
Laurent Destailleur
1d45a6ee62 Merge pull request #24773 from Hystepik/develop_v17#1 
Fix #24769 : External user cannot access card
 2023-05-15 23:45:26 +02:00
Laurent Destailleur
b72cba5c14 Merge pull request #24775 from Hystepik/develop#3 
fix : php 8.1 warnings
 2023-05-15 23:21:24 +02:00
Laurent Destailleur
9972ab2f44 CSS 2023-05-15 20:53:31 +02:00
Christophe Battarel
4be4b9e53c FIX mask next value sql string for external modules 2023-05-15 17:49:56 +02:00
Laurent Destailleur
79cdb3a7f9 NEW Use an ajax component to swith prospection status on thidparty list 2023-05-15 16:35:42 +02:00
hystepik
979359526e fix : php 8.1 warnings 2023-05-15 16:05:04 +02:00
stickler-ci
fd108f67a7 Fixing style errors. 2023-05-15 13:27:01 +00:00
Noé Courtier
c9eacc4928 FIX: Warehouse total line 2023-05-15 15:19:30 +02:00
Laurent Destailleur
6dffeeda2d Merge pull request #24348 from FliyFly/editProspectStatus 
NEW new feature (select prospect status)
 2023-05-15 14:55:53 +02:00
hystepik
325c75db54 Fix #24769 : External user cannot access card 2023-05-15 14:03:37 +02:00
Laurent Destailleur
23a7491e12 NEW: Add option PDF_SHOW_EMAIL_AFTER_USER_CONTACT to show email after 
specific assigned contact on PDF
 2023-05-15 11:30:45 +02:00
Laurent Destailleur
5876e71072 NEW: Add option PDF_SHOW_PHONE_AFTER_USER_CONTACT to show phone after 
specific assigned contact on PDF
 2023-05-15 11:20:18 +02:00
stickler-ci
76e7195dd0 Fixing style errors. 2023-05-15 09:16:23 +00:00
jpb
a8cfea083e add charchesociales in security.lib.php 2023-05-15 11:09:35 +02:00
daraelmin
130a84e63d Fix link for member tag in box 2023-05-14 23:10:25 +02:00
daraelmin
c9c973acc2 Fix label and badge color status in box_members_by_tags 
Pending members were listed as green instead of orange

Validate member short label was used insteaded of pending member short label
 2023-05-14 22:33:25 +02:00
Laurent Destailleur
b51e6ac025 Fix column length 2023-05-14 20:51:36 +02:00
Laurent Destailleur
80f5358e6e Fix label for title of table must be short value 2023-05-14 20:44:52 +02:00
Laurent Destailleur
8705cf1e7d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-05-14 20:40:59 +02:00
Laurent Destailleur
977c845d56 Fix sentence overwrite on proposal PDF 2023-05-14 20:40:47 +02:00