Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

additional fields for margin modules #211

Closed
wants to merge 1 commit into from
Closed

additional fields for margin modules #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion htdocs/install/mysql/migration/3.2.0-3.3.0.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,19 @@ INSERT INTO llx_c_input_reason (rowid,code,label,active) VALUES (10, 'SRC_EMPLOY
ALTER TABLE llx_commande_fournisseur CHANGE COLUMN date_cloture date_approve datetime;
ALTER TABLE llx_commande_fournisseur CHANGE COLUMN fk_user_cloture fk_user_approve integer;

ALTER TABLE llx_mailing MODIFY COLUMN body mediumtext;
ALTER TABLE llx_mailing MODIFY COLUMN body mediumtext;

alter table llx_propaldet add column fk_fournprice int(11) after info_bits;
alter table llx_propaldet add column pa_ht double(24,8) after fk_fournprice;
alter table llx_propaldet add column marge_tx double(6,3) after pa_ht;
alter table llx_propaldet add column marque_tx double(6,3) after marge_tx;

alter table llx_commandedet add column fk_fournprice int(11) after info_bits;
alter table llx_commandedet add column pa_ht double(24,8) after fk_fournprice;
alter table llx_commandedet add column marge_tx double(6,3) after pa_ht;
alter table llx_commandedet add column marque_tx double(6,3) after marge_tx;

alter table llx_facturedet add column fk_fournprice int(11) after info_bits;
alter table llx_facturedet add column pa_ht double(24,8) after fk_fournprice;
alter table llx_facturedet add column marge_tx double(6,3) after pa_ht;
alter table llx_facturedet add column marque_tx double(6,3) after marge_tx;
9 changes: 7 additions & 2 deletions htdocs/install/mysql/tables/llx_commandedet.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
-- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2006-2009 Laurent Destailleur <eldy@users.sourceforge.net>
-- Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
-- Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
--
-- 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
Expand Down Expand Up @@ -43,8 +44,12 @@ create table llx_commandedet
date_start datetime DEFAULT NULL, -- date debut si service
date_end datetime DEFAULT NULL, -- date fin si service
info_bits integer DEFAULT 0, -- TVA NPR ou non
marge_tx double(6,3) DEFAULT 0, -- taux de marge (marge sur prix d'achat)
marque_tx double(6,3) DEFAULT 0, -- taux de marque (marge sur prix de vente)

fk_fournprice int(11) DEFAULT NULL, -- r�f�rence prix fournisseur
pa_ht double(24,8) DEFAULT 0, -- prix d'achat HT
marge_tx double(6,3) DEFAULT 0, -- taux de marge (marge sur prix d'achat)
marque_tx double(6,3) DEFAULT 0, -- taux de marque (marge sur prix de vente)

special_code integer UNSIGNED DEFAULT 0, -- code pour les lignes speciales
rang integer DEFAULT 0,
import_key varchar(14)
Expand Down
7 changes: 7 additions & 0 deletions htdocs/install/mysql/tables/llx_facturedet.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
-- Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
-- Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr>
-- Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
-- Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
--
-- 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
Expand Down Expand Up @@ -45,6 +46,12 @@ create table llx_facturedet
date_start datetime DEFAULT NULL, -- date debut si service
date_end datetime DEFAULT NULL, -- date fin si service
info_bits integer DEFAULT 0, -- TVA NPR ou non

fk_fournprice int(11) DEFAULT NULL, -- r�f�rence prix fournisseur
pa_ht double(24,8) DEFAULT 0, -- prix d'achat HT
marge_tx double(6,3) DEFAULT 0, -- taux de marge (marge sur prix d'achat)
marque_tx double(6,3) DEFAULT 0, -- taux de marque (marge sur prix de vente)

fk_code_ventilation integer DEFAULT 0 NOT NULL,
fk_export_compta integer DEFAULT 0 NOT NULL,
special_code integer UNSIGNED DEFAULT 0, -- code pour les lignes speciales
Expand Down
3 changes: 3 additions & 0 deletions htdocs/install/mysql/tables/llx_propaldet.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
-- Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr>
-- Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
-- Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
--
-- 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
Expand Down Expand Up @@ -44,6 +45,8 @@ create table llx_propaldet
date_end datetime DEFAULT NULL, -- date fin si service
info_bits integer DEFAULT 0, -- TVA NPR ou non


fk_fournprice int(11) DEFAULT NULL, -- r�f�rence prix fournisseur
pa_ht double(24,8) DEFAULT 0, -- prix d'achat HT
marge_tx double(6,3) DEFAULT 0, -- taux de marge (marge sur prix d'achat)
marque_tx double(6,3) DEFAULT 0, -- taux de marque (marge sur prix de vente)
Expand Down