Merge remote-tracking branch 'origin/3.7' into develop

Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/admin.lang
	htdocs/projet/index.php
This commit is contained in:
Laurent Destailleur
2015-03-01 16:13:22 +01:00
6 changed files with 95 additions and 57 deletions

View File

@@ -31,10 +31,10 @@ create table llx_projet_task
datev datetime, -- date validation
label varchar(255) NOT NULL,
description text,
duration_effective real DEFAULT 0 NOT NULL,
planned_workload real DEFAULT 0 NOT NULL,
progress integer DEFAULT 0, -- percentage increase
priority integer DEFAULT 0, -- priority
duration_effective real DEFAULT 0,
planned_workload real DEFAULT 0,
progress integer DEFAULT 0, -- percentage increase
priority integer DEFAULT 0, -- priority
fk_user_creat integer, -- user who created the task
fk_user_valid integer, -- user who validated the task
fk_statut smallint DEFAULT 0 NOT NULL,