Commit Graph

88554 Commits

Author SHA1 Message Date
Laurent Destailleur
ac6bbc1914
Merge pull request #17961 from Hystepik/develop#1
Fix #17906 : fix access denied
2021-06-17 13:30:45 +02:00
Laurent Destailleur
3ff4f7c722
Merge pull request #17959 from dolibit-ut/patch-360
Update month_report.php
2021-06-17 13:30:15 +02:00
Laurent Destailleur
378184564a
Merge pull request #17957 from dolibit-ut/patch-358
Update define_holiday.php
2021-06-17 13:30:03 +02:00
Laurent Destailleur
70309d8a3e
Merge pull request #17956 from dolibit-ut/patch-357
Update card.php
2021-06-17 13:29:52 +02:00
Laurent Destailleur
de1f21082f
Merge pull request #17955 from dolibit-ut/patch-356
Update llx_00_c_country.sql
2021-06-17 13:29:29 +02:00
Laurent Destailleur
2f4f8648af
Merge pull request #17960 from dolibit-ut/patch-361
Update view_log.php
2021-06-17 13:29:09 +02:00
lmarcouiller
cf3761eb2e Fix #17906 : fix access denied 2021-06-17 10:09:07 +02:00
UT from dolibit
23b24c589e
Update view_log.php
$title
2021-06-17 09:15:24 +02:00
UT from dolibit
789a2744f2
Update month_report.php
$title
2021-06-17 09:13:54 +02:00
UT from dolibit
c1297d561d
Update document.php 2021-06-17 09:11:07 +02:00
UT from dolibit
e62e6d9696
Update define_holiday.php
$title
2021-06-17 09:08:59 +02:00
UT from dolibit
053f8f8338
Update card.php 2021-06-17 09:07:17 +02:00
UT from dolibit
e67062aea1
Update llx_00_c_country.sql
Ouganda  ->  Uganda 
Ukraine = Ukraine 
United Arab Emirates (is yet EN) 
Iles mineures éloignées des États-Unis  ->  United States Minor Outlying Islands 
Uruguay = Uruguay 
Ouzbékistan  ->  Uzbekistan 

Vanuatu = Vanuatu 
Vénézuela  ->  Venezuela 
Viêt Nam  ->  Vietnam 
Iles Vierges britanniques  ->  British Virgin Islands 
Iles Vierges américaines  ->  Virgin Islands of the United States  (also called:  American Virgin Islands) 

Wallis-et-Futuna  ->  Wallis and Futuna 
Sahara occidental  ->  Western Sahara 

Yémen  ->  Yemen 

Zambie  ->  Zambia 
Zimbabwe = Zimbabwe 

Guernesey  ->  Guernsey 
Ile de Man  ->  Isle of Man 
Jersey = Jersey 

Monténégro  ->  Montenegro 
Saint-Barthélemy   (Saint Barthélemy) 
Saint-Martin   (Saint Martin) 
Kosovo = Kosovo
2021-06-17 09:04:41 +02:00
Laurent Destailleur
61bd572a9c Fix token for ajax call 2021-06-17 03:37:52 +02:00
Laurent Destailleur
3754c2c3c9 Fix name of field 2021-06-17 00:59:11 +02:00
Laurent Destailleur
e04cf7d53a css 2021-06-16 22:17:44 +02:00
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
b2221d2c3a
Update extrafields.class.php 2021-06-16 14:31:22 +02:00
Antonin MARCHAL
d5cb81982d fix wrong display on extrafields type = double 2021-06-16 14:21:23 +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
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
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
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
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