Commit Graph

71400 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
ATM John BOTELLA
c6f4879575 Fix issue from scrutinizer 2018-12-01 12:04:34 +01:00
BENKE Charlene
676ac67817
scrutinizer error update 2018-12-01 11:49:25 +01:00
BENKE Charlene
1f91a763ff
scrutinizer major error correction
It seems like $tasksarray can also be of type string. However, the property $lines is declared as type array<integer,object<Task>>. Maybe add an additional type check?
2018-12-01 11:44:46 +01:00
Frédéric FRANCE
9a9a963703
Update .travis.yml 2018-12-01 11:41:04 +01:00
Frédéric FRANCE
07da468109
Update modDav.class.php 2018-12-01 11:39:58 +01:00
BENKE Charlene
fca332995b
scrutinizer major error 2018-12-01 11:37:50 +01:00
BENKE Charlene
c34b213f61
scrutinizer major error 2018-12-01 11:33:58 +01:00
Juanjo Menent
0e1c4d92da
Merge pull request #10112 from inoveaconseil/patch-2
Fix missing translation
2018-11-30 23:59:29 +01:00
Juanjo Menent
a57a43fc05
Merge pull request #10104 from inoveaconseil/MassClose
FIX mass action closed proposal
2018-11-30 23:56:38 +01:00
Juanjo Menent
70d75caf09
Merge pull request #10096 from ptibogxiv/patch-98
Fix trans
2018-11-30 23:54:36 +01:00
Inovea Conseil
6201962dcf
Fix missing translation 2018-11-30 23:27:05 +01:00
Frédéric FRANCE
9c95940bfd
Update .travis.yml 2018-11-30 22:12:37 +01:00
Frédéric FRANCE
c2a9e51a80
Update .travis.yml 2018-11-30 19:09:05 +01:00
Frédéric FRANCE
49fc41661b
Update .travis.yml 2018-11-30 19:01:03 +01:00
Frédéric FRANCE
3c2de0f82e
check dav compatibility with php 5.4 2018-11-30 18:44:12 +01:00
Laurent Destailleur
2dc6351593 Fix website import 2018-11-30 15:16:17 +01:00
Inovea Conseil
ad7117be60 FIX mass action closed proposal 2018-11-30 15:05:28 +01:00
Inovea Conseil
46f5e7b06b Merge remote-tracking branch 'Dolibarr/develop' into MassClose 2018-11-30 15:00:25 +01:00
Laurent Destailleur
7a4c1cddc8 Fix save master file of a website 2018-11-30 14:46:44 +01:00
Laurent Destailleur
e8d29c644b Fix grab web site 2018-11-30 14:30:00 +01:00
Laurent De Coninck
0f45ed0a8c fix docker image creation + xdebug
Fix the PHP image creation + adding xdebug

[see: X]
2018-11-30 13:04:06 +01:00
Laurent Destailleur
94c2d7194c Trans Website 2018-11-30 12:41:35 +01:00
Laurent Destailleur
034c846ce2 Typo 2018-11-30 12:38:16 +01:00
Laurent Destailleur
4260d5765f Fix bad trans key 2018-11-30 11:50:32 +01:00
Laurent Destailleur
f82e97d6aa Typo 2018-11-30 11:26:15 +01:00
Laurent Destailleur
00865c6e0a Fix travis 2018-11-30 11:15:03 +01:00
Laurent Destailleur
6fbf292a95 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-11-30 11:01:36 +01:00
Laurent Destailleur
dd357d167a Update ChangeLog 2018-11-30 11:00:42 +01:00
ptibogxiv
e8bdb580ab
Fix trans 2018-11-29 14:00:27 +01:00
ptibogxiv
310dc46113
Update list.php 2018-11-29 13:44:42 +01:00
ptibogxiv
31e3b82ca6
Fix duration display product/service in list.php 2018-11-29 13:44:10 +01:00
Laurent Destailleur
539d993666 Fix translation of month 2018-11-29 12:20:47 +01:00