Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
91,506 Commits 36 Branches 189 Tags
eb0fd1674d26a8157ff133173f9177ee6a23e81f
Commit Graph

442 Commits

Author SHA1 Message Date
Frédéric FRANCE
e52b79d586 Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-11-01 14:19:06 +01:00
Frédéric FRANCE
d9bf49c5dc phpcs 2020-10-31 21:04:38 +01:00
Frédéric FRANCE
49390a596c Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-31 20:33:59 +01:00
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 17:51:30 +00:00
Frédéric FRANCE
fb980fb110 merge 2020-10-31 16:40:53 +01:00
Frédéric FRANCE
e95f38cca7 merge 2020-10-31 16:22:13 +01:00
Frédéric FRANCE
be4a4cb54b Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-31 16:10:16 +01:00
Frédéric FRANCE
8bf2b1797c tabs 2020-10-31 15:59:33 +01:00
stickler-ci
284c9bc6a8 Fixing style errors. 2020-10-31 13:34:01 +00:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Frédéric FRANCE
0b9c866825 Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-31 09:08:07 +01:00
Frédéric FRANCE
757c800039 work 2020-10-31 09:03:09 +01:00
Frédéric FRANCE
460af58134 typo 2020-10-30 22:09:15 +01:00
Frédéric FRANCE
2cbbf86a5b Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-30 17:48:00 +01:00
Frédéric FRANCE
28adc985b0 Update api_setup.class.php 2020-10-30 17:31:57 +01:00
Frédéric FRANCE
ace1dc16f1 Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-30 14:47:09 +01:00
Frédéric FRANCE
5c71b7e24c work on members 2020-10-30 09:25:14 +01:00
Frédéric FRANCE
412077ab51 doxygen 2020-10-30 08:24:02 +01:00
Pierre Penelon
63c5c41a7b ADD Handle proposals upload in documents API 2020-10-28 01:47:25 +01:00
Laurent Destailleur
e10033143a Fix bad var 2020-10-27 18:40:44 +01:00
Laurent Destailleur
80d13e711c More secured getURLContent method. Add PHPUnit on getURLContent 2020-10-27 18:02:05 +01:00
Scrutinizer Auto-Fixer
1512521d91 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-07 13:01:28 +00:00
Laurent Destailleur
cfc3c01815 Factorize code to know if a parameter is used to store a secret 2020-10-05 12:13:06 +02:00
Laurent Destailleur
f442dac2c9 Add token on most GET url for admin action 2020-09-30 15:13:28 +02:00
Laurent Destailleur
216b3c885d Fix escaping 2020-09-20 01:30:36 +02:00
Laurent Destailleur
584a02bc9a Update api_setup.class.php 2020-09-16 01:11:47 +02:00
ptibogxiv
f09655ec6c Update api_setup.class.php 2020-09-14 10:53:38 +02:00
stickler-ci
75a9678086 Fixing style errors. 2020-09-14 08:48:04 +00:00
ptibogxiv
557a6863ba NEW get state by REST API 2020-09-14 10:45:20 +02:00
Laurent Destailleur
1f8278c8ca Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/core/class/html.formmail.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/langs/en_US/other.lang
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-09-12 04:42:59 +02:00
Laurent Destailleur
5ea3f09e17 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/translate.class.php
 2020-09-12 04:29:28 +02:00
ptibogxiv
9f475a3f93 FIX API variable error return 
Some modules, when there is no value, delete the variables so don't find variable can be normal.

Error 404 is better than 500 with error servor (same as other object when not found)
ie thirdparties, contacts invoices...)
 2020-09-10 14:01:00 +02:00
Laurent Destailleur
b8fe2188a6 Standardize code around model_pdf 2020-09-10 01:49:09 +02:00
ATM-Nicolas
6bd6b285fd FIX : Static property called as non static 2020-09-08 16:03:18 +02:00
florian HENRY
e44a1fd33f ->error rather than dol_print_error into product 2020-07-31 16:09:38 +02:00
Laurent Destailleur
2687666579 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-29 13:54:12 +02:00
Laurent Destailleur
391fcc799b FIX #14279 2020-07-29 12:51:18 +02:00
Laurent Destailleur
a607ff4c1a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/core/lib/project.lib.php
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/products.lang
	htdocs/langs/fr_FR/stocks.lang
	htdocs/langs/fr_FR/ticket.lang
	htdocs/mrp/mo_card.php
 2020-06-18 15:50:31 +02:00
Laurent Destailleur
c0b269b9ee Fix Permissions on MO and API for MO 2020-06-18 01:09:30 +02:00
Laurent Destailleur
6c2d70d43b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-17 19:27:39 +02:00
Laurent Destailleur
54596d2286 FIX #13967 2020-06-17 19:26:17 +02:00
Laurent Destailleur
bbbcd5b6b3 Fix phpcs 2020-06-16 22:48:19 +02:00
Xebax
5d76b4781e FIX Upload of documents for members using the REST API. 2020-06-16 22:48:14 +02:00
Laurent Destailleur
64b2a2d92f Fix phpcs 2020-06-16 22:46:36 +02:00
Xebax
a22c89da96 FIX Upload of documents for members using the REST API. 2020-06-14 14:58:09 +02:00
Frédéric FRANCE
b41ac00b98 add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5 add new rule 2020-05-21 01:41:27 +02:00
Laurent Destailleur
30fede216c Fix Add '_pw' var as var sensibles. 2020-05-06 04:03:07 +02:00
Laurent Destailleur
a88ab40384 Clean phpcs 2020-05-02 15:18:59 +02:00
Laurent Destailleur
ed045b2673 FIX #13749 2020-04-27 15:04:31 +02:00