From 300438b290b182ccf99fc00d9b6c9df7ea734f2e Mon Sep 17 00:00:00 2001 From: atm-quentin Date: Fri, 8 Feb 2019 15:57:08 +0100 Subject: [PATCH 1/5] FIX on chrome you can send multiple form if you click more than once on button --- htdocs/main.inc.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index daa0dda21a5..02ff8cef69c 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1978,6 +1978,21 @@ if (! function_exists("llxFooter")) print "\n"; print "\n"; - } + + ?> + + + Date: Sat, 9 Feb 2019 16:35:10 +0100 Subject: [PATCH 2/5] Update paiement.php --- htdocs/compta/paiement.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ''; From 9893e8d752cbabc4700500b994b77687b55aeb09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 10 Feb 2019 23:37:12 +0100 Subject: [PATCH 3/5] Update consumption.php --- htdocs/contact/consumption.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php index 8928be1d626..9c5d82f6aa6 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; } @@ -500,10 +497,7 @@ if ($sql_select) elseif ($objp->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived"); 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) From be9cfdae85fc43b5ca83a9bcf90bccae4fb7a844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Mon, 11 Feb 2019 00:05:38 +0100 Subject: [PATCH 4/5] Update index.php --- htdocs/admin/menus/index.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 '
'; From aa206e5d7cbeec1547d9589985f0477a39447e8c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Feb 2019 13:45:38 +0100 Subject: [PATCH 5/5] Update consumption.php --- htdocs/contact/consumption.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php index 9c5d82f6aa6..4191563eaec 100644 --- a/htdocs/contact/consumption.php +++ b/htdocs/contact/consumption.php @@ -488,16 +488,16 @@ 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"); elseif ($objp->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived"); elseif ($objp->description == '(EXCESS PAID)') $txt=$langs->trans("ExcessPaid"); //else $txt=$langs->trans("Discount"); - print $txt.''; + print $txt; + print ''; if ($objp->description) { if ($objp->description == '(CREDIT_NOTE)' && $objp->fk_remise_except > 0)