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

Dolibarr · May 25, 2013 · 15402b9 · 15402b9
2 parents e3e00b0 + 309f59f
commit 15402b9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql
@@ -377,3 +377,5 @@ create table llx_facture_fourn_extrafields
 ALTER TABLE llx_facture_fourn_extrafields ADD INDEX idx_facture_fourn_extrafields (fk_object);
 
 ALTER TABLE llx_user_clicktodial ADD COLUMN url varchar(255) AFTER fk_user;
+
+ALTER TABLE llx_societe_address CHANGE COLUMN tel phone varchar(20);
diff --git a/htdocs/install/mysql/tables/llx_societe_address.sql b/htdocs/install/mysql/tables/llx_societe_address.sql
@@ -1,6 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2000-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
--- Copyright (C) 2005-2010 Houssin Regis        <regis.houssin@capnetworks.com>
+-- Copyright (C) 2005-2013 Houssin Regis        <regis.houssin@capnetworks.com>
 --
 -- 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
@@ -29,7 +29,7 @@ create table llx_societe_address
   zip                varchar(10),                         -- zipcode
   town               varchar(50),                         -- town
   fk_pays            integer        DEFAULT 0,            --
-  tel                varchar(20),                         -- phone number
+  phone              varchar(20),                         -- phone number
   fax                varchar(20),                         -- fax number
   note               text,                                --
   fk_user_creat      integer,