Works on hook module

This commit is contained in:
Regis Houssin 2010-09-24 14:39:03 +00:00
parent 52c3245e8f
commit 7648e6a723
5 changed files with 21 additions and 11 deletions

View File

@ -54,3 +54,8 @@ ALTER TABLE llx_actioncomm ADD COLUMN fk_supplier_invoice integer;
ALTER TABLE llx_tmp_caisse MODIFY fk_article integer NOT NULL;
ALTER TABLE llx_propaldet ADD COLUMN fk_parent_line integer NULL AFTER fk_propal;
ALTER TABLE llx_commandedet ADD COLUMN fk_parent_line integer NULL AFTER fk_commande;
ALTER TABLE llx_facturedet ADD COLUMN fk_parent_line integer NULL AFTER fk_facture;
ALTER TABLE llx_facturedet_rec ADD COLUMN fk_parent_line integer NULL AFTER fk_facture;

View File

@ -23,8 +23,9 @@
create table llx_commandedet
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
fk_commande integer,
fk_product integer,
fk_commande integer NOT NULL,
fk_parent_line integer NULL,
fk_product integer NULL,
description text,
tva_tx double(6,3), -- vat rate
localtax1_tx double(6,3), -- localtax1 rate

View File

@ -26,6 +26,7 @@ create table llx_facturedet
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
fk_facture integer NOT NULL,
fk_parent_line integer NULL,
fk_product integer NULL, -- Doit pouvoir etre nul pour ligne detail sans produits
description text,
tva_tx double(6,3), -- Taux tva produit/service (exemple 19.6)

View File

@ -25,7 +25,8 @@ create table llx_facturedet_rec
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
fk_facture integer NOT NULL,
fk_product integer,
fk_parent_line integer NULL,
fk_product integer NULL,
product_type integer DEFAULT 0,
description text,
tva_tx double(6,3) DEFAULT 19.6, -- taux tva

View File

@ -1,6 +1,7 @@
-- ===================================================================
-- Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
-- Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr>
-- Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
--
-- 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
@ -22,11 +23,12 @@
create table llx_propaldet
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
fk_propal integer,
fk_product integer,
fk_propal integer NOT NULL,
fk_parent_line integer NULL,
fk_product integer NULL,
description text,
fk_remise_except integer NULL, -- Lien vers table des remises fixes
tva_tx double(6,3) DEFAULT 0, -- taux tva
tva_tx double(6,3) DEFAULT 0, -- taux tva
localtax1_tx double(6,3) DEFAULT 0, -- localtax1 tax
localtax2_tx double(6,3) DEFAULT 0, -- localtax2 tax
qty real, -- quantity
@ -39,10 +41,10 @@ create table llx_propaldet
total_localtax1 double(24,8) DEFAULT 0, -- Total localtax1
total_localtax2 double(24,8) DEFAULT 0, -- Total localtax2
total_ttc double(24,8) DEFAULT 0, -- Total TTC de la ligne toute quantite et incluant remise ligne et globale
product_type integer DEFAULT 0,
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
product_type integer DEFAULT 0,
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
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)