From 084efd03a3d7e365ac44aff32961744d874b949f Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Fri, 24 Aug 2012 17:26:36 +0200
Subject: [PATCH 1/4] Fix: Bad assignation of const for pdf delivery module
 name

---
 htdocs/core/modules/modExpedition.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index 235c80e873f..a95dd9eac0e 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -211,8 +211,8 @@ class modExpedition extends DolibarrModules
 		$sql = array(
 			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND entity = ".$conf->entity,
 			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','shipping',".$conf->entity.")",
-			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[1][2]."' AND entity = ".$conf->entity,
-			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[1][2]."','delivery',".$conf->entity.")",
+			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[2][2]."' AND entity = ".$conf->entity,
+			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[2][2]."','delivery',".$conf->entity.")",
 		);
 
 		return $this->_init($sql,$options);

From 0dafeb8e443773e68fa4fd85329c12783df83063 Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Fri, 24 Aug 2012 17:30:22 +0200
Subject: [PATCH 2/4] Fix: Bad assignation of const for pdf delivery module
 name

---
 htdocs/install/mysql/migration/repair.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 99a91bab00a..4494fdfaf3e 100644
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -47,6 +47,8 @@ UPDATE llx_product SET canvas = NULL where canvas = 'default@product';
 
 DELETE FROM llx_boxes where box_id NOT IN (SELECT rowid FROM llx_boxes_def);
 
+DELETE FROM  llx_document_model WHERE nom ='elevement' AND type='delivery';
+
 -- VMYSQL4.1 DELETE T1 FROM llx_boxes_def as T1, llx_boxes_def as T2 where T1.entity = T2.entity AND T1.file = T2.file AND T1.note = T2.note and T1.rowid > T2.rowid
 -- VPGSQL8.2 DELETE FROM llx_boxes_def as T1 WHERE rowid NOT IN (SELECT min(rowid) FROM llx_boxes_def GROUP BY file, entity, note)
 

From bc2411098c4c7f397c775484e190884a38ec34d5 Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Fri, 24 Aug 2012 17:45:44 +0200
Subject: [PATCH 3/4] Fix: Bad assignation of const for pdf delivery module
 name

---
 htdocs/install/mysql/migration/repair.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 4494fdfaf3e..b68f4aa1bd6 100644
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -47,7 +47,7 @@ UPDATE llx_product SET canvas = NULL where canvas = 'default@product';
 
 DELETE FROM llx_boxes where box_id NOT IN (SELECT rowid FROM llx_boxes_def);
 
-DELETE FROM  llx_document_model WHERE nom ='elevement' AND type='delivery';
+UPDATE llx_document_model SET nom='typhon' WHERE nom ='elevement' AND type='delivery';
 
 -- VMYSQL4.1 DELETE T1 FROM llx_boxes_def as T1, llx_boxes_def as T2 where T1.entity = T2.entity AND T1.file = T2.file AND T1.note = T2.note and T1.rowid > T2.rowid
 -- VPGSQL8.2 DELETE FROM llx_boxes_def as T1 WHERE rowid NOT IN (SELECT min(rowid) FROM llx_boxes_def GROUP BY file, entity, note)

From fef04f69213ab64f3a4df2c47e8f8b6bac46e290 Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Fri, 24 Aug 2012 18:03:03 +0200
Subject: [PATCH 4/4] Fix: Bad assignation of const for pdf delivery module
 name

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index a3c7069876c..3310347ae10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,7 +28,7 @@ English Dolibarr ChangeLog
 - Fix: [ bug #503 ] Unable to delete linked file to a deposit
 - Fix: [ bug #501 ] Error while trying to modify an user
 - Fix: [ bug #506 ] Can't set percentage of a started event
-
+- Fix: Bad assignation of const for pdf delivery module name
 
 ***** ChangeLog for 3.2.0 compared to 3.1.3 *****
 WARNING: PHP lower than 5.x are no more supported.