Commit Graph

238 Commits

Author SHA1 Message Date
Laurent Destailleur
fa8ce6e4fd
Merge pull request #20710 from fappels/develop_confirm_createbills
Move massaction 'confirm_createbills' from actions_massactions.inc.php to commande/list.php
2022-04-29 17:19:18 +02:00
Laurent Destailleur
147e61472c Clean code: Remove all   entities. 2022-04-29 13:10:28 +02:00
Francis Appels
7e44227df2 Cleanup 'confirm_createbills' 2022-04-25 14:28:57 +02:00
Laurent Destailleur
4e34649fc2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/modulebuilder/index.php
2022-04-14 16:10:23 +02:00
Laurent Destailleur
a006eaecde Fix trans 2022-04-12 13:02:33 +02:00
Laurent Destailleur
baa4608812 Debug v16 2022-04-07 18:16:06 +02:00
Laurent Destailleur
5d0408f7af Fix filter on member list 2022-02-26 19:15:40 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Frédéric FRANCE
d40e9bb304
remove old field
field skype has been removed
2021-11-01 13:52:06 +01:00
Laurent Destailleur
e43b33028c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/card.php
2021-10-20 15:06:10 +02:00
atm-florian
c016a20aac FIX 13.0 - due to a typo in the 'mode' parameter, the "first name" column of the list of members displays the full name 2021-10-18 12:12:38 +02:00
Laurent Destailleur
38c0e93285 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/public/project/index.php
2021-09-01 17:52:04 +02:00
Laurent Destailleur
da8dcaa0c9 Fix look and feel v14 2021-09-01 12:15:23 +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
7c9909ee12 Fix label of list of members 2021-08-30 19:21:52 +02:00
Laurent Destailleur
d9bfd72c29 Fix missing login in tooltip 2021-08-30 19:13:02 +02:00
Laurent Destailleur
3c029d0ccf Fix sort on company on member list. 2021-08-30 18:57:41 +02:00
Laurent Destailleur
9db5f85d4e Fix responsive 2021-08-30 18:42:41 +02:00
Laurent Destailleur
9c3ba22b02 Fix label of company of a thirdparty 2021-08-30 18:38:31 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
6f449cfd6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 16:33:38 +02:00
ptibogxiv
f83f02e4e2
Fix for php8 2021-07-26 15:24:58 +02:00
lmarcouiller
dcd4d53622 Fix php 8 warning in adherents list 2021-06-30 10:22:00 +02:00
damien clochard
05bb2c720d FIX #17996: Avoid implicit type casts for llx_adherent_type.subscription
The llx_adherent_type.subscription column is VARCHAR so we need to
compare it with a string, not an int.
2021-06-21 18:24:52 +02:00
daraelmin
8423ad823b
Update list.php 2021-06-14 12:41:32 +02:00
Laurent Destailleur
819e6e1122 Fix duplicate 2021-05-27 14:59:44 +02:00
Laurent Destailleur
a33f6a8977 css 2021-05-27 14:57:16 +02:00
Frédéric FRANCE
371f2e4f37
fix warnings 2021-05-26 18:24:06 +02:00
Frédéric FRANCE
8221011d7d
Update list.php 2021-05-25 23:22:43 +02:00
Laurent Destailleur
8576cf1b72 Fix combo when we must no hide value with key -1 2021-05-25 22:51:37 +02:00
NextGestion
6f85cab6c4 Merge https://github.com/Dolibarr/dolibarr into dolibarr_partnership 2021-05-04 10:55:19 +01: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
daraelmin
965eb2d639
Fix logical test always false
subscription is an integer and is set to 0 or 1. So subscription is never equal to "yes"
2021-04-29 22:57:39 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
stickler-ci
6f32b2edda Fixing style errors. 2021-04-19 13:23:36 +00:00
NextGestion
263e110ca3 Enhance module Member 2021-04-19 13:19:32 +01:00
Anthony Berton
a612831e28 next_change 2021-04-14 14:45:55 +02:00
Laurent Destailleur
9154e07689 Fix picto for tags 2021-04-14 12:33:53 +02:00
Laurent Destailleur
dcf460e248 Use css on img_picto 2021-04-14 12:28:01 +02:00
Anthony Berton
707bf5adca picto_mass_actions 2021-04-14 10:20:34 +02:00
Laurent Destailleur
ca1715df96 Add some protection for SQL injection 2021-03-22 13:31:06 +01:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00
daraelmin
4d8ed4bd40 merge develop 2021-03-20 15:34:30 +01:00
Laurent Destailleur
5a4ffc18b9 FIx #yogosha5667 2021-03-19 13:02:55 +01:00
daraelmin
6f7f5a57e1
Search on excluded member 2021-03-13 16:11:48 +01:00
Frédéric FRANCE
1b046f25cf
add new rule 2021-03-01 00:19:52 +01:00
Laurent Destailleur
32370bf63d Look and feel v14 2021-02-15 20:13:38 +01:00