Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 09:01:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
100,555 Commits 39 Branches 191 Tags
c03958a867d1180e5bcaf99feee94de8acdb334a
Commit Graph

100555 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Laurent Destailleur
d154ec2344 FIX Collector to create lead was broken 2021-06-14 20:06:52 +02:00
Laurent Destailleur
a79afeaf02 Add info to allow debug of email collector 2021-06-14 19:58:12 +02:00
Laurent Destailleur
165d0d76d7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-14 19:29:03 +02:00
Laurent Destailleur
8b0c2d997c Clean code 2021-06-14 19:28:38 +02:00
stickler-ci
745ad8b403 Fixing style errors. 2021-06-14 15:10:24 +00:00
Gauthier PC portable 024
564a3b66c2 FIX : method exists 2021-06-14 17:08:16 +02:00
Gauthier PC portable 024
33553f3347 FIX : same thing on supplier orders 2021-06-14 17:01:59 +02:00
Laurent Destailleur
5fade1148d Merge pull request #17829 from aspangaro/14b12 
NEW Add field date start/end from/to in expense report list
 2021-06-14 16:11:13 +02:00
Laurent Destailleur
dd27d38d5e Merge pull request #17869 from aspangaro/14b13 
NEW Add field date from/to in supplier invoice list
 2021-06-14 16:02:50 +02:00
Laurent Destailleur
4b7292e405 Merge pull request #17928 from dolibit-ut/patch-349 
Update card.php
 2021-06-14 15:47:44 +02:00
Laurent Destailleur
b64f54c86f Merge pull request #17927 from dolibit-ut/patch-348 
Update card.php
 2021-06-14 15:46:49 +02:00
Laurent Destailleur
1a44d81c96 Merge pull request #17929 from Dolibarr/scrutinizer-patch-2 
Scrutinizer Auto-Fixes
 2021-06-14 15:45:43 +02:00
stickler-ci
afa1e117c5 Fixing style errors. 2021-06-14 13:37:39 +00:00
Scrutinizer Auto-Fixer
55c9f37ffa Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-06-14 13:37:02 +00:00
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
UT from dolibit
d2a19b530f Update card.php 2021-06-14 14:24:21 +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
UT from dolibit
45e0f8a7ee Update card.php 2021-06-14 14:11:21 +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