lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
73,226 Commits 43 Branches 150 Tags 886 MiB
53b2100dbb
Commit Graph

1106 Commits

Author SHA1 Message Date
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
96de1b175c
clean missing spaces in the last merge 2019-02-02 08:51:30 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-02-01 18:31:44 +01:00
ATM-Nicolas
2cbb58c2eb Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_contact_related_item_tab 2019-02-01 10:54:42 +01:00
ATM-Nicolas
f432a874e6 NEW : Contact related items tab 2019-02-01 10:51:28 +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
Laurent Destailleur
62ba4ba2cb
Merge pull request #10291 from joseplluis/patch-5 
FIX: delete all contact categories
 2019-01-03 12:58:11 +01:00
Josep Lluís
932e5ef0b5
FIX: delete all contact categories 
Delete all contact categories is not necessary on contact card.
Current function setCategories will do it when necessary.
 2019-01-02 08:37:26 +01:00
Regis Houssin
4a1d8567b1 FIX replace deprecated "fieldLabel()" with "Form::editfieldkey" 
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
 2018-12-25 08:52:10 +01:00
Laurent Destailleur
25b93fdd3e
Merge pull request #10188 from AlainRnet/patch-7 
Update vcard.php
 2018-12-15 16:01:38 +01:00
Laurent Destailleur
f55db6dd84 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/resources/dbmodel/dolibarr_schema.mwb
 2018-12-15 14:09:16 +01:00
Laurent Destailleur
611ccc4a9a
Merge branch 'develop' into fieldlabel 2018-12-14 15:42:01 +01:00
Laurent Destailleur
0c3165a79a
Merge branch 'develop' into email-contact-card 2018-12-14 15:26:15 +01:00
Laurent Destailleur
5dabefe227 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-13 20:49:55 +01:00
Laurent Destailleur
4a61c1b6ed FIX lang not loaded 2018-12-11 13:25:09 +01:00
Laurent Destailleur
b47e7b2267 Work on new unsubscribe process 2018-12-11 09:49:46 +01:00
Laurent Destailleur
3213b3be07 Standardize code: Move jabberid into social network module 2018-12-11 09:17:02 +01:00
AlainRnet
cce133caea
Update vcard.php 
update from vcard 2.1 to vcard 3.0
 2018-12-06 00:29:51 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
 2018-12-01 19:23:06 +01:00
Laurent Destailleur
cb9ada2119 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/product/price.php
 2018-12-01 18:19:45 +01:00
ATM John BOTELLA
474228cbd6 FIX #8741 2018-12-01 17:01:11 +01:00
Philippe GRAND
3df83d7cf3 fix scrutinizer issue : The variable seems only to be defined at a later point 2018-12-01 15:45:02 +01:00
Laurent Destailleur
1d2c2a23ef Fix look and feel v8 2018-11-25 11:57:19 +01:00
Frédéric FRANCE
12dcda7e02
Merge remote-tracking branch 'upstream/develop' into fieldlabel 2018-11-15 22:01:36 +01:00
Laurent Destailleur
01e7b5747d FIX user param is null not 0 when not defined 
FIX properties email_xx were not set
 2018-11-12 15:27:59 +01:00
Laurent Destailleur
5a7cb95b72 FIX filter on entity must be done as soon as we don't search on rowid. 2018-11-12 14:49:08 +01:00
Frédéric FRANCE
09efde4901
Merge remote-tracking branch 'upstream/develop' into fieldlabel 2018-11-09 18:13:59 +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
François J
7c2256a4a7 Fix X-Dolibarr-TRACKID header: set to 'conXXX' where XXX is contact ID. 2018-11-09 09:33:27 +01:00
Laurent Destailleur
b45ead7038
Merge pull request #9970 from OPEN-DSI/search-contact-by-town 
New Search Contact by Town
 2018-11-08 19:55:51 +01:00
François J
afdefa56bd New Search Contact by Town 
Adding the missing SQL condition to filter contact list by user requested town
 2018-11-07 15:34:07 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
François J
2dd69c3735 Hide buttons when action is presend email 2018-11-06 16:51:48 +01:00
François J
29c71b31fe [New] Add Presend form & Actions to send emails to Contact card 
Add ability to send email to contact from the Contact card. Functionality was copied and adapted from the Third Party card.
 2018-11-06 16:40:39 +01:00
Frédéric FRANCE
42a9abad56
remove fieldlabel and add fieldeditkey 2018-10-27 17:45:29 +02: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
Laurent Destailleur
277655b911 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-24 13:31:31 +02:00
Laurent Destailleur
30a2004d53 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-24 13:30:54 +02:00
gauthier
036f70860e FIX : wrong occurence number of contract on contact card, we must only count externals 2018-10-24 10:17:21 +02:00
Philippe GRAND
9551cb12f5 Standardize and update code 2018-10-13 09:59:33 +02:00
Laurent Destailleur
ded5c4c3dd Social network module 2018-10-12 11:02:03 +02:00
Philippe GRAND
83db36f9b2 Standardize code 2018-10-06 12:11:48 +02:00