lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #2539

Browse Source
This commit is contained in:
Laurent Destailleur 2015-04-07 18:14:20 +02:00
parent 6fa0234409
commit 547b7d5f91
9 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
View File

@ -378,6 +378,9 @@ CREATE TABLE llx_askpricesupplierdet_extrafields (
-- End Module AskPriceSupplier -- -- End Module AskPriceSupplier --
ALTER TABLE llx_commande_fournisseur ADD COLUMN date_approve2 datetime after date_approve;
ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_user_approve2 integer after fk_user_approve;
ALTER TABLE llx_societe ADD COLUMN fk_incoterms integer; ALTER TABLE llx_societe ADD COLUMN fk_incoterms integer;
ALTER TABLE llx_societe ADD COLUMN location_incoterms varchar(255); 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 fk_incoterms integer;
@ -386,8 +389,6 @@ ALTER TABLE llx_commande ADD COLUMN fk_incoterms integer;
ALTER TABLE llx_commande ADD COLUMN location_incoterms varchar(255); 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 fk_incoterms integer;
ALTER TABLE llx_commande_fournisseur ADD COLUMN location_incoterms varchar(255); ALTER TABLE llx_commande_fournisseur ADD COLUMN location_incoterms varchar(255);
ALTER TABLE llx_commande_fournisseur ADD COLUMN date_approve2 datetime after date_approve;
ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_user_approve2 integer after fk_user_approve;
ALTER TABLE llx_facture ADD COLUMN fk_incoterms integer; ALTER TABLE llx_facture ADD COLUMN fk_incoterms integer;
ALTER TABLE llx_facture ADD COLUMN location_incoterms varchar(255); 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 fk_incoterms integer;

4
htdocs/install/mysql/tables/llx_commande.sql
View File

@ -62,10 +62,12 @@ create table llx_commande
fk_mode_reglement integer, -- mode de reglement fk_mode_reglement integer, -- mode de reglement
date_livraison date default NULL, date_livraison date default NULL,
fk_shipping_method integer, -- shipping method id fk_shipping_method integer, -- shipping method id
fk_availability integer NULL, fk_availability integer NULL,
fk_input_reason integer, -- id coming from c_input_reason, '0' if no defined fk_input_reason integer, -- id coming from c_input_reason, '0' if no defined
fk_delivery_address integer, -- delivery address (deprecated) fk_delivery_address integer, -- delivery address (deprecated)
fk_incoterms integer, -- for incoterms
location_incoterms varchar(255), -- for incoterms
import_key varchar(14), import_key varchar(14),
extraparams varchar(255) -- for stock other parameters with json format extraparams varchar(255) -- for stock other parameters with json format

2
htdocs/install/mysql/tables/llx_commande_fournisseur.sql
View File

@ -62,6 +62,8 @@ create table llx_commande_fournisseur
fk_cond_reglement integer, -- condition de reglement fk_cond_reglement integer, -- condition de reglement
fk_mode_reglement integer, -- mode de reglement fk_mode_reglement integer, -- mode de reglement
fk_input_method integer default 0, -- id coming from c_input_reason, '0' if no defined fk_input_method integer default 0, -- id coming from c_input_reason, '0' if no defined
fk_incoterms integer, -- for incoterms
location_incoterms varchar(255), -- for incoterms
import_key varchar(14), import_key varchar(14),
extraparams varchar(255) -- for stock other parameters with json format extraparams varchar(255) -- for stock other parameters with json format

4
htdocs/install/mysql/tables/llx_expedition.sql
View File

@ -50,6 +50,8 @@ create table llx_expedition
weight float, -- weight weight float, -- weight
note_private text, note_private text,
note_public text, note_public text,
model_pdf varchar(255) model_pdf varchar(255),
fk_incoterms integer, -- for incoterms
location_incoterms varchar(255) -- for incoterms
)ENGINE=innodb; )ENGINE=innodb;

3
htdocs/install/mysql/tables/llx_facture.sql
View File

@ -75,6 +75,9 @@ create table llx_facture
note_private text, note_private text,
note_public text, note_public text,
model_pdf varchar(255), model_pdf varchar(255),
fk_incoterms integer, -- for incoterms
location_incoterms varchar(255), -- for incoterms
import_key varchar(14), import_key varchar(14),
extraparams varchar(255), -- for stock other parameters with json format extraparams varchar(255), -- for stock other parameters with json format

8
htdocs/install/mysql/tables/llx_facture_fourn.sql
View File

@ -60,12 +60,14 @@ create table llx_facture_fourn
fk_projet integer, -- projet auquel est associee la facture fk_projet integer, -- projet auquel est associee la facture
fk_account integer, -- bank account fk_account integer, -- bank account
fk_cond_reglement integer, -- condition de reglement (30 jours, fin de mois ...) fk_cond_reglement integer, -- condition de reglement (30 jours, fin de mois ...)
fk_mode_reglement integer, -- mode de reglement (CHQ, VIR, ...) fk_mode_reglement integer, -- mode de reglement (CHQ, VIR, ...)
date_lim_reglement date, -- date limite de reglement date_lim_reglement date, -- date limite de reglement
note_private text, note_private text,
note_public text, note_public text,
fk_incoterms integer, -- for incoterms
location_incoterms varchar(255), -- for incoterms
model_pdf varchar(255), model_pdf varchar(255),
import_key varchar(14), import_key varchar(14),
extraparams varchar(255) -- for stock other parameters with json format extraparams varchar(255) -- for stock other parameters with json format

4
htdocs/install/mysql/tables/llx_livraison.sql
View File

@ -39,6 +39,8 @@ create table llx_livraison
total_ht double(24,8) DEFAULT 0, total_ht double(24,8) DEFAULT 0,
note_private text, note_private text,
note_public text, note_public text,
model_pdf varchar(255) model_pdf varchar(255),
fk_incoterms integer, -- for incoterms
location_incoterms varchar(255) -- for incoterms
)ENGINE=innodb; )ENGINE=innodb;

2
htdocs/install/mysql/tables/llx_propal.sql
View File

@ -65,6 +65,8 @@ create table llx_propal
fk_shipping_method integer, -- shipping method id fk_shipping_method integer, -- shipping method id
fk_availability integer NULL, fk_availability integer NULL,
fk_input_reason integer, fk_input_reason integer,
fk_incoterms integer, -- for incoterms
location_incoterms varchar(255), -- for incoterms
import_key varchar(14), import_key varchar(14),
extraparams varchar(255), -- for stock other parameters with json format extraparams varchar(255), -- for stock other parameters with json format
fk_delivery_address integer -- delivery address (deprecated) fk_delivery_address integer -- delivery address (deprecated)

2
htdocs/install/mysql/tables/llx_societe.sql
View File

@ -70,6 +70,8 @@ create table llx_societe
fournisseur tinyint DEFAULT 0, -- fournisseur 0/1 fournisseur tinyint DEFAULT 0, -- fournisseur 0/1
supplier_account varchar(32), -- compte client chez un fournisseur supplier_account varchar(32), -- compte client chez un fournisseur
fk_prospectlevel varchar(12), -- prospect level (in llx_c_prospectlevel) fk_prospectlevel varchar(12), -- prospect level (in llx_c_prospectlevel)
fk_incoterms integer, -- for incoterms
location_incoterms varchar(255), -- for incoterms
customer_bad tinyint DEFAULT 0, -- mauvais payeur 0/1 customer_bad tinyint DEFAULT 0, -- mauvais payeur 0/1
customer_rate real DEFAULT 0, -- taux fiabilite client (0 a 1) customer_rate real DEFAULT 0, -- taux fiabilite client (0 a 1)
supplier_rate real DEFAULT 0, -- taux fiabilite fournisseur (0 a 1) supplier_rate real DEFAULT 0, -- taux fiabilite fournisseur (0 a 1)