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

htdocs/holiday/class/holidayagenda.class.php

 <?php
-/* Copyright (C) 2006-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2010 Regis Houssin        <regis@dolibarr.fr>
-* Copyright (C) 2010 	   Juanjo Menent        <jmenent@2byte.es>
-* Copyright (C) 2011 	   Anthony Hebert       <ahebert@teclib.com>
+/* Copyright (C) 2011	Anthony Hebert		<ahebert@teclib.com>
+ * Copyright (C) 2012	Regis Houssin		<regis@dolibarr.fr>
+ * Copyright (C) 2012	Laurent Destailleur	<eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +21,6 @@
  *	\file       holidayagenda.class.php
  *	\ingroup    holiday
  *	\brief      Fichier d'agenda pour le module Congés Payés
- *	\version    $Id: holidayagenda.class.php,v 1.00 2011/09/15 11:00:00 ahebert Exp $
  */
 
 
@@ -31,11 +29,12 @@
  *	\brief 		Classe mere pour heritage des classes Agenda
  */
 
-require_once(DOL_DOCUMENT_ROOT."/core/class/commonagenda.class.php");
-require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php");
+// FIXME this class not exist
+//require_once DOL_DOCUMENT_ROOT.'/core/class/commonagenda.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 
 
-class HolidayAgenda extends CommonAgenda
+class HolidayAgenda// extends CommonAgenda
 {
     var $db;
 
@@ -49,12 +48,13 @@ class HolidayAgenda extends CommonAgenda
 
 
     /**
-     *    Constructeur de la classe
-     *    @param	DB		Handler acces base de donnees
+     *	Constructor
+     *
+     *	@param	DoliDB	$db		Database access handler
      */
-    function construct($DB)
+    function construct($db)
     {
-        $this->db = $DB;
+        $this->db = $db;
     }
 
     /**

test/phpunit/BuildDocTest.php

@@ -40,10 +40,7 @@ require_once dirname(__FILE__).'/../../htdocs/projet/class/task.class.php';
 require_once dirname(__FILE__).'/../../htdocs/fourn/class/fournisseur.product.class.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/pdf.lib.php';
 require_once dirname(__FILE__).'/../../htdocs/core/modules/facture/doc/pdf_crabe.modules.php';
-require_once dirname(__FILE__).'/../../htdocs/core/modules/facture/doc/pdf_oursin.modules.php';
 require_once dirname(__FILE__).'/../../htdocs/core/modules/propale/doc/pdf_azur.modules.php';
-require_once dirname(__FILE__).'/../../htdocs/core/modules/propale/doc/pdf_jaune.modules.php';
-require_once dirname(__FILE__).'/../../htdocs/core/modules/commande/doc/pdf_edison.modules.php';
 require_once dirname(__FILE__).'/../../htdocs/core/modules/commande/doc/pdf_einstein.modules.php';
 require_once dirname(__FILE__).'/../../htdocs/core/modules/project/pdf/pdf_baleine.modules.php';
 require_once dirname(__FILE__).'/../../htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php';