lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
develop

Conflicts:
	htdocs/core/modules/import/import_csv.modules.php
This commit is contained in:
Laurent Destailleur 2012-10-28 19:53:14 +01:00
commit 9d4471dd67
28 changed files with 3062 additions and 3057 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/facture/class/facture.class.php
View File

@ -3196,7 +3196,7 @@ class FactureLigne
$this->rowid = $objp->rowid; $this->rowid = $objp->rowid;
$this->fk_facture = $objp->fk_facture; $this->fk_facture = $objp->fk_facture;
$this->fk_parent_line = $objp->fk_parent_line; $this->fk_parent_line = $objp->fk_parent_line;
$this->label = $objp->label; $this->label = $objp->custom_label;
$this->desc = $objp->description; $this->desc = $objp->description;
$this->qty = $objp->qty; $this->qty = $objp->qty;
$this->subprice = $objp->subprice; $this->subprice = $objp->subprice;

4
htdocs/core/class/html.form.class.php
View File

@ -2315,8 +2315,8 @@ class Form
$autoOpen=false; $autoOpen=false;
$dialogconfirm.='-'.$button; $dialogconfirm.='-'.$button;
} }
$pageyes=(preg_match('/\?/',$page)?'&':'?').'action='.$action.'&confirm=yes'; $pageyes=$page.(preg_match('/\?/',$page)?'&':'?').'action='.$action.'&confirm=yes';
$pageno=($useajax == 2 ? (preg_match('/\?/',$page)?'&':'?').'confirm=no':''); $pageno=($useajax == 2 ? $page.(preg_match('/\?/',$page)?'&':'?').'confirm=no':'');
// Add input fields into list of fields to read during submit (inputok and inputko) // Add input fields into list of fields to read during submit (inputok and inputko)
if (is_array($formquestion)) if (is_array($formquestion))
{ {

25
test/phpunit/ExportTest.php
View File

@ -126,16 +126,16 @@ class ExportTest extends PHPUnit_Framework_TestCase
{ {
global $conf,$user,$langs,$db; 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=new Export($db);
//$objexport->load_arrays($user,$datatoexport); //$objexport->load_arrays($user,$datatoexport);
// Define properties // Define properties
$datatoexport='test'; $datatoexport='test';
$array_selected = array("f.facnumber"=>1, "f.amount"=>2, "f.total"=>3, "f.tva"=>4); $array_selected = array("f.facnumber"=>1, "f.total"=>2, "f.tva"=>3);
$array_export_fields = array("f.facnumber"=>"FacNumber", "f.amount"=>"FacAmount", "f.total"=>"FacTotal", "f.tva"=>"FacVat"); $array_export_fields = array("f.facnumber"=>"FacNumber", "f.total"=>"FacTotal", "f.tva"=>"FacVat");
$array_alias = array("f_facnumber"=>"facnumber", "f_amount"=>"amount", "f_total"=>"total", "f_tva"=>"tva"); $array_alias = array("f_facnumber"=>"facnumber", "f_total"=>"total", "f_tva"=>"tva");
$objexport->array_export_fields[0]=$array_export_fields; $objexport->array_export_fields[0]=$array_export_fields;
$objexport->array_export_alias[0]=$array_alias; $objexport->array_export_alias[0]=$array_alias;
@ -170,22 +170,23 @@ class ExportTest extends PHPUnit_Framework_TestCase
* *
* @return void * @return void
*/ */
/*
public function testExportFilteredExport() public function testExportFilteredExport()
{ {
global $conf,$user,$langs,$db; 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=new Export($db);
//$objexport->load_arrays($user,$datatoexport); //$objexport->load_arrays($user,$datatoexport);
// Define properties // Define properties
$datatoexport='test'; $datatoexport='test_filtered';
$array_selected = array("f.facnumber"=>1, "f.amount"=>2, "f.total"=>3, "f.tva"=>4); $array_selected = array("f.facnumber"=>1, "f.total"=>2, "f.tva"=>3);
$array_export_fields = array("f.facnumber"=>"FacNumber", "f.amount"=>"FacAmount", "f.total"=>"FacTotal", "f.tva"=>"FacVat"); $array_export_fields = array("f.facnumber"=>"FacNumber", "f.total"=>"FacTotal", "f.tva"=>"FacVat");
$array_filtervalue = array("f.amount" => ">100"); $array_filtervalue = array("f.total" => ">100");
$array_filtered = array("f.amount" => 1); $array_filtered = array("f.total" => 1);
$array_alias = array("f_facnumber"=>"facnumber", "f_amount"=>"amount", "f_total"=>"total", "f_tva"=>"tva"); $array_alias = array("f_facnumber"=>"facnumber", "f_total"=>"total", "f_tva"=>"tva");
$objexport->array_export_fields[0]=$array_export_fields; $objexport->array_export_fields[0]=$array_export_fields;
$objexport->array_export_alias[0]=$array_alias; $objexport->array_export_alias[0]=$array_alias;
@ -213,7 +214,7 @@ class ExportTest extends PHPUnit_Framework_TestCase
$this->assertEquals($result,$expectedresult); $this->assertEquals($result,$expectedresult);
return true; return true;
} }*/
/** /**
* Test export function * Test export function

2
test/phpunit/FactureTest.php
View File

@ -268,7 +268,7 @@ class FactureTest extends PHPUnit_Framework_TestCase
$result=$localobject->delete($id); $result=$localobject->delete($id);
print __METHOD__." id=".$id." result=".$result."\n"; print __METHOD__." id=".$id." result=".$result."\n";
$this->assertLessThan($result, 0); $this->assertGreaterThanOrEqual(0, $result);
return $result; return $result;
} }

86
test/phpunit/jenkins_phpunittest.xml
View File

@ -10,46 +10,48 @@
processIsolation="false" processIsolation="false"
stopOnFailure="true" stopOnFailure="true"
syntaxCheck="true"> syntaxCheck="true">
<filter> <php>
<blacklist> <ini name="max_execution_time" value="600"/>
<directory suffix=".php">../../build/</directory> <ini name="max_input_time" value="600"/>
<directory suffix=".php">../../dev/</directory> </php>
<directory suffix=".php">../../doc/</directory> <filter>
<directory suffix=".php">../../test/</directory> <blacklist>
<directory suffix=".php">../../htdocs/core/menus/smartphone/</directory> <directory suffix=".php">../../build/</directory>
<directory suffix=".php">../../htdocs/products/canvas/</directory> <directory suffix=".php">../../dev/</directory>
<directory suffix=".php">../../htdocs/contact/canvas/</directory> <directory suffix=".php">../../doc/</directory>
<directory suffix=".php">../../htdocs/societe/canvas/</directory> <directory suffix=".php">../../test/</directory>
<directory suffix=".php">../../htdocs/includes/</directory> <directory suffix=".php">../../htdocs/core/menus/smartphone/</directory>
</blacklist> <directory suffix=".php">../../htdocs/products/canvas/</directory>
<whitelist addUncoveredFilesFromWhitelist="true"> <directory suffix=".php">../../htdocs/contact/canvas/</directory>
<directory suffix=".class.php">../../htdocs/</directory> <directory suffix=".php">../../htdocs/societe/canvas/</directory>
<directory suffix=".lib.php">../../htdocs/</directory> <directory suffix=".php">../../htdocs/includes/</directory>
<directory suffix=".inc.php">../../htdocs/</directory> </blacklist>
<directory suffix=".modules.php">../../htdocs/</directory> <whitelist addUncoveredFilesFromWhitelist="true">
<file>../../htdocs/core/modules/facture/modules_facture.php</file> <directory suffix=".class.php">../../htdocs/</directory>
<file>../../htdocs/core/modules/commande/modules_commande.php</file> <directory suffix=".lib.php">../../htdocs/</directory>
<file>../../htdocs/core/modules/propale/modules_propale.php</file> <directory suffix=".inc.php">../../htdocs/</directory>
<file>../../htdocs/core/modules/project/modules_project.php</file> <directory suffix=".modules.php">../../htdocs/</directory>
<file>../../htdocs/core/modules/fichinter/modules_fichinter.php</file> <file>../../htdocs/core/modules/facture/modules_facture.php</file>
<exclude> <file>../../htdocs/core/modules/commande/modules_commande.php</file>
<directory suffix=".php">../../build/</directory> <file>../../htdocs/core/modules/propale/modules_propale.php</file>
<directory suffix=".php">../../dev/</directory> <file>../../htdocs/core/modules/project/modules_project.php</file>
<directory suffix=".php">../../doc/</directory> <file>../../htdocs/core/modules/fichinter/modules_fichinter.php</file>
<directory suffix=".php">../../test/</directory> <exclude>
<directory suffix=".php">../../htdocs/core/menus/smartphone</directory> <directory suffix=".php">../../build/</directory>
<directory suffix=".php">../../htdocs/products/canvas/</directory> <directory suffix=".php">../../dev/</directory>
<directory suffix=".php">../../htdocs/contact/canvas/</directory> <directory suffix=".php">../../doc/</directory>
<directory suffix=".php">../../htdocs/societe/canvas/</directory> <directory suffix=".php">../../test/</directory>
<directory suffix=".php">../../htdocs/includes/</directory> <directory suffix=".php">../../htdocs/core/menus/smartphone</directory>
<file>../../htdocs/boutique/osc_master.inc.php</file> <directory suffix=".php">../../htdocs/products/canvas/</directory>
<file>../../htdocs/compta/bank/pre.inc.php</file> <directory suffix=".php">../../htdocs/contact/canvas/</directory>
<file>../../htdocs/compta/paiement/cheque/pre.inc.php</file> <directory suffix=".php">../../htdocs/societe/canvas/</directory>
<file>../../htdocs/holiday/common.inc.php</file> <directory suffix=".php">../../htdocs/includes/</directory>
<file>../../htdocs/ftp/pre.inc.php</file> <file>../../htdocs/boutique/osc_master.inc.php</file>
</exclude> <file>../../htdocs/compta/bank/pre.inc.php</file>
</whitelist> <file>../../htdocs/compta/paiement/cheque/pre.inc.php</file>
</filter> <file>../../htdocs/holiday/common.inc.php</file>
<ini name="max_execution_time" value="600"/> <file>../../htdocs/ftp/pre.inc.php</file>
<ini name="max_input_time" value="600"/> </exclude>
</whitelist>
</filter>
</phpunit> </phpunit>

90
test/phpunit/phpunittest.xml
View File

@ -10,48 +10,50 @@
processIsolation="false" processIsolation="false"
stopOnFailure="true" stopOnFailure="true"
syntaxCheck="true"> syntaxCheck="true">
<filter> <php>
<blacklist> <ini name="max_execution_time" value="600"/>
<directory suffix=".php">../../build/</directory> <ini name="max_input_time" value="600"/>
<directory suffix=".php">../../dev/</directory> </php>
<directory suffix=".php">../../doc/</directory> <filter>
<directory suffix=".php">../../test/</directory> <blacklist>
<directory suffix=".php">../../htdocs/core/menus/smartphone/</directory> <directory suffix=".php">../../build/</directory>
<directory suffix=".php">../../htdocs/custom/</directory> <directory suffix=".php">../../dev/</directory>
<directory suffix=".php">../../htdocs/products/canvas/</directory> <directory suffix=".php">../../doc/</directory>
<directory suffix=".php">../../htdocs/contact/canvas/</directory> <directory suffix=".php">../../test/</directory>
<directory suffix=".php">../../htdocs/societe/canvas/</directory> <directory suffix=".php">../../htdocs/core/menus/smartphone/</directory>
<directory suffix=".php">../../htdocs/includes/</directory> <directory suffix=".php">../../htdocs/custom/</directory>
</blacklist> <directory suffix=".php">../../htdocs/products/canvas/</directory>
<whitelist addUncoveredFilesFromWhitelist="true"> <directory suffix=".php">../../htdocs/contact/canvas/</directory>
<directory suffix=".class.php">../../htdocs/</directory> <directory suffix=".php">../../htdocs/societe/canvas/</directory>
<directory suffix=".lib.php">../../htdocs/</directory> <directory suffix=".php">../../htdocs/includes/</directory>
<directory suffix=".inc.php">../../htdocs/</directory> </blacklist>
<directory suffix=".modules.php">../../htdocs/</directory> <whitelist addUncoveredFilesFromWhitelist="true">
<file>../../htdocs/core/modules/facture/modules_facture.php</file> <directory suffix=".class.php">../../htdocs/</directory>
<file>../../htdocs/core/modules/commande/modules_commande.php</file> <directory suffix=".lib.php">../../htdocs/</directory>
<file>../../htdocs/core/modules/propale/modules_propale.php</file> <directory suffix=".inc.php">../../htdocs/</directory>
<file>../../htdocs/core/modules/project/modules_project.php</file> <directory suffix=".modules.php">../../htdocs/</directory>
<file>../../htdocs/core/modules/fichinter/modules_fichinter.php</file> <file>../../htdocs/core/modules/facture/modules_facture.php</file>
<exclude> <file>../../htdocs/core/modules/commande/modules_commande.php</file>
<directory suffix=".php">../../build/</directory> <file>../../htdocs/core/modules/propale/modules_propale.php</file>
<directory suffix=".php">../../dev/</directory> <file>../../htdocs/core/modules/project/modules_project.php</file>
<directory suffix=".php">../../doc/</directory> <file>../../htdocs/core/modules/fichinter/modules_fichinter.php</file>
<directory suffix=".php">../../test/</directory> <exclude>
<directory suffix=".php">../../htdocs/core/menus/smartphone</directory> <directory suffix=".php">../../build/</directory>
<directory suffix=".php">../../htdocs/custom/</directory> <directory suffix=".php">../../dev/</directory>
<directory suffix=".php">../../htdocs/products/canvas/</directory> <directory suffix=".php">../../doc/</directory>
<directory suffix=".php">../../htdocs/contact/canvas/</directory> <directory suffix=".php">../../test/</directory>
<directory suffix=".php">../../htdocs/societe/canvas/</directory> <directory suffix=".php">../../htdocs/core/menus/smartphone</directory>
<directory suffix=".php">../../htdocs/includes/</directory> <directory suffix=".php">../../htdocs/custom/</directory>
<file>../../htdocs/boutique/osc_master.inc.php</file> <directory suffix=".php">../../htdocs/products/canvas/</directory>
<file>../../htdocs/compta/bank/pre.inc.php</file> <directory suffix=".php">../../htdocs/contact/canvas/</directory>
<file>../../htdocs/compta/paiement/cheque/pre.inc.php</file> <directory suffix=".php">../../htdocs/societe/canvas/</directory>
<file>../../htdocs/holiday/common.inc.php</file> <directory suffix=".php">../../htdocs/includes/</directory>
<file>../../htdocs/ftp/pre.inc.php</file> <file>../../htdocs/boutique/osc_master.inc.php</file>
</exclude> <file>../../htdocs/compta/bank/pre.inc.php</file>
</whitelist> <file>../../htdocs/compta/paiement/cheque/pre.inc.php</file>
</filter> <file>../../htdocs/holiday/common.inc.php</file>
<ini name="max_execution_time" value="600"/> <file>../../htdocs/ftp/pre.inc.php</file>
<ini name="max_input_time" value="600"/> </exclude>
</whitelist>
</filter>
</phpunit> </phpunit>