From ded5d47afc94d884db06c36fad65fdc317114c24 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 12 Mar 2014 01:21:18 +0100 Subject: [PATCH] Fix: multilangs array was not loaded. --- htdocs/contrat/fiche.php | 4 +++- htdocs/core/lib/sendings.lib.php | 6 +++++- htdocs/expedition/shipment.php | 8 ++++++-- htdocs/fichinter/fiche.php | 4 +++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index e6396776168..891fc35e6f4 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -262,7 +262,9 @@ if ($action == 'add' && $user->rights->contrat->creer) // Define output language if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) { - $prod = new Product($db, $lines[$i]->fk_product); + $prod = new Product($db); + $prod->id=$lines[$i]->fk_product; + $prod->getMultiLangs(); $outputlangs = $langs; $newlang=''; diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php index 06a89fbff80..ac625114750 100644 --- a/htdocs/core/lib/sendings.lib.php +++ b/htdocs/core/lib/sendings.lib.php @@ -219,7 +219,11 @@ function show_list_sending_receive($origin,$origin_id,$filter='') $object = new $origin($db); $object->fetch($origin_id); $object->fetch_thirdparty(); - $prod = new Product($db, $objp->fk_product); + + $prod = new Product($db); + $prod->id=$objp->fk_product; + $prod->getMultiLangs(); + $outputlangs = $langs; $newlang=''; if (empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id']; diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php index 9d2c8da6351..48cf7ffc3e0 100644 --- a/htdocs/expedition/shipment.php +++ b/htdocs/expedition/shipment.php @@ -153,7 +153,7 @@ if ($id > 0 || ! empty($ref)) if ($action == 'cloture') { print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id,$langs->trans("CloseShipment"),$langs->trans("ConfirmCloseShipment"),"confirm_cloture"); - + } // Onglet commande @@ -409,7 +409,11 @@ if ($id > 0 || ! empty($ref)) if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) { $commande->fetch_thirdparty(); - $prod = new Product($db, $objp->fk_product); + + $prod = new Product($db); + $prod->id=$objp->fk_product; + $prod->getMultiLangs(); + $outputlangs = $langs; $newlang=''; if (empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id']; diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index 3bf4e2fefd0..e38e84613b0 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -226,7 +226,9 @@ else if ($action == 'add' && $user->rights->ficheinter->creer) // Define output language if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) { - $prod = new Product($db, $lines[$i]->fk_product); + $prod = new Product($db); + $prod->id=$lines[$i]->fk_product; + $prod->getMultiLangs(); $outputlangs = $langs; $newlang='';