diff --git a/unit-test/dossier25.sql.gz b/unit-test/dossier25.sql.gz deleted file mode 100644 index a7b28e950..000000000 Binary files a/unit-test/dossier25.sql.gz and /dev/null differ diff --git a/unit-test/include/class/acc_balanceTest.php b/unit-test/include/class/acc_balanceTest.php index 9e7b5f458..09e35e492 100644 --- a/unit-test/include/class/acc_balanceTest.php +++ b/unit-test/include/class/acc_balanceTest.php @@ -64,9 +64,11 @@ class Acc_BalanceTest extends TestCase $this->object->filter_cat(array()); $this->assertEquals($this->object->jrn,null); $this->object->filter_cat(array('2'=>'FIN')); + sort($this->object->jrn); $this->assertEquals([1,83,152],$this->object->jrn); $this->object->filter_cat(array('1'=>'ACH','2'=>'FIN')); - $this->assertEquals([35,3,1,83,152],$this->object->jrn); + sort($this->object->jrn); + $this->assertEquals([1,3,35,83,152],$this->object->jrn); } /** *@covers Acc_Balance::summary_add diff --git a/unit-test/include/class/acc_ledger_saleTest.php b/unit-test/include/class/acc_ledger_saleTest.php index f92052ff4..b9eb6756e 100644 --- a/unit-test/include/class/acc_ledger_saleTest.php +++ b/unit-test/include/class/acc_ledger_saleTest.php @@ -580,8 +580,8 @@ class Acc_Ledger_SaleTest extends TestCase // cancel change $g_connection->get_value("update tva_rate set tva_both_side = $1 where tva_id=3 ",[$old_autoreverse]); - $g_connection->exec_sql("delete from jrn where jr_mt=$1",[1734717784.385]); - + $g_connection->exec_sql("delete from jrn where jr_mt=$1",[$array['mt']]); + $g_connection->exec_sql('delete from jrnx where jrnx.j_grpt not in (select jr_grpt_id from jrn)'); } /** @@ -595,7 +595,7 @@ class Acc_Ledger_SaleTest extends TestCase $array['e_march1_tva_id']=5; - // clean + // clean0 $g_connection->exec_sql("delete from jrn where jr_mt=$1",[1734717784.385]); $this->object->insert($array); @@ -627,8 +627,8 @@ class Acc_Ledger_SaleTest extends TestCase // cancel change - $g_connection->exec_sql("delete from jrn where jr_mt=$1",[1734717784.385]); - + $g_connection->exec_sql("delete from jrn where jr_mt=$1",[$array['mt']]); + $g_connection->exec_sql('delete from jrnx where jrnx.j_grpt not in (select jr_grpt_id from jrn)'); }