Commit Graph

100322 Commits

Author SHA1 Message Date
Laurent Destailleur
c4e8866727 Clean code 2021-06-16 21:20:27 +02:00
Laurent Destailleur
f850f058fa Look and feel v14 2021-06-16 21:06:55 +02:00
Laurent Destailleur
834fc289b6 Fix look and feel v14 2021-06-16 20:35:55 +02:00
Laurent Destailleur
ac1e6c9966 FIX sql error on strict mysql 2021-06-16 20:17:21 +02:00
Laurent Destailleur
19ddfc8fc6 Fix warning 2021-06-16 19:44:58 +02:00
Laurent Destailleur
8db0ecd4db Add fix of corrupted data 2021-06-16 19:40:43 +02:00
Laurent Destailleur
8c18837095 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-16 19:01:03 +02:00
Laurent Destailleur
f6998d7c32 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/actions_massactions.inc.php
2021-06-16 19:00:52 +02:00
Laurent Destailleur
3020cce9ee
Merge pull request #17951 from frederic34/patch-7
fix warning
2021-06-16 14:32:36 +02:00
Laurent Destailleur
f3b53c18c4
Merge pull request #17952 from ibuiv/bugfix-extrafields-float
fix wrong display on extrafields type = double
2021-06-16 14:31:58 +02:00
Laurent Destailleur
b2221d2c3a
Update extrafields.class.php 2021-06-16 14:31:22 +02:00
Laurent Destailleur
e68955afc5 Try to reduce the depth of git clone 2021-06-16 14:27:49 +02:00
Antonin MARCHAL
d5cb81982d fix wrong display on extrafields type = double 2021-06-16 14:21:23 +02:00
Laurent Destailleur
884ef12dde Add -e php option to parallel-lint 2021-06-16 14:08:46 +02:00
Laurent Destailleur
a556caf777 Clean phpunit file 2021-06-16 14:00:50 +02:00
Laurent Destailleur
3fffbb4cd3 Split updage and enable of new module in 2 different tasks 2021-06-16 13:55:17 +02:00
Laurent Destailleur
d5a747eed7 Fix travis syntax file 2021-06-16 13:14:28 +02:00
Laurent Destailleur
2dbe621f44 Fxi travis file 2021-06-16 13:11:35 +02:00
Laurent Destailleur
6a4210f759 Reduce travis load 2021-06-16 12:53:49 +02:00
Frédéric FRANCE
11a1cba68a
fix warning 2021-06-16 12:10:21 +02:00
Laurent Destailleur
daff2c25f7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-16 12:08:47 +02:00
Laurent Destailleur
06b09f614a Fix var not defined 2021-06-16 12:08:34 +02:00
Laurent Destailleur
d8e144808f
Merge pull request #17950 from frederic34/patch-9
fix unknown right
2021-06-16 12:04:29 +02:00
Laurent Destailleur
89442c9ab5
Merge pull request #17949 from frederic34/patch-8
fix php warning
2021-06-16 12:02:54 +02:00
Frédéric FRANCE
cf9c595568
fix unknown right
supprimer doesn't exists
2021-06-16 12:01:52 +02:00
Laurent Destailleur
73be66ac5b
Merge pull request #17948 from frederic34/patch-7
fix php warning
2021-06-16 12:00:05 +02:00
Frédéric FRANCE
fca75a5842
fix php warning 2021-06-16 11:54:33 +02:00
Frédéric FRANCE
5d79143401
fix php warning 2021-06-16 11:50:52 +02:00
Laurent Destailleur
0baa992ded
Merge pull request #17945 from dolibit-ut/patch-354
Update llx_00_c_country.sql
2021-06-16 11:31:33 +02:00
Laurent Destailleur
b28395dd05
Merge pull request #17942 from aspangaro/14a26
Look & feel v14
2021-06-16 11:31:16 +02:00
Laurent Destailleur
ccf3bacf9a
Merge pull request #17943 from aspangaro/14b14
FIX SQL Error on automatic binding with functionality "company per entity" activated
2021-06-16 11:30:43 +02:00
Laurent Destailleur
1b6396e3e9
Merge pull request #17944 from dolibit-ut/patch-353
Update ChangeLog
2021-06-16 11:30:10 +02:00
UT from dolibit
b8824435d2
Update llx_00_c_country.sql
Taïwan  ->  Taiwan 
Tadjikistan  ->  Tajikistan 
Tanzanie  ->  Tanzania 
Thaïlande  ->  Thailand 
Timor Oriental  ->  East Timor /  Timor-Leste 
Tokélaou  ->  Tokelau 
Tonga = Tonga 
Trinité-et-Tobago  ->  Trinidad and Tobago 
Turquie  ->  Turkey 
Turkménistan  ->  Turkmenistan 
Iles Turks-et-Caicos  ->  Turks and Caicos Islands 
Tuvalu = Tuvalu
2021-06-16 09:40:45 +02:00
UT from dolibit
4c47c5f2e7
Update ChangeLog 2021-06-16 09:27:08 +02:00
Alexandre SPANGARO
7f0d2b009e FIX SQL Error on automatic binding with functionality "company per entity" activated 2021-06-16 06:23:50 +02:00
Alexandre SPANGARO
e848579495 Look & feel v14 2021-06-16 06:00:00 +02:00
Laurent Destailleur
e503f73e95 Comment dead code 2021-06-15 22:28:39 +02:00
Laurent Destailleur
8b238c43ce Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-15 22:23:46 +02:00
Laurent Destailleur
93d681760f
Merge pull request #17932 from dolibit-ut/patch-351
Update ChangeLog
2021-06-15 22:21:19 +02:00
Laurent Destailleur
b6f90c3299
Merge pull request #17939 from Hystepik/develop#2
Fix #17930 : input boxes can be empty as previously on survey
2021-06-15 22:20:03 +02:00
Laurent Destailleur
244ff0b35a
Merge pull request #17937 from Hystepik/develop#1
Close #17890 : produceandconsume into api finished
2021-06-15 22:19:21 +02:00
Laurent Destailleur
df41691377
Merge pull request #17936 from dolibit-ut/patch-352
Update index.php
2021-06-15 22:18:38 +02:00
Laurent Destailleur
36f599519e
Merge pull request #17935 from frederic34/patch-8
fix php warning
2021-06-15 22:18:26 +02:00
Laurent Destailleur
6bf8e425c5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-15 22:18:07 +02:00
Laurent Destailleur
87a19af86d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/contacts.tpl.php
2021-06-15 22:17:53 +02:00
Laurent Destailleur
5cccf901c8
Merge pull request #17931 from dolibit-ut/patch-350
Update llx_00_c_country.sql
2021-06-15 22:12:56 +02:00
Laurent Destailleur
2a3b330e1e Fix newToken() 2021-06-15 22:10:59 +02:00
Laurent Destailleur
1aad151e19 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-06-15 22:08:50 +02:00
Laurent Destailleur
ac7ad64737
Merge pull request #17934 from frederic34/patch-7
fix php warning
2021-06-15 22:08:37 +02:00
Laurent Destailleur
dea8c8d32f
Merge pull request #17938 from atm-kevin/FIX_13.0_Ticket_Card
Fix : Fatal error on ticket presend
2021-06-15 22:08:03 +02:00