diff --git a/html/ajax_misc.php b/html/ajax_misc.php index d0d3b207c..493e92dfd 100644 --- a/html/ajax_misc.php +++ b/html/ajax_misc.php @@ -247,10 +247,6 @@ $path = array( "tva_parameter"=>"ajax_tva_parameter", // Currency , delete a rate "CurrencyRateDelete"=>"ajax_currency", - // Display all cards using an accounting - "display_all_card"=>"ajax_display_all_card", - // Currency , add / remove / update currency - "CurrencyManage"=>"ajax_currency" ) ; if (array_key_exists($op, $path)) { diff --git a/html/do.php b/html/do.php index 2b463292d..6ec340c7a 100644 --- a/html/do.php +++ b/html/do.php @@ -108,6 +108,10 @@ html_page_start($style_user); if ( DEBUG ) { ?> diff --git a/sql/upgrade.sql b/sql/upgrade.sql index e8af5a3d7..d9c22d1e5 100644 --- a/sql/upgrade.sql +++ b/sql/upgrade.sql @@ -1,4 +1,5 @@ begin; +update attr_def set ad_extra = '[sql] fd_id in (select fd_id from fiche_def where frd_id in (4,8,9,14))' where ad_id=25; insert into "parameter" (pr_id ) values ('MY_DEFAULT_ROUND_ERROR_DEB'); insert into "parameter" (pr_id ) values ('MY_DEFAULT_ROUND_ERROR_CRED'); drop view if exists v_all_card_currency; diff --git a/unit-test/include/class/acc_account.classTest.php b/unit-test/include/class/acc_account.classTest.php index e8af419b2..ca3d34a2b 100644 --- a/unit-test/include/class/acc_account.classTest.php +++ b/unit-test/include/class/acc_account.classTest.php @@ -1,9 +1,10 @@ object=new Acc_Bilan($g_connection); + $this->object->from = $g_connection->get_value('select min(p_id) from parm_periode'); + $this->object->to = $g_connection->get_value('select max(p_id) from parm_periode'); } /** @@ -41,6 +44,8 @@ class Acc_BilanTest extends PHPUnit_Framework_TestCase public function testDisplay_form() { $r=$this->object->display_form(); + $this->assertStringStartsWith('',$r); } @@ -50,7 +55,12 @@ class Acc_BilanTest extends PHPUnit_Framework_TestCase */ public function testVerify() { + ob_start(); $this->object->verify(); + $r=ob_get_contents(); + ob_end_clean(); + + $this->assertStringStartsWith('

',$r); } /** diff --git a/unit-test/include/class/acc_computeTest.class.php b/unit-test/include/class/acc_computeTest.class.php index 2f01e15df..1b19e5fb9 100644 --- a/unit-test/include/class/acc_computeTest.class.php +++ b/unit-test/include/class/acc_computeTest.class.php @@ -1,9 +1,10 @@ object=new User($cn, USE_ID); + $this->object=new User($this->cn, USE_ID); } /**