Fix bug for PGSQL Migration 3.4->3.5

Fix bug on create invoice from contract
Dolibarr · Jun 27, 2013 · 1580f92 · 1580f92
1 parent f02fa8a
commit 1580f92
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
@@ -315,7 +315,7 @@
 						}
 
 						//Extrafields
-						if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+						if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)  && method_exists($lines[$i],'fetch_optionals') ) // For avoid conflicts if trigger used
 						{
 							$lines[$i]->fetch_optionals($lines[$i]->rowid);
 							$array_option=$lines[$i]->array_options;

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
@@ -1008,12 +1008,12 @@
 										$fk_parent_line = 0;
 									}
 
-								//Extrafields
-								if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-								{
-									$lines[$i]->fetch_optionals($lines[$i]->rowid);
-									$array_option=$lines[$i]->array_options;
-								}
+									//Extrafields
+									if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i],'fetch_optionals'))
+									{
+										$lines[$i]->fetch_optionals($lines[$i]->rowid);
+										$array_option=$lines[$i]->array_options;
+									}
 
 									$result = $object->addline(
 										$id,

diff --git a/htdocs/install/mysql/migration/3.4.0-3.5.0.sql b/htdocs/install/mysql/migration/3.4.0-3.5.0.sql
@@ -66,4 +66,4 @@ ALTER TABLE llx_propaldet_extrafields ADD INDEX idx_propaldet_extrafields (fk_ob
 DROP table llx_adherent_options;
 DROP table llx_adherent_options_label;
 
-ALTER TABLE `llx_user` ADD `accountancy_code` VARCHAR( 24 ) NULL;
+ALTER TABLE llx_user ADD accountancy_code VARCHAR( 24 ) NULL;