diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php index 79f7955bb13266b29cec0403bcf0e393ae6be442..7cabdc17b7091f804f7909e1bc81234148e8b0aa 100755 --- a/htdocs/fourn/commande/index.php +++ b/htdocs/fourn/commande/index.php @@ -436,7 +436,7 @@ print "</table><br>"; print '</td></tr></table>'; -$db->close(); - llxFooter(); + +$db->close(); ?> diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql index 398fc8eb9266f6f8820810680f0263e8f574f996..8554e5030e35ae796514d64b90292ea071e08bde 100755 --- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql +++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql @@ -29,3 +29,5 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 2 ALTER TABLE llx_commande_fournisseur CHANGE COLUMN date_cloture date_approve datetime; ALTER TABLE llx_commande_fournisseur CHANGE COLUMN fk_user_cloture fk_user_approve integer; + +ALTER TABLE llx_mailing MODIFY COLUMN body mediumtext; \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing.sql index 4d8e6d57cf4785fe3d83908a89cd4a5d971e962f..aad9949d2d9b312ab7d46561e0988735efa56cf8 100644 --- a/htdocs/install/mysql/tables/llx_mailing.sql +++ b/htdocs/install/mysql/tables/llx_mailing.sql @@ -30,7 +30,7 @@ create table llx_mailing titre varchar(60), -- Ref of mailing entity integer DEFAULT 1 NOT NULL, -- multi company id sujet varchar(60), -- Sujet of mailing - body text, + body mediumtext, bgcolor varchar(8), -- Backgroud color of mailing bgimage varchar(255), -- Backgroud image of mailing cible varchar(60), diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index e9ebdd00d1c636c75070817f0131c8143a78a814..68af1d9aee34a011dfb4177170e69d5b711a88e3 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -465,14 +465,14 @@ class Project extends CommonObject // End call triggers } - dol_syslog("Project::delete sql=" . $sql, LOG_DEBUG); + dol_syslog(get_class($this) . "::delete sql=" . $sql, LOG_DEBUG); $this->db->commit(); return 1; } else { $this->error = $this->db->lasterror(); - dol_syslog("Project::delete " . $this->error, LOG_ERR); + dol_syslog(get_class($this) . "::delete " . $this->error, LOG_ERR); $this->db->rollback(); return -1; } diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index 225b5343757dd95fb28db5b6e0d404c032c8755a..a2b9e337f26e583a8a0c6ab9b1069a067a33ef90 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -1,6 +1,6 @@ <?php -/* Copyright (C) 2008-2009 Laurent Destailleur <eldy@users.sourceforge.net> - * Copyright (C) 2010 Regis Houssin <regis@dolibarr.fr> +/* Copyright (C) 2008-2012 Laurent Destailleur <eldy@users.sourceforge.net> + * Copyright (C) 2010_2012 Regis Houssin <regis@dolibarr.fr> * * 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 @@ -368,8 +368,6 @@ class Task extends CommonObject } else { - $this->db->free($resql); - //Delete associated link file if ($conf->projet->dir_output) { diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php index ffe7f19e6a05581621471ce183c357d5537875e2..41073db30ccd6288af11a41b94f940505a677eea 100644 --- a/test/phpunit/AllTests.php +++ b/test/phpunit/AllTests.php @@ -60,8 +60,8 @@ class AllTests { $suite = new PHPUnit_Framework_TestSuite('PHPUnit Framework'); - require_once dirname(__FILE__).'/CoreTest.php'; - $suite->addTestSuite('CoreTest'); + //require_once dirname(__FILE__).'/CoreTest.php'; + //$suite->addTestSuite('CoreTest'); require_once dirname(__FILE__).'/AdminLibTest.php'; $suite->addTestSuite('AdminLibTest'); require_once dirname(__FILE__).'/DateLibTest.php'; @@ -72,7 +72,7 @@ class AllTests $suite->addTestSuite('ImagesLibTest'); require_once dirname(__FILE__).'/FunctionsTest.php'; $suite->addTestSuite('FunctionsTest'); - require_once dirname(__FILE__).'/NumberingModulesTest.php'; + require_once dirname(__FILE__).'/_NumberingModulesTest.php'; $suite->addTestSuite('NumberingModulesTest'); require_once dirname(__FILE__).'/PdfDocTest.php'; $suite->addTestSuite('PdfDocTest'); diff --git a/test/phpunit/CoreTest.php b/test/phpunit/CoreTest.php index 7ca6b78856b954d995452cd8fa0c7a4cc545e9f9..24101beedbe7f69b0b3779b6e63bba93dab80593 100755 --- a/test/phpunit/CoreTest.php +++ b/test/phpunit/CoreTest.php @@ -26,6 +26,7 @@ global $conf,$user,$langs,$db; //define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver require_once 'PHPUnit/Autoload.php'; +require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1');