Commit Graph

89109 Commits

Author SHA1 Message Date
Frédéric FRANCE
1936b11db8
doxygen 2019-11-14 18:40:30 +01:00
Frédéric FRANCE
fc55123af0
Update api_thirdparties.class.php 2019-11-14 18:31:09 +01:00
VESSILLER
4ea3fe7609 NEW get user connected informations in REST API 2019-11-14 17:57:29 +01:00
Laurent Destailleur
8ef9728470 Fix permission on file 2019-11-14 17:28:23 +01:00
stickler-ci
07880dd835 Fixing style errors. 2019-11-14 16:00:08 +00:00
Laurent Destailleur
f7ab1498a7 FIX Advisory ID: usd20190053 2019-11-14 17:00:02 +01:00
ptibogxiv
fee8e33e2b
Update type.php 2019-11-14 16:58:17 +01:00
stickler-ci
280c0a56b6 Fixing style errors. 2019-11-14 15:37:54 +00:00
ptibogxiv
ae2ddb1f1e
Fix adherent type v11 2019-11-14 16:36:07 +01:00
Laurent Destailleur
80b3e27341 Fix bad name of constant 2019-11-14 14:23:48 +01:00
Laurent Destailleur
7e0ae4bf0e FIX The pdf templates were using the large logo making PDF too large 2019-11-14 14:17:22 +01:00
Laurent Destailleur
4fc7b8c3b1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/tpl/extrafields_list_search_title.tpl.php
2019-11-14 12:49:42 +01:00
Laurent Destailleur
a29adc94f3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/comm/card.php
	htdocs/langs/en_US/admin.lang
2019-11-14 12:48:33 +01:00
Laurent Destailleur
ee800189a6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-14 12:45:00 +01:00
Laurent Destailleur
9d963a7ca6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-14 12:44:32 +01:00
Laurent Destailleur
7d997990fa Fix phpcs 2019-11-14 12:44:15 +01:00
Laurent Destailleur
0e3d90f145 Fix syntax error 2019-11-14 12:42:44 +01:00
Laurent Destailleur
da3a907075
Merge branch 'develop' into fix-product-virtual-stock-stats-sending 2019-11-14 12:16:28 +01:00
Laurent Destailleur
0b947cddae Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-14 12:15:50 +01:00
Laurent Destailleur
d36bf43d2d Fix php error 2019-11-14 12:15:16 +01:00
Laurent Destailleur
8db4eff108
Merge pull request #12437 from Dolibarr/scrutinizer-patch-8
Scrutinizer Auto-Fixes
2019-11-14 12:10:44 +01:00
Laurent Destailleur
8cf9ed282b
Merge pull request #12436 from Dolibarr/scrutinizer-patch-7
Scrutinizer Auto-Fixes
2019-11-14 12:10:30 +01:00
Scrutinizer Auto-Fixer
f197196719 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-14 11:09:46 +00:00
gauthier
a5635825f3 FIX : wrong invoice id for fetchObjetctLinked 2019-11-14 12:09:32 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-14 11:09:15 +00:00
Laurent Destailleur
f5da126cff Fix property not defined 2019-11-14 12:01:01 +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
75667833fe Fix missing ->msgid 2019-11-14 10:01:05 +01:00
VESSILLER
851cf4f3f3 FIX add product qty in shipment already sent only if reel stock was decremented 2019-11-14 09:52:13 +01:00
Frédéric FRANCE
a3e092b227
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-14 09:21:26 +01:00
Laurent Destailleur
95a6d7f8f5 Doxyen 2019-11-14 09:13:15 +01:00
Laurent Destailleur
ea05b8192d Sort file 2019-11-14 09:01:46 +01:00
Laurent Destailleur
f87c6b82c5
Merge pull request #12433 from erpware/develop
Updated .gitignore and remove duplicated entries
2019-11-14 08:59:57 +01:00
Laurent Destailleur
dba640b281
Update .gitignore 2019-11-14 08:58:42 +01:00
Laurent Destailleur
523b5e74a6
Merge pull request #12431 from frederic34/patch-6
Update conf.class.php
2019-11-14 08:54:06 +01:00
Laurent Destailleur
56f2463a15
Merge branch 'develop' into patch-6 2019-11-14 08:53:53 +01:00
Laurent Destailleur
6b1d7f5382
Merge pull request #12432 from frederic34/patch-7
FIX #12385
2019-11-14 08:51:23 +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
Laurent Destailleur
614faa07c1
Merge pull request #12427 from Dolibarr/scrutinizer-patch-3
Scrutinizer Auto-Fixes
2019-11-14 08:49:53 +01:00
Laurent Destailleur
46eb499155
Merge pull request #12430 from Dolibarr/scrutinizer-patch-6
Scrutinizer Auto-Fixes
2019-11-14 08:49:39 +01:00
Frédéric FRANCE
446c66da62
use class CONST 2019-11-14 08:15:39 +01:00
Frédéric FRANCE
3bac051521
use class CONST 2019-11-14 08:07:16 +01:00
Alexandre SPANGARO
1a9c430e00 Add migration 2019-11-14 04:53:13 +01:00
Daniel Seichter
c2eba28f36 Merge remote-tracking branch 'upstream/develop' into develop 2019-11-14 00:18:03 +01:00
Frédéric FRANCE
9040f6d9c7
can tag actioncomm 2019-11-13 21:18:34 +01:00
Frédéric FRANCE
9dcf53c65e
add tables 2019-11-13 20:56:36 +01:00
Frédéric FRANCE
3ec7568559
FIX #12385 2019-11-13 20:44:21 +01:00
Frédéric FRANCE
2ea58b11ca
wip 2019-11-13 20:36:32 +01:00