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

develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: I2196e69ebae5a057eb6df018b683ff35f721ead9

htdocs/install/mysql/migration/3.3.0-3.4.0.sql

@@ -210,6 +210,7 @@ ALTER TABLE llx_user ADD COLUMN   fk_state          integer        DEFAULT 0;
 ALTER TABLE llx_user ADD COLUMN   fk_country        integer        DEFAULT 0;
 ALTER TABLE llx_product_price ADD COLUMN import_key varchar(14) AFTER price_by_qty;
 
+
 CREATE TABLE llx_printer_ipp 
 (
 	rowid int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
@@ -221,3 +222,5 @@ CREATE TABLE llx_printer_ipp
 	login varchar(32) NOT NULL,
 )ENGINE=innodb;
 
+ALTER TABLE llx_socpeople ADD COLUMN ref_ext varchar(128) after entity;
+

htdocs/install/mysql/tables/llx_socpeople.sql

@@ -25,6 +25,7 @@ create table llx_socpeople
   tms				timestamp,
   fk_soc			integer,									-- lien vers la societe
   entity			integer DEFAULT 1 NOT NULL,					-- multi company id
+  ref_ext           varchar(128),                               -- reference into an external system (not used by dolibarr)
   civilite			varchar(6),
   lastname			varchar(50),
   firstname			varchar(50),