lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
100,289 Commits 43 Branches 150 Tags 886 MiB
ccf3bacf9a
Commit Graph

100289 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
stickler-ci
26cae49faf Fixing style errors. 2021-06-15 20:06:48 +00:00
Laurent Destailleur
5ddf12b29c Fix set language 2021-06-15 22:06:26 +02:00
Laurent Destailleur
78f41bf60e
Update card.php 2021-06-15 22:04:31 +02:00
Laurent Destailleur
dc6512e5af
Merge pull request #17940 from Hystepik/develop#3 
Fix #17907 : import of the undefined function
 2021-06-15 22:00:17 +02:00
Laurent Destailleur
f1cd3a7044
Merge pull request #17941 from frederic34/recruitement 
replace recruitement by recruitment
 2021-06-15 21:59:56 +02:00
Laurent Destailleur
1c87420895 Fix #yogosha6411 2021-06-15 20:22:36 +02:00
Laurent Destailleur
3a5770f679 Clean code 2021-06-15 20:16:05 +02:00
Frédéric FRANCE
f79e16e3b1
replace recruitement by recruitment 2021-06-15 19:08:08 +02:00
Laurent Destailleur
adfbb9d7d5 Fix VAT column missing 2021-06-15 17:53:25 +02:00
Laurent Destailleur
f6274b8418 Fix nb of holidays can be float 2021-06-15 16:29:42 +02:00
Laurent Destailleur
d0173044ac css 2021-06-15 16:18:15 +02:00
lmarcouiller
674bd53b32 Fix #17907 : import of the undefined function 2021-06-15 16:11:25 +02:00
Laurent Destailleur
162da2a5b1 css 2021-06-15 15:24:12 +02:00
Laurent Destailleur
83ec4cbd71 Reponsive 2021-06-15 15:19:46 +02:00
lmarcouiller
d070c5b75d Fix #17930 : input boxes can be empty as previously 2021-06-15 15:13:25 +02:00
Laurent Destailleur
5f7dddbdcb Fix permissions 2021-06-15 14:49:08 +02:00
Laurent Destailleur
43c5dd2aea Fix permissions 2021-06-15 14:29:07 +02:00
Laurent Destailleur
3cd4f3e4af Fix permissions 2021-06-15 14:26:59 +02:00
Laurent Destailleur
80760d7960 Fix permissions 2021-06-15 14:18:09 +02:00
Laurent Destailleur
7f3c8b4cd5 Fix user can't edit record 2021-06-15 13:54:52 +02:00
Laurent Destailleur
d1ffd4fcc8 Trans 2021-06-15 13:48:00 +02:00
kevin
9ff0efbcc2 FIX fatal error when adding message to a ticket 2021-06-15 12:04:24 +02:00
lmarcouiller
2688b902b6 Close #17890 : produceandconsume into api finished 2021-06-15 11:35:41 +02:00
UT from dolibit
77f0645c0e
Update index.php 2021-06-15 10:30:58 +02:00
Frédéric FRANCE
5ceb957059
fix php warning 2021-06-15 08:48:52 +02:00
Frédéric FRANCE
8fbdde9ec3
Update contacts.tpl.php 2021-06-15 08:43:14 +02:00
Frédéric FRANCE
cd615b1717
fix php warning 2021-06-15 08:31:08 +02:00
Laurent Destailleur
a1e6236df0 Fix regression sql error 2021-06-15 02:15:45 +02:00
Laurent Destailleur
3b9936f7e2 Fix responsive 2021-06-15 01:18:17 +02:00
UT from dolibit
0b4105880e
Update ChangeLog 2021-06-14 21:59:37 +02:00
UT from dolibit
41549af751
Update llx_00_c_country.sql 
Iles Salomon  ->  Solomon Islands 
Somalie  ->  Somalia 
South Africa 
Iles Géorgie du Sud et Sandwich du Sud  ->  South Georgia and the South Sandwich Islands 
Sri Lanka = Sri Lanka 
Soudan  ->  Sudan 
Suriname = Suriname 
Iles Svalbard et Jan Mayen  ->  Svalbard and Jan Mayen 
Swaziland = Swaziland     & new also:   Eswatini 
Syrie  ->  Syria
 2021-06-14 21:45:11 +02:00
Laurent Destailleur
7e7800c110 Fix phpcs 2021-06-14 20:37:21 +02:00
Laurent Destailleur
347c6ae8a8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/projet/class/project.class.php
	htdocs/projet/list.php
 2021-06-14 20:13:27 +02:00