Commit Graph

133 Commits

Author SHA1 Message Date
atm-greg
99f93dbbf5 fix bad getpost 2019-11-18 14:33:01 +01:00
Laurent Destailleur
944a15d06b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-11-12 10:20:16 +01:00
Laurent Destailleur
f8e8d15606 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-12 10:19:01 +01:00
Laurent Destailleur
15d0d6e271 FIX #12258 2019-10-30 02:39:51 +01:00
Maxime Kohlhaas
fced9ec690 Fix missing contact fetch on card 2019-10-27 12:04:01 +01:00
Laurent Destailleur
84c8b6b5d1 FIX #12198 2019-10-22 15:23:23 +02:00
ptibogxiv
ba60e99b45 Update card.php 2019-07-24 13:22:41 +02:00
ptibogxiv
f959341aa8 Update card.php 2019-07-23 14:30:12 +02:00
ptibogxiv
57db12ccdb Update card.php 2019-07-23 14:10:13 +02:00
ptibogxiv
cc10f5e684 Update card.php 2019-07-23 14:06:51 +02:00
Laurent Destailleur
5f0fbcea9a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/contact/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
2019-06-02 11:49:33 +02:00
Laurent Destailleur
f2088a084f Fix error management 2019-05-31 11:53:30 +02:00
Laurent Destailleur
54714bc755 Deprecated property ->fk_departement is now ->state_id everywhere. 2019-04-05 20:06:13 +02:00
Laurent Destailleur
61b7564664 Fix syntax error 2019-02-27 02:29:14 +01:00
Alexandre SPANGARO
2da1447a0b Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin 2019-02-25 09:12:04 +01:00
Alexandre SPANGARO
acb9cfe07a NEW: Add LinkedIn field 2019-02-25 09:07:58 +01:00
Frédéric FRANCE
167a857f4c replace html code by html5 in contact 2019-02-24 14:47:47 +01:00
Sof
be4cd0572a Update card.php 2019-02-17 20:09:46 +01:00
Frédéric FRANCE
55d4037de1 Update card.php 2019-02-13 23:57:27 +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
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Josep Lluís
60d3cced37 FIX: delete all contact categories
Delete all contact categories is not necessary on contact card.
Current function setCategories will do it when necessary.

Conflicts:
	htdocs/contact/card.php
2019-01-03 13:00:06 +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
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
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
Frédéric FRANCE
12dcda7e02 Merge remote-tracking branch 'upstream/develop' into fieldlabel 2018-11-15 22:01:36 +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
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
98b1e13ed7 Work on module socialnetworks 2018-09-26 16:55:46 +02:00
Frédéric FRANCE
a3fa13994b replace select_date 2018-09-09 09:36:12 +02:00
Frédéric FRANCE
30a3b95368 loadlangs 2018-05-26 20:32:23 +02:00
Laurent Destailleur
be965bdbab Clean code 2018-04-13 13:28:48 +02:00
Laurent Destailleur
1521b0595b Clean code 2018-04-13 11:03:03 +02:00
Laurent Destailleur
d46a8eb8f0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/company.php
2018-04-07 12:30:30 +02:00
Laurent Destailleur
1a321e19c8 FIX XSS in company setup page 2018-04-06 19:12:13 +02:00
Laurent Destailleur
b4446764f8 Clean code of deprecated usage 2018-02-21 14:48:25 +01:00
Rui Strecht
a13866f091 Changed MAIN_SHOW_REGION_IN_STATE to MAIN_SHOW_REGION_IN_STATE_SELECT for clarity 2018-01-25 16:14:39 +00:00
Rui Strecht
496ac644eb Updated label and added new translation for label 2018-01-25 16:10:04 +00:00
Regis Houssin
4683a35532 Fix: wrong image path with multicompany sharing 2018-01-10 12:52:30 +01:00
Regis Houssin
bd1acca2cd Fix: wrong entity with multicompany thirdparty sharing 2018-01-10 12:38:12 +01:00
Laurent Destailleur
a501a20487 NEW Search filters in lists are restored when using "back to list" 2017-10-03 16:00:52 +02:00