diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php index 9227d9a1cfd..038b4be27a6 100644 --- a/htdocs/core/lib/admin.lib.php +++ b/htdocs/core/lib/admin.lib.php @@ -1689,8 +1689,11 @@ function phpinfo_array() { ob_start(); phpinfo(); + $phpinfostring = ob_get_contents(); + ob_end_clean(); + $info_arr = array(); - $info_lines = explode("\n", strip_tags(ob_get_clean(), "

")); // end of ob_start() + $info_lines = explode("\n", strip_tags($phpinfostring, "

")); $cat = "General"; foreach ($info_lines as $line) { diff --git a/htdocs/product/inventory/lib/inventory.lib.php b/htdocs/product/inventory/lib/inventory.lib.php index da2b626ab5c..47fa1e53510 100644 --- a/htdocs/product/inventory/lib/inventory.lib.php +++ b/htdocs/product/inventory/lib/inventory.lib.php @@ -73,48 +73,3 @@ function inventoryPrepareHead(&$inventory, $title = 'Inventory', $get = '') array(dol_buildpath('/product/inventory/inventory.php?id='.$inventory->id.$get, 1), $langs->trans('Inventory'), 'inventory') ); } - - - -/** - * Define head array for tabs of inventory tools setup pages - * - * @param Inventory $inventory Object inventory - * - * @return string html of products - */ -function inventorySelectProducts(&$inventory) -{ - global $conf, $db, $langs; - - $except_product_id = array(); - - foreach ($inventory->Inventorydet as $Inventorydet) - { - $except_product_id[] = $Inventorydet->fk_product; - } - - ob_start(); - $form = new Form($db); - $form->select_produits(-1, 'fk_product'); - - $TChildWarehouses = array($inventory->fk_warehouse); - $e = new Entrepot($db); - $e->fetch($inventory->fk_warehouse); - if (method_exists($e, 'get_children_warehouses')) $e->get_children_warehouses($e->id, $TChildWarehouses); - - $Tab = array(); - $sql = 'SELECT rowid, label - FROM '.MAIN_DB_PREFIX.'entrepot WHERE rowid IN('.implode(', ', $TChildWarehouses).')'; - if (method_exists($e, 'get_children_warehouses')) $sql .= ' ORDER BY fk_parent'; - $resql = $db->query($sql); - while ($res = $db->fetch_object($resql)) { - $Tab[$res->rowid] = $res->label; - } - print '   '; - print $langs->trans('Warehouse').' : '.$form::selectarray('fk_warehouse', $Tab); - - $select_html = ob_get_clean(); - - return $select_html; -} diff --git a/htdocs/takepos/send.php b/htdocs/takepos/send.php index ba1e3f5e5ad..f618b260db1 100644 --- a/htdocs/takepos/send.php +++ b/htdocs/takepos/send.php @@ -60,10 +60,12 @@ if ($action=="send") $model_id = $conf->global->TAKEPOS_EMAIL_TEMPLATE_INVOICE; $arraydefaultmessage = $formmail->getEMailTemplate($db, 'facture_send', $user, $outputlangs, $model_id); $subject = $arraydefaultmessage->topic; + ob_start(); // turn on output receipt include 'receipt.php'; $receipt = ob_get_contents(); // get the contents of the output buffer ob_end_clean(); + $msg="".$arraydefaultmessage->content."
".$receipt.""; $sendto=$email; $from=$mysoc->email;