diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql index 9d37b981fed..b3554695926 100644 --- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql +++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql @@ -473,3 +473,6 @@ UPDATE llx_accounting_system SET fk_country = 12 WHERE pcg_version = 'PCG'; -- May have error due to duplicate keys 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; diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql index 04267d22d3a..64dcebe4616 100755 --- a/htdocs/install/mysql/tables/llx_product.sql +++ b/htdocs/install/mysql/tables/llx_product.sql @@ -23,73 +23,75 @@ create table llx_product ( - rowid integer AUTO_INCREMENT PRIMARY KEY, - ref varchar(128) NOT NULL, - entity integer DEFAULT 1 NOT NULL, -- Multi company id + rowid integer AUTO_INCREMENT PRIMARY KEY, + ref varchar(128) NOT NULL, + 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, - tms timestamp, - fk_parent integer DEFAULT 0, -- Not used. Used by external modules. Virtual product id + datec datetime, + tms timestamp, + fk_parent integer DEFAULT 0, -- Not used. Used by external modules. Virtual product id - label varchar(255) NOT NULL, - description text, - note_public text, - note text, - customcode varchar(32), -- Optionnal custom code - fk_country integer DEFAULT NULL, -- Optionnal id of original country - price double(24,8) DEFAULT 0, - price_ttc double(24,8) DEFAULT 0, - price_min double(24,8) DEFAULT 0, - price_min_ttc double(24,8) DEFAULT 0, - price_base_type varchar(3) DEFAULT 'HT', - 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. - tva_tx double(6,3), -- Default VAT rate of product - recuperableonly integer NOT NULL DEFAULT '0', -- French NPR VAT - localtax1_tx double(6,3) DEFAULT 0, -- - localtax1_type varchar(10) NOT NULL DEFAULT '0', -- - localtax2_tx double(6,3) DEFAULT 0, -- - localtax2_type varchar(10) NOT NULL DEFAULT '0', -- - fk_user_author integer DEFAULT NULL, -- user making creation - fk_user_modif integer, -- user making last change - tosell tinyint DEFAULT 1, -- Product you sell - 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) - 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) - duration varchar(6), - seuil_stock_alerte integer DEFAULT NULL, - url varchar(255), - barcode varchar(255) DEFAULT NULL, -- barcode - fk_barcode_type integer DEFAULT NULL, -- barcode type - accountancy_code_sell varchar(32), -- Selling accountancy code - accountancy_code_buy varchar(32), -- Buying accountancy code - partnumber varchar(32), -- Part/Serial number. TODO To use it into screen if not a duplicate of barcode. - weight float DEFAULT NULL, - weight_units tinyint DEFAULT NULL, - length float DEFAULT NULL, - length_units tinyint DEFAULT NULL, - width float DEFAULT NULL, - width_units tinyint DEFAULT NULL, - height float DEFAULT NULL, - height_units tinyint DEFAULT NULL, - surface float DEFAULT NULL, - surface_units tinyint DEFAULT NULL, - volume float DEFAULT NULL, - volume_units tinyint DEFAULT NULL, - stock real, -- Current physical stock (dernormalized field) - pmp double(24,8) DEFAULT 0 NOT NULL, -- To store valuation of stock calculated using average price method, for this product - 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. - 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. - canvas varchar(32) DEFAULT NULL, - finished tinyint DEFAULT NULL, -- 1=manufactured product, 0=matiere premiere - hidden tinyint DEFAULT 0, -- Not used. Deprecated. - import_key varchar(14), -- Import key - model_pdf varchar(255), -- model save dodument used - fk_price_expression integer, -- Link to the rule for dynamic price calculation - desiredstock integer DEFAULT 0, - fk_unit integer DEFAULT NULL, - price_autogen TINYINT DEFAULT 0 + label varchar(255) NOT NULL, + description text, + note_public text, + note text, + customcode varchar(32), -- Optionnal custom code + fk_country integer DEFAULT NULL, -- Optionnal id of original country + price double(24,8) DEFAULT 0, + price_ttc double(24,8) DEFAULT 0, + price_min double(24,8) DEFAULT 0, + price_min_ttc double(24,8) DEFAULT 0, + price_base_type varchar(3) DEFAULT 'HT', + 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. + tva_tx double(6,3), -- Default VAT rate of product + recuperableonly integer NOT NULL DEFAULT '0', -- French NPR VAT + localtax1_tx double(6,3) DEFAULT 0, + localtax1_type varchar(10) NOT NULL DEFAULT '0', + localtax2_tx double(6,3) DEFAULT 0, + localtax2_type varchar(10) NOT NULL DEFAULT '0', + fk_user_author integer DEFAULT NULL, -- user making creation + fk_user_modif integer, -- user making last change + tosell tinyint DEFAULT 1, -- Product you sell + 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) + 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) + duration varchar(6), + seuil_stock_alerte integer DEFAULT NULL, + url varchar(255), + barcode varchar(255) DEFAULT NULL, -- barcode + fk_barcode_type integer DEFAULT NULL, -- barcode type + accountancy_code_sell varchar(32), -- Selling accountancy code + accountancy_code_sell_intra varchar(32), -- Selling accountancy code for vat intracommunity + accountancy_code_sell_export varchar(32), -- Selling accountancy code for vat export + accountancy_code_buy varchar(32), -- Buying accountancy code + partnumber varchar(32), -- Part/Serial number. TODO To use it into screen if not a duplicate of barcode. + weight float DEFAULT NULL, + weight_units tinyint DEFAULT NULL, + length float DEFAULT NULL, + length_units tinyint DEFAULT NULL, + width float DEFAULT NULL, + width_units tinyint DEFAULT NULL, + height float DEFAULT NULL, + height_units tinyint DEFAULT NULL, + surface float DEFAULT NULL, + surface_units tinyint DEFAULT NULL, + volume float DEFAULT NULL, + volume_units tinyint DEFAULT NULL, + stock real, -- Current physical stock (dernormalized field) + pmp double(24,8) DEFAULT 0 NOT NULL, -- To store valuation of stock calculated using average price method, for this product + 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. + 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. + canvas varchar(32) DEFAULT NULL, + finished tinyint DEFAULT NULL, -- 1=manufactured product, 0=matiere premiere + hidden tinyint DEFAULT 0, -- Not used. Deprecated. + import_key varchar(14), -- Import key + model_pdf varchar(255), -- model save dodument used + fk_price_expression integer, -- Link to the rule for dynamic price calculation + desiredstock integer DEFAULT 0, + fk_unit integer DEFAULT NULL, + price_autogen tinyint DEFAULT 0 )ENGINE=innodb;