Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur
2015-03-14 14:30:09 +01:00
parent 44d6bdb1c5 ecbee5d4dc
commit c06ff8acd9
10 changed files with 165 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,5 +40,6 @@ create table llx_product_fournisseur_price
info_bits integer NOT NULL DEFAULT 0,
fk_user integer,
fk_supplier_price_expression integer, -- Link to the rule for dynamic price calculation
import_key varchar(14) -- Import key
import_key varchar(14), -- Import key
delivery_time_days integer
)ENGINE=innodb;

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

@@ -22,7 +22,7 @@ create table llx_projet_task_time
fk_task integer NOT NULL,
task_date date, -- only the day
task_datehour datetime, -- day + hour
task_date_withhour integer DEFAULT 0; -- 0 by default, 1 if date was entered with start hour
task_date_withhour integer DEFAULT 0, -- 0 by default, 1 if date was entered with start hour
task_duration double,
fk_user integer,
thm double(24,8),