Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests 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/tax.lib.php
View File

@@ -29,10 +29,10 @@
/**
* Prepare array with list of tabs
*
* @param Object $object Object related to tabs
* @param ChargeSociales $object Object related to tabs
* @return array Array of tabs to show
*/
function tax_prepare_head($object)
function tax_prepare_head(ChargeSociales $object)
{
global $langs, $conf;