Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-11 12:01:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dinamic-prices-product' of

Browse Source 
https://github.com/IonAgorria/dolibarr into
IonAgorria-dinamic-prices-product

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/fournisseurs.php
This commit is contained in:
Laurent Destailleur
2015-01-31 14:53:14 +01:00
parent 0aab43c728 2c01370ce6
commit 1c7feb67ea
16 changed files with 503 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
View File

@@ -18,14 +18,20 @@
-- -- VPGSQL8.2 DELETE FROM llx_usergroup_user WHERE fk_user NOT IN (SELECT rowid from llx_user);
-- -- VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
--create table for price expressions and add column in product supplier
create table llx_c_price_expression
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
title varchar(20) NOT NULL,
expression varchar(80) NOT NULL
rowid integer AUTO_INCREMENT PRIMARY KEY,
title varchar(20) NOT NULL,
expression varchar(80) NOT NULL
)ENGINE=innodb;
ALTER TABLE llx_product_fournisseur_price ADD COLUMN fk_supplier_price_expression integer DEFAULT NULL;
ALTER TABLE llx_product ADD COLUMN fk_price_expression integer DEFAULT NULL;
ALTER TABLE llx_product_price ADD COLUMN fk_price_expression integer DEFAULT NULL;
--create table for user conf of printing driver
CREATE TABLE llx_printing
(

1
htdocs/install/mysql/tables/llx_product.sql Normal file → Executable file
View File

@@ -76,5 +76,6 @@ create table llx_product
finished tinyint DEFAULT NULL,
hidden tinyint DEFAULT 0, -- Not used. Deprecated.
import_key varchar(14), -- Import key
fk_price_expression integer, -- Link to the rule for dynamic price calculation
desiredstock integer DEFAULT 0
)ENGINE=innodb;

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

@@ -39,6 +39,6 @@ create table llx_product_fournisseur_price
tva_tx double(6,3) NOT NULL,
info_bits integer NOT NULL DEFAULT 0,
fk_user integer,
fk_price_expression integer, -- Link to the rule for dynamic amount calculation
fk_supplier_price_expression integer, -- Link to the rule for dynamic price calculation
import_key varchar(14) -- Import key
)ENGINE=innodb;

1
htdocs/install/mysql/tables/llx_product_price.sql Normal file → Executable file
View File

@@ -38,6 +38,7 @@ create table llx_product_price
fk_user_author integer,
tosell tinyint DEFAULT 1,
price_by_qty integer NOT NULL DEFAULT 0,
fk_price_expression integer, -- Link to the rule for dynamic price calculation
import_key varchar(14)
)ENGINE=innodb;