Frédéric FRANCE
|
dbed10a701
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-01 21:39:20 +01:00 |
|
Laurent Destailleur
|
2d9135b6ad
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expedition/card.php
htdocs/holiday/list.php
|
2019-11-01 21:06:06 +01:00 |
|
Laurent Destailleur
|
e3b5be7475
|
All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
|
2019-11-01 12:52:03 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
Laurent Destailleur
|
248016cd5d
|
Merge pull request #12241 from frederic34/contactphone
Contactphone
|
2019-10-30 02:52:11 +01:00 |
|
Laurent Destailleur
|
15d0d6e271
|
FIX #12258
|
2019-10-30 02:39:51 +01:00 |
|
Frédéric FRANCE
|
8a7a7ad0c8
|
Update contact.class.php
|
2019-10-28 08:16:43 +01:00 |
|
Frédéric FRANCE
|
6e03e0ba83
|
Update contact.class.php
|
2019-10-28 08:08:59 +01:00 |
|
Frédéric FRANCE
|
043a71442f
|
contact phone
|
2019-10-27 20:06:16 +01:00 |
|
Laurent Destailleur
|
6855f588b5
|
Use dolGetStatus
|
2019-10-24 16:38:06 +02:00 |
|
Laurent Destailleur
|
84c8b6b5d1
|
FIX #12198
|
2019-10-22 15:23:23 +02:00 |
|
Laurent Destailleur
|
f9c86256dc
|
FIX #12198
|
2019-10-22 15:21:41 +02:00 |
|
Laurent Destailleur
|
d79114c1f8
|
Clean code
|
2019-10-20 15:16:40 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Laurent Destailleur
|
2ed96c9e5f
|
Fix scrutinizer
|
2019-10-15 02:54:19 +02:00 |
|
stickler-ci
|
bc32d684a4
|
Fixing style errors.
|
2019-10-04 16:12:33 +00:00 |
|
florian HENRY
|
d48f0fa791
|
resolve conflixt
|
2019-10-01 18:07:59 +02:00 |
|
Alexandre SPANGARO
|
16c6c9ae75
|
Merge remote-tracking branch 'upstream/develop' into 11.0_https
|
2019-10-01 06:12:24 +02:00 |
|
Alexandre SPANGARO
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +02:00 |
|
Frédéric FRANCE
|
258424416e
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-30 07:49:52 +02:00 |
|
florian HENRY
|
885d958e63
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
|
2019-09-27 20:12:09 +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 |
|
Frédéric FRANCE
|
bd4c9a64a8
|
wip
|
2019-09-07 14:48:25 +02:00 |
|
florian HENRY
|
dff7be59c8
|
mostlyDone
|
2019-09-06 09:22:53 +02:00 |
|
florian HENRY
|
d50114df64
|
mostlyDone
|
2019-09-06 09:20:18 +02:00 |
|
Laurent Destailleur
|
f893854986
|
Fix remove warnings
|
2019-09-05 14:24:13 +02:00 |
|
Laurent Destailleur
|
1828872bd1
|
Removed deprecated properties
|
2019-09-05 13:39:33 +02:00 |
|
Laurent Destailleur
|
3f121f07cc
|
Removed deprecated properties
|
2019-09-05 13:38:38 +02:00 |
|
florian HENRY
|
6c20fbafdf
|
add trigger files
|
2019-09-03 17:04:42 +02:00 |
|
florian HENRY
|
d811de4da2
|
let only triggers part
|
2019-09-02 22:01:48 +02:00 |
|
florian HENRY
|
405c92640c
|
on going
|
2019-09-02 14:47:32 +02:00 |
|
Laurent Destailleur
|
386f929fe3
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/lib/website.lib.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
|
2019-08-15 23:39:02 +02:00 |
|
Laurent Destailleur
|
64e52789d6
|
FIX #11591 FIX #11592
|
2019-08-15 20:39:47 +02:00 |
|
Laurent Destailleur
|
a46bfc7a29
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/project.lib.php
|
2019-07-25 17:54:14 +02:00 |
|
ptibogxiv
|
c219b62b10
|
Update contact.class.php
|
2019-07-24 13:23:24 +02:00 |
|
ptibogxiv
|
46d0137d30
|
FIx display civility in contact card
|
2019-07-23 14:04:54 +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
|
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 |
|
florian HENRY
|
0787eee9b8
|
fix :email collector for event creation
|
2019-05-18 18:42:46 +02:00 |
|
Laurent Destailleur
|
84050c888f
|
Fix set of civility label
|
2019-04-11 18:04:18 +02:00 |
|
Laurent Destailleur
|
9337e48072
|
Merge branch 'develop' into patch-147
|
2019-04-11 17:54:29 +02:00 |
|
ptibogxiv
|
42b1ab10d1
|
Update contact.class.php
|
2019-04-11 17:04:40 +02:00 |
|
ptibogxiv
|
1f017d4d06
|
Update contact.class.php
|
2019-04-11 17:03:07 +02:00 |
|
Laurent Destailleur
|
54714bc755
|
Deprecated property ->fk_departement is now ->state_id everywhere.
|
2019-04-05 20:06:13 +02:00 |
|
ptibogxiv
|
013b8a61ec
|
ADD cilivity label in fetch contact / API
|
2019-03-29 12:11:50 +01:00 |
|