Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
126,919 Commits 36 Branches 189 Tags
cb15d8c7beb0db960202c0207fe164e65e59349c
Commit Graph

226 Commits

Author SHA1 Message Date
Laurent Destailleur
d177b8e133 Fix phpcs 2023-11-07 21:13:23 +01:00
daraelmin
4fc415a287 New option to define the start period of a first subscription (#26484) 
* New option to define the start period of a first subscription

add default date of starting (year, month or subscription payment)
add delay for subscription period

* Update member.php

* Fix period for statistique if delay is set
 2023-11-07 18:05:36 +01:00
daraelmin
63ccf17402 FIX #24367 - membership duration is the default duration adhtype (#26428) 
* FIX #24367 - membership duration is the default duration adhtype

* avoid error for old database

* avoid error for old database

* Update paymentok.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-02 01:33:46 +01:00
Laurent Destailleur
ca3c7f0a37 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-10-26 13:52:22 +02:00
daraelmin
a815c99d53 FIX suggested end for membership can be before subscription start (#26351) 
* Fix wrong debug log

* Fix suggested end for membership can be in the past

MEMBER_SUBSCRIPTION_SUGGEST_END_OF_YEAR and MEMBER_SUBSCRIPTION_SUGGEST_END_OF_MONTH should be based on the subscription start date, not on the creation date

* Fix typo
 2023-10-26 12:48:40 +02:00
Laurent Destailleur
5b15b5c647 QUAL Move conf->global into getDolGlobal... 2023-10-24 17:00:13 +02:00
Dev2a
fcd4c4e429 Fix: Change access to $conf->global to function getDolGlobal (automatique) 2023-10-08 23:19:49 +02:00
Laurent Destailleur
686a085dfe Debug v18 2023-07-02 20:27:04 +02:00
Frédéric France
68855ce672 use user hasRight 2023-06-19 20:08:27 +02:00
Frédéric France
eaad829b6f use user hasRight 2023-06-12 20:31:34 +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
fd4c24e000 use user hasRight 2023-06-05 23:49:13 +02:00
hystepik
c717194049 Fix : bad value on amount in subscription 2023-05-22 14:17:11 +02:00
Laurent Destailleur
c1a5ce3578 Debug v18 2023-05-17 00:20:36 +02:00
Laurent Destailleur
0fb03fdc2d Clean code 2023-04-08 01:43:21 +02:00
Frédéric FRANCE
05de1b419d can suggest end date of subscription 
define option if needed
MEMBER_SUBSCRIPTION_SUGGEST_END_OF_MONTH
MEMBER_SUBSCRIPTION_SUGGEST_END_OF_YEAR
 2023-03-02 23:25:09 +01:00
Laurent Destailleur
2168578f2e Fix inline css 2023-02-18 14:00:25 +01:00
Frédéric FRANCE
9fe920b2a9 deprecate method send_an_email 2023-02-08 21:45:46 +01:00
Frédéric FRANCE
6bb8badfdf use user->hasRight 2022-12-21 08:50:13 +01:00
Frédéric FRANCE
3680f20465 use user->hasRight 2022-12-21 08:41:19 +01:00
Frédéric FRANCE
9ecf353342 fix warnings 2022-12-20 17:57:19 +01:00
hystepik
d8ce58811a Fix : php 8.1 warnings 2022-12-09 14:27:43 +01:00
Laurent Destailleur
4890a2ada3 Debug v17 2022-11-04 11:37:28 +01:00
Laurent Destailleur
7a277d9560 Merge branch 'develop' into loaddolibarrenv 2022-09-09 17:02:05 +02:00
Philippe GRAND
b411ec8b59 update code toward php8 compliance 2022-09-09 10:26:01 +02:00
Frédéric France
da8617e3ff Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv 2022-09-08 18:59:23 +02:00
Laurent Destailleur
ee05abaa27 Clean code 2022-09-08 15:13:16 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Philippe GRAND
f7d23c0168 FIX php8 compatibility 2022-08-23 10:04:07 +02:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
Laurent Destailleur
259a292704 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-24 16:33:24 +02:00
Laurent Destailleur
34199cf0fb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/core/modules/modRecruitment.class.php
 2022-05-24 16:31:45 +02:00
Laurent Destailleur
c1ef208c0f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/lib/security.lib.php
	htdocs/expensereport/card.php
 2022-05-24 16:27:26 +02:00
Marc de Lima Lucio
25196fa709 FIX: new member subscription: bank account and payment mode might be hidden 2022-05-19 10:20:31 +02:00
Laurent Destailleur
06804c3547 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/template/myobject_list.php
 2022-03-11 17:04:23 +01:00
Laurent Destailleur
31aa5515db Debug v15 2022-03-11 12:05:28 +01:00
lmarcouiller
aea9c2e427 Fix : fix php 8.0 warnings 2022-02-17 10:22:58 +01:00
nervo
26c54373e8 Add "addMoreActionsButtons" hook to subscription form 2022-01-15 19:06:07 +01:00
Laurent Destailleur
7edba34107 Debug and secure the signature feature 2021-12-25 17:08:40 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed 
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
 2021-11-29 15:09:18 +01:00
Laurent Destailleur
83b8f329ca Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-11 15:37:09 +01:00
daraelmin
cea3d93b91 Fix wrong sign in test 2021-11-09 20:51:27 +01:00
Laurent Destailleur
d55fde4633 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-08 18:49:53 +01:00
daraelmin
9d7f7e2090 Better condition 2021-11-05 14:03:56 +01:00
stickler-ci
586005ff2e Fixing style errors. 2021-11-03 21:43:30 +00:00
daraelmin
f9db196512 Update subscription.php 2021-11-03 22:31:45 +01:00
daraelmin
0e91b32e99 Update subscription.php 2021-11-03 20:40:09 +01:00
daraelmin
973f408b6e Fix default enddate subscription must be in futur 2021-11-03 20:35:57 +01:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00