Commit Graph

91068 Commits

Author SHA1 Message Date
Frédéric FRANCE
f5673fd08a
doxygen 2020-10-28 22:47:29 +01:00
Laurent Destailleur
cb0f1bc6d4
Merge pull request #15203 from Dolibarr/scrutinizer-patch-2
Scrutinizer Auto-Fixes
2020-10-28 17:51:11 +01:00
Scrutinizer Auto-Fixer
208740c9c4 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-28 16:49:52 +00:00
Laurent Destailleur
f760b20bde Fix double semi colon 2020-10-28 17:48:20 +01:00
Laurent Destailleur
8a58471aeb
Merge pull request #15191 from frederic34/patch-10
Fix print extrafield on pdf lines
2020-10-28 17:35:58 +01:00
Laurent Destailleur
d4459367ab
Merge pull request #15193 from frederic34/patch-13
Update delivery.class.php
2020-10-28 17:17:45 +01:00
Laurent Destailleur
4cf32824bf
Merge pull request #15187 from frederic34/patch-6
Make MAIN_ALL_TO_UPPER utf8 compliant
2020-10-28 17:17:18 +01:00
Laurent Destailleur
6a76946f99
Merge pull request #15189 from frederic34/patch-8
doxygen
2020-10-28 17:13:50 +01:00
Laurent Destailleur
b23a4e1025
Merge pull request #15190 from FHenry/dev_finaly_maildev_in_docker
new maildev work in docker compose
2020-10-28 17:13:01 +01:00
Laurent Destailleur
6ed781c7c4
Merge pull request #15192 from frederic34/patch-11
Update fichinter.class.php
2020-10-28 17:11:02 +01:00
Laurent Destailleur
77dfda1a2d
Merge pull request #15194 from ptibogxiv/patch-391
FIX display variants card
2020-10-28 17:10:34 +01:00
Laurent Destailleur
e3f848238d
Merge pull request #15195 from frederic34/cachecompanylib
add cache
2020-10-28 17:09:27 +01:00
Laurent Destailleur
07da283707
Merge pull request #15188 from frederic34/20201027_phpcs
fix phpcs
2020-10-28 17:08:25 +01:00
Laurent Destailleur
5f3596ef3e
Merge branch 'develop' into 20201027_phpcs 2020-10-28 17:08:15 +01:00
Laurent Destailleur
393efed01f
Merge pull request #15196 from ppenelon/develop
New Handle proposals upload in documents API
2020-10-28 17:07:21 +01:00
Laurent Destailleur
9a85441c61 Fix phpcs 2020-10-28 17:06:30 +01:00
Laurent Destailleur
ef59b71cdf Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/class/product.class.php
	htdocs/product/stats/card.php
2020-10-28 17:02:20 +01:00
Laurent Destailleur
f02a35d398 Fix bad array when year is not defined into graph stat of products 2020-10-28 16:47:00 +01:00
Laurent Destailleur
6363a6cd60 Fix sanitize 2020-10-28 14:11:46 +01:00
Laurent Destailleur
47dfe633f9 Fix filter on date on statistics of products 2020-10-28 13:19:35 +01:00
Pierre Penelon
63c5c41a7b
ADD Handle proposals upload in documents API 2020-10-28 01:47:25 +01:00
Pierre Penelon
8532135630
Merge pull request #2 from Dolibarr/develop
Update from master
2020-10-28 01:44:58 +01:00
Frédéric FRANCE
0d65ab0c96
add cache 2020-10-28 00:34:59 +01:00
ptibogxiv
6fd996381e
FIX display variant card 2020-10-27 23:07:05 +01:00
Frédéric FRANCE
a1af0f11c1
Update delivery.class.php 2020-10-27 23:01:28 +01:00
Frédéric FRANCE
bc7c1540cc
Update fichinter.class.php 2020-10-27 22:57:06 +01:00
Frédéric FRANCE
e8659469b9
Update expedition.class.php 2020-10-27 22:49:30 +01:00
Florian HENRY
5d38d01a27 add new container 2020-10-27 22:49:20 +01:00
Florian HENRY
e4dfed53c2 new maildev work in docker compose 2020-10-27 22:42:48 +01:00
Frédéric FRANCE
9ba22d2813
doxygen 2020-10-27 22:07:31 +01:00
Frédéric FRANCE
7a7a6f8018
fix phpcs 2020-10-27 21:28:26 +01:00
Frédéric FRANCE
19ff2ef19e
Update user.class.php 2020-10-27 20:52:37 +01:00
Laurent Destailleur
f7c90d7e90 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-27 20:50:48 +01:00
Laurent Destailleur
039bc3c412 Fix phpunit 2020-10-27 20:50:33 +01:00
Frédéric FRANCE
0ff32c7074
Update societe.class.php 2020-10-27 20:50:11 +01:00
Frédéric FRANCE
5a01d91492
Update contact.class.php 2020-10-27 20:48:13 +01:00
Frédéric FRANCE
b9f593b73a
Update adherent.class.php 2020-10-27 20:46:32 +01:00
Frédéric FRANCE
991273bd10
Update functions.lib.php 2020-10-27 20:44:17 +01:00
Frédéric FRANCE
584373af55
Update user.class.php 2020-10-27 20:15:46 +01:00
Frédéric FRANCE
4f3b732ed5
Update societe.class.php 2020-10-27 20:14:42 +01:00
Frédéric FRANCE
0a024f285d
Update contact.class.php 2020-10-27 20:13:01 +01:00
Frédéric FRANCE
6d6b143011
Update adherent.class.php 2020-10-27 20:11:18 +01:00
Frédéric FRANCE
7d30a11a26
Update functions.lib.php 2020-10-27 20:06:49 +01:00
Laurent Destailleur
9595d56235
Merge pull request #15186 from fappels/13_fix_delete_product_ajax
Fix delete product using ajax
2020-10-27 20:03:00 +01:00
Laurent Destailleur
6e0ae82048 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-27 19:57:52 +01:00
Laurent Destailleur
33e56a2d7c Fix decimal qty for #14666 2020-10-27 19:56:36 +01:00
Laurent Destailleur
d7a9e0f61a
Merge pull request #15185 from Dolibarr/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2020-10-27 19:47:20 +01:00
Scrutinizer Auto-Fixer
a2a9c51e50 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-27 18:46:07 +00:00
Francis Appels
828df6c134 Fix delete product using ajax 2020-10-27 19:45:12 +01:00
Laurent Destailleur
ec6c735d89 Clean code 2020-10-27 19:44:15 +01:00