From 848d76ee78632fc1a642a2293457e99d83433713 Mon Sep 17 00:00:00 2001 From: atm-arnaud Date: Tue, 10 Apr 2018 14:43:32 +0200 Subject: [PATCH 1/6] FIX #8023 --- htdocs/compta/bank/card.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php index 308c98f0cab..617abbce5f2 100644 --- a/htdocs/compta/bank/card.php +++ b/htdocs/compta/bank/card.php @@ -845,11 +845,11 @@ else // Ref print ''.$langs->trans("Ref").''; - print 'ref).'">'; + print 'ref)).'">'; // Label print ''.$langs->trans("Label").''; - print 'label).'">'; + print 'label)).'">'; // Type print ''.$langs->trans("AccountType").''; From 5621d1f8ea3bba85e842ee7aa10f872855f3616a Mon Sep 17 00:00:00 2001 From: gauthier Date: Tue, 10 Apr 2018 15:03:15 +0200 Subject: [PATCH 2/6] FIX #8478 !empty instead of count to avoid warning --- htdocs/core/tpl/admin_extrafields_view.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php index 6d3bb43f3b2..c5618b07297 100644 --- a/htdocs/core/tpl/admin_extrafields_view.tpl.php +++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php @@ -60,7 +60,7 @@ if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) print ' '; print "\n"; -if (count($extrafields->attribute_type)) +if (!empty($extrafields->attribute_type)) { foreach($extrafields->attribute_type as $key => $value) { From 1fd5dba118c42875cc84efd00515aa8dde11dc5e Mon Sep 17 00:00:00 2001 From: Marc de Lima Lucio Date: Tue, 10 Apr 2018 15:24:57 +0200 Subject: [PATCH 3/6] FIX: payment term doc-specific label was not used --- htdocs/core/class/commondocgenerator.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index 535200ab95a..c32819bdb3a 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -367,7 +367,7 @@ abstract class CommonDocGenerator $array_key.'_payment_mode_code'=>$object->mode_reglement_code, $array_key.'_payment_mode'=>($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code)!='PaymentType'.$object->mode_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code):$object->mode_reglement), $array_key.'_payment_term_code'=>$object->cond_reglement_code, - $array_key.'_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code)!='PaymentCondition'.$object->cond_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code):$object->cond_reglement), + $array_key.'_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code)!='PaymentCondition'.$object->cond_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code):($object->cond_reglement_doc?$object->cond_reglement_doc:$object->cond_reglement)), $array_key.'_total_ht_locale'=>price($object->total_ht, 0, $outputlangs), $array_key.'_total_vat_locale'=>(! empty($object->total_vat)?price($object->total_vat, 0, $outputlangs):price($object->total_tva, 0, $outputlangs)), From 75bc3d17e6aaa0960acee60afce9283ca0830a8a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 11 Apr 2018 14:55:29 +0200 Subject: [PATCH 4/6] Update admin_extrafields_view.tpl.php --- htdocs/core/tpl/admin_extrafields_view.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php index c5618b07297..a3292773d4d 100644 --- a/htdocs/core/tpl/admin_extrafields_view.tpl.php +++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php @@ -60,7 +60,7 @@ if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) print ' '; print "\n"; -if (!empty($extrafields->attribute_type)) +if (is_array($extrafields->attribute_type)) && count($extrafields->attribute_type)) { foreach($extrafields->attribute_type as $key => $value) { From 628b437e28750d46ea9454f4be375537229bd2bd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 11 Apr 2018 16:25:05 +0200 Subject: [PATCH 5/6] Update card.php --- htdocs/compta/bank/card.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php index 617abbce5f2..032ac6fc5ef 100644 --- a/htdocs/compta/bank/card.php +++ b/htdocs/compta/bank/card.php @@ -845,11 +845,11 @@ else // Ref print ''.$langs->trans("Ref").''; - print 'ref)).'">'; + print 'ref).'">'; // Label print ''.$langs->trans("Label").''; - print 'label)).'">'; + print 'label).'">'; // Type print ''.$langs->trans("AccountType").''; From 0518218aed63fbe6fdbbc584a97ec5ba1d53d48a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 11 Apr 2018 17:17:03 +0200 Subject: [PATCH 6/6] Fix regression --- htdocs/core/tpl/admin_extrafields_view.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php index a3292773d4d..096d7e0bbff 100644 --- a/htdocs/core/tpl/admin_extrafields_view.tpl.php +++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php @@ -60,7 +60,7 @@ if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) print ' '; print "\n"; -if (is_array($extrafields->attribute_type)) && count($extrafields->attribute_type)) +if (is_array($extrafields->attribute_type) && count($extrafields->attribute_type)) { foreach($extrafields->attribute_type as $key => $value) {