Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
87,753 Commits 36 Branches 189 Tags
45f834cb15122c034e1666a03e920f159183d7dd
Commit Graph

647 Commits

Author SHA1 Message Date
Laurent Destailleur
4308f48cad Merge branch 'develop' into MissingHook 2019-06-20 03:04:32 +02:00
Laurent Destailleur
bf71731fc9 Fix phpcs 2019-06-19 22:28:33 +02:00
Nicolas ZABOURI
b6bd4119d9 FIX travis Public underscore in load_ldap_info 2019-06-19 09:12:01 +02:00
Laurent Destailleur
525598f6aa Fix scrutinizer warnings 2019-06-18 20:01:28 +02:00
Laurent Destailleur
e8ba312d2a Fix phpcs 2019-05-23 14:25:16 +02:00
Frédéric FRANCE
a368a6a43e Update adherent_type.class.php 2019-05-19 11:52:34 +02:00
Frédéric FRANCE
a09584ae4b The method _load_ldap_dn() cannot be called... 
The method _load_ldap_dn() cannot be called from this context as it is declared private in class AdherentType.
 2019-05-19 09:46:47 +02:00
Laurent Destailleur
d789004782 Update adherent.class.php 2019-05-09 15:35:55 +02:00
ptibogxiv
3ddd5110ef Update adherent.class.php 2019-05-09 13:42:32 +02:00
Laurent Destailleur
553d97d290 Merge pull request #11077 from ptibogxiv/patch-159 
FIX: dolibarrize civility for fetch member
 2019-05-02 12:40:51 +02:00
Laurent Destailleur
590c6fb91f Update adherent.class.php 2019-05-02 12:40:34 +02:00
ptibogxiv
f33b7fc744 Update adherent.class.php 2019-04-27 15:19:39 +02:00
ptibogxiv
d8d462e36f FIX: dolibarrize civility for fetch member 
same code as contact or other object
 2019-04-27 14:53:14 +02:00
ptibogxiv
9b9295ab50 Update adherent.class.php 2019-04-26 14:25:58 +02:00
ptibogxiv
3e02dc2465 FIX : dolibarrize fk_soc ->socid for member 2019-04-26 13:23:30 +02:00
ptibogxiv
65bb7d9031 Update adherent_type.class.php 2019-04-25 09:37:07 +02:00
ptibogxiv
6190e7813e Fix get morphy adherent type 2019-04-25 09:14:51 +02:00
Laurent Destailleur
6884999ee3 Merge pull request #10925 from ptibogxiv/patch-146 
NEW morphy value in member type
 2019-04-25 03:00:25 +02:00
ptibogxiv
0583cf7804 Update adherent_type.class.php 2019-04-24 15:44:57 +02:00
Laurent Destailleur
fff9b7db9d Fix doxygen 2019-04-04 18:33:12 +02:00
ptibogxiv
abd8dca3ea Update api_memberstypes.class.php 2019-04-01 20:26:04 +02:00
ptibogxiv
2da9cfbbe4 Update api_memberstypes.class.php 2019-04-01 20:25:37 +02:00
Laurent Destailleur
c7e4cd7fa1 More complete examples 2019-04-01 18:39:36 +02:00
ptibogxiv
22ea6fa0ab Update api_memberstypes.class.php 2019-03-27 14:04:13 +01:00
ptibogxiv
fa302db84f Update adherent_type.class.php 2019-03-27 12:48:18 +01:00
ptibogxiv
2e9badd21d Update api_memberstypes.class.php 2019-03-27 12:45:33 +01:00
Frédéric FRANCE
544934f322 phpcs fix 2019-03-19 12:48:44 +01:00
Philippe Grand
4935aa2fe4 Update adherent.class.php 2019-03-18 12:25:35 +01:00
Philippe GRAND
609dc5360b add comments 2019-03-18 12:19:56 +01:00
Philippe GRAND
905f7cf8dd add comments 2019-03-18 10:22:20 +01:00
Laurent Destailleur
e5567c7ee4 Fix typo 2019-03-16 14:48:41 +01:00
Laurent Destailleur
b6cacf3a20 Fix label of status for members on smartphone 2019-03-15 20:18:35 +01:00
Laurent Destailleur
bede7b80a2 Fix smartphone 2019-03-15 20:09:42 +01:00
Laurent Destailleur
af6508b1c8 FIX Bad label of status for members (must be short version in list) 2019-03-15 20:06:05 +01:00
Laurent Destailleur
ddc52b7199 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/exports/export.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2019-03-07 14:13:38 +01:00
Laurent Destailleur
a0bc6672d8 Try to avoid to make subquery when not necessary 2019-03-07 12:43:17 +01:00
Timoté Fallais
c31318f29d Update libelle of user (making Mailman working correctly) 2019-03-07 09:15:43 +01:00
Frédéric FRANCE
f283782445 change visibility 2019-03-04 19:57:46 +01:00
ptibogxiv
dd172f04d5 Fixe date on fetch adherent.class.php 2019-03-03 21:51:32 +01:00
Laurent Destailleur
8fce6e5e31 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/core/modules/mailings/xinputfile.modules.php
	htdocs/fourn/facture/card.php
 2019-03-02 19:13:37 +01:00
Laurent Destailleur
429da47d68 Fix default language of reminders 2019-02-28 13:11:14 +01:00
Frédéric FRANCE
089875b8a2 add visibility 2019-02-27 17:53:52 +01:00
Frédéric FRANCE
5a4ac82880 Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-27 08:23:29 +01:00
Alexandre SPANGARO
acb9cfe07a NEW: Add LinkedIn field 2019-02-25 09:07:58 +01:00
Frédéric FRANCE
42a1387218 wip 2019-02-25 00:56:48 +01:00
Laurent Destailleur
af92303319 Merge pull request #10487 from frederic34/psr2squizwhite 
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
 2019-02-08 09:30:25 +01:00
Laurent Destailleur
9e28db4202 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/export.php
 2019-02-06 00:51:10 +01:00
Laurent Destailleur
ce5717a7b7 FIX Default language of company is not set 2019-02-05 20:43:26 +01:00
Laurent Destailleur
82df83cec2 Add log 2019-02-05 20:04:25 +01:00
Frédéric FRANCE
970392adb8 Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00