Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
100,555 Commits 36 Branches 189 Tags
c03958a867d1180e5bcaf99feee94de8acdb334a
Commit Graph

214 Commits

Author SHA1 Message Date
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
Florian HENRY
806b40662f merge develop 2020-12-28 21:15:25 +01:00
Laurent Destailleur
f8b179a1be Merge pull request #15351 from frederic34/patch-13 
separate ref and rowid in members
 2020-12-27 15:18:55 +01:00
Florian HENRY
f03574d061 bank ok 2020-12-24 14:56:26 +01:00
Florian HENRY
5ae5f3e7ac let societe project acctioncomme website accounr 2020-12-24 00:32:54 +01:00
Laurent Destailleur
d65dc85a10 FIX for php 8 2020-12-23 19:16:25 +01:00
Laurent Destailleur
8e839a34e2 FIX for php 8 2020-12-23 19:14:47 +01:00
Frédéric FRANCE
016c9915ef Update 12.0.0-13.0.0.sql 
add ref in class

add ref in getNomUrl

add ref on card
 2020-11-10 23:03:03 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Frédéric FRANCE
d3c87dabab display members 2020-10-26 21:51:17 +01:00
Laurent Destailleur
e3542c6d4f Merge pull request #14848 from TobiasSekan/ShowCategoryInListOnlyWithRights 
NEW Show category filter on lists only when user have rights to read categories
 2020-10-06 12:29:10 +02:00
Sekan, Tobias
2bf15b3a92 Show category filter only on rights to read it 2020-09-28 10:42:49 +02:00
Laurent Destailleur
3ee2459dc7 Enhancement for #14835: Can filter on expiration date, add list of 
members without subscriptions
 2020-09-27 16:03:20 +02:00
daraelmin
b3d386fa54 Fix Category is lost on sorting member list 
When sorting member list filter by tag/category the criteria is lost because of one missing GET parameter

Just adding a GET parameter to keep the category/tag parameter when sorting the list
 2020-09-20 08:42:25 +02:00
Laurent Destailleur
7dd69a2b2b Fix escape 2020-09-19 20:11:04 +02:00
Laurent Destailleur
b7d56cbfbf Fix syntax error 2020-09-16 01:09:54 +02:00
BENKE Charlene
1d0dc7cab0 Update list.php 2020-09-15 11:31:29 +02:00
Laurent Destailleur
e65e4a6d47 Beautify for of member module 2020-08-18 11:52:00 +02:00
Laurent Destailleur
8109145fe3 Merge pull request #14162 from laurantines/develop 
Update list.php in Adherents
 2020-07-03 00:24:54 +02:00
laurantines
a34c6ec7b0 Update list.php in Adherents 
Add Address in search
 2020-07-01 13:12:52 +02:00
Laurent Destailleur
ab176cd078 Merge pull request #13937 from frederic34/Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 
add new rule
 2020-05-26 00:20:12 +02:00
laurantines
416d1d0301 Update list.php 
Search by d,phone, d.phone_perso, d.phone_mobile in SELECT QUERY
 2020-05-25 22:53:03 +02:00
laurantines
962d795740 Update list.php 
Search by d,phone, d.phone_perso, d.phone_mobile in SELECT QUERY
 2020-05-25 12:26:05 +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