Commit Graph

5903 Commits

Author SHA1 Message Date
Laurent Destailleur
3b9d2abcb2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/product.lib.php
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php
	htdocs/product/list.php
2019-11-29 11:42:08 +01:00
Laurent Destailleur
3acd0bc2ff FIX Reduce number of request for list of products 2019-11-29 11:32:09 +01:00
Frédéric FRANCE
00a80e498e $head was never initialized 2019-11-28 23:06:04 +01:00
Scrutinizer Auto-Fixer
5f99e25c45 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-28 11:36:20 +00:00
Laurent Destailleur
540f47b998 Merge pull request #12523 from oscim/patch-11
Put $object in complete_head_from_modules
2019-11-28 12:20:16 +01:00
Laurent Destailleur
1e84b0ea97 Merge pull request #12522 from Dolibarr/scrutinizer-patch-15
Scrutinizer Auto-Fixes
2019-11-28 12:19:43 +01:00
Laurent Destailleur
874f5b7005 Merge pull request #12528 from frederic34/patch-8
image2wbmp() is deprecated as of PHP 7.3.0
2019-11-28 12:19:32 +01:00
Laurent Destailleur
c0d349e9f7 Merge pull request #12530 from frederic34/patch-13
fix doxygen
2019-11-27 20:11:24 +01:00
Laurent Destailleur
c22fea52e5 Fix do not ping name of server 2019-11-27 11:38:30 +01:00
Laurent Destailleur
9a9a43fc4d Return OS with ping 2019-11-27 11:34:10 +01:00
Frédéric FRANCE
757d05e907 fix doxygen 2019-11-26 18:59:26 +01:00
Frédéric FRANCE
a04fa05b6c image2wbmp() is deprecated as of PHP 7.3.0
https://www.php.net/manual/en/function.image2wbmp.php
image2wbmp() is deprecated as of PHP 7.3.0, and will be removed in the next major version. Use imagewbmp() instead.
2019-11-26 18:41:38 +01:00
oscim
1e6b93500a Put $object in complete_head_from_modules
Add object for correctly usage in function complete_head_from_modules
2019-11-26 16:34:16 +01:00
Scrutinizer Auto-Fixer
057ab6a059 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-26 11:52:04 +00:00
Laurent Destailleur
d1419f81da Merge pull request #12390 from bb2a/patch-4
Use english name of subsitution variables for thirdparties
2019-11-26 10:26:45 +01:00
Laurent Destailleur
b44817f2bf Merge pull request #12518 from frederic34/patch-17
doxygen
2019-11-26 09:10:47 +01:00
Frédéric FRANCE
1ccf0808d0 doxygen 2019-11-26 00:28:26 +01:00
andreubisquerra
6baa1c8d4a Fix travis 2019-11-25 23:32:40 +01:00
andreubisquerra
b2e995279e Fix takepos.lib.php to add Receipt tab and delete unnecessary takepos.lib.php 2019-11-25 19:29:07 +01:00
Laurent Destailleur
bc5270ce76 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/facture/card.php
2019-11-24 18:15:25 +01:00
Laurent Destailleur
cf0311dd6a FIX Hook getAccessForbiddenMessage was missing parameters 2019-11-22 16:13:22 +01:00
Laurent Destailleur
e8bc8b68c1 Fix missing field in migration 2019-11-21 18:17:40 +01:00
Anthony Berton
496aa0c065 Update functions.lib.php 2019-11-21 10:38:59 +01:00
Scrutinizer Auto-Fixer
cd7523318d Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-19 08:30:26 +00:00
Laurent Destailleur
16d67a1a8e Fix several trouble with some types in modulebuilder
Fix difference between null and 0
2019-11-17 17:36:36 +01:00
Anthony Berton
fe3c921152 Merge branch 'develop' into patch-4 2019-11-17 10:17:47 +01:00
Anthony Berton
e1f36ae107 Update functions.lib.php 2019-11-16 17:37:18 +01:00
Laurent Destailleur
1f5bea01f5 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/product/fournisseurs.php
	htdocs/user/card.php
2019-11-14 21:30:16 +01:00
Laurent Destailleur
7e52c70321 FIX Advisory ID: usd20190067 2019-11-14 21:16:18 +01:00
Laurent Destailleur
411e9c87e3 Debug feature to set sender profiles 2019-11-14 11:53:28 +01:00
Laurent Destailleur
52787b56b2 Fix when limit = 0
Look and feel v11
2019-11-14 11:00:49 +01:00
Laurent Destailleur
171b94fc5c Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
2019-11-14 08:50:24 +01:00
Laurent Destailleur
86094613e8 Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
Scrutinizer Auto-Fixes
2019-11-14 08:50:06 +01:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
8a527631a0 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:02 +00:00
Laurent Destailleur
ede05e03ba Merge pull request #12417 from frederic34/patch-7
doxygen
2019-11-13 18:34:29 +01:00
Laurent Destailleur
7118dbbd1d Fix var not defined 2019-11-13 18:25:48 +01:00
Laurent Destailleur
89bf35a8bf Fix default value show must match the theme selected 2019-11-12 21:54:41 +01:00
Frédéric FRANCE
7ce297c6cc doxygen 2019-11-12 21:53:17 +01:00
Laurent Destailleur
03e35623c6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-12 00:43:37 +01:00
Laurent Destailleur
8be0a6d470 Fix: Can set savingdocmask by caller. Fix permissions names.
Fix: Disable crop on svg images.
2019-11-12 00:43:26 +01:00
Scrutinizer Auto-Fixer
038bda254d Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-11 22:59:36 +00:00
Laurent Destailleur
5eb03cf6ad Avoid false positive. 2019-11-11 13:26:48 +01:00
Laurent Destailleur
771f304c79 Fix typo 2019-11-09 18:40:08 +01:00
Anthony Berton
4449c6d2a7 Update functions.lib.php 2019-11-08 16:34:20 +01:00
Laurent Destailleur
d1c49c7021 Fix trans 2019-11-08 10:24:03 +01:00
Laurent Destailleur
34beca0758 Fix var not not consistent 2019-11-07 16:33:11 +01:00
Laurent Destailleur
8318db85a3 Fix typo 2019-11-07 16:32:44 +01:00
Laurent Destailleur
c0b8684475 Merge pull request #12341 from inoveaconseil/bankStatementDocument
NEW add upload for account statement
2019-11-07 15:06:47 +01:00