mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-17 23:11:29 +01:00
Merge remote-tracking branch 'Upstream/develop' into develop-loan
Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql
This commit is contained in:
aspangaro
41
htdocs/install/mysql/data/llx_c_incoterms.sql
Normal file
41
htdocs/install/mysql/data/llx_c_incoterms.sql
Normal file
@@ -0,0 +1,41 @@
|
||||
-- Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
-- Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
|
||||
-- Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
-- Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
|
||||
-- Copyright (C) 2004 Guillaume Delecourt <guillaume.delecourt@opensides.be>
|
||||
-- Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
|
||||
-- Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.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
|
||||
-- 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/>.
|
||||
--
|
||||
--
|
||||
|
||||
--
|
||||
-- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
|
||||
-- de l'install et tous les sigles '--' sont supprimés.
|
||||
--
|
||||
|
||||
|
||||
INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('EXW', 'Ex Works, au départ non chargé, non dédouané sortie d''usine (uniquement adapté aux flux domestiques, nationaux)', 1);
|
||||
INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('FCA', 'Free Carrier, marchandises dédouanées et chargées dans le pays de départ, chez le vendeur ou chez le commissionnaire de transport de l''acheteur', 1);
|
||||
INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('FAS', 'Free Alongside Ship, sur le quai du port de départ', 1);
|
||||
INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('FOB', 'Free On Board, chargé sur le bateau, les frais de chargement dans celui-ci étant fonction du liner term indiqué par la compagnie maritime (à la charge du vendeur)', 1);
|
||||
INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('CFR', 'Cost and Freight, chargé dans le bateau, livraison au port de départ, frais payés jusqu''au port d''arrivée, sans assurance pour le transport, non déchargé du navire à destination (les frais de déchargement sont inclus ou non au port d''arrivée)', 1);
|
||||
INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('CIF', 'Cost, Insurance and Freight, chargé sur le bateau, frais jusqu''au port d''arrivée, avec l''assurance marchandise transportée souscrite par le vendeur pour le compte de l''acheteur', 1);
|
||||
INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('CPT', 'Carriage Paid To, livraison au premier transporteur, frais jusqu''au déchargement du mode de transport, sans assurance pour le transport', 1);
|
||||
INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('CIP', 'Carriage and Insurance Paid to, idem CPT, avec assurance marchandise transportée souscrite par le vendeur pour le compte de l''acheteur', 1);
|
||||
INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('DAT', 'Delivered At Terminal, marchandises (déchargées) livrées sur quai, dans un terminal maritime, fluvial, aérien, routier ou ferroviaire désigné (dédouanement import, et post-acheminement payés par l''acheteur)', 1);
|
||||
INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('DAP', 'Delivered At Place, marchandises (non déchargées) mises à disposition de l''acheteur dans le pays d''importation au lieu précisé dans le contrat (déchargement, dédouanement import payé par l''acheteur)', 1);
|
||||
INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('DDP', 'Delivered Duty Paid, marchandises (non déchargées) livrées à destination finale, dédouanement import et taxes à la charge du vendeur ; l''acheteur prend en charge uniquement le déchargement (si exclusion des taxes type TVA, le préciser clairement)', 1);
|
||||
|
||||
@@ -1095,8 +1095,8 @@ ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_task (fk_task);
|
||||
ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_date (task_date);
|
||||
ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_datehour (task_datehour);
|
||||
|
||||
ALTER TABLE llx_projet_task CHANGE COLUMN duration_effective real DEFAULT 0 NULL;
|
||||
ALTER TABLE llx_projet_task CHANGE COLUMN planned_workload real DEFAULT 0 NULL;
|
||||
ALTER TABLE llx_projet_task MODIFY COLUMN duration_effective real DEFAULT 0 NULL;
|
||||
ALTER TABLE llx_projet_task MODIFY COLUMN planned_workload real DEFAULT 0 NULL;
|
||||
|
||||
|
||||
-- add extrafield on ficheinter lines
|
||||
|
||||
@@ -62,6 +62,10 @@ create table llx_payment_loan
|
||||
fk_user_modif integer
|
||||
)ENGINE=innodb;
|
||||
|
||||
UPDATE llx_projet_task_time SET task_datehour = task_date where task_datehour IS NULL;
|
||||
ALTER TABLE llx_projet_task_time ADD COLUMN task_date_withhour integer DEFAULT 0 after task_datehour;
|
||||
|
||||
|
||||
ALTER TABLE llx_commande_fournisseur MODIFY COLUMN date_livraison datetime;
|
||||
|
||||
-- Add id commandefourndet in llx_commande_fournisseur_dispatch to correct /fourn/commande/dispatch.php display when several times same product in supplier order
|
||||
@@ -155,6 +159,7 @@ ALTER TABLE llx_contratdet_extrafields ADD INDEX idx_contratdet_extrafields (fk_
|
||||
|
||||
ALTER TABLE llx_product_fournisseur_price ADD COLUMN delivery_time_days integer;
|
||||
|
||||
|
||||
ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN comment varchar(255);
|
||||
ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN status integer;
|
||||
ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN tms timestamp;
|
||||
@@ -240,7 +245,6 @@ CREATE TABLE llx_expensereport_det
|
||||
ALTER TABLE llx_projet ADD COLUMN budget_amount double(24,8);
|
||||
|
||||
|
||||
|
||||
create table llx_commande_fournisseurdet_extrafields
|
||||
(
|
||||
rowid integer AUTO_INCREMENT PRIMARY KEY,
|
||||
@@ -269,3 +273,134 @@ ALTER TABLE llx_facture_fourn_det ADD COLUMN fk_parent_line integer NULL after f
|
||||
ALTER TABLE llx_commande_fournisseurdet ADD COLUMN special_code integer DEFAULT 0;
|
||||
ALTER TABLE llx_commande_fournisseurdet ADD COLUMN rang integer DEFAULT 0;
|
||||
ALTER TABLE llx_commande_fournisseurdet ADD COLUMN fk_parent_line integer NULL after fk_commande;
|
||||
|
||||
ALTER TABLE llx_projet ADD COLUMN date_close datetime DEFAULT NULL;
|
||||
ALTER TABLE llx_projet ADD COLUMN fk_user_close integer DEFAULT NULL;
|
||||
|
||||
|
||||
|
||||
-- Module AskPriceSupplier --
|
||||
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;
|
||||
|
||||
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;
|
||||
|
||||
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;
|
||||
|
||||
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;
|
||||
-- End Module AskPriceSupplier --
|
||||
|
||||
|
||||
ALTER TABLE llx_societe ADD COLUMN fk_incoterms integer;
|
||||
ALTER TABLE llx_societe ADD COLUMN location_incoterms varchar(255);
|
||||
ALTER TABLE llx_propal ADD COLUMN fk_incoterms integer;
|
||||
ALTER TABLE llx_propal ADD COLUMN location_incoterms varchar(255);
|
||||
ALTER TABLE llx_commande ADD COLUMN fk_incoterms integer;
|
||||
ALTER TABLE llx_commande ADD COLUMN location_incoterms varchar(255);
|
||||
ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_incoterms integer;
|
||||
ALTER TABLE llx_commande_fournisseur ADD COLUMN location_incoterms varchar(255);
|
||||
ALTER TABLE llx_facture ADD COLUMN fk_incoterms integer;
|
||||
ALTER TABLE llx_facture ADD COLUMN location_incoterms varchar(255);
|
||||
ALTER TABLE llx_facture_fourn ADD COLUMN fk_incoterms integer;
|
||||
ALTER TABLE llx_facture_fourn ADD COLUMN location_incoterms varchar(255);
|
||||
ALTER TABLE llx_expedition ADD COLUMN fk_incoterms integer;
|
||||
ALTER TABLE llx_expedition ADD COLUMN location_incoterms varchar(255);
|
||||
ALTER TABLE llx_livraison ADD COLUMN fk_incoterms integer;
|
||||
ALTER TABLE llx_livraison ADD COLUMN location_incoterms varchar(255);
|
||||
|
||||
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;
|
||||
|
||||
ALTER TABLE llx_c_incoterms ADD UNIQUE INDEX uk_c_incoterms (code);
|
||||
|
||||
INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('EXW', 'Ex Works, au départ non chargé, non dédouané sortie d''usine (uniquement adapté aux flux domestiques, nationaux)', 1);
|
||||
INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('FCA', 'Free Carrier, marchandises dédouanées et chargées dans le pays de départ, chez le vendeur ou chez le commissionnaire de transport de l''acheteur', 1);
|
||||
INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('FAS', 'Free Alongside Ship, sur le quai du port de départ', 1);
|
||||
INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('FOB', 'Free On Board, chargé sur le bateau, les frais de chargement dans celui-ci étant fonction du liner term indiqué par la compagnie maritime (à la charge du vendeur)', 1);
|
||||
INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('CFR', 'Cost and Freight, chargé dans le bateau, livraison au port de départ, frais payés jusqu''au port d''arrivée, sans assurance pour le transport, non déchargé du navire à destination (les frais de déchargement sont inclus ou non au port d''arrivée)', 1);
|
||||
INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('CIF', 'Cost, Insurance and Freight, chargé sur le bateau, frais jusqu''au port d''arrivée, avec l''assurance marchandise transportée souscrite par le vendeur pour le compte de l''acheteur', 1);
|
||||
INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('CPT', 'Carriage Paid To, livraison au premier transporteur, frais jusqu''au déchargement du mode de transport, sans assurance pour le transport', 1);
|
||||
INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('CIP', 'Carriage and Insurance Paid to, idem CPT, avec assurance marchandise transportée souscrite par le vendeur pour le compte de l''acheteur', 1);
|
||||
INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('DAT', 'Delivered At Terminal, marchandises (déchargées) livrées sur quai, dans un terminal maritime, fluvial, aérien, routier ou ferroviaire désigné (dédouanement import, et post-acheminement payés par l''acheteur)', 1);
|
||||
INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('DAP', 'Delivered At Place, marchandises (non déchargées) mises à disposition de l''acheteur dans le pays d''importation au lieu précisé dans le contrat (déchargement, dédouanement import payé par l''acheteur)', 1);
|
||||
INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('DDP', 'Delivered Duty Paid, marchandises (non déchargées) livrées à destination finale, dédouanement import et taxes à la charge du vendeur ; l''acheteur prend en charge uniquement le déchargement (si exclusion des taxes type TVA, le préciser clairement)', 1);
|
||||
|
||||
55
htdocs/install/mysql/tables/llx_askpricesupplier.sql
Normal file
55
htdocs/install/mysql/tables/llx_askpricesupplier.sql
Normal file
@@ -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;
|
||||
@@ -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;
|
||||
48
htdocs/install/mysql/tables/llx_askpricesupplierdet.sql
Normal file
48
htdocs/install/mysql/tables/llx_askpricesupplierdet.sql
Normal file
@@ -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;
|
||||
@@ -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;
|
||||
|
||||
19
htdocs/install/mysql/tables/llx_c_incoterms.key.sql
Normal file
19
htdocs/install/mysql/tables/llx_c_incoterms.key.sql
Normal file
@@ -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);
|
||||
25
htdocs/install/mysql/tables/llx_c_incoterms.sql
Normal file
25
htdocs/install/mysql/tables/llx_c_incoterms.sql
Normal file
@@ -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;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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),
|
||||
|
||||
Reference in New Issue
Block a user