From 19d2242ae787283d0b7587604152f16bfde2bdd5 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 29 Aug 2011 14:45:46 +0200 Subject: [PATCH 1/2] Fix: increase size for external modules name --- htdocs/install/mysql/migration/3.0.0-3.1.0.sql | 3 +++ htdocs/install/mysql/tables/llx_element_element.sql | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql index 1591edfe391..7a8b75d08b5 100755 --- a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql +++ b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql @@ -484,3 +484,6 @@ ALTER TABLE llx_don ADD phone_mobile varchar(24) after email; ALTER TABLE llx_don ADD phone varchar(24) after email; ALTER TABLE llx_user ADD civilite varchar(6) after entity; + +ALTER TABLE llx_element_element MODIFY sourcetype varchar(32) NOT NULL; +ALTER TABLE llx_element_element MODIFY targettype varchar(32) NOT NULL; \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_element_element.sql b/htdocs/install/mysql/tables/llx_element_element.sql index 57d92bc8ce9..60d02146b9d 100644 --- a/htdocs/install/mysql/tables/llx_element_element.sql +++ b/htdocs/install/mysql/tables/llx_element_element.sql @@ -1,5 +1,6 @@ -- ============================================================================ --- Copyright (C) 2008 Laurent Destailleur +-- Copyright (C) 2008-2011 Laurent Destailleur +-- Copyright (C) 2011 Regis Houssin -- -- 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 @@ -24,8 +25,8 @@ create table llx_element_element ( rowid integer AUTO_INCREMENT PRIMARY KEY, fk_source integer NOT NULL, - sourcetype varchar(16) NOT NULL, + sourcetype varchar(32) NOT NULL, fk_target integer NOT NULL, - targettype varchar(16) NOT NULL + targettype varchar(32) NOT NULL ) ENGINE=innodb; From 496e567b217c1e15b63637b529198f272806752b Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 29 Aug 2011 15:49:17 +0200 Subject: [PATCH 2/2] bug #34162: Bad link in prosprection area --- htdocs/comm/propal/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index ae8c8f82cd9..097e7bcf63d 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -183,7 +183,7 @@ if ($conf->propal->enabled) $obj = $db->fetch_object($resql); print ""; print ''; - print "rowid."\">".img_object($langs->trans("ShowPropal"),"propal").' '.$obj->ref.""; + print "".img_object($langs->trans("ShowPropal"),"propal").' '.$obj->ref.""; print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).''; $i++; }