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

Merge pull request #1069 from FHenry/develop

Browse Source 
Fix bug for PGSQL Migration 3.4->3.5
This commit is contained in:
Laurent Destailleur
2013-06-27 02:23:20 -07:00
parent f02fa8a41d 1580f92b11
commit 115e780952
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/commande/fiche.php
View File

@@ -315,7 +315,7 @@ else if ($action == 'add' && $user->rights->commande->creer)
}
//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;

12
htdocs/compta/facture.php
View File

@@ -1008,12 +1008,12 @@ else if ($action == 'add' && $user->rights->facture->creer)
$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,

2
htdocs/install/mysql/migration/3.4.0-3.5.0.sql
View File

@@ -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;