Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.7' into 3.8

Browse Source 
Conflicts:
	htdocs/core/modules/modContrat.class.php
	htdocs/fichinter/card.php
	htdocs/install/upgrade2.php
This commit is contained in:
Laurent Destailleur
2015-10-01 11:16:35 +02:00
parent 0c64fa04bc 076f2ed9d1
commit b57c156b60
11 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/commande/class/commandestats.class.php
View File

@@ -48,7 +48,7 @@ class CommandeStats extends Stats
* Constructor
*
* @param DoliDB $db Database handler
* @param int $socid Id third party for filter
* @param int $socid Id third party for filter. This value must be forced during the new to external user company if user is an external user.
* @param string $mode Option ('customer', 'supplier')
* @param int $userid Id user for filter (creation user)
*/