diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 1be018f61a9..81f564254a1 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -641,11 +641,11 @@ function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $p if ((is_numeric($active) && $i == $active) || (! is_numeric($active) && $active == $links[$i][2])) { - $out.=''.$links[$i][1].''."\n"; + $out.=''.$links[$i][1].''."\n"; } else { - $out.=''.$links[$i][1].''."\n"; + $out.=''.$links[$i][1].''."\n"; } } $out.=''; diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index f8491dd53ac..82abde453c1 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -85,6 +85,7 @@ ClassifyCanceled=Classify 'Abandoned' ClassifyClosed=Classify 'Closed' CreateBill=Create Invoice AddBill=Add invoice or credit note +AddToDraftInvoices=Add to draft invoice DeleteBill=Delete invoice SearchACustomerInvoice=Search for a customer invoice SearchASupplierInvoice=Search for a supplier invoice @@ -199,6 +200,7 @@ StandingOrders=Standing orders StandingOrder=Standing order NoDraftBills=No draft invoices NoOtherDraftBills=No other draft invoices +NoDraftInvoices=No draft invoices RefBill=Invoice ref ToBill=To bill RemainderToBill=Remainder to bill diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index db5be3df9c9..393678ed4c4 100644 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -70,9 +70,11 @@ CancelOrder=Cancel order AddOrder=Add order AddToMyOrders=Add to my orders AddToOtherOrders=Add to other orders +AddToDraftOrders=Add to draft order ShowOrder=Show order NoOpenedOrders=No opened orders NoOtherOpenedOrders=No other opened orders +NoDraftOrders=No draft orders OtherOrders=Other orders LastOrders=Last %s orders LastModifiedOrders=Last %s modified orders diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang index ffc042dfa00..a54bdfb0b2b 100644 --- a/htdocs/langs/en_US/propal.lang +++ b/htdocs/langs/en_US/propal.lang @@ -71,6 +71,8 @@ ErrorPropalNotFound=Propal %s not found Estimate=Estimate : EstimateShort=Estimate OtherPropals=Other proposals +AddToDraftProposals=Add to draft proposal +NoDraftProposals=No draft proposals CopyPropalFrom=Create commercial proposal by copying existing proposal CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services DefaultProposalDurationValidity=Default commercial proposal validity duration (in days) diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index debbe4f4d33..c27aeb340c4 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -80,6 +80,7 @@ ClassifyCanceled=Classer 'Abandonnée' ClassifyClosed=Classer 'Fermée' CreateBill=Créer Facture AddBill=Créer facture ou avoir +AddToDraftInvoices=Ajouter à facture brouillon DeleteBill=Supprimer facture SearchACustomerInvoice=Rechercher une facture client SearchASupplierInvoice=Rechercher une facture fournisseur @@ -194,6 +195,7 @@ StandingOrders=Prélèvements StandingOrder=Prélèvement NoDraftBills=Pas de facture brouillon NoOtherDraftBills=Pas d'autre facture brouillon +NoDraftInvoices=Pas de factures brouillons RefBill=Réf facture ToBill=À facturer RemainderToBill=Reste à facturer diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang index c5569128e7a..1091b4c2844 100644 --- a/htdocs/langs/fr_FR/orders.lang +++ b/htdocs/langs/fr_FR/orders.lang @@ -70,9 +70,11 @@ CancelOrder=Annuler la commande AddOrder=Créer commande AddToMyOrders=Ajouter à mes commandes AddToOtherOrders=Ajouter aux autres commandes +AddToDraftOrders=Ajouter à commande brouillon ShowOrder=Afficher commande -NoOpenedOrders=Pas de commande brouillon -NoOtherOpenedOrders=Pas d'autre commande brouillon +NoOpenedOrders=Pas de commande ouvertes +NoOtherOpenedOrders=Pas d'autre commandes ouvertes +NoDraftOrders=Pas de commandes brouillons OtherOrders=Autres commandes LastOrders=Les %s dernières commandes LastModifiedOrders=Les %s dernières commandes modifiées diff --git a/htdocs/langs/fr_FR/propal.lang b/htdocs/langs/fr_FR/propal.lang index f826113b310..544c55eacc7 100644 --- a/htdocs/langs/fr_FR/propal.lang +++ b/htdocs/langs/fr_FR/propal.lang @@ -71,6 +71,8 @@ ErrorPropalNotFound=Propale %s inexistante Estimate=Devis : EstimateShort=Devis OtherPropals=Autres propositions +AddToDraftProposals=Ajouter à proposition brouillon +NoDraftProposals=Pas de propositions brouillons CopyPropalFrom=Créer proposition/devis par recopie d'un proposition existante CreateEmptyPropal=Créer proposition/devis vierge DefaultProposalDurationValidity=Délai de validité par défaut (en jours) diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index dd42134ee2d..c5aa1916f70 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -1338,7 +1338,7 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status) $langs->load("propal"); $html .= '