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

Merge remote-tracking branch 'origin/3.7' into develop

Browse Source 
Conflicts:
	htdocs/compta/facture.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
This commit is contained in:
Laurent Destailleur
2015-01-09 23:09:10 +01:00
parent 027c9c4d98 9049931ff0
commit fc78d632d3
39 changed files with 522 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
test/phpunit/ContratTest.php
View File

@@ -164,37 +164,13 @@ class ContratTest extends PHPUnit_Framework_TestCase
return $localobject;
}
/**
* testContratValid
*
* @param Contrat $localobject Contract
* @return int
*
* @depends testContratFetch
* The depends says test is run only if previous is ok
*/
public function testContratValid($localobject)
{
global $conf,$user,$langs,$db;
$conf=$this->savconf;
$user=$this->savuser;
$langs=$this->savlangs;
$db=$this->savdb;
$result=$localobject->update_statut($user);
print __METHOD__." id=".$localobject->id." result=".$result."\n";
$this->assertLessThan($result, 0);
return $localobject;
}
/**
* testContratValid
* testContratOther
*
* @param Object $localobject Object contract
* @return int
*
* @depends testContratValid
* @depends testContratFetch
* The depends says test is run only if previous is ok
*/
public function testContratOther($localobject)