diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 79a6797245ac3755d3cf790cb64e680b7bdf6d31..e31de4094037b3c23fbd58751ad47ea67b4ce496 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -1998,7 +1998,7 @@ if ($action == 'create' && $user->rights->commande->creer) { $rowspan ++; // Bank Account - if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER) && ! empty($conf->banque->enabled)) + if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER) && ! empty($conf->banque->enabled)) { print '<tr><td class="nowrap">'; print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">'; diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 3c7269c3e6fb7727334ed11f925fd6987da446e8..753f91fbddad2df6447284e4a41ac91b5fb0b9e7 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -1544,7 +1544,7 @@ elseif (! empty($object->id)) print '</td></tr>'; // Bank Account - if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER) && ! empty($conf->banque->enabled)) + if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER) && ! empty($conf->banque->enabled)) { print '<tr><td class="nowrap">'; print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">'; diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php index af5f3393672cf42e1221f058776ccb2e752163fa..0ace96c67194cdccbfadd6ba2c9bde245b74ca9d 100755 --- a/test/phpunit/FunctionsLibTest.php +++ b/test/phpunit/FunctionsLibTest.php @@ -824,32 +824,32 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase $this->assertEquals(dol_nl2br($string, 1, 1), "a<br />a"); } - /** - * testDolPrice2Num - * - * @return boolean - */ - public function testDolPrice2Num() + /** + * testDolPrice2Num + * + * @return boolean + */ + public function testDolPrice2Num() { - $this->assertEquals(1000, price2num('1 000.0')); - $this->assertEquals(1000, price2num('1 000','MT')); - $this->assertEquals(1000, price2num('1 000','MU')); + $this->assertEquals(1000, price2num('1 000.0')); + $this->assertEquals(1000, price2num('1 000','MT')); + $this->assertEquals(1000, price2num('1 000','MU')); $this->assertEquals(1000.123456, price2num('1 000.123456')); // Round down - $this->assertEquals(1000.12, price2num('1 000.123452','MT')); - $this->assertEquals(1000.12345, price2num('1 000.123452','MU'),"Test MU"); + $this->assertEquals(1000.12, price2num('1 000.123452','MT')); + $this->assertEquals(1000.12345, price2num('1 000.123452','MU'),"Test MU"); - // Round up - $this->assertEquals(1000.13, price2num('1 000.125456','MT')); - $this->assertEquals(1000.12546, price2num('1 000.125456','MU'),"Test MU"); + // Round up + $this->assertEquals(1000.13, price2num('1 000.125456','MT')); + $this->assertEquals(1000.12546, price2num('1 000.125456','MU'),"Test MU"); // Text can't be converted $this->assertEquals('12.4$',price2num('12.4$')); - $this->assertEquals('12r.4$',price2num('12r.4$')); + $this->assertEquals('12r.4$',price2num('12r.4$')); - return true; + return true; } }