Commit Graph

296 Commits

Author SHA1 Message Date
ptibogxiv
a181469ff8 Update type.php 2021-07-26 14:34:45 +02:00
ptibogxiv
cfdcad0077 Update type.php 2021-07-26 14:30:38 +02:00
Laurent Destailleur
19a203bd40 Fix amount of memberships 2021-05-12 22:09:06 +02:00
daraelmin
6644fd3a73 Fix undefined translation key 2021-05-03 22:15:40 +02:00
Laurent Destailleur
9973085613 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/card.php
	htdocs/comm/propal/card.php
	htdocs/compta/bank/releve.php
	htdocs/compta/paiement/rapport.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/reception/card.php
	htdocs/societe/societecontact.php
2021-05-03 19:36:49 +02:00
Laurent Destailleur
cbc481dc60 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/adherents/list.php
	htdocs/adherents/type.php
	htdocs/core/lib/company.lib.php
2021-05-03 19:01:47 +02:00
Laurent Destailleur
540e4f3d2e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-03 18:58:41 +02:00
stickler-ci
832ceb2be3 Fixing style errors. 2021-05-01 18:36:59 +00:00
daraelmin
5f23c68f85 Update type.php 2021-05-01 20:01:18 +02:00
Laurent Destailleur
0d4eaca3e8 Merge pull request #17426 from daraelmin/daraelmin-patch-v11
Fix wrong alias in natural_search v11-v14
2021-04-30 11:58:53 +02:00
daraelmin
4174ebd9c0 Fix subscription =="yes" 2021-04-29 23:11:51 +02:00
daraelmin
68415322ec Fix v11 wrong alias in natural_search 2021-04-29 10:00:54 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
daraelmin
4d8ed4bd40 merge develop 2021-03-20 15:34:30 +01:00
Frédéric FRANCE
19079dcae6 fix php8 warning 2021-03-19 17:17:08 +01:00
daraelmin
e290884552 update subscription and type 2021-03-18 23:23:57 +01:00
UT from dolibit
972d162c5e Update type.php
$help_url = 'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder';
2021-03-18 21:16:44 +01:00
daraelmin
fa25ba797f Add excluded status in adherent type stats 2021-03-13 15:28:31 +01:00
Frédéric FRANCE
1b046f25cf add new rule 2021-03-01 00:19:52 +01:00
Laurent Destailleur
d16276ea2c Clean code 2021-02-16 11:15:42 +01:00
Laurent Destailleur
e7775d2f79 Fix scrutinizer errors 2020-11-30 12:54:47 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel"
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
2020-11-23 15:12:52 +01:00
Givriz
c48129e279 Ajout de la class "button-save"
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
2020-11-19 20:23:38 +01:00
Laurent Destailleur
ed6925d87d Fix label 2020-11-02 16:46:28 +01:00
Laurent Destailleur
83a7b19333 Look and feel v13 2020-11-02 11:41:07 +01:00
Frédéric FRANCE
5a3780e062 end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Frédéric FRANCE
9a470fa42d replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-07 08:18:17 +00:00
Laurent Destailleur
e65e4a6d47 Beautify for of member module 2020-08-18 11:52:00 +02:00
Frédéric FRANCE
f4011520a3 add new rule 2020-05-21 09:31:49 +02:00
Frédéric FRANCE
ba8cf2b398 add new rule 2020-05-21 09:21:30 +02:00
Frédéric FRANCE
ccc859ec80 add new rule 2020-05-21 09:12:18 +02:00
Frédéric FRANCE
43dcd9beb5 add new rule 2020-05-21 00:02:33 +02:00
Josep Lluís
e1f1e2bf97 FIX type member extrafields are duplicated on edit
type member extrafields are duplicated on edit, and old usage on create (without tpl)
2020-04-20 17:50:19 +02:00
Laurent Destailleur
67a7d6b77d Look and feel v12 2020-04-20 15:57:15 +02:00
Laurent Destailleur
a5379c7144 FIX All forms must use newToken()
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/cashcontrol/cashcontrol_card.php
	htdocs/supplier_proposal/card.php
2020-03-24 13:14:23 +01:00
Laurent Destailleur
1ff15e1fd9 FIX All forms must use newToken() 2020-03-24 13:10:35 +01:00
Laurent Destailleur
820a21a721 Simple setup tutorial 2020-03-23 18:35:22 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Laurent Destailleur
f4f3efec62 Fight against $_POST 2020-02-16 19:33:58 +01:00
Laurent Destailleur
a9790f355d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-21 11:32:40 +01:00
Laurent Destailleur
f2ed97dada Fix default value 2020-01-21 10:29:41 +01:00
Laurent Destailleur
c203e21966 Fix default values 2020-01-21 10:28:42 +01:00
Laurent Destailleur
f64b3262c3 Merge pull request #12475 from ptibogxiv/patch-279
NEW add WYSiWYG on member type's description
2020-01-15 14:18:08 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
ptibogxiv
789e751e4a Update type.php 2019-11-20 10:55:58 +01:00
stickler-ci
54e528d659 Fixing style errors. 2019-11-20 09:38:32 +00:00