Commit Graph

3348 Commits

Author SHA1 Message Date
Laurent Destailleur
f0fd249498 Fix warnings 2023-06-26 16:22:00 +02:00
Frédéric France
68855ce672 use user hasRight 2023-06-19 20:08:27 +02:00
Laurent Destailleur
31474d80f1 Doxygen 2023-06-19 00:52:43 +02:00
Frédéric France
eaad829b6f use user hasRight 2023-06-12 20:31:34 +02:00
Frédéric France
f9a1fbf410 use user hasRight 2023-06-12 20:25:51 +02:00
Frédéric France
0cb70110eb use user hasRight 2023-06-12 20:10:42 +02:00
Florian HENRY
5cec30aeae agin fix php8 warning 2023-06-09 01:14:57 +02:00
Laurent Destailleur
31d6df0dcd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/adherents/subscription/card.php
2023-06-08 09:58:36 +02:00
Laurent Destailleur
d28fcdafff Debug v18 2023-06-08 09:55:08 +02:00
Frédéric France
5a018d715d use user hasRight 2023-06-06 00:05:02 +02:00
Frédéric France
fd4c24e000 use user hasRight 2023-06-05 23:49:13 +02:00
Laurent Destailleur
6efa2ecfbb Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-04 03:34:49 +02:00
Laurent Destailleur
ebfe632efe Debug v18 2023-06-03 15:33:46 +02:00
Laurent Destailleur
8d7e53a98c Clean code 2023-06-03 13:56:06 +02:00
ptibogxiv
b886791b28 Fix php 8 error on member card 2023-06-03 11:00:46 +02:00
Laurent Destailleur
e16d944284 Clean code 2023-05-30 13:37:56 +02:00
daraelmin
9d34f9dba9 FIX PHP 8 Warning in subscription list 2023-05-25 12:30:52 +02:00
Laurent Destailleur
63ca062614 Merge pull request #24845 from Hystepik/develop#2
Fix : bad value on amount in subscription
2023-05-24 10:35:27 +02:00
Laurent Destailleur
8f981fb734 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-05-24 03:23:30 +02:00
Laurent Destailleur
481fc79721 Debug v18 - Fix extrafields visibility in customreports 2023-05-24 00:26:30 +02:00
David Beniamine
f929aee3af Add a setting to send subscription reminder to a cc address 2023-05-23 14:12:41 +02:00
hystepik
c717194049 Fix : bad value on amount in subscription 2023-05-22 14:17:11 +02:00
daraelmin
3039c62738 FIX better box member by tag
Fix total is missing for each row
Fix Link on category points now in the adherent list filtered by category
Fix order in box is now same as the select in the list
2023-05-21 18:18:12 +02:00
Laurent Destailleur
96f577f1fb Merge pull request #24791 from frederic34/patch-1
fix warnings in member pages
2023-05-17 15:26:29 +02:00
daraelmin
e7e781d1eb FIX PHP 8 Warning in adherent index.php 2023-05-17 12:38:10 +02:00
Frédéric FRANCE
bed87447c4 fix warnings 2023-05-17 12:25:01 +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
c1a5ce3578 Debug v18 2023-05-17 00:20:36 +02:00
Laurent Destailleur
9d8af9c530 Fix restore option to have non samples stats 2023-05-17 00:04:37 +02:00
daraelmin
6abf459da5 Fix copyright 2023-05-14 16:57:44 +02:00
daraelmin
873f1bc8e8 remove new feature
Must wait for an other PR
2023-05-14 16:53:12 +02:00
daraelmin
a67330a0ff fix merge 2023-05-14 15:59:23 +02:00
daraelmin
059589656e Merge branch 'Dolibarr:develop' into daraelmin-stats-adh-by-status 2023-05-14 12:17:41 +02:00
daraelmin
31c03ad7d8 Merge branch 'develop' into daraelmin-stats-adh-by-status 2023-05-14 12:17:05 +02:00
Laurent Destailleur
a54eb10f7d css 2023-05-12 15:58:20 +02:00
Laurent Destailleur
b4eb13ba28 Fix tooltip 2023-05-12 15:56:47 +02:00
Laurent Destailleur
81931b62dd Fix output of note 2023-05-12 15:53:46 +02:00
Laurent Destailleur
5dd3f57a1e Debug v18 2023-05-11 13:11:21 +02:00
Laurent Destailleur
09120d3fa9 Debug v18 2023-05-09 16:08:43 +02:00
Laurent Destailleur
7a781840ca Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-03 04:54:49 +02:00
Laurent Destailleur
889811c6d1 Fix amount on renewal for membership 2023-05-02 12:38:25 +02:00
Laurent Destailleur
4fb496a1d2 Merge pull request #24633 from frederic34/commonpeople
move some methods in trait
2023-05-01 14:43:08 +02:00
Laurent Destailleur
d40fe56cb4 Fix warning 2023-04-30 04:50:10 +02:00
Laurent Destailleur
4028b5d568 Clean code 2023-04-29 13:13:12 +02:00
Laurent Destailleur
be835d63ed Merge pull request #24635 from VMR-Global-Solutions/develop
API add / fix filter on extrafields in index()
2023-04-28 20:02:09 +02:00
Laurent Destailleur
e74c50aa8a Clean code 2023-04-28 16:05:25 +02:00
VMR Global Solutions
926aa6fec7 API add / fix filter on extrafields in index()
Add / change in api_xxx.class.php files the ability to filter on extrafields when missing in the public functions index()
by changing the SQL query with the pattern 
" FROM ".MAIN_DB_PREFIX"xxxx AS t LEFT JOIN ".MAIN_DB_PREFIX."xxxx_extrafields AS ef ON (ef.fk_object = t.rowid)
2023-04-28 09:31:33 +02:00
Frédéric FRANCE
89d67c8fd4 move some methods in trait 2023-04-27 23:48:21 +02:00
Frédéric FRANCE
6e5abdc462 add hook init context 2023-04-26 09:48:02 +02:00
Laurent Destailleur
c891196b5b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-04-25 21:02:01 +02:00