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

72072 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frédéric FRANCE
9ceea06468 fix travis 2018-12-01 17:10:06 +01:00
andreubisquerra
1009588592 TakeBOX now is 'TakePOS Connector' 2018-12-01 17:09:21 +01:00
aurelien goudeneche
06e6d3ab00 Merge pull request #1 from Dolibarr/develop 
Fork Update
 2018-12-01 17:07:56 +01:00
ATM John BOTELLA
474228cbd6 FIX #8741 2018-12-01 17:01:11 +01:00
Laurent Destailleur
b41e0a40e7 Merge pull request #10138 from inoveaconseil/patch-4 
FIX #6580
 2018-12-01 16:56:31 +01:00
Maxime Kohlhaas
8c13c87429 Fix path for user photo 2018-12-01 16:55:42 +01:00
florian HENRY
6236f727c9 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8.0_fix9964 2018-12-01 16:51:51 +01:00
florian HENRY
c422904b99 fix #9964 2018-12-01 16:51:40 +01:00
Inovea Conseil
18281d9d43 FIX #6580 
FIX #6580
 2018-12-01 16:48:50 +01:00
Laurent Destailleur
e4bc9f8f87 Merge pull request #10136 from grandoc/8.0 
fix :#9967
 2018-12-01 16:45:37 +01:00
Maxime Kohlhaas
748dd12e4d Merge pull request #9056 from ATM-Nicolas/fix_default_preselected_mail_model 
FIX : Select first mail model by default
 2018-12-01 16:39:22 +01:00
Laurent Destailleur
3d09b05338 Merge pull request #10135 from atm-florian/8.0_fix9999 
fix #9999
 2018-12-01 16:31:02 +01:00
Philippe GRAND
bbf3b3baac fix :#9967 2018-12-01 16:27:14 +01:00
florian HENRY
c320dcd161 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8.0_fix9999 2018-12-01 16:24:20 +01:00
florian HENRY
589511f38c fix #9999 2018-12-01 16:23:40 +01:00
Laurent Destailleur
3ea69cb1f1 Merge pull request #10130 from inoveaconseil/patch-3 
Fix #9572
 2018-12-01 16:22:38 +01:00
Laurent Destailleur
508cb459eb Merge pull request #10134 from frederic34/patch-18 
devcamp 2018 fix #9642
 2018-12-01 16:21:30 +01:00
Frédéric FRANCE
61322b9ce2 devcamp 2018 fix #9642 2018-12-01 16:19:54 +01:00
Laurent Destailleur
2069223e4e Merge pull request #10133 from defrance/patch-133 
fix #9475
 2018-12-01 16:19:10 +01:00
BENKE Charlene
1dc2fc5060 fix #9475 2018-12-01 16:17:52 +01:00
Laurent Destailleur
a8009d4a72 Merge pull request #9972 from OPEN-DSI/contact-agenda-multiple-resources 
FIX Work with new table actioncomm_resources and multiple contact affectation
 2018-12-01 16:16:50 +01:00
Laurent Destailleur
9ac984af76 Update company.lib.php 2018-12-01 16:15:34 +01:00
Inovea Conseil
0ba5fda3da Update price.php 2018-12-01 16:11:49 +01:00
Laurent Destailleur
3b4ee295f3 Merge pull request #10129 from simnandez/8.0 
Fix #9929
 2018-12-01 15:58:38 +01:00
Inovea Conseil
8964ec7ea1 Fix #9572 
Fix #9572
 2018-12-01 15:58:37 +01:00
Laurent Destailleur
07713ca08e Merge pull request #10103 from laudeco/feature/fix_docker_creation 
fix docker image creation + adding the support of xdebug
 2018-12-01 15:54:56 +01:00
Juanjo Menent
7d4553179d Fix #9929 2018-12-01 15:48:46 +01:00
Laurent Destailleur
6076976e3b Merge pull request #10128 from grandoc/new_branch_01_12_2018 
fix scrutinizer issue : The variable  seems only to be defined at a l…
 2018-12-01 15:48:38 +01:00
Laurent Destailleur
2666a25da4 Merge branch 'develop' into develop_mc 2018-12-01 15:47:00 +01:00
Philippe GRAND
3df83d7cf3 fix scrutinizer issue : The variable seems only to be defined at a later point 2018-12-01 15:45:02 +01:00
florian HENRY
b9046b9174 fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0 2018-12-01 15:42:07 +01:00
florian HENRY
faf7ea345f fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/core/class/commonobject.class.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0 2018-12-01 15:23:46 +01:00
florian HENRY
dacc959937 fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/core/class/comment.class.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0 2018-12-01 15:18:51 +01:00
Laurent Destailleur
5c755b6f9f Merge pull request #10095 from ptibogxiv/patch-97 
Fix duration display product/service  in list.php
 2018-12-01 15:14:57 +01:00
Laurent Destailleur
778547818d Merge pull request #10108 from frederic34/patch-2 
Avoid adding libs not compatible with php 5.4
 2018-12-01 15:09:25 +01:00
Laurent Destailleur
5d3575ab4d Merge pull request #10126 from atm-florian/develop 
fix scrutinizer
 2018-12-01 15:08:45 +01:00
Laurent Destailleur
f94f7e15ca Update date.lib.php 2018-12-01 15:07:55 +01:00
Laurent Destailleur
03f0922325 Merge pull request #10087 from AurelGDN/develop 
New Takepos: cheque payment button in cashdesk
 2018-12-01 15:03:19 +01:00
Laurent Destailleur
03a67cee99 Merge pull request #10113 from frederic34/patch-9 
llx_paiementfourn.sql #8723
 2018-12-01 14:54:57 +01:00
Laurent Destailleur
305ab85f5d Merge pull request #10114 from frederic34/patch-17 
Update 6.0.0-7.0.0.sql #8723
 2018-12-01 14:54:31 +01:00
florian HENRY
d928372239 fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/commande/class/commande.class.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0 2018-12-01 14:51:22 +01:00
Laurent Destailleur
358be875e4 Merge pull request #10120 from defrance/patch-127 
scrutinizer major error
 2018-12-01 14:49:50 +01:00
Laurent Destailleur
b8e3aaa3cb Merge pull request #10121 from defrance/patch-128 
scrutinizer major error
 2018-12-01 14:49:28 +01:00
Laurent Destailleur
915b1b9528 Merge pull request #10124 from atm-john/fix_issue_from_scrutinizer 
Fix issue from scrutinizer
 2018-12-01 14:49:14 +01:00
Laurent Destailleur
60610ca49d Merge pull request #10119 from simnandez/8.0 
Fix #10097
 2018-12-01 14:48:39 +01:00
BENKE Charlene
60d0a5efab massfilesarea feature for plugin modules 2018-12-01 14:44:34 +01:00
florian HENRY
8e38d24121 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2018-12-01 14:43:32 +01:00
florian HENRY
47eda86e2f fix scrutinizer 2018-12-01 14:39:04 +01:00
Laurent Destailleur
30ed180dd4 Merge pull request #10122 from defrance/patch-129 
scrutinizer major error correction
 2018-12-01 14:29:42 +01:00
Laurent Destailleur
06e16d510c Merge pull request #10123 from defrance/patch-130 
scrutinizer error update
 2018-12-01 14:29:02 +01:00