Commit Graph

91206 Commits

Author SHA1 Message Date
Laurent Destailleur
e5a5f37b3f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/langs/en_US/bills.lang
2020-10-31 15:09:26 +01:00
Laurent Destailleur
522a3f9919 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-31 15:06:11 +01:00
Laurent Destailleur
b7dde7599b More complete scrutinizer file 2020-10-31 15:06:00 +01:00
Laurent Destailleur
125b94d749
Merge pull request #15234 from frederic34/patch-8
doxygen
2020-10-31 15:05:41 +01:00
Laurent Destailleur
bb4bde4d5b
Merge pull request #15233 from frederic34/patch-6
doxygen
2020-10-31 15:02:32 +01:00
Laurent Destailleur
fcdd1b4169
Merge pull request #15236 from Dolibarr/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2020-10-31 15:01:59 +01:00
Laurent Destailleur
ce59e8e35b Fix phpcs 2020-10-31 14:58:13 +01:00
Laurent Destailleur
41b938047d Fix doc 2020-10-31 14:51:32 +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
Laurent Destailleur
92bdcd017d Fix 2020-10-31 14:26:11 +01:00
Laurent Destailleur
5ab90eeb16 Update doc 2020-10-31 14:25:03 +01:00
Laurent Destailleur
80efdcf260 Debug multicurrency editor 2020-10-31 14:24:00 +01:00
Frédéric FRANCE
78b94c775b
Update commonobject.class.php 2020-10-31 13:59:46 +01:00
Frédéric FRANCE
ffb8c91dc4
doxygen 2020-10-31 13:58:07 +01:00
Laurent Destailleur
11f9c4cfbd
Merge pull request #15117 from atm-jpb/develop_editorRate
# New multi-currency exchange rate editor
2020-10-31 13:55:42 +01:00
Laurent Destailleur
24df254e92
Update multicurrency.class.php 2020-10-31 13:54:23 +01:00
Laurent Destailleur
1af3709793
Merge pull request #15232 from frederic34/patch-6
doxygen
2020-10-31 13:50:28 +01:00
Laurent Destailleur
2b47d74baf
Merge pull request #15231 from frederic34/patch-15
fix result is a resource
2020-10-31 13:49:40 +01:00
Laurent Destailleur
2b09b7be8e Fix css 2020-10-31 13:47:50 +01:00
Frédéric FRANCE
d122238439
Update supplier_proposal.class.php 2020-10-31 13:29:08 +01:00
Frédéric FRANCE
8daf0c168c
Update facture.class.php 2020-10-31 13:27:29 +01:00
Frédéric FRANCE
7b6bc3de63
Update propal.class.php 2020-10-31 13:25:19 +01:00
Frédéric FRANCE
85b3b5de36
Update commonobject.class.php 2020-10-31 13:24:09 +01:00
Frédéric FRANCE
c4a7e58435
Update societe.class.php 2020-10-31 13:22:04 +01:00
Laurent Destailleur
499069ae51 Fix position of fields in MO list 2020-10-31 13:19:00 +01:00
Frédéric FRANCE
ae351a5659
doxygen 2020-10-31 13:13:55 +01:00
Laurent Destailleur
f485ebc2cf Removed dead code 2020-10-31 12:56:30 +01:00
Laurent Destailleur
9113ecedfa code comment 2020-10-31 12:55:26 +01:00
Laurent Destailleur
cea61d3b52 Fix var 2020-10-31 12:44:14 +01:00
Laurent Destailleur
8d6fa350b9 Clean code 2020-10-31 12:41:26 +01:00
Laurent Destailleur
df7218b6a4 Fix for multicompany 2020-10-31 12:39:14 +01:00
Laurent Destailleur
623cb54480 Prepare a more complete fix for #15016 2020-10-31 12:30:47 +01:00
Laurent Destailleur
a4d2927f82 Fix for #15016
Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
2020-10-31 12:18:54 +01:00
Laurent Destailleur
b42361022d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-31 12:13:56 +01:00
Laurent Destailleur
fcb3245295 Fix for #15016 2020-10-31 12:11:41 +01:00
Laurent Destailleur
ee444f38f7
Merge pull request #15226 from frederic34/patch-6
fix update api_boms.class.php
2020-10-31 11:58:12 +01:00
Laurent Destailleur
9b9ee2c4e4
Merge pull request #15229 from frederic34/patch-13
fix undefined variable
2020-10-31 11:57:50 +01:00
Laurent Destailleur
b029ae5b6f
Merge pull request #15230 from frederic34/patch-14
fix undefined variable
2020-10-31 11:57:38 +01:00
Frédéric FRANCE
72c443868c
Update api_thirdparties.class.php 2020-10-31 11:57:35 +01:00
Laurent Destailleur
bdfc723750
Merge pull request #15228 from frederic34/patch-10
fix undefined variable
2020-10-31 11:54:03 +01:00
Laurent Destailleur
fb1013229e
Merge pull request #15227 from frederic34/patch-8
fix undefined variable
2020-10-31 11:53:50 +01:00
Frédéric FRANCE
25741a618e
fix result is a resource 2020-10-31 09:50:50 +01:00
Frédéric FRANCE
a64e676dad
fix undefined variable 2020-10-31 09:40:15 +01:00
Frédéric FRANCE
21a933f15c
fix undefined variable 2020-10-31 09:37:56 +01:00
Frédéric FRANCE
c6433ef58b
fix undefined variable 2020-10-31 09:32:00 +01:00
Frédéric FRANCE
f1beca0471
fix undefined variable 2020-10-31 09:27:58 +01:00
Frédéric FRANCE
9b10de3a8c
Update api_boms.class.php
public function update(User $user, $notrigger = false)
2020-10-31 09:22:02 +01:00
Laurent Destailleur
f7172a9a3c css 2020-10-31 04:50:26 +01:00
Laurent Destailleur
f53483f983 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-31 04:26:23 +01:00