lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
93,485 Commits 43 Branches 150 Tags 886 MiB
3801dd34cd
Commit Graph

700 Commits

Author SHA1 Message Date
Laurent Destailleur
fd04729727 Fix tooltip on extrafield title was on wrong line. 2019-10-23 20:35:39 +02:00
Laurent Destailleur
b48f08dd07 Theme v11 2019-10-23 20:12:29 +02:00
Frédéric FRANCE
9ec7836387
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-20 16:37:18 +02:00
Frédéric FRANCE
360bf55f5b
clean indent 2019-10-20 01:09:11 +02:00
Frédéric FRANCE
f4540dddb8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-17 20:24:04 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Frédéric FRANCE
d9ba09bec1
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-12 19:02:24 +02:00
Frédéric FRANCE
9f59656589
fix typo inspired by grandoc 2019-10-11 23:08:33 +02:00
Frédéric FRANCE
f253315c8d
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-08 18:30:58 +02:00
Laurent Destailleur
3acf7211c3
Merge pull request #11847 from ptibogxiv/patch-257 
NEW: Option to allow to create members from third-party
 2019-10-08 15:08:34 +02:00
Laurent Destailleur
da5890e584
Update adherent.class.php 2019-10-07 20:32:51 +02:00
Laurent Destailleur
e02794248e
Merge branch 'develop' into patch-264 2019-10-07 13:25:16 +02:00
Frédéric FRANCE
98023353fe
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-03 17:21:31 +02:00
Sebastien Baguet
5dbf34a864 Small fix on a query 2019-10-03 13:34:47 +02:00
Sebastien Baguet
9daffcbe07 Fix for no subscription members 2019-10-03 00:29:41 +02:00
Frédéric FRANCE
aca9d92db8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 22:03:33 +02:00
Frédéric FRANCE
010b2723b6
work on migration script 2019-10-01 20:14:06 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Frédéric FRANCE
cea3669ffa
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-28 00:35:14 +02:00
Laurent Destailleur
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
1c13a38ce9 Typo abscissa 2019-09-23 21:45:23 +02:00
stickler-ci
8d8ded324d Fixing style errors. 2019-09-17 11:56:16 +00:00
ptibogxiv
a295d57e0c
Update adherent_type.class.php 2019-09-17 13:54:17 +02:00
ptibogxiv
c01ab4ab53
Update adherent_type.class.php 2019-09-17 13:53:34 +02:00
Frédéric FRANCE
de3a67f5bd
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-12 21:52:06 +02:00
Frédéric FRANCE
e4a0de245a
work on user 2019-09-12 18:41:26 +02:00
Laurent Destailleur
84e197e48a Clean code 2019-09-12 00:09:49 +02:00
Frédéric FRANCE
dc2ea3cef9
add socialnetworks dictionary 2019-09-11 23:00:14 +02:00
Frédéric FRANCE
3fddef0c9e
add socialnetworks dictionary 2019-09-11 22:27:09 +02:00
Laurent Destailleur
61cf47aa16 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 00:14:07 +02:00
Laurent Destailleur
1d74387125 Removed deprecated property ->numero (We must use ->num_payment) 2019-09-09 08:47:23 +02:00
ptibogxiv
2d3b0a7d43
Update adherent.class.php 2019-09-08 20:05:13 +02:00
Alexandre SPANGARO
3a8d8ee902 FIX #11401 Adherent unknown language key 2019-09-08 03:56:01 +02:00
Laurent Destailleur
529dd05226 Replace deprecated code 2019-09-06 10:53:05 +02:00
Laurent Destailleur
733c90956f Fix phpunit 2019-09-02 03:40:09 +02:00
Laurent Destailleur
97a1a47266 Change deprecated properties with new name 2019-09-01 22:21:48 +02:00
Laurent Destailleur
f6c2fb77ae Fix scrutinizer 2019-09-01 22:02:48 +02:00
Laurent Destailleur
2f49fc6a7b Fix scrutinizer 2019-08-31 02:49:54 +02:00
Laurent Destailleur
48db5c2a44 Replace deprecated actioncomm->note into actioncomm->note_private 2019-08-31 02:46:39 +02:00
Laurent Destailleur
d5328d1cec Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 15:43:19 +02:00
Laurent Destailleur
478b1fea25 FIX #11711 2019-08-27 15:06:50 +02:00
John Botella
b4c4e5a662 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard 2019-08-02 14:52:01 +02:00
Laurent Destailleur
0bc90d81c8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-02 12:05:12 +02:00
Laurent Destailleur
c01ac05aec FIX Content of email for subscription 2019-08-02 12:04:06 +02:00
John Botella
9b84987cc1 prepare new dashboard 2019-08-01 12:33:19 +02:00
Laurent Destailleur
adfbd62f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-14 00:44:35 +02:00
Regis Houssin
4dab57b494 FIX phpcs 2019-07-13 11:24:25 +02:00
Regis Houssin
b7df4a2cd0 FIX this function can not be private 2019-07-13 11:21:07 +02:00
Laurent Destailleur
fa476b4994 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
Laurent Destailleur
7de0f5c0be NEW Avoid wrap between picto and text on getNomUrl 2019-06-25 10:22:39 +02:00
Laurent Destailleur
efa09301b1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 20:19:14 +02:00
Laurent Destailleur
71b266b5a8 Code comment 2019-06-22 19:20:01 +02:00
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
Laurent Destailleur
57f81217ee Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/localtax/index.php
	htdocs/compta/tva/index.php
 2019-02-03 21:14:44 +01:00
Laurent Destailleur
4d41b1b33c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-03 19:45:45 +01:00
Laurent Destailleur
62d677118d
Update adherent.class.php 2019-02-03 19:24:18 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-02-01 18:31:44 +01:00
Philippe GRAND
c5bbaa4aa3 fix translation 2019-01-31 15:15:18 +01:00
Philippe GRAND
7cf51a5e35 fix translation 2019-01-31 14:05:55 +01:00
gauthier
bfc7265cbc FIX : better test on fetch 2019-01-31 11:53:10 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
ptibogxiv
b05f6d82fa
Update subscription.class.php 2019-01-17 19:38:19 +01:00
ptibogxiv
7ebf3967cb
Update subscription.class.php 2019-01-17 17:45:52 +01:00
ptibogxiv
829807b467
modify class to display save adherent type in subscription 2019-01-17 17:38:46 +01:00
Laurent Destailleur
e7943ae844 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-16 16:48:52 +01:00
Laurent Destailleur
d3828130ab Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/adherents/class/adherent.class.php
 2019-01-16 16:48:21 +01:00
Laurent Destailleur
698222c769 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/adherents/subscription.php
 2019-01-16 16:45:30 +01:00
Laurent Destailleur
6becdc8af4 Fix missing substitution of ID 2019-01-16 16:34:36 +01:00
Laurent Destailleur
d455cad724 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-27 21:31:52 +01:00
Laurent Destailleur
9842f50942 Fix substitution for members 2018-12-27 21:16:33 +01:00
Laurent Destailleur
44a6644969 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-18 21:55:53 +01:00
Laurent Destailleur
89068ffef1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/langs/es_ES/companies.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/product/stock/product.php
	htdocs/user/card.php
 2018-12-18 21:55:14 +01:00
Laurent Destailleur
4b6ae9d424 FIX Error reported when creation of thirdparty from member fails 
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/class/commonobject.class.php
 2018-12-18 21:32:41 +01:00
Laurent Destailleur
f2318716ec FIX Error reported when creation of thirdparty from member fails 2018-12-18 21:27:16 +01:00
Laurent Destailleur
2b6269a162
Merge pull request #10171 from hregis/develop_bug 
FIX scrutinizer
 2018-12-15 15:44:27 +01:00
Alexandre SPANGARO
60f56fcf8d
Merge branch 'develop' into 10.0_members 2018-12-14 11:39:02 +01:00
Laurent Destailleur
38cd324da7 FIX Look and feel v8 2018-12-09 23:58:27 +01:00
Regis Houssin
2d8494050f FIX scrutinizer 2018-12-03 11:21:49 +01:00
Frédéric FRANCE
ab02cb3cde
doc comment adherent class 2018-12-02 10:12:40 +01:00
Laurent Destailleur
8f15fe9c63 Empty lines 2018-11-26 12:41:10 +01:00
Alexandre SPANGARO
2d55666a0b NEW Add gender in member card 2018-11-18 21:50:58 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
90d3b80efb NEW Add email in event histor for reminder email of expired subsription 2018-11-03 22:53:55 +01:00
Laurent Destailleur
68ec172798 Fix setup to enable reminder b email 2018-11-03 12:37:52 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Frédéric FRANCE
5e7a330f16
Update adherent.class.php 2018-10-15 08:53:47 +02:00
Laurent Destailleur
cb53e18aa4 Social network module 2018-10-12 11:19:18 +02:00
Laurent Destailleur
8f4b74733c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
 2018-10-10 01:51:54 +02:00
Laurent Destailleur
d75828567c Fix amount last subscription 2018-10-10 01:44:56 +02:00
Laurent Destailleur
2539f0047f FIX Sending of reminder for expired subscriptions 2018-10-09 23:10:39 +02:00
Philippe GRAND
af0bcb2631 Standardize code 2018-10-09 09:40:00 +02:00
Philippe GRAND
bba6669f03 Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018 2018-10-09 08:47:26 +02:00