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

Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	htdocs/compta/bank/class/paymentvarious.class.php
	htdocs/compta/bank/various_payment/card.php
	htdocs/don/card.php
	htdocs/langs/en_US/main.lang
	htdocs/public/payment/newpayment.php
	test/phpunit/DateLibTzFranceTest.php
This commit is contained in:
Laurent Destailleur
2021-03-01 15:48:30 +01:00
parent ae81ab0c7c 8a602ad143
commit 222012da37
19 changed files with 327 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/phpunit/DateLibTest.php
View File

@@ -334,7 +334,6 @@ class DateLibTest extends PHPUnit\Framework\TestCase
print __METHOD__." result=".$result."\n";
$this->assertSame('1 '.strtolower(dol_substr($langs->trans("Day"), 0, 1).'.'), $result);
return $result;
}