From 2119179226633e15834a86843b524b687654e164 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 28 Oct 2012 12:23:58 +0100 Subject: [PATCH] Fix: field "amount" is obsolete --- test/phpunit/ExportTest.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/test/phpunit/ExportTest.php b/test/phpunit/ExportTest.php index 0d0fcf8186f..fbd9f0011a1 100755 --- a/test/phpunit/ExportTest.php +++ b/test/phpunit/ExportTest.php @@ -126,16 +126,16 @@ class ExportTest extends PHPUnit_Framework_TestCase { global $conf,$user,$langs,$db; - $sql = "SELECT f.facnumber as f_facnumber, f.amount as f_amount, f.total as f_total, f.tva as f_tva FROM ".MAIN_DB_PREFIX."facture f"; + $sql = "SELECT f.facnumber as f_facnumber, f.total as f_total, f.tva as f_tva FROM ".MAIN_DB_PREFIX."facture f"; $objexport=new Export($db); //$objexport->load_arrays($user,$datatoexport); // Define properties $datatoexport='test'; - $array_selected = array("f.facnumber"=>1, "f.amount"=>2, "f.total"=>3, "f.tva"=>4); - $array_export_fields = array("f.facnumber"=>"FacNumber", "f.amount"=>"FacAmount", "f.total"=>"FacTotal", "f.tva"=>"FacVat"); - $array_alias = array("f_facnumber"=>"facnumber", "f_amount"=>"amount", "f_total"=>"total", "f_tva"=>"tva"); + $array_selected = array("f.facnumber"=>1, "f.total"=>2, "f.tva"=>3); + $array_export_fields = array("f.facnumber"=>"FacNumber", "f.total"=>"FacTotal", "f.tva"=>"FacVat"); + $array_alias = array("f_facnumber"=>"facnumber", "f_total"=>"total", "f_tva"=>"tva"); $objexport->array_export_fields[0]=$array_export_fields; $objexport->array_export_alias[0]=$array_alias; @@ -174,18 +174,18 @@ class ExportTest extends PHPUnit_Framework_TestCase { global $conf,$user,$langs,$db; - $sql = "SELECT f.facnumber as f_facnumber, f.amount as f_amount, f.total as f_total, f.tva as f_tva FROM ".MAIN_DB_PREFIX."facture f"; + $sql = "SELECT f.facnumber as f_facnumber, f.total as f_total, f.tva as f_tva FROM ".MAIN_DB_PREFIX."facture f"; $objexport=new Export($db); //$objexport->load_arrays($user,$datatoexport); // Define properties - $datatoexport='test'; - $array_selected = array("f.facnumber"=>1, "f.amount"=>2, "f.total"=>3, "f.tva"=>4); - $array_export_fields = array("f.facnumber"=>"FacNumber", "f.amount"=>"FacAmount", "f.total"=>"FacTotal", "f.tva"=>"FacVat"); - $array_filtervalue = array("f.amount" => ">100"); - $array_filtered = array("f.amount" => 1); - $array_alias = array("f_facnumber"=>"facnumber", "f_amount"=>"amount", "f_total"=>"total", "f_tva"=>"tva"); + $datatoexport='test_filtered'; + $array_selected = array("f.facnumber"=>1, "f.total"=>2, "f.tva"=>3); + $array_export_fields = array("f.facnumber"=>"FacNumber", "f.total"=>"FacTotal", "f.tva"=>"FacVat"); + $array_filtervalue = array("f.total" => ">100"); + $array_filtered = array("f.total" => 1); + $array_alias = array("f_facnumber"=>"facnumber", "f_total"=>"total", "f_tva"=>"tva"); $objexport->array_export_fields[0]=$array_export_fields; $objexport->array_export_alias[0]=$array_alias;