Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
72,480 Commits 36 Branches 189 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

176 Commits

Author SHA1 Message Date
Laurent Destailleur
40e923ec85 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/modules/modAgenda.class.php
 2019-03-02 19:07:14 +01:00
Laurent Destailleur
cefaeb583f Update xinputfile.modules.php 2019-02-28 11:24:43 +01:00
Laurent Destailleur
85d46a5270 Update xinputfile.modules.php 2019-02-28 11:24:07 +01:00
gauthier
1237a6d3e9 FIX : same thing here 2019-02-27 14:58:10 +01:00
gauthier
49e03b009f FIX : if empty error message, we just see "error" displayed 2019-02-27 14:50:01 +01: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
Philippe GRAND
61daff6cb6 Standardize code 2018-10-06 12:34:51 +02:00
Laurent Destailleur
d6ee00f2e7 Fix constructors does not need return value 2018-09-16 10:22:23 +02:00
Philippe GRAND
ca9b1f155f Standardize and update code 2018-09-14 14:05:19 +02:00
Frédéric FRANCE
987fdbe73c Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 21:29:41 +02:00
Frédéric FRANCE
3e71f4e6b0 Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 18:36:49 +02:00
Frédéric FRANCE
998b67fa98 Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 18:32:15 +02:00
Philippe GRAND
b8df44167a Standardize and update code 2018-09-12 15:09:12 +02:00
Frédéric FRANCE
a558c3bdac replace select_date 2018-09-09 11:25:59 +02:00
Frédéric FRANCE
70ba223788 move phpcs:ignore 2018-09-06 21:27:18 +02:00
Frédéric FRANCE
85df267a5b move phpcs:ignore 2018-09-05 20:36:44 +02:00
Frédéric FRANCE
f7c3ca9d20 move phpcs:ignore 2018-09-05 18:49:06 +02:00
Frédéric FRANCE
ecc6c118a6 move phpcs:ignore 2018-09-04 23:26:37 +02:00
Frédéric FRANCE
7799774ca1 move phpcs:ignore 2018-09-04 22:52:55 +02:00
Frédéric FRANCE
3847df1de6 move phpcs:ignore 2018-09-04 21:53:53 +02:00
Frédéric FRANCE
fd6281b364 move phpcs:ignore 2018-09-04 20:00:09 +02:00
Frédéric FRANCE
57fb3dc2f4 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Frédéric FRANCE
6aee680a4f PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Frédéric FRANCE
fe4260a014 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Laurent Destailleur
7219bac0b2 Merge pull request #9168 from frederic34/trimtrailing 
Trimtrailing
 2018-08-28 02:30:02 +02:00
Philippe GRAND
d91b1fd895 Update and standardize code 2018-08-22 11:06:34 +02:00
Philippe GRAND
a669830427 Update and standardize code 2018-08-22 10:37:16 +02:00
Frédéric FRANCE
850ac34020 mark non camelCaps function 2018-08-13 17:26:32 +02:00
Frédéric FRANCE
6cb0fb10d6 trim trailing 2018-07-26 19:05:34 +02:00
Laurent Destailleur
1b5c5cfafb Fix select status 2018-06-24 10:42:07 +02:00
Laurent Destailleur
c405181393 Merge pull request #8987 from a-schild/develop 
Added mailing by thirdparty filtering by prospect type and status
 2018-06-24 10:31:09 +02:00
a-schild
baba0757d7 Added filtering by prospect type and status 
Added filtering by prospect type and status
 2018-06-19 11:46:03 +02:00
a-schild
211bb87e46 Moved functionality to select by categories 
Moved functionality to select by categories
 2018-06-19 11:45:27 +02:00
a-schild
3e9bc75c9c Added mailings to thirdparties 
Allows to select third parties as mailing targets, depending client/lead
and active/inactive status
 2018-06-18 12:23:27 +02:00
florian HENRY
22cdbffb0a new : add adv targt emailing amdin with main feature level 1 2018-05-21 10:58:16 +02:00
Regis Houssin
2906358383 Fix: use "socpeople" instead "societe" 2018-04-27 10:42:10 +02:00
Laurent Destailleur
55d3e72463 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/contact/class/contact.class.php
	htdocs/societe/card.php
 2018-03-12 19:02:30 +01:00
Maxime Kohlhaas
c008853842 Fix #8057 2018-03-10 23:05:33 +01:00
Regis Houssin
4c06384197 Fix: differentiate sharing of "member" and "member_type" 2018-02-24 11:13:14 +01:00
Laurent Destailleur
1ce155728f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/mailings/fraise.modules.php
 2017-12-01 16:25:13 +01:00
ptibogxiv
c194538609 Update fraise.modules.php 2017-11-29 10:45:16 +01:00
ptibogxiv
883c9dbf99 Fix for multicompany 
last fix for multicompany compliance
 2017-11-29 09:28:03 +01:00
Laurent Destailleur
3b98a06ebb Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/mailings/fraise.modules.php
 2017-11-28 12:18:01 +01:00
ptibogxiv
10b0eafba7 Update fraise.modules.php 2017-11-27 18:12:52 +01:00
ptibogxiv
ea9071512d Update fraise.modules.php 2017-11-27 17:08:15 +01:00
ptibogxiv
0a5a50263d fix for multicompany 2017-11-27 16:07:40 +01:00
ptibogxiv
a9e4fcfdca Update fraise.modules.php 2017-11-27 15:49:28 +01:00
ptibogxiv
780e8ce470 fix for multicompany 2017-11-27 15:13:14 +01:00