From 6e10dd3cce61650f330591b6ee48bdd1b1c6ebcd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 22 Feb 2015 17:10:13 +0100
Subject: [PATCH] Trad

---
 htdocs/install/mysql/migration/3.7.0-3.8.0.sql | 7 +++++++
 htdocs/langs/en_US/main.lang                   | 1 +
 2 files changed, 8 insertions(+)

diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
index 4a71995133c..fb644e5b9a7 100755
--- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
+++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
@@ -19,6 +19,12 @@
 -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 
 
+ALTER TABLE llx_commande_fournisseur MODIFY COLUMN date_livraison datetime; 
+
+-- Add id commandefourndet in llx_commande_fournisseur_dispatch to correct /fourn/commande/dispatch.php display when several times same product in supplier order
+ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN fk_commandefourndet INT(11) NOT NULL DEFAULT '0' AFTER fk_product;
+
+
 -- Remove menu entries of removed or renamed modules
 DELETE FROM llx_menu where module = 'printipp';
 
@@ -190,3 +196,4 @@ CREATE TABLE llx_expensereport_det
 
 ALTER TABLE llx_projet ADD COLUMN budget_amount double(24,8);
 
+
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index d7e82aa43b8..0b5347f6e38 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -141,6 +141,7 @@ Cancel=Cancel
 Modify=Modify
 Edit=Edit
 Validate=Validate
+ValidateAndApprove=Validate and Approve
 ToValidate=To validate
 Save=Save
 SaveAs=Save As
-- 
GitLab