Merge remote-tracking branch 'Upstream/develop' into develop-loan

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql

htdocs/install/mysql/tables/llx_askpricesupplier.sql

@@ -0,0 +1,55 @@
+-- ========================================================================
+-- Copyright (C) 2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+-- ========================================================================
+
+CREATE TABLE llx_askpricesupplier (
+  rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  ref varchar(30) NOT NULL,
+  entity integer NOT NULL DEFAULT '1',
+  ref_ext varchar(255) DEFAULT NULL,
+  ref_int varchar(255) DEFAULT NULL,
+  fk_soc integer DEFAULT NULL,
+  fk_projet integer DEFAULT NULL,
+  tms timestamp,
+  datec datetime DEFAULT NULL,
+  date_valid datetime DEFAULT NULL,
+  date_cloture datetime DEFAULT NULL,
+  fk_user_author integer DEFAULT NULL,
+  fk_user_modif integer DEFAULT NULL,
+  fk_user_valid integer DEFAULT NULL,
+  fk_user_cloture integer DEFAULT NULL,
+  fk_statut smallint NOT NULL DEFAULT '0',
+  price double DEFAULT '0',
+  remise_percent double DEFAULT '0',
+  remise_absolue double DEFAULT '0',
+  remise double DEFAULT '0',
+  total_ht double(24,8) DEFAULT 0,
+  tva double(24,8) DEFAULT 0,
+  localtax1 double(24,8) DEFAULT 0,
+  localtax2 double(24,8) DEFAULT 0,
+  total double(24,8) DEFAULT 0,
+  fk_account integer DEFAULT NULL,
+  fk_currency varchar(3) DEFAULT NULL,
+  fk_cond_reglement integer DEFAULT NULL,
+  fk_mode_reglement integer DEFAULT NULL,
+  note_private text,
+  note_public text,
+  model_pdf varchar(255) DEFAULT NULL,
+  date_livraison date DEFAULT NULL,
+  fk_shipping_method integer DEFAULT NULL,
+  import_key varchar(14) DEFAULT NULL,
+  extraparams varchar(255) DEFAULT NULL
+) ENGINE=innodb;

htdocs/install/mysql/tables/llx_askpricesupplier_extrafields.sql

@@ -0,0 +1,23 @@
+-- ========================================================================
+-- Copyright (C) 2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+-- ========================================================================
+
+CREATE TABLE llx_askpricesupplier_extrafields (
+  rowid integer AUTO_INCREMENT PRIMARY KEY,
+  tms timestamp,
+  fk_object integer NOT NULL,
+  import_key varchar(14) DEFAULT NULL
+) ENGINE=innodb;

htdocs/install/mysql/tables/llx_askpricesupplierdet.sql

@@ -0,0 +1,48 @@
+-- ========================================================================
+-- Copyright (C) 2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+-- ========================================================================
+
+CREATE TABLE llx_askpricesupplierdet (
+  rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  fk_askpricesupplier integer NOT NULL,
+  fk_parent_line integer DEFAULT NULL,
+  fk_product integer DEFAULT NULL,
+  label varchar(255) DEFAULT NULL,
+  description text,
+  fk_remise_except integer DEFAULT NULL,
+  tva_tx double(6,3) DEFAULT 0,
+  localtax1_tx double(6,3) DEFAULT 0,
+  localtax1_type varchar(10) DEFAULT NULL,
+  localtax2_tx double(6,3) DEFAULT 0,
+  localtax2_type varchar(10) DEFAULT NULL,
+  qty double DEFAULT NULL,
+  remise_percent double DEFAULT '0',
+  remise double DEFAULT '0',
+  price double DEFAULT NULL,
+  subprice double(24,8) DEFAULT 0,
+  total_ht double(24,8) DEFAULT 0,
+  total_tva double(24,8) DEFAULT 0,
+  total_localtax1 double(24,8) DEFAULT 0,
+  total_localtax2 double(24,8) DEFAULT 0,
+  total_ttc double(24,8) DEFAULT 0,
+  product_type integer DEFAULT 0,
+  info_bits integer DEFAULT 0,
+  buy_price_ht double(24,8) DEFAULT 0,
+  fk_product_fournisseur_price integer DEFAULT NULL,
+  special_code integer DEFAULT 0,
+  rang integer DEFAULT 0,
+  ref_fourn varchar(30) DEFAULT NULL
+) ENGINE=innodb;

htdocs/install/mysql/tables/llx_askpricesupplierdet_extrafields.sql

@@ -0,0 +1,24 @@
+-- ========================================================================
+-- Copyright (C) 2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+-- ========================================================================
+
+CREATE TABLE llx_askpricesupplierdet_extrafields (
+  rowid integer AUTO_INCREMENT PRIMAR KEY,
+  tms timestamp,
+  fk_object integer NOT NULL,
+  import_key varchar(14) DEFAULT NULL
+) ENGINE=innodb;
+

htdocs/install/mysql/tables/llx_c_incoterms.key.sql

@@ -0,0 +1,19 @@
+-- ========================================================================
+-- Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ========================================================================
+
+ALTER TABLE llx_c_incoterms ADD UNIQUE INDEX uk_c_incoterms (code);

htdocs/install/mysql/tables/llx_c_incoterms.sql

@@ -0,0 +1,25 @@
+-- ========================================================================
+-- Copyright (C) 2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ========================================================================
+
+CREATE TABLE llx_c_incoterms (
+  rowid integer AUTO_INCREMENT PRIMARY KEY,
+  code varchar(3) NOT NULL,
+  libelle varchar(255) NOT NULL,
+  active tinyint DEFAULT 1  NOT NULL
+) ENGINE=innodb;
+

htdocs/install/mysql/tables/llx_projet.sql

@@ -32,6 +32,8 @@ create table llx_projet
   fk_user_creat    integer NOT NULL,			-- createur du projet
   public           integer,						-- project is public or not
   fk_statut        smallint DEFAULT 0 NOT NULL,
+  date_close       datetime DEFAULT NULL,    
+  fk_user_close    integer DEFAULT NULL,
   note_private     text,
   note_public      text,
   --budget_days      real,                      -- budget in days is sum of field planned_workload of tasks

htdocs/install/mysql/tables/llx_projet_task_time.sql

@@ -20,8 +20,9 @@ create table llx_projet_task_time
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
   fk_task          integer NOT NULL,
-  task_date        date,				-- only the day
-  task_datehour    datetime,			-- day + hour
+  task_date        date,					-- only the day
+  task_datehour    datetime,				-- day + hour
+  task_date_withhour integer DEFAULT 0;	-- 0 by default, 1 if date was entered with start hour
   task_duration    double,
   fk_user          integer,
   thm			   double(24,8),