Commit Graph

619 Commits

Author SHA1 Message Date
Laurent Destailleur
8603d493ad Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contrat/list.php
	htdocs/install/mysql/tables/llx_partnership.key.sql
2022-03-19 17:34:26 +01:00
Laurent Destailleur
ed631b2b06 Fix doxygen, missing error message 2022-03-18 16:14:20 +01:00
Laurent Destailleur
548cad0508 FIx #20110 2022-02-28 21:30:12 +01:00
Laurent Destailleur
6b8312aab0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-17 20:51:25 +01:00
Laurent Destailleur
d19aca7192 # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-17 20:50:03 +01:00
Laurent Destailleur
aacd439765 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/api/class/api_setup.class.php
2022-02-17 20:46:20 +01:00
Laurent Destailleur
a71bdc4024 Merge pull request #20053 from ptibogxiv/patch-5
NEW API REST filter states by country
2022-02-17 19:53:00 +01:00
Laurent Destailleur
1b53ed09f9 Work on custom report feature 2022-02-15 11:03:48 +01:00
ptibogxiv
061dd565cc Update api_setup.class.php 2022-02-13 13:22:01 +01:00
ptibogxiv
f2b88c6d7c Update api_setup.class.php 2022-02-13 10:09:39 +01:00
ptibogxiv
8d3e97bab9 Update api_setup.class.php 2022-02-12 19:21:07 +01:00
ptibogxiv
54af0cf47a NEW API REST filter states by country 2022-02-12 19:02:00 +01:00
ptibogxiv
a5a8f30939 FIX API REST setup
bad words
2022-02-12 17:08:43 +01:00
ptibogxiv
11e15255bd FIX API REST for setup values 2022-02-12 16:59:29 +01:00
Laurent Destailleur
a16d47c78e Close #19890 2022-01-23 12:06:40 +01:00
Laurent Destailleur
7ccb1c94a1 Fix var not defined 2022-01-13 19:07:05 +01:00
Laurent Destailleur
054116900a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-13 11:59:05 +01:00
Laurent Destailleur
d3af00d4e6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-12 10:58:24 +01:00
ptibogxiv
63611ab717 NEW add setup/establishments API (need for recruitment API) 2022-01-11 20:24:23 +01:00
Laurent Destailleur
1efbff8fea Fix error message 2022-01-11 15:42:03 +01:00
Laurent Destailleur
b41fdb6ec9 Fix tool for generic to sql filters. Must not be saved into api files. 2022-01-01 21:46:16 +01:00
Laurent Destailleur
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +01:00
Laurent Destailleur
626cd24305 Clean code for #19639 2021-12-19 17:05:57 +01:00
Scrutinizer Auto-Fixer
5567310e44 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-10-25 20:07:31 +00:00
Laurent Destailleur
ab78930476 Add api to post supplier proposal and supplier order documents 2021-10-06 18:50:29 +02:00
Laurent Destailleur
96b617cb4d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/eventorganization/conferenceorboothattendee_card.php
	htdocs/mrp/mo_list.php
2021-10-06 18:30:26 +02:00
Laurent Destailleur
1c53035e38 Doc 2021-10-06 16:19:36 +02:00
Laurent Destailleur
902fed1f0d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/ecm/index.php
2021-10-02 20:09:06 +02:00
Laurent Destailleur
166d3b08d6 Add LIBXML_NONET to simplexml_load_string 2021-09-30 20:12:01 +02:00
Laurent Destailleur
95e1ec87dc Merge branch 'develop' into patch-445 2021-09-30 13:40:23 +02:00
stickler-ci
4d62aff8aa Fixing style errors. 2021-09-28 18:29:50 +00:00
ptibogxiv
1b71404225 Update api_setup.class.php 2021-09-28 20:27:45 +02:00
Laurent Destailleur
1199782d61 Update api_setup.class.php 2021-09-28 13:10:46 +02:00
Laurent Destailleur
4f660343aa Update api_setup.class.php 2021-09-28 12:59:00 +02:00
Laurent Destailleur
b795d6b430 Update api_setup.class.php 2021-09-28 12:58:19 +02:00
stickler-ci
509e1f5636 Fixing style errors. 2021-09-25 10:48:39 +00:00
ptibogxiv
1cdba9fb80 NEW API get list of legal form of business 2021-09-25 12:46:27 +02:00
stickler-ci
6b820ae4c5 Fixing style errors. 2021-09-25 10:16:29 +00:00
ptibogxiv
77d64e4fe2 NEW API list of staff units 2021-09-25 12:13:06 +02:00
Laurent Destailleur
6fd191b01a Update doc 2021-09-13 01:22:53 +02:00
Laurent Destailleur
e965d6d6f2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/pdf.php
	htdocs/api/class/api_access.class.php
2021-09-03 11:02:21 +02:00
Laurent Destailleur
7758c0b8a7 Fix phpcs 2021-09-02 16:06:19 +02:00
Laurent Destailleur
8600d8d00d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-01 22:50:06 +02:00
Laurent Destailleur
0f325bdd65 Update api_access.class.php 2021-09-01 18:05:24 +02:00
Laurent Destailleur
d2f3d134df Code comment. Better _checkFilters 2021-08-30 16:54:45 +02:00
lainwir3d
359dae6af8 FIX #18542 REST API: set global $user variable to DolibarrApiAccess::user. 2021-08-29 23:13:41 +04:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
bda36337cd Prepare fix #yogosha6443 2021-06-30 17:22:36 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
ce8c606132 Clean APIs 2021-05-12 11:04:22 +02:00