From 8787a703a0da13048c3ca22b1f3c35ce7636bb1e Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 6 Sep 2012 08:06:48 +0200 Subject: [PATCH 1/9] Fix: remove old tests --- test/phpunit/BuildDocTest.php | 34 +++++----------------------------- 1 file changed, 5 insertions(+), 29 deletions(-) diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php index 9de9efd0895..671646be826 100644 --- a/test/phpunit/BuildDocTest.php +++ b/test/phpunit/BuildDocTest.php @@ -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); From 0b057a071a494e051e6f276e5ab3171deb54b38b Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 6 Sep 2012 08:24:29 +0200 Subject: [PATCH 2/9] Fix: for avoid phpunit errors --- htdocs/holiday/admin/holiday.php | 14 +++++--------- htdocs/holiday/common.inc.php | 3 ++- htdocs/holiday/define_holiday.php | 5 ++--- htdocs/holiday/fiche.php | 16 ++++++---------- htdocs/holiday/index.php | 11 +++++------ htdocs/holiday/month_report.php | 13 +++++-------- htdocs/holiday/view_log.php | 5 ++--- 7 files changed, 27 insertions(+), 40 deletions(-) diff --git a/htdocs/holiday/admin/holiday.php b/htdocs/holiday/admin/holiday.php index 9690e93f3cc..2e3cf836d9d 100644 --- a/htdocs/holiday/admin/holiday.php +++ b/htdocs/holiday/admin/holiday.php @@ -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'); diff --git a/htdocs/holiday/common.inc.php b/htdocs/holiday/common.inc.php index f3b44f57d00..2c135d0ed8e 100644 --- a/htdocs/holiday/common.inc.php +++ b/htdocs/holiday/common.inc.php @@ -23,7 +23,8 @@ * \brief Common load of data */ -require_once(DOL_DOCUMENT_ROOT. "/holiday/class/holiday.class.php"); +require '../main.inc.php' ; +require DOL_DOCUMENT_ROOT. '/holiday/class/holiday.class.php'; $langs->load("user"); $langs->load("other"); diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php index 7d68e823a1d..8c11e3bd031 100644 --- a/htdocs/holiday/define_holiday.php +++ b/htdocs/holiday/define_holiday.php @@ -25,9 +25,8 @@ * \author dmouillard@teclib.com */ -require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT. "/user/class/user.class.php"); -require_once(DOL_DOCUMENT_ROOT. "/holiday/common.inc.php"); +require DOL_DOCUMENT_ROOT. '/holiday/common.inc.php'; +require_once DOL_DOCUMENT_ROOT. '/user/class/user.class.php'; // Protection if external user if ($user->societe_id > 0) accessforbidden(); diff --git a/htdocs/holiday/fiche.php b/htdocs/holiday/fiche.php index 1499bc230ba..968876e2466 100644 --- a/htdocs/holiday/fiche.php +++ b/htdocs/holiday/fiche.php @@ -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 - * \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"); +require DOL_DOCUMENT_ROOT. '/holiday/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"); diff --git a/htdocs/holiday/index.php b/htdocs/holiday/index.php index c8f69cdfb08..6052297ede1 100644 --- a/htdocs/holiday/index.php +++ b/htdocs/holiday/index.php @@ -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"); +require DOL_DOCUMENT_ROOT. '/holiday/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(); diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php index c8ef3267ec6..70eb6049e74 100644 --- a/htdocs/holiday/month_report.php +++ b/htdocs/holiday/month_report.php @@ -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 - * \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"); + +require DOL_DOCUMENT_ROOT. '/holiday/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(); diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php index 786f9d3dab6..177dd2cc498 100644 --- a/htdocs/holiday/view_log.php +++ b/htdocs/holiday/view_log.php @@ -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"); +require DOL_DOCUMENT_ROOT. '/holiday/common.inc.php'; +require_once DOL_DOCUMENT_ROOT. '/user/class/user.class.php'; // Protection if external user if ($user->societe_id > 0) accessforbidden(); From e0bb5f334d304ee9e21c3c058046c4e18f79c1b7 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 6 Sep 2012 08:31:38 +0200 Subject: [PATCH 3/9] Try to avoid phpunit errors --- htdocs/holiday/common.inc.php | 2 +- htdocs/holiday/define_holiday.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/holiday/common.inc.php b/htdocs/holiday/common.inc.php index 2c135d0ed8e..d842827e28f 100644 --- a/htdocs/holiday/common.inc.php +++ b/htdocs/holiday/common.inc.php @@ -23,7 +23,7 @@ * \brief Common load of data */ -require '../main.inc.php' ; +require '../main.inc.php'; require DOL_DOCUMENT_ROOT. '/holiday/class/holiday.class.php'; $langs->load("user"); diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php index 8c11e3bd031..4dcec831e65 100644 --- a/htdocs/holiday/define_holiday.php +++ b/htdocs/holiday/define_holiday.php @@ -22,7 +22,6 @@ * \file define_holiday.php * \ingroup holiday * \brief File that defines the balance of paid holiday of users. - * \author dmouillard@teclib.com */ require DOL_DOCUMENT_ROOT. '/holiday/common.inc.php'; From 9e4ff47711b4faf0743f667408836e36651b5d78 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 6 Sep 2012 08:52:31 +0200 Subject: [PATCH 4/9] Fix: bad path --- htdocs/holiday/define_holiday.php | 2 +- htdocs/holiday/fiche.php | 2 +- htdocs/holiday/index.php | 2 +- htdocs/holiday/month_report.php | 2 +- htdocs/holiday/view_log.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php index 4dcec831e65..2b66b8d1567 100644 --- a/htdocs/holiday/define_holiday.php +++ b/htdocs/holiday/define_holiday.php @@ -24,7 +24,7 @@ * \brief File that defines the balance of paid holiday of users. */ -require DOL_DOCUMENT_ROOT. '/holiday/common.inc.php'; +require 'common.inc.php'; require_once DOL_DOCUMENT_ROOT. '/user/class/user.class.php'; // Protection if external user diff --git a/htdocs/holiday/fiche.php b/htdocs/holiday/fiche.php index 968876e2466..2110f51a323 100644 --- a/htdocs/holiday/fiche.php +++ b/htdocs/holiday/fiche.php @@ -22,7 +22,7 @@ * \brief Form and file creation of paid holiday. */ -require DOL_DOCUMENT_ROOT. '/holiday/common.inc.php'; +require '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'; diff --git a/htdocs/holiday/index.php b/htdocs/holiday/index.php index 6052297ede1..171e0421b1a 100644 --- a/htdocs/holiday/index.php +++ b/htdocs/holiday/index.php @@ -23,7 +23,7 @@ * \brief List of holiday. */ -require DOL_DOCUMENT_ROOT. '/holiday/common.inc.php'; +require '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'; diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php index 70eb6049e74..aca1913e1d9 100644 --- a/htdocs/holiday/month_report.php +++ b/htdocs/holiday/month_report.php @@ -22,7 +22,7 @@ * \brief Monthly report of paid holiday. */ -require DOL_DOCUMENT_ROOT. '/holiday/common.inc.php'; +require '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'; diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php index 177dd2cc498..5d22451f52c 100644 --- a/htdocs/holiday/view_log.php +++ b/htdocs/holiday/view_log.php @@ -23,7 +23,7 @@ * \ingroup holiday */ -require DOL_DOCUMENT_ROOT. '/holiday/common.inc.php'; +require 'common.inc.php'; require_once DOL_DOCUMENT_ROOT. '/user/class/user.class.php'; // Protection if external user From 83dd81110d605efd2cefcbf0e4a5d828e475f0cc Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 6 Sep 2012 09:01:54 +0200 Subject: [PATCH 5/9] Fix: bad path the return --- htdocs/holiday/admin/holiday.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/holiday/admin/holiday.php b/htdocs/holiday/admin/holiday.php index 2e3cf836d9d..99e6f7fa4af 100644 --- a/htdocs/holiday/admin/holiday.php +++ b/htdocs/holiday/admin/holiday.php @@ -25,7 +25,7 @@ * \brief Page module configuration paid holiday. */ -require '../main.inc.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'; From c9ea50c51f92a5958481d306ab25a1fc9cabf5c9 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 6 Sep 2012 09:09:00 +0200 Subject: [PATCH 6/9] Try another method --- htdocs/holiday/common.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/holiday/common.inc.php b/htdocs/holiday/common.inc.php index d842827e28f..4b2ab0c487d 100644 --- a/htdocs/holiday/common.inc.php +++ b/htdocs/holiday/common.inc.php @@ -18,12 +18,12 @@ */ /** - * \file htdocs/holiday/include.inc.php + * \file htdocs/holiday/common.inc.php * \ingroup holiday * \brief Common load of data */ -require '../main.inc.php'; +require dirname(__FILE__).'/../main.inc.php'; require DOL_DOCUMENT_ROOT. '/holiday/class/holiday.class.php'; $langs->load("user"); From 7bd18ba84050d6b6f3b02774607254c92b3878d7 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 6 Sep 2012 09:17:01 +0200 Subject: [PATCH 7/9] Fix: phpunit error again ! pfff --- htdocs/holiday/common.inc.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/holiday/common.inc.php b/htdocs/holiday/common.inc.php index 4b2ab0c487d..93735fe0761 100644 --- a/htdocs/holiday/common.inc.php +++ b/htdocs/holiday/common.inc.php @@ -24,7 +24,9 @@ */ require dirname(__FILE__).'/../main.inc.php'; -require DOL_DOCUMENT_ROOT. '/holiday/class/holiday.class.php'; +if (! class_exists('Holiday')) { + require DOL_DOCUMENT_ROOT. '/holiday/class/holiday.class.php'; +} $langs->load("user"); $langs->load("other"); From c99e730e0cae8142bf43691c1cb3f40f8a8c1a81 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 6 Sep 2012 09:27:23 +0200 Subject: [PATCH 8/9] Fix: last try before asylum --- htdocs/holiday/define_holiday.php | 2 +- htdocs/holiday/fiche.php | 2 +- htdocs/holiday/index.php | 2 +- htdocs/holiday/month_report.php | 2 +- htdocs/holiday/view_log.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php index 2b66b8d1567..a37207eddaa 100644 --- a/htdocs/holiday/define_holiday.php +++ b/htdocs/holiday/define_holiday.php @@ -24,7 +24,7 @@ * \brief File that defines the balance of paid holiday of users. */ -require 'common.inc.php'; +include 'common.inc.php'; require_once DOL_DOCUMENT_ROOT. '/user/class/user.class.php'; // Protection if external user diff --git a/htdocs/holiday/fiche.php b/htdocs/holiday/fiche.php index 2110f51a323..6f32fff0b15 100644 --- a/htdocs/holiday/fiche.php +++ b/htdocs/holiday/fiche.php @@ -22,7 +22,7 @@ * \brief Form and file creation of paid holiday. */ -require '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'; diff --git a/htdocs/holiday/index.php b/htdocs/holiday/index.php index 171e0421b1a..61a6e4318df 100644 --- a/htdocs/holiday/index.php +++ b/htdocs/holiday/index.php @@ -23,7 +23,7 @@ * \brief List of holiday. */ -require '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'; diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php index aca1913e1d9..36a3212c0d1 100644 --- a/htdocs/holiday/month_report.php +++ b/htdocs/holiday/month_report.php @@ -22,7 +22,7 @@ * \brief Monthly report of paid holiday. */ -require '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'; diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php index 5d22451f52c..ffe000bf04d 100644 --- a/htdocs/holiday/view_log.php +++ b/htdocs/holiday/view_log.php @@ -23,7 +23,7 @@ * \ingroup holiday */ -require 'common.inc.php'; +include 'common.inc.php'; require_once DOL_DOCUMENT_ROOT. '/user/class/user.class.php'; // Protection if external user From 00784ffce5004570ec455a6361ece6f0bfae9c7a Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 6 Sep 2012 09:48:25 +0200 Subject: [PATCH 9/9] Fir: go to hell --- htdocs/holiday/common.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/holiday/common.inc.php b/htdocs/holiday/common.inc.php index 93735fe0761..d321d6d386e 100644 --- a/htdocs/holiday/common.inc.php +++ b/htdocs/holiday/common.inc.php @@ -23,7 +23,7 @@ * \brief Common load of data */ -require dirname(__FILE__).'/../main.inc.php'; +require_once realpath(dirname(__FILE__)) . '/../main.inc.php'; if (! class_exists('Holiday')) { require DOL_DOCUMENT_ROOT. '/holiday/class/holiday.class.php'; }