Commit Graph

100223 Commits

Author SHA1 Message Date
Laurent Destailleur
49dabda323 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	doc/index.html
	doc/user/README-DE.md
2021-06-14 15:33:38 +02:00
Laurent Destailleur
d6d419783e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	doc/install/README-DE
	doc/install/README-FR
2021-06-14 15:26:41 +02:00
Laurent Destailleur
c8a41fab11 Doc 2021-06-14 15:24:50 +02:00
Laurent Destailleur
819aa108e9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-14 15:24:14 +02:00
Laurent Destailleur
1d9310055e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-06-14 15:19:11 +02:00
Laurent Destailleur
e81023c35a Update doc 2021-06-14 15:12:08 +02:00
Laurent Destailleur
d04fe12ce9 # WARNING: head commit changed in the meantime
Clean code
2021-06-14 15:05:54 +02:00
Laurent Destailleur
261bc88545 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-14 14:50:26 +02:00
Laurent Destailleur
617338cccd Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-14 14:50:15 +02:00
Laurent Destailleur
4464aeb639 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-06-14 14:44:08 +02:00
Laurent Destailleur
6078267f86 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
2021-06-14 14:43:46 +02:00
Laurent Destailleur
dcca3011ee Clean code 2021-06-14 14:41:50 +02:00
Laurent Destailleur
e41a3a2f42
Merge pull request #17867 from OPEN-DSI/v11-fix-clone-invoice-with-acount-line
FIX clone invoice with acount line
2021-06-14 14:41:05 +02:00
Laurent Destailleur
9a820ba974
Merge pull request #17925 from dolibit-ut/patch-347
Update agenda.php
2021-06-14 14:27:56 +02:00
Laurent Destailleur
094315d708
Merge pull request #17926 from daraelmin/daraelmin-patch-1
Clean code (use Adh constant and precise comment)
2021-06-14 14:27:40 +02:00
Laurent Destailleur
3cacad795f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-14 14:26:07 +02:00
Laurent Destailleur
988dbd25b3 Fix sql syntax error 2021-06-14 14:24:18 +02:00
Laurent Destailleur
d0b033548c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/bookmarks/bookmarks.lib.php
2021-06-14 14:21:53 +02:00
Laurent Destailleur
5117be4b36
Merge pull request #17920 from atm-adrien/FIX/12.0_bookmarks_on_searchlist
FIX : Allow to set bookmarks on list filtered by multiselect fields
2021-06-14 14:18:28 +02:00
Laurent Destailleur
46752186fc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-14 14:15:53 +02:00
Laurent Destailleur
f988f4c352 Fix contact 2021-06-14 14:15:32 +02:00
Laurent Destailleur
b588aee704
Merge pull request #17917 from fappels/14_create_thumbs_php8.0
Fix create image thumbs on php 8.0
2021-06-14 14:07:21 +02:00
Laurent Destailleur
03fbd68da4
Update images.lib.php 2021-06-14 14:05:48 +02:00
Laurent Destailleur
91933dda4e
Merge pull request #17924 from dolibit-ut/patch-346
Update bom_agenda.php
2021-06-14 14:03:24 +02:00
Laurent Destailleur
515517d72f
Merge pull request #17921 from dolibit-ut/patch-344
Update ChangeLog
2021-06-14 14:03:12 +02:00
Laurent Destailleur
95fed04e56
Merge pull request #17923 from dolibit-ut/patch-345
Update README.md
2021-06-14 14:02:46 +02:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
daraelmin
023453e73b
Update geo.php 2021-06-14 12:45:13 +02:00
daraelmin
8423ad823b
Update list.php 2021-06-14 12:41:32 +02:00
daraelmin
80f4278c42
Clean code 2021-06-14 12:24:58 +02:00
daraelmin
f5ec96bfce
Clean code (use Adh constant and precise comment) 2021-06-14 12:19:24 +02:00
UT from dolibit
2143395d70
Update agenda.php 2021-06-14 11:02:43 +02:00
UT from dolibit
ba4f7a66d3
Update bom_agenda.php 2021-06-14 10:55:29 +02:00
UT from dolibit
5f1f61c38b
Update README.md 2021-06-14 10:45:09 +02:00
UT from dolibit
fe06e76e2f
Update ChangeLog 2021-06-14 10:21:16 +02:00
Adrien Raze
0f91c4cfa2 FIX : Allow to set bookmarks on list filtered by multiselect fields 2021-06-14 10:02:44 +02:00
Laurent Destailleur
046215f64a Fix PHP8 2021-06-14 02:08:28 +02:00
Laurent Destailleur
f8f951977c Debug v14 2021-06-14 01:33:01 +02:00
Laurent Destailleur
aceeb9558f css 2021-06-14 01:13:46 +02:00
Laurent Destailleur
34cebe6aa3 Look and feel v14 2021-06-14 01:11:39 +02:00
Laurent Destailleur
465ee6e643 Fix security check on public pages 2021-06-13 20:37:53 +02:00
Laurent Destailleur
3eea92c6e6 Clean code 2021-06-13 20:36:12 +02:00
Laurent Destailleur
6f97a551ef Clean code 2021-06-13 20:32:11 +02:00
Laurent Destailleur
67e00e5cf5 Fix regression. Missing rollback. 2021-06-13 19:05:48 +02:00
Laurent Destailleur
95ee0f630d Fix phpcs 2021-06-13 18:10:04 +02:00
Francis Appels
a019996bc8 Fix create image thumbs on php 8.0 2021-06-13 17:36:51 +02:00
Laurent Destailleur
a72f66b456 Fix: dictionnaries are edited per entity 2021-06-13 16:32:06 +02:00
Laurent Destailleur
e0abbb2525 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-13 16:24:21 +02:00
Laurent Destailleur
0cbcba7bc4
Merge pull request #17916 from frederic34/patch-16
fix warnings
2021-06-13 16:21:44 +02:00
Laurent Destailleur
205a6fac98
Merge pull request #17910 from frederic34/patch-11
fix PDF BACKGROUND not found
2021-06-13 16:21:05 +02:00