Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
75,225 Commits 36 Branches 189 Tags
cfa414b2de51c08ad9c110bf7a0a3d7b51d3a093
Commit Graph

4990 Commits

Author SHA1 Message Date
Laurent Destailleur
6b8a3094f0 Fix missing some keys in substitution arrays 2018-11-17 00:14:23 +01:00
Laurent Destailleur
5d596fe584 Fix trackid must contains an id of instance 2018-11-16 16:43:13 +01:00
atm-quentin
a0d5607ba5 FIX error travis 2018-11-16 15:29:05 +01:00
atm-quentin
a8ab666d62 remplacement en masse des $conf->entity par des getEntity('facture') 2018-11-16 11:17:18 +01:00
François J
a5777d30e1 Fix Contact Agenda events filter when no Third Party 
Handle case where the contact is not linked to any third party.
 2018-11-16 10:09:25 +01:00
Frédéric FRANCE
ce6b7adaa0 Merge remote-tracking branch 'upstream/develop' into actionrefused 2018-11-15 22:15:45 +01:00
Regis Houssin
2350908d4e FIX change getEntity doc and changelog 2018-11-15 19:00:14 +01:00
Laurent Destailleur
e1407c8289 Merge pull request #10012 from hregis/develop_mc 
FIX compatibility between proposal sharing and proposalnumber sharing
 2018-11-15 17:19:28 +01:00
Laurent Destailleur
85cdc44105 Several fixes in project creation, cache of dolGetIfFromCode, ... 2018-11-15 13:39:12 +01:00
Regis Houssin
2bc25fc008 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2018-11-14 15:24:41 +01:00
Laurent Destailleur
a7989eb893 Fix menu 2018-11-14 13:55:10 +01:00
Frédéric FRANCE
731d19a29b add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
Regis Houssin
04edcaa89c FIX compatibility between proposal sharing and proposalnumber sharing 2018-11-13 20:20:46 +01:00
Laurent Destailleur
77582b2a41 FIX the autofocus feature 2018-11-13 11:36:57 +01:00
François J
10dd5652ee Add SELECT DISTINCT to show_actions_done() SQL request 2018-11-12 12:34:25 +01:00
François J
9a6a3d8df4 Join llx_actioncomm_resources only if we have a contact object. 2018-11-12 12:20:07 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
3e844db74f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fichinter/stats/index.php
 2018-11-08 20:19:28 +01:00
Laurent Destailleur
9a31a61c9d FIX #9971 2018-11-08 20:05:01 +01:00
Laurent Destailleur
588de2cc86 Fix filter on entity on project 2018-11-08 18:45:02 +01:00
Laurent Destailleur
c55f83b0b7 Fix multicompany filter missing 2018-11-08 11:25:29 +01:00
François J
121297b5bd SQL Join actioncomm_resources 2018-11-07 17:10:51 +01:00
François J
aea01b3208 NEW Work with new table actioncomm_resources and multiple contact affectation 2018-11-07 17:04:18 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Laurent Destailleur
9a0b5fb599 Fix extrafields 2018-11-07 12:25:22 +01:00
Laurent Destailleur
4a25317f10 Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
Laurent Destailleur
763f3cd518 Debug modulebuilder 2018-11-05 18:10:38 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00
Laurent Destailleur
d65bf1fbc7 Fix emailcollector 2018-11-05 15:31:41 +01:00
Laurent Destailleur
68ec172798 Fix setup to enable reminder b email 2018-11-03 12:37:52 +01:00
Laurent Destailleur
c764d7f8d5 Fix remove var_dump 2018-10-30 21:34:17 +01:00
Regis Houssin
9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
 2018-10-30 18:29:28 +01:00
Laurent Destailleur
c9d00848e6 Merge pull request #9914 from frederic34/patch-27 
make play and playdisable equals
 2018-10-30 14:49:54 +01:00
Laurent Destailleur
4a71374cf7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-30 14:48:09 +01:00
Laurent Destailleur
68f6ebd0ff Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/lib/security.lib.php
	htdocs/modulebuilder/template/myobject_card.php
 2018-10-30 14:47:39 +01:00
Laurent Destailleur
7a268d8d9f Clean code 2018-10-30 14:27:14 +01:00
Laurent Destailleur
81c70898bf Merge pull request #9884 from hregis/develop_bug 
FIX $forceentity is not used, replace by $currentobject if needed
 2018-10-30 14:16:29 +01:00
Laurent Destailleur
d4fd55c4cf FIX #9907 2018-10-30 13:54:11 +01:00
Laurent Destailleur
ca6d15a3eb Merge pull request #9820 from laudeco/hotfix/9640_member_email 
FIX the member e-mail on resign and validation.
 2018-10-30 12:41:34 +01:00
Laurent Destailleur
9bb1572e63 Update functions.lib.php 2018-10-30 12:41:06 +01:00
Frédéric FRANCE
450a837393 make play and playdisable equals 2018-10-29 18:50:15 +01:00
Laurent Destailleur
0266db7aa8 FIX deletion on draft is allowed if we are allwoed to create 2018-10-29 18:19:40 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Regis Houssin
866a7df510 FIX $forceentity is not used, replace by $currentobject if needed 2018-10-26 18:23:48 +02:00
De Coninck Laurent
d347cf3a85 set a message 2018-10-26 16:18:27 +02:00
Laurent Destailleur
0e464ea4f5 Merge pull request #9866 from frederic34/emptylines 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
 2018-10-26 15:31:24 +02:00
Laurent Destailleur
d28c9ddea5 Merge pull request #9872 from laudeco/feature/improvement_module_picto 
improve img_picto by returning ASAP
 2018-10-26 15:20:40 +02:00
De Coninck Laurent
70cd68ebef improve img_picto by returning ASAP 
We do not need an else each time some times, return is good enough. I also remove some line of comments since it's only code in it. We have GIT to find the code back we do not need to put it in comment ;-).
 2018-10-25 18:21:00 +02:00
atm-ph
f41e7e05e1 Fix PHP warnings printed in javascript 2018-10-25 12:01:17 +02:00
Frédéric FRANCE
86d854f3f4 Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00