Commit Graph

191 Commits

Author SHA1 Message Date
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
Laurent Destailleur
c81bf68578 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/dict.php
	htdocs/compta/cashcontrol/cashcontrol_list.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/modulebuilder/index.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/class/api_products.class.php
2021-10-22 15:56:44 +02:00
daraelmin
eed689e1c1 quote instead double quote 2021-10-20 16:33:38 +02:00
daraelmin
a2adc6fc58 Getpostisset 2021-10-20 15:59:42 +02:00
daraelmin
dc465d6bac Fix adhtype amount as default on new subscription 2021-10-20 00:29:46 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
d38c3028eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
2021-09-23 02:41:53 +02:00
Laurent Destailleur
06f97f4f80 Look and feel v14 2021-09-21 12:04:28 +02:00
Scrutinizer Auto-Fixer
312ca95feb Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-08-31 18:18:28 +00:00
Laurent Destailleur
0aa4868c34 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-31 13:14:01 +02:00
Laurent Destailleur
5549186e3a Fix link 2021-08-30 19:28:49 +02:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +02:00
Laurent Destailleur
21852bd16b Show link to invoices on member record 2021-08-23 15:25:41 +02:00
Laurent Destailleur
5f16de8150 Code comment 2021-08-23 15:08:29 +02:00
Laurent Destailleur
a25346e302 FIX Date of payment of subscription must not be set to 1970-01-01.
Fix look and feel v14
2021-08-23 15:00:29 +02:00
Laurent Destailleur
e99355a0c2 Clean html 2021-04-30 15:22:17 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
Laurent Destailleur
78d7cfffa8 FIX #yogosha5747 2021-03-29 15:25:28 +02:00
Laurent Destailleur
86c7ab922a Fix #yogosha5728 2021-03-24 18:57:23 +01:00
daraelmin
4d8ed4bd40 merge develop 2021-03-20 15:34:30 +01:00
Laurent Destailleur
86094525b1 Merge pull request #16829 from dolibit-ut/patch-121
Update subscription.php
2021-03-20 11:52:42 +01:00
Frédéric FRANCE
84b71dbcc8 fix php8 warning 2021-03-19 16:34:17 +01:00
UT from dolibit
c0a420bcb7 Update subscription.php
$help_url = "EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder";

llxHeader("", $title, $help_url);
2021-03-19 09:17:24 +01:00
daraelmin
e290884552 update subscription and type 2021-03-18 23:23:57 +01:00
Alexandre SPANGARO
03481a0197 Uniformize translation 2021-03-16 04:22:43 +01:00
daraelmin
e038408195 Update comment on subscription creation
subscription is not allowed if the membre status is "excluded"
2021-03-13 15:34:29 +01:00
stickler-ci
d5e6f54b5c Fixing style errors. 2021-03-10 15:33:53 +00:00
Givriz
6e46396b17 Ajout de picto pour le genre et la civilité 2021-03-10 16:31:50 +01:00
Laurent Destailleur
1cdea45707 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/societe/canvas/company/tpl/card_create.tpl.php
	htdocs/societe/canvas/individual/tpl/card_create.tpl.php
	htdocs/societe/card.php
2021-03-01 17:46:36 +01:00
Laurent Destailleur
222012da37 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/class/paymentvarious.class.php
	htdocs/compta/bank/various_payment/card.php
	htdocs/don/card.php
	htdocs/langs/en_US/main.lang
	htdocs/public/payment/newpayment.php
	test/phpunit/DateLibTzFranceTest.php
2021-03-01 15:48:30 +01:00
Frédéric FRANCE
1b046f25cf add new rule 2021-03-01 00:19:52 +01:00
Laurent Destailleur
77151bd560 Standardize tabs 2021-02-28 23:53:20 +01:00
Frédéric FRANCE
a0031901e4 complete doaction hook 2021-02-22 11:36:03 +01:00
Laurent Destailleur
b4e301893c Update subscription.php 2021-02-22 11:22:48 +01:00
abb
765893f9e6 new:hook doActions for subscriptions with possibility to modify values of variables $datefrom,$dateto,$paymentdate inside hook 2021-02-21 19:44:27 +01:00