Commit Graph

632 Commits

Author SHA1 Message Date
Laurent Destailleur
f7fe25e408 Uniformize code to prepare mass update 2014-02-27 10:37:23 +01:00
Laurent Destailleur
46e9b5d550 Merge branch 'develop' of https://github.com/grandoc/dolibarr into
grandoc-develop

Conflicts:
	htdocs/langs/ar_SA/admin.lang
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/tr_TR/admin.lang
2014-02-10 01:30:48 +01:00
Laurent Destailleur
70ab096b79 More simple specimen for test 2014-02-08 12:58:27 +01:00
Grand Philippe
1855ba556a fix misspelled words 2014-02-05 17:53:30 +01:00
Laurent Destailleur
1b88ab2355 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/contact/class/contact.class.php
2014-01-31 10:12:41 +01:00
Laurent Destailleur
c5d5d6a8d6 A better fix to have default statut to enabled when created an address. 2014-01-30 18:17:52 +01:00
simnandez
17581dd6d6 Fix: Default status into contact creation must be Actif 2014-01-30 12:21:58 +01:00
simnandez
ee72a9a4e6 Fix: Default status into contact creation must be Actif 2014-01-30 12:20:36 +01:00
Alexis Algoud
b2477b6764 Regression in contact form on Note field
It's seems to be a regression to Note field in 3.3 instead of public and private Note introduced in 3.4 (and confirmed in the class -> Note / / deprecated)
2014-01-27 10:36:59 +01:00
Laurent Destailleur
8d916215cc New: Add new hook function addMoreActionsButtons to allow a module to
add/replace action buttons into an element.
2014-01-24 12:51:01 +01:00
Laurent Destailleur
1fd67807ce Merge remote-tracking branch 'origin/3.5' into develop 2014-01-18 01:13:29 +01:00
Grand Philippe
938f31f383 Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1. 2014-01-12 21:45:52 +01:00
Laurent Destailleur
23eb0f3770 Qual: Mutualize code for actions of editing notes
New: Add button 'cancel' to cancel edition of a note (private or public)
2014-01-11 13:33:30 +01:00
Laurent Destailleur
fbeb61861a Start to remove too low level permission. Philisophy of dolibarr is
having a minum of permission. Starting to include one permission for
each field we manage should not be into core.
Also activation of "skype" field in a future should probably be
rewritten to support as several communication id (chat, skype,
hanghout) with only one feature.
2013-12-14 20:58:03 +01:00
Laurent Destailleur
eaf151d7f5 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/.gitignore
	htdocs/contact/fiche.php
2013-12-14 03:13:46 +01:00
Laurent Destailleur
d7bb138f43 Fix: Missing status 4 and 5 2013-12-02 22:12:57 +01:00
Laurent Destailleur
0ff9533786 Missing css 2013-12-02 20:30:15 +01:00
Raphaël Doursenaud
f71b39b1c3 Added missing class member 2013-11-27 15:20:37 +01:00
aspangaro
e1b4d01235 Improvement of the Skype button
Perm & add a button"Chat"
2013-11-24 21:28:15 +01:00
Florian Henry
85ea8b4161 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-15 15:41:37 +01:00
Laurent Destailleur
c324f6a9a3 Merge pull request #1295 from FHenry/develop
Display customer code (according setting) into list
2013-11-15 05:05:36 -08:00
Florian Henry
05e0af0f23 WebService contact with statut (the new field) 2013-11-14 19:41:27 +01:00
Peter Fontaine
5a1df20c80 fix contact creation 2013-11-14 17:16:27 +01:00
Florian Henry
8fca860a2d Add status filter on contact list 2013-11-12 15:40:00 +01:00
Laurent Destailleur
addedb6f15 Merge branch 'develop' of https://github.com/FHenry/dolibarr into
FHenry-develop

Conflicts:
	htdocs/core/class/extrafields.class.php
2013-11-05 19:53:49 +01:00
Florian Henry
36ec7509ac Set same icon status rule as for thirdparty 2013-11-05 09:54:49 +01:00
aspangaro
d79ba9695a Task 157 : Add a skype button 2013-11-04 21:41:36 +01:00
Florian Henry
693918d8b6 misspelling 2013-10-30 12:40:00 +01:00
Florian Henry
f512ef344a Better managent of contact status and fix COMPANY_DONOTSEARCH_ANYWHERE
use every where before SOCIETE_DONOTSEARCH_ANYWHERE was used
2013-10-30 12:24:51 +01:00
Laurent Destailleur
c81bb60384 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/public/cron/cron_run_jobs.php
2013-10-27 02:33:03 +02:00
Laurent Destailleur
8d63c2f9c5 Fix: ref_ext was not loaded
Conflicts:
	htdocs/contact/class/contact.class.php
2013-10-08 00:44:55 +02:00
Laurent Destailleur
a690ae05f6 Fix: ref_ext was not loaded 2013-10-08 00:42:40 +02:00
Laurent Destailleur
4958d17d24 Doxygen 2013-10-08 00:42:28 +02:00
Laurent Destailleur
b778700c95 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/contact/fiche.php
2013-10-07 22:52:14 +02:00
Laurent Destailleur
ebb1dbcec3 Fix: security sql injection 2013-10-07 22:50:12 +02:00
Laurent Destailleur
065c87d81c Qual: uniformize code: property ->tel on objects is now ->phone
everywhere
2013-09-25 19:58:22 +02:00
Laurent Destailleur
dd0612099c Qual: Uniformize fields departement_id into state_id 2013-09-20 14:35:58 +02:00
Cédric Salvador
fc136d0d06 changed parameter 2013-09-16 14:17:53 +02:00
Cédric Salvador
d9a26d0aa9 natural search in list pages 2013-09-16 14:17:53 +02:00
Laurent Destailleur
72557437ef Checkstyle 2013-09-10 14:19:36 +02:00
Laurent Destailleur
414ab39d30 Fix: bug detected with phpunit 2013-09-09 02:37:11 +02:00
Laurent Destailleur
b7d2811048 Merge pull request #1216 from FHenry/develop
Fix bug on category contact
2013-09-06 13:49:39 -07:00
Laurent Destailleur
c151ef7b87 Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00
Florian Henry
34d4c15d0e Fix bug on category contact 2013-09-05 21:03:03 +02:00
lalaina rasamoelina
8a4041e534 T975-develop Add an element (statut) in the table llx_socpeople
It's used to mark if the contact is gone or no(we can activate or desactivate the contact with this)
And if the contact is gone,we don't print her mail in the mail list,where we can send a mail
2013-08-22 11:04:06 +02:00
lalaina rasamoelina
1295c8d27b Put the status of contact in the list of contact 2013-08-22 11:04:06 +02:00
lalaina rasamoelina
dc3ccf6373 Style of page 2013-08-22 11:04:06 +02:00
lalaina rasamoelina
148abfbe72 Printing the contact in the list 2013-08-22 11:04:06 +02:00
lalaina rasamoelina
5ed186e178 Delete the contact who are gone,in the email list 2013-08-22 11:04:06 +02:00
lalaina rasamoelina
83d5c1a441 Printing of contact 2013-08-22 11:04:05 +02:00