From f291233aa5c063c2482db9efa6900e445d2642d8 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 8 Aug 2011 16:13:28 +0000 Subject: [PATCH 1/2] Fix: uniformize fields name with standard extrafields --- htdocs/install/mysql/migration/3.0.0-3.1.0.sql | 4 +++- htdocs/install/mysql/tables/llx_advanced_extrafields.sql | 4 ++-- 2 files changed, 5 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 1db0fe41fb9..3e4a44db5a9 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 @@ -1,5 +1,5 @@ -- --- $Id: 3.0.0-3.1.0.sql,v 1.86 2011/08/08 16:07:33 hregis Exp $ +-- $Id: 3.0.0-3.1.0.sql,v 1.87 2011/08/08 16:13:28 hregis Exp $ -- -- Be carefull to requests order. -- This file must be loaded by calling /install/index.php page @@ -486,3 +486,5 @@ ALTER TABLE llx_user ADD civilite varchar(6) after entity; ALTER TABLE llx_advanced_extrafields_options DROP COLUMN tms; ALTER TABLE llx_advanced_extrafields_options CHANGE COLUMN rang pos integer; ALTER TABLE llx_advanced_extrafields CHANGE COLUMN rang pos integer; +ALTER TABLE llx_advanced_extrafields CHANGE COLUMN format type varchar(8) NOT NULL; +ALTER TABLE llx_advanced_extrafields CHANGE COLUMN fieldsize size integer; diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql index 02344d027e4..7dbf6b92416 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql @@ -14,7 +14,7 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -- --- $Id: llx_advanced_extrafields.sql,v 1.3 2011/08/08 16:07:33 hregis Exp $ +-- $Id: llx_advanced_extrafields.sql,v 1.4 2011/08/08 16:13:29 hregis Exp $ -- =================================================================== create table llx_advanced_extrafields @@ -27,7 +27,7 @@ create table llx_advanced_extrafields name varchar(64) NOT NULL, -- code name of field label varchar(64) NOT NULL, type varchar(8) NOT NULL, -- date, string, integer, float - fieldsize integer, + size integer, maxlength integer, options varchar(255), From 3b0c55ae67728d6c9598dfa9dc08af0d9a567d8d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 16:14:48 +0000 Subject: [PATCH 2/2] Fix: Bad doxygen description --- htdocs/comm/clients.php | 6 +++--- htdocs/comm/fiche.php | 6 +++--- htdocs/lib/doxygen.php | 10 ++++++---- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/htdocs/comm/clients.php b/htdocs/comm/clients.php index 187b1421c41..662e16f2876 100644 --- a/htdocs/comm/clients.php +++ b/htdocs/comm/clients.php @@ -19,9 +19,9 @@ /** * \file htdocs/comm/clients.php - * \ingroup commercial, societe + * \ingroup commercial societe * \brief List of customers - * \version $Id: clients.php,v 1.79 2011/08/03 00:46:26 eldy Exp $ + * \version $Id: clients.php,v 1.80 2011/08/08 16:15:05 eldy Exp $ */ require("../main.inc.php"); @@ -249,5 +249,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.79 $'); +llxFooter('$Date: 2011/08/08 16:15:05 $ - $Revision: 1.80 $'); ?> diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index e0b3c1481fa..40a6a2535ab 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -23,9 +23,9 @@ /** * \file htdocs/comm/fiche.php - * \ingroup commercial, compta + * \ingroup commercial compta * \brief Page to show customer card of a third party - * \version $Id: fiche.php,v 1.282 2011/08/03 00:46:27 eldy Exp $ + * \version $Id: fiche.php,v 1.283 2011/08/08 16:15:05 eldy Exp $ */ require("../main.inc.php"); @@ -891,5 +891,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.282 $'); +llxFooter('$Date: 2011/08/08 16:15:05 $ - $Revision: 1.283 $'); ?> diff --git a/htdocs/lib/doxygen.php b/htdocs/lib/doxygen.php index 9b60524db98..dc6a442072f 100644 --- a/htdocs/lib/doxygen.php +++ b/htdocs/lib/doxygen.php @@ -18,16 +18,18 @@ */ /** - * \mainpage Dolibarr project * \file htdocs/lib/doxygen.php * \ingroup core - * \brief Page used as doxygen documentation header - * \version $Id: doxygen.php,v 1.7 2011/08/08 16:07:48 eldy Exp $ + * \version $Id: doxygen.php,v 1.8 2011/08/08 16:14:48 eldy Exp $ + * \mainpage Dolibarr project * * This is source documentation for Dolibarr ERP/CRM.
* This documentation can be built or updated running the script dolibarr-doxygen-build.pl or from Eclipse with Doxygen plugin.
*
* Dolibarr official web site: www.dolibarr.org
- * Dolibarr site francophone: www.dolibarr.fr
+ *
+ * Dolibarr french portal: www.dolibarr.fr
+ * Dolibarr spanish portal: www.dolibarr.es
+ *
*/ ?> \ No newline at end of file