diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 0a41969afd3..d1e0b9020b7 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -162,7 +162,7 @@ function societe_prepare_head(Societe $object)
$head[$h][2] = 'rib';
$h++;
}
-
+
// Show more tabs from modules
// Entries must be declared in modules descriptor with line
// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
@@ -217,7 +217,7 @@ function societe_prepare_head(Societe $object)
$upload_dir = $conf->societe->multidir_output[$object->entity] . "/" . $object->id ;
$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
$nbLinks=Link::count($db, $object->element, $object->id);
-
+
$head[$h][0] = DOL_URL_ROOT.'/societe/document.php?socid='.$object->id;
$head[$h][1] = $langs->trans("Documents");
if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' '.($nbFiles+$nbLinks).'';
@@ -234,7 +234,7 @@ function societe_prepare_head(Societe $object)
}
$head[$h][2] = 'agenda';
$h++;
-
+
// Log
/*$head[$h][0] = DOL_URL_ROOT.'/societe/info.php?socid='.$object->id;
$head[$h][1] = $langs->trans("Info");
@@ -334,7 +334,7 @@ function getCountry($searchkey,$withcode='',$dbtouse=0,$outputlangs='',$entconv=
global $db,$langs;
$result='';
-
+
// Check parameters
if (empty($searchkey) && empty($searchlabel))
{
@@ -421,23 +421,26 @@ function getState($id,$withcode='',$dbtouse=0)
}
/**
- * Retourne le nom traduit ou code+nom d'une devise
+ * Return label of currency or code+label
*
- * @param string $code_iso Code iso de la devise
- * @param int $withcode '1'=affiche code + nom
- * @return string Nom traduit de la devise
+ * @param string $code_iso Code iso of currency
+ * @param int $withcode '1'=show code + label
+ * @param Translate $outputlangs Output language
+ * @return string Label translated of currency
*/
-function currency_name($code_iso,$withcode='')
+function currency_name($code_iso, $withcode='', $outputlangs=null)
{
global $langs,$db;
- // Si il existe une traduction, on peut renvoyer de suite le libelle
- if ($langs->trans("Currency".$code_iso)!="Currency".$code_iso)
+ if (empty($outputlangs)) $outputlangs=$langs;
+
+ // If there is a translation, we can send immediatly the label
+ if ($outputlangs->trans("Currency".$code_iso)!="Currency".$code_iso)
{
- return $langs->trans("Currency".$code_iso);
+ return ($withcode?$code_iso.' - ':'').$outputlangs->trans("Currency".$code_iso);
}
- // Si pas de traduction, on consulte le libelle par defaut en table
+ // If no translation, we read table to get label by default
$sql = "SELECT label FROM ".MAIN_DB_PREFIX."c_currencies";
$sql.= " WHERE code_iso='".$code_iso."'";
@@ -457,8 +460,8 @@ function currency_name($code_iso,$withcode='')
{
return $code_iso;
}
-
}
+ return 'ErrorWhenReadingCurrencyLabel';
}
/**
@@ -499,7 +502,7 @@ function getFormeJuridiqueLabel($code)
/**
* Return if a country is inside the EEC (European Economic Community)
* TODO Add a field into country dictionary.
- *
+ *
* @param Object $object Object
* @return boolean true = country inside EEC, false = country outside EEC
*/
@@ -649,7 +652,7 @@ function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelin
// Opp percent
print '
';
-
+
foreach ($histo as $key=>$value)
{
-
+
$actionstatic->fetch($histo[$key]['id']); // TODO Do we need this, we already have a lot of data of line into $histo
$out.="
\n";
$i++;
}
@@ -1454,7 +1457,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
}
$out.='';
-
+
if ($noprint) return $out;
else print $out;
}
diff --git a/test/phpunit/AdminLibTest.php b/test/phpunit/AdminLibTest.php
index 7c9033fe2a6..5cf34e969b1 100644
--- a/test/phpunit/AdminLibTest.php
+++ b/test/phpunit/AdminLibTest.php
@@ -115,7 +115,7 @@ class AdminLibTest extends PHPUnit_Framework_TestCase
}
/**
- * testConvertTime2Seconds
+ * testVersionCompare
*
* @return void
*/
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index a417824867b..56c5541d0bb 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -81,6 +81,8 @@ class AllTests
//$suite->addTestSuite('CoreTest');
require_once dirname(__FILE__).'/AdminLibTest.php';
$suite->addTestSuite('AdminLibTest');
+ require_once dirname(__FILE__).'/CompanyLibTest.php';
+ $suite->addTestSuite('CompanyLibTest');
require_once dirname(__FILE__).'/DateLibTest.php';
$suite->addTestSuite('DateLibTest');
//require_once dirname(__FILE__).'/DateLibTzFranceTest.php';
@@ -107,7 +109,7 @@ class AllTests
$suite->addTestSuite('CodingSqlTest');
require_once dirname(__FILE__).'/CodingPhpTest.php';
$suite->addTestSuite('CodingPhpTest');
-
+
require_once dirname(__FILE__).'/SecurityTest.php';
$suite->addTestSuite('SecurityTest');
@@ -121,7 +123,7 @@ class AllTests
$suite->addTestSuite('BuildDocTest');
require_once dirname(__FILE__).'/CMailFileTest.php';
$suite->addTestSuite('CMailFileTest');
-
+
require_once dirname(__FILE__).'/CommonObjectTest.php';
$suite->addTestSuite('CommonObjectTest');
@@ -181,7 +183,7 @@ class AllTests
$suite->addTestSuite('HolidayTest');
require_once dirname(__FILE__).'/ExpenseReportTest.php';
$suite->addTestSuite('ExpenseReportTest');
-
+
require_once dirname(__FILE__).'/EntrepotTest.php';
$suite->addTestSuite('EntrepotTest');
require_once dirname(__FILE__).'/MouvementStockTest.php';
@@ -192,7 +194,7 @@ class AllTests
require_once dirname(__FILE__).'/RestAPIUserTest.php';
$suite->addTestSuite('RestAPIUserTest');
-
+
require_once dirname(__FILE__).'/WebservicesProductsTest.php';
$suite->addTestSuite('WebservicesProductsTest');
require_once dirname(__FILE__).'/WebservicesInvoicesTest.php';
diff --git a/test/phpunit/CompanyLibTest.php b/test/phpunit/CompanyLibTest.php
new file mode 100644
index 00000000000..1d61d5925e3
--- /dev/null
+++ b/test/phpunit/CompanyLibTest.php
@@ -0,0 +1,144 @@
+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ * or see http://www.gnu.org/
+ */
+
+/**
+ * \file test/phpunit/CompanyLibTest.php
+ * \ingroup test
+ * \brief PHPUnit test
+ * \remarks To run this script as CLI: phpunit filename.php
+ */
+
+global $conf,$user,$langs,$db;
+//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver
+//require_once 'PHPUnit/Autoload.php';
+require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/company.lib.php';
+
+if (empty($user->id)) {
+ print "Load permissions for admin user nb 1\n";
+ $user->fetch(1);
+ $user->getrights();
+}
+$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+
+
+/**
+ * Class for PHPUnit tests
+ *
+ * @backupGlobals disabled
+ * @backupStaticAttributes enabled
+ * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased.
+ */
+class CompanyLibTest extends PHPUnit_Framework_TestCase
+{
+ protected $savconf;
+ protected $savuser;
+ protected $savlangs;
+ protected $savdb;
+
+ /**
+ * Constructor
+ * We save global variables into local variables
+ *
+ * @return AdminLibTest
+ */
+ function __construct()
+ {
+ //$this->sharedFixture
+ global $conf,$user,$langs,$db;
+ $this->savconf=$conf;
+ $this->savuser=$user;
+ $this->savlangs=$langs;
+ $this->savdb=$db;
+
+ print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+ //print " - db ".$db->db;
+ print "\n";
+ }
+
+ // Static methods
+ public static function setUpBeforeClass()
+ {
+ global $conf,$user,$langs,$db;
+ $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+ print __METHOD__."\n";
+ }
+
+ // tear down after class
+ public static function tearDownAfterClass()
+ {
+ global $conf,$user,$langs,$db;
+ $db->rollback();
+
+ print __METHOD__."\n";
+ }
+
+ /**
+ * Init phpunit tests
+ *
+ * @return void
+ */
+ protected function setUp()
+ {
+ global $conf,$user,$langs,$db;
+ $conf=$this->savconf;
+ $user=$this->savuser;
+ $langs=$this->savlangs;
+ $db=$this->savdb;
+
+ print __METHOD__."\n";
+ }
+ /**
+ * End phpunit tests
+ *
+ * @return void
+ */
+ protected function tearDown()
+ {
+ print __METHOD__."\n";
+ }
+
+ /**
+ * testNameCurrency
+ *
+ * @return void
+ */
+ public function testNameCurrency()
+ {
+ global $conf,$user,$langs,$db;
+ $conf=$this->savconf;
+ $user=$this->savuser;
+ $langs=$this->savlangs;
+ $db=$this->savdb;
+
+ $result=currency_name('USD');
+ print __METHOD__." result=".$result."\n";
+ $this->assertEquals('United States Dollar',$result);
+
+ $outputlangs=new Translate('', $conf);
+ $outputlangs->setDefaultLang('fr_FR');
+ $outputlangs->load("dict");
+
+ $result=currency_name('USD', 1, $outputlangs);
+ print __METHOD__." result=".$result."\n";
+ $this->assertEquals('USD - Dollars US',$result);
+
+ return $result;
+ }
+}