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 develop

Browse Source
This commit is contained in:
Laurent Destailleur 2012-09-06 10:22:56 +02:00
commit 1a2ead7bdf
8 changed files with 35 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/holiday/admin/holiday.php
View File

@ -25,15 +25,11 @@
* \brief Page module configuration paid holiday.
*/
$res=0;
if (! $res && file_exists("../main.inc.php")) $res=@include("../main.inc.php"); // For root directory
if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php"); // For "custom" directory
if (! $res) die("Include of main fails");
dol_include_once("/holiday/class/holiday.class.php");
require_once(DOL_DOCUMENT_ROOT. "/core/class/html.form.class.php");
require_once(DOL_DOCUMENT_ROOT. "/user/class/user.class.php");
require_once(DOL_DOCUMENT_ROOT. "/user/class/usergroup.class.php");
require '../../main.inc.php';
require DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
require_once DOL_DOCUMENT_ROOT. '/core/class/html.form.class.php';
require_once DOL_DOCUMENT_ROOT. '/user/class/user.class.php';
require_once DOL_DOCUMENT_ROOT. '/user/class/usergroup.class.php';
$action=GETPOST('action');

7
htdocs/holiday/common.inc.php
View File

@ -18,12 +18,15 @@
*/
/**
* \file htdocs/holiday/include.inc.php
* \file htdocs/holiday/common.inc.php
* \ingroup holiday
* \brief Common load of data
*/
require_once(DOL_DOCUMENT_ROOT. "/holiday/class/holiday.class.php");
require_once realpath(dirname(__FILE__)) . '/../main.inc.php';
if (! class_exists('Holiday')) {
require DOL_DOCUMENT_ROOT. '/holiday/class/holiday.class.php';
}
$langs->load("user");
$langs->load("other");

6
htdocs/holiday/define_holiday.php
View File

@ -22,12 +22,10 @@
* \file define_holiday.php
* \ingroup holiday
* \brief File that defines the balance of paid holiday of users.
* \author dmouillard@teclib.com <Dimitri Mouillard>
*/
require('../main.inc.php');
require_once(DOL_DOCUMENT_ROOT. "/user/class/user.class.php");
require_once(DOL_DOCUMENT_ROOT. "/holiday/common.inc.php");
include 'common.inc.php';
require_once DOL_DOCUMENT_ROOT. '/user/class/user.class.php';
// Protection if external user
if ($user->societe_id > 0) accessforbidden();

16
htdocs/holiday/fiche.php
View File

@ -20,18 +20,14 @@
* \file fiche.php
* \ingroup holiday
* \brief Form and file creation of paid holiday.
* \version $Id: fiche.php,v 1.16 2011/09/15 11:00:00 dmouillard Exp $
* \author dmouillard@teclib.com <Dimitri Mouillard>
* \remarks Form and file creation of paid holiday.
*/
require('../main.inc.php');
require_once(DOL_DOCUMENT_ROOT. "/core/class/html.form.class.php");
require_once(DOL_DOCUMENT_ROOT. "/user/class/usergroup.class.php");
require_once(DOL_DOCUMENT_ROOT. "/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT. "/core/class/CMailFile.class.php");
require_once(DOL_DOCUMENT_ROOT. "/core/class/html.formmail.class.php");
require_once(DOL_DOCUMENT_ROOT. "/holiday/common.inc.php");
include 'common.inc.php';
require_once DOL_DOCUMENT_ROOT. '/core/class/html.form.class.php';
require_once DOL_DOCUMENT_ROOT. '/user/class/usergroup.class.php';
require_once DOL_DOCUMENT_ROOT. '/core/class/html.formfile.class.php';
require_once DOL_DOCUMENT_ROOT. '/core/class/CMailFile.class.php';
require_once DOL_DOCUMENT_ROOT. '/core/class/html.formmail.class.php';
// Get parameters
$myparam = GETPOST("myparam");

11
htdocs/holiday/index.php
View File

@ -23,12 +23,11 @@
* \brief List of holiday.
*/
require('../main.inc.php');
require_once(DOL_DOCUMENT_ROOT. "/core/class/html.form.class.php");
require_once(DOL_DOCUMENT_ROOT. "/core/class/html.formother.class.php");
require_once(DOL_DOCUMENT_ROOT. "/user/class/user.class.php");
require_once(DOL_DOCUMENT_ROOT. "/user/class/usergroup.class.php");
require_once(DOL_DOCUMENT_ROOT. "/holiday/common.inc.php");
include 'common.inc.php';
require_once DOL_DOCUMENT_ROOT. '/core/class/html.form.class.php';
require_once DOL_DOCUMENT_ROOT. '/core/class/html.formother.class.php';
require_once DOL_DOCUMENT_ROOT. '/user/class/user.class.php';
require_once DOL_DOCUMENT_ROOT. '/user/class/usergroup.class.php';
// Protection if external user
if ($user->societe_id > 0) accessforbidden();

13
htdocs/holiday/month_report.php
View File

@ -20,15 +20,12 @@
* \file month_report.php
* \ingroup holiday
* \brief Monthly report of paid holiday.
* \version $Id: month_report.php,v 1.00 2011/09/15 11:00:00 flegastelois Exp $
* \author flegastelois@teclib.com <François Legastelois>
* \remarks Monthly report of paid holiday.
*/
require('../main.inc.php');
require_once(DOL_DOCUMENT_ROOT.'/user/class/user.class.php');
require_once(DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php');
require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php');
require_once(DOL_DOCUMENT_ROOT. "/holiday/common.inc.php");
include 'common.inc.php';
require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
// Protection if external user
if ($user->societe_id > 0) accessforbidden();

5
htdocs/holiday/view_log.php
View File

@ -23,9 +23,8 @@
* \ingroup holiday
*/
require('../main.inc.php');
require_once(DOL_DOCUMENT_ROOT. "/user/class/user.class.php");
require_once(DOL_DOCUMENT_ROOT. "/holiday/common.inc.php");
include 'common.inc.php';
require_once DOL_DOCUMENT_ROOT. '/user/class/user.class.php';
// Protection if external user
if ($user->societe_id > 0) accessforbidden();

34
test/phpunit/BuildDocTest.php
View File

@ -175,24 +175,14 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
$localobject->modelpdf='crabe';
$result=facture_pdf_create($db, $localobject, $localobject->modelpdf, $langs);
$localobject=new Facture($this->savdb);
$localobject->initAsSpecimen();
$this->assertLessThan($result, 0);
print __METHOD__." result=".$result."\n";
// Oursin
$localobject->modelpdf='oursin';
$result=facture_pdf_create($db, $localobject, $localobject->modelpdf, $langs);
$this->assertLessThan($result, 0);
print __METHOD__." result=".$result."\n";
return 0;
}
/**
* testFactureBuild
* testFactureFournisseurBuild
*
* @return int
*/
@ -242,13 +232,6 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
$this->assertLessThan($result, 0);
print __METHOD__." result=".$result."\n";
// Edison
$localobject->modelpdf='edison';
$result=commande_pdf_create($db, $localobject, $localobject->modelpdf, $langs);
$this->assertLessThan($result, 0);
print __METHOD__." result=".$result."\n";
return 0;
}
@ -297,20 +280,13 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
$localobject=new Propal($this->savdb);
$localobject->initAsSpecimen();
// Einstein
// Azur
$localobject->modelpdf='azur';
$result=propale_pdf_create($db, $localobject, $localobject->modelpdf, $langs);
$this->assertLessThan($result, 0);
print __METHOD__." result=".$result."\n";
// Edison
$localobject->modelpdf='jaune';
$result=propale_pdf_create($db, $localobject, $localobject->modelpdf, $langs);
$this->assertLessThan($result, 0);
print __METHOD__." result=".$result."\n";
return 0;
}
@ -331,7 +307,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
$localobject=new Project($this->savdb);
$localobject->initAsSpecimen();
// Soleil
// Baleine
$localobject->modelpdf='baleine';
$result=project_pdf_create($db, $localobject, $localobject->modelpdf, $langs);
@ -385,14 +361,14 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
$localobject=new Expedition($this->savdb);
$localobject->initAsSpecimen();
// Soleil
// Merou
$localobject->modelpdf='merou';
$result=expedition_pdf_create($db, $localobject, $localobject->modelpdf, $langs);
$this->assertLessThan($result, 0);
print __METHOD__." result=".$result."\n";
// Soleil
// Rouget
$localobject->modelpdf='rouget';
$result=expedition_pdf_create($db, $localobject, $localobject->modelpdf, $langs);