diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php index dc3b715fc21..99f52dbad1f 100644 --- a/htdocs/admin/menus/index.php +++ b/htdocs/admin/menus/index.php @@ -2,6 +2,7 @@ /* Copyright (C) 2007 Patrick Raguin * Copyright (C) 2007-2012 Laurent Destailleur * Copyright (C) 2009-2012 Regis Houssin + * Copyright (C) 2019 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -256,7 +257,7 @@ if ($action == 'delete') print '
'; print ''; print $langs->trans("MenuHandler").': '; -print $formadmin->select_menu_families($menu_handler.(preg_match('/_menu/', $menu_handler)?'':'_menu'), 'menu_handler', array_merge($dirstandard, $dirsmartphone)); +$formadmin->select_menu_families($menu_handler.(preg_match('/_menu/', $menu_handler)?'':'_menu'), 'menu_handler', array_merge($dirstandard, $dirsmartphone)); print '   '; print '
'; diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index c3ac6c18d80..887c1d9993e 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -8,7 +8,7 @@ * Copyright (C) 2014 Raphaël Doursenaud * Copyright (C) 2014 Teddy Andreotti <125155@supinfo.com> * Copyright (C) 2015 Juanjo Menent - * Copyright (C) 2018 Frédéric France + * Copyright (C) 2018-2019 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -763,7 +763,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie { // Print total print ''; - print ''.$langs->trans('TotalTTC').''; + print ''.$langs->trans('TotalTTC').''; if (!empty($conf->multicurrency->enabled)) { print ''; print ''; diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php index 8928be1d626..4191563eaec 100644 --- a/htdocs/contact/consumption.php +++ b/htdocs/contact/consumption.php @@ -322,18 +322,15 @@ if (!empty($sql_select)) $sql.=")"; } $sql.= $db->order($sortfield, $sortorder); -//print ($sql);exit; $resql=$db->query($sql); $totalnboflines = $db->num_rows($resql); $sql.= $db->plimit($limit + 1, $offset); - //print $sql; } $disabled=0; $showempty=2; -if (empty($elementTypeArray) && ! $object->client && ! $object->fournisseur) -{ +if (empty($elementTypeArray) && ! $object->thirdparty->client && ! $object->thirdparty->fournisseur) { $showempty=$langs->trans("ThirdpartyNotCustomerNotSupplierSoNoRef"); $disabled=1; } @@ -491,9 +488,8 @@ if ($sql_select) $description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($objp->description)); } - if (($objp->info_bits & 2) == 2) { ?> - - info_bits & 2) == 2) { + print ''; $txt=''; print img_object($langs->trans("ShowReduc"), 'reduc').' '; if ($objp->description == '(DEPOSIT)') $txt=$langs->trans("Deposit"); @@ -501,9 +497,7 @@ if ($sql_select) elseif ($objp->description == '(EXCESS PAID)') $txt=$langs->trans("ExcessPaid"); //else $txt=$langs->trans("Discount"); print $txt; - ?> - - '; if ($objp->description) { if ($objp->description == '(CREDIT_NOTE)' && $objp->fk_remise_except > 0) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 5c765953b3c..8d5f496a6f5 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -2123,5 +2123,20 @@ if (! function_exists("llxFooter")) print "\n"; print "\n"; - } + + ?> + + +