Update database

This commit is contained in:
Alexandre SPANGARO 2017-10-31 22:04:50 +01:00
parent da1afa80cf
commit cc26095467
2 changed files with 71 additions and 66 deletions

View File

@ -473,3 +473,6 @@ UPDATE llx_accounting_system SET fk_country = 12 WHERE pcg_version = 'PCG';
-- May have error due to duplicate keys -- May have error due to duplicate keys
ALTER TABLE llx_resource ADD UNIQUE INDEX uk_resource_ref (ref, entity); ALTER TABLE llx_resource ADD UNIQUE INDEX uk_resource_ref (ref, entity);
ALTER TABLE llx_product ADD COLUMN accountancy_code_sell_intra varchar(32) AFTER accountancy_code_sell;
ALTER TABLE llx_product ADD COLUMN accountancy_code_sell_export varchar(32) AFTER accountancy_code_sell_intra;

View File

@ -23,73 +23,75 @@
create table llx_product create table llx_product
( (
rowid integer AUTO_INCREMENT PRIMARY KEY, rowid integer AUTO_INCREMENT PRIMARY KEY,
ref varchar(128) NOT NULL, ref varchar(128) NOT NULL,
entity integer DEFAULT 1 NOT NULL, -- Multi company id entity integer DEFAULT 1 NOT NULL, -- Multi company id
ref_ext varchar(128), -- reference into an external system (not used by dolibarr) ref_ext varchar(128), -- reference into an external system (not used by dolibarr)
datec datetime, datec datetime,
tms timestamp, tms timestamp,
fk_parent integer DEFAULT 0, -- Not used. Used by external modules. Virtual product id fk_parent integer DEFAULT 0, -- Not used. Used by external modules. Virtual product id
label varchar(255) NOT NULL, label varchar(255) NOT NULL,
description text, description text,
note_public text, note_public text,
note text, note text,
customcode varchar(32), -- Optionnal custom code customcode varchar(32), -- Optionnal custom code
fk_country integer DEFAULT NULL, -- Optionnal id of original country fk_country integer DEFAULT NULL, -- Optionnal id of original country
price double(24,8) DEFAULT 0, price double(24,8) DEFAULT 0,
price_ttc double(24,8) DEFAULT 0, price_ttc double(24,8) DEFAULT 0,
price_min double(24,8) DEFAULT 0, price_min double(24,8) DEFAULT 0,
price_min_ttc double(24,8) DEFAULT 0, price_min_ttc double(24,8) DEFAULT 0,
price_base_type varchar(3) DEFAULT 'HT', price_base_type varchar(3) DEFAULT 'HT',
cost_price double(24,8) DEFAULT NULL, -- Cost price without tax. Can be used for margin calculation. cost_price double(24,8) DEFAULT NULL, -- Cost price without tax. Can be used for margin calculation.
default_vat_code varchar(10), -- Same code than into table llx_c_tva (but no constraints). Should be used in priority to find default vat, npr, localtaxes for product. default_vat_code varchar(10), -- Same code than into table llx_c_tva (but no constraints). Should be used in priority to find default vat, npr, localtaxes for product.
tva_tx double(6,3), -- Default VAT rate of product tva_tx double(6,3), -- Default VAT rate of product
recuperableonly integer NOT NULL DEFAULT '0', -- French NPR VAT recuperableonly integer NOT NULL DEFAULT '0', -- French NPR VAT
localtax1_tx double(6,3) DEFAULT 0, -- localtax1_tx double(6,3) DEFAULT 0,
localtax1_type varchar(10) NOT NULL DEFAULT '0', -- localtax1_type varchar(10) NOT NULL DEFAULT '0',
localtax2_tx double(6,3) DEFAULT 0, -- localtax2_tx double(6,3) DEFAULT 0,
localtax2_type varchar(10) NOT NULL DEFAULT '0', -- localtax2_type varchar(10) NOT NULL DEFAULT '0',
fk_user_author integer DEFAULT NULL, -- user making creation fk_user_author integer DEFAULT NULL, -- user making creation
fk_user_modif integer, -- user making last change fk_user_modif integer, -- user making last change
tosell tinyint DEFAULT 1, -- Product you sell tosell tinyint DEFAULT 1, -- Product you sell
tobuy tinyint DEFAULT 1, -- Product you buy tobuy tinyint DEFAULT 1, -- Product you buy
onportal tinyint DEFAULT 0, -- If it is a product you sell and you want to sell it on portal (module website must be on) onportal tinyint DEFAULT 0, -- If it is a product you sell and you want to sell it on portal (module website must be on)
tobatch tinyint DEFAULT 0 NOT NULL, -- Is it a product that need a batch management (eat-by or lot management) tobatch tinyint DEFAULT 0 NOT NULL, -- Is it a product that need a batch management (eat-by or lot management)
fk_product_type integer DEFAULT 0, -- Type of product: 0 for regular product, 1 for service, 9 for other (used by external module) fk_product_type integer DEFAULT 0, -- Type of product: 0 for regular product, 1 for service, 9 for other (used by external module)
duration varchar(6), duration varchar(6),
seuil_stock_alerte integer DEFAULT NULL, seuil_stock_alerte integer DEFAULT NULL,
url varchar(255), url varchar(255),
barcode varchar(255) DEFAULT NULL, -- barcode barcode varchar(255) DEFAULT NULL, -- barcode
fk_barcode_type integer DEFAULT NULL, -- barcode type fk_barcode_type integer DEFAULT NULL, -- barcode type
accountancy_code_sell varchar(32), -- Selling accountancy code accountancy_code_sell varchar(32), -- Selling accountancy code
accountancy_code_buy varchar(32), -- Buying accountancy code accountancy_code_sell_intra varchar(32), -- Selling accountancy code for vat intracommunity
partnumber varchar(32), -- Part/Serial number. TODO To use it into screen if not a duplicate of barcode. accountancy_code_sell_export varchar(32), -- Selling accountancy code for vat export
weight float DEFAULT NULL, accountancy_code_buy varchar(32), -- Buying accountancy code
weight_units tinyint DEFAULT NULL, partnumber varchar(32), -- Part/Serial number. TODO To use it into screen if not a duplicate of barcode.
length float DEFAULT NULL, weight float DEFAULT NULL,
length_units tinyint DEFAULT NULL, weight_units tinyint DEFAULT NULL,
width float DEFAULT NULL, length float DEFAULT NULL,
width_units tinyint DEFAULT NULL, length_units tinyint DEFAULT NULL,
height float DEFAULT NULL, width float DEFAULT NULL,
height_units tinyint DEFAULT NULL, width_units tinyint DEFAULT NULL,
surface float DEFAULT NULL, height float DEFAULT NULL,
surface_units tinyint DEFAULT NULL, height_units tinyint DEFAULT NULL,
volume float DEFAULT NULL, surface float DEFAULT NULL,
volume_units tinyint DEFAULT NULL, surface_units tinyint DEFAULT NULL,
stock real, -- Current physical stock (dernormalized field) volume float DEFAULT NULL,
pmp double(24,8) DEFAULT 0 NOT NULL, -- To store valuation of stock calculated using average price method, for this product volume_units tinyint DEFAULT NULL,
fifo double(24,8), -- To store valuation of stock calculated using fifo method, for this product. TODO Not used, should be replaced by stock value stored into movement table. stock real, -- Current physical stock (dernormalized field)
lifo double(24,8), -- To store valuation of stock calculated using lifo method, for this product. TODO Not used, should be replaced by stock value stored into movement table. pmp double(24,8) DEFAULT 0 NOT NULL, -- To store valuation of stock calculated using average price method, for this product
canvas varchar(32) DEFAULT NULL, fifo double(24,8), -- To store valuation of stock calculated using fifo method, for this product. TODO Not used, should be replaced by stock value stored into movement table.
finished tinyint DEFAULT NULL, -- 1=manufactured product, 0=matiere premiere lifo double(24,8), -- To store valuation of stock calculated using lifo method, for this product. TODO Not used, should be replaced by stock value stored into movement table.
hidden tinyint DEFAULT 0, -- Not used. Deprecated. canvas varchar(32) DEFAULT NULL,
import_key varchar(14), -- Import key finished tinyint DEFAULT NULL, -- 1=manufactured product, 0=matiere premiere
model_pdf varchar(255), -- model save dodument used hidden tinyint DEFAULT 0, -- Not used. Deprecated.
fk_price_expression integer, -- Link to the rule for dynamic price calculation import_key varchar(14), -- Import key
desiredstock integer DEFAULT 0, model_pdf varchar(255), -- model save dodument used
fk_unit integer DEFAULT NULL, fk_price_expression integer, -- Link to the rule for dynamic price calculation
price_autogen TINYINT DEFAULT 0 desiredstock integer DEFAULT 0,
fk_unit integer DEFAULT NULL,
price_autogen tinyint DEFAULT 0
)ENGINE=innodb; )ENGINE=innodb;