Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

352 Commits

Author SHA1 Message Date
Laurent Destailleur
be8075881c Clean dead code 2019-12-20 11:15:15 +01:00
Laurent Destailleur
9f86cd8824 Debug v11 2019-12-20 11:14:16 +01:00
stickler-ci
ffde746479 Fixing style errors. 2019-12-12 16:22:07 +00:00
Anthony Berton
21a28e4bb4 Update contact.class.php 2019-12-12 17:20:20 +01:00
Scrutinizer Auto-Fixer
36a74cd160 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-03 10:17:29 +00:00
Norbert Penel
073274072f FIX #12558 2019-12-01 10:47:25 +01:00
Scrutinizer Auto-Fixer
812d0af1d9 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-08 14:51:54 +00:00
Frédéric FRANCE
872f58f261 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-11-03 21:48:24 +01:00
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
stickler-ci
d46f519438 Fixing style errors. 2019-10-30 19:07:50 +00:00
Frédéric FRANCE
f7747ed00a Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-30 20:06:43 +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
Frédéric FRANCE
a43e6f96b5 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-25 08:12:54 +02: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
Frédéric FRANCE
9ec7836387 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-20 16:37:18 +02:00
Laurent Destailleur
d79114c1f8 Clean code 2019-10-20 15:16:40 +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
d1d9b1ed85 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-15 09:39:57 +02:00
Laurent Destailleur
2ed96c9e5f Fix scrutinizer 2019-10-15 02:54:19 +02:00
Frédéric FRANCE
b78187c1eb Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-08 00:07:27 +02:00
stickler-ci
bc32d684a4 Fixing style errors. 2019-10-04 16:12:33 +00: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
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
b87610adcc Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-30 19:34:35 +02:00
Frédéric FRANCE
258424416e Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-30 07:49:52 +02:00
Frédéric FRANCE
cea3669ffa Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-28 00:35:14 +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
af63ac4051 work on contact 2019-09-14 13:31:26 +02:00
Frédéric FRANCE
1cd59cc16a work on user 2019-09-14 11:26:31 +02:00
Frédéric FRANCE
62922884fe specimens 2019-09-12 18:12:28 +02:00
Frédéric FRANCE
9f3c54e5a5 definitions 2019-09-12 18:04:24 +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