Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch 'develop' of github.com:atm-maxime/dolibarr into develop

Browse Source
This commit is contained in:
Maxime Kohlhaas
2015-04-18 10:43:11 +02:00
parent 7aba52c810 07fd6a3ae7
commit 1fa43379c9
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
View File

@@ -1177,3 +1177,5 @@ ALTER TABLE llx_extrafields ADD COLUMN list integer DEFAULT 0 after perms;
-- IVORY COST (id country=21) -- IVORY COST (id country=21)
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (211, 21, '0','0',0,0,0,0,'IVA Rate 0',1); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (211, 21, '0','0',0,0,0,0,'IVA Rate 0',1);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (212, 21, '18','0',7.5,2,0,0,'IVA standard rate',1); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (212, 21, '18','0',7.5,2,0,0,'IVA standard rate',1);
ALTER TABLE llx_livraison MODIFY COLUMN date_delivery DATETIME NULL DEFAULT NULL;

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

@@ -33,7 +33,7 @@ create table llx_livraison
fk_user_author integer, -- createur du bon de livraison fk_user_author integer, -- createur du bon de livraison
date_valid datetime, -- date de validation date_valid datetime, -- date de validation
fk_user_valid integer, -- valideur du bon de livraison fk_user_valid integer, -- valideur du bon de livraison
date_delivery date DEFAULT NULL, -- delivery date date_delivery datetime DEFAULT NULL, -- delivery date
fk_address integer, -- delivery address (deprecated) fk_address integer, -- delivery address (deprecated)
fk_statut smallint DEFAULT 0, fk_statut smallint DEFAULT 0,
total_ht double(24,8) DEFAULT 0, total_ht double(24,8) DEFAULT 0,