Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 09:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into

Browse Source 
marcosgdf-misc

Conflicts:
	htdocs/barcode/codeinit.php
This commit is contained in:
Laurent Destailleur
2015-02-18 22:54:02 +01:00
parent cc1d506614 e485dd413d
commit 4963555669
108 changed files with 413 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/lib/order.lib.php
View File

@@ -28,10 +28,10 @@
/**
* Prepare array with list of tabs
*
* @param Object $object Object related to tabs
* @param Commande $object Object related to tabs
* @return array Array of tabs to show
*/
function commande_prepare_head($object)
function commande_prepare_head(Commande $object)
{
global $langs, $conf, $user;
if (! empty($conf->expedition->enabled)) $langs->load("sendings");