From 4b854fb33db6cc4bd32ce54cab062afffd65f38a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 16 Jul 2016 14:37:35 +0200 Subject: [PATCH] Fix better error message when possible refering objects list is empty. --- htdocs/admin/expensereport.php | 1 - htdocs/comm/index.php | 8 ++++---- htdocs/compta/index.php | 12 ++++++------ htdocs/holiday/list.php | 2 +- htdocs/langs/en_US/companies.lang | 1 + htdocs/societe/consumption.php | 13 +++++++++++-- 6 files changed, 23 insertions(+), 14 deletions(-) diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php index 5c8fa9732e4..3023cb7cc66 100644 --- a/htdocs/admin/expensereport.php +++ b/htdocs/admin/expensereport.php @@ -372,7 +372,6 @@ else dol_print_error($db); } - print ''; print ''; print ''; diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 4711aac7222..a205ff54d1a 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -197,7 +197,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire) else { $var=!$var; - print ''; + print ''; } print "
'.$langs->trans("Name").'
'.$langs->trans("NoProposal").'
'.$langs->trans("NoProposal").'

"; @@ -277,7 +277,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos else { $var=!$var; - print ''.$langs->trans("NoProposal").''; + print ''.$langs->trans("NoProposal").''; } print "
"; @@ -357,7 +357,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire) else { $var=!$var; - print ''.$langs->trans("NoOrder").''; + print ''.$langs->trans("NoOrder").''; } print "
"; @@ -438,7 +438,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande else { $var=!$var; - print ''.$langs->trans("NoSupplierOrder").''; + print ''.$langs->trans("NoSupplierOrder").''; } print "
"; diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 1c167e04e95..35a56e5afb3 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -199,7 +199,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) } else { - print ''.$langs->trans("NoInvoice").''; + print ''.$langs->trans("NoInvoice").''; } print "
"; $db->free($resql); @@ -275,7 +275,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- } else { - print ''.$langs->trans("NoInvoice").''; + print ''.$langs->trans("NoInvoice").''; } print "
"; $db->free($resql); @@ -387,7 +387,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) { $colspan=5; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++; - print ''.$langs->trans("NoInvoice").''; + print ''.$langs->trans("NoInvoice").''; } print '
'; $db->free($resql); @@ -474,7 +474,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- { $colspan=5; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++; - print ''.$langs->trans("NoInvoice").''; + print ''.$langs->trans("NoInvoice").''; } print '
'; } @@ -842,7 +842,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) { $colspan=6; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++; - print ''.$langs->trans("NoInvoice").''; + print ''.$langs->trans("NoInvoice").''; } print '
'; $db->free($resql); @@ -942,7 +942,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- { $colspan=6; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++; - print ''.$langs->trans("NoInvoice").''; + print ''.$langs->trans("NoInvoice").''; } print '
'; } diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php index 4f95b86a6cf..8489f57187e 100644 --- a/htdocs/holiday/list.php +++ b/htdocs/holiday/list.php @@ -429,7 +429,7 @@ if (! empty($holiday->holiday)) // Si il n'y a pas d'enregistrement suite à une recherche if($holiday_payes == '2') { - print ''; + print ''; print ''.$langs->trans('NoRecordFound').''; print ''; } diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index f13a2ec02ec..361e0a1b32d 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -74,6 +74,7 @@ DefaultLang=Language by default VATIsUsed=VAT is used VATIsNotUsed=VAT is not used CopyAddressFromSoc=Fill address with thirdparty address +ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects ##### Local Taxes ##### LocalTax1IsUsed=Use second tax LocalTax1IsUsedES= RE is used diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php index db2cc31529b..eb912548caa 100644 --- a/htdocs/societe/consumption.php +++ b/htdocs/societe/consumption.php @@ -145,10 +145,11 @@ if ($object->client) if ($conf->propal->enabled && $user->rights->propal->lire) $elementTypeArray['propal']=$langs->transnoentitiesnoconv('Proposals'); if ($conf->commande->enabled && $user->rights->commande->lire) $elementTypeArray['order']=$langs->transnoentitiesnoconv('Orders'); if ($conf->facture->enabled && $user->rights->facture->lire) $elementTypeArray['invoice']=$langs->transnoentitiesnoconv('Invoices'); - if ($conf->ficheinter->enabled && $user->rights->ficheinter->lire) $elementTypeArray['fichinter']=$langs->transnoentitiesnoconv('Interventions'); if ($conf->contrat->enabled && $user->rights->contrat->lire) $elementTypeArray['contract']=$langs->transnoentitiesnoconv('Contracts'); } +if ($conf->ficheinter->enabled && $user->rights->ficheinter->lire) $elementTypeArray['fichinter']=$langs->transnoentitiesnoconv('Interventions'); + if ($object->fournisseur) { print ''; @@ -318,8 +319,16 @@ if (!empty($sql_select)) //print $sql; } +$disabled=0; +$showempty=2; +if (empty($elementTypeArray) && ! $object->client && ! $object->fournisseur) +{ + $showempty=$langs->trans("ThirdpartyNotCustomerNotSupplierSoNoRef"); + $disabled=1; +} + // Define type of elements -$typeElementString = $form->selectarray("type_element", $elementTypeArray, GETPOST('type_element'), 2); +$typeElementString = $form->selectarray("type_element", $elementTypeArray, GETPOST('type_element'), $showempty, 0, 0, '', 0, 0, $disabled); $button = ''; $param="&sref=".$sref."&month=".$month."&year=".$year."&sprod_fulldescr=".$sprod_fulldescr."&socid=".$socid."&type_element=".$type_element;