diff --git a/htdocs/comm/askpricesupplier/document.php b/htdocs/comm/askpricesupplier/document.php index 0644f932629..6c76496e329 100644 --- a/htdocs/comm/askpricesupplier/document.php +++ b/htdocs/comm/askpricesupplier/document.php @@ -109,6 +109,7 @@ if ($object->id > 0) print ''; // Ref client + /* PHFAVRE retrait en temporaire print '
| '; print $langs->trans('RefCustomer').' | '; @@ -118,7 +119,8 @@ if ($object->id > 0) print $object->ref_client; print ' | '; print '||||||||||||||||
| ".$langs->trans("Company")." | "; print ''.$object->thirdparty->getNomUrl(1).' | ||||||||||||||||
';
print '
'; diff --git a/htdocs/core/lib/askpricesupplier.lib.php b/htdocs/core/lib/askpricesupplier.lib.php index 0cdf15a09a0..54ecea18345 100644 --- a/htdocs/core/lib/askpricesupplier.lib.php +++ b/htdocs/core/lib/askpricesupplier.lib.php @@ -43,32 +43,6 @@ function askpricesupplier_prepare_head($object) $head[$h][2] = 'comm'; $h++; - if ((empty($conf->commande->enabled) && ((! empty($conf->expedition_bon->enabled) && $user->rights->expedition->lire) - || (! empty($conf->livraison_bon->enabled) && $user->rights->expedition->livraison->lire)))) - { - $langs->load("sendings"); - $head[$h][0] = DOL_URL_ROOT.'/expedition/askpricesupplier.php?id='.$object->id; - if ($conf->expedition_bon->enabled) $text=$langs->trans("Shipment"); - if ($conf->livraison_bon->enabled) $text.='/'.$langs->trans("Receivings"); - $head[$h][1] = $text; - $head[$h][2] = 'shipping'; - $h++; - } - if (! empty($conf->global->MAIN_USE_PREVIEW_TABS)) - { - $head[$h][0] = DOL_URL_ROOT.'/comm/askpricesupplier/apercu.php?id='.$object->id; - $head[$h][1] = $langs->trans("Preview"); - $head[$h][2] = 'preview'; - $h++; - } - - if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) - { - $head[$h][0] = DOL_URL_ROOT.'/comm/askpricesupplier/contact.php?id='.$object->id; - $head[$h][1] = $langs->trans('ContactsAddresses'); - $head[$h][2] = 'contact'; - $h++; - } // Show more tabs from modules // Entries must be declared in modules descriptor with line diff --git a/htdocs/langs/fr_FR/askpricesupplier.lang b/htdocs/langs/fr_FR/askpricesupplier.lang index 96b4c784cfc..8640ec23358 100644 --- a/htdocs/langs/fr_FR/askpricesupplier.lang +++ b/htdocs/langs/fr_FR/askpricesupplier.lang @@ -66,8 +66,8 @@ AskpricesupplierStatusDraftShort=Brouillon AskpricesupplierStatusValidatedShort=Validée AskpricesupplierStatusOpenedShort=Ouverte AskpricesupplierStatusClosedShort=Fermée -AskpricesupplierStatusSignedShort=Signée -AskpricesupplierStatusNotSignedShort=Non signée +AskpricesupplierStatusSignedShort=Acceptée +AskpricesupplierStatusNotSignedShort=Refusée AskpricesupplierStatusBilledShort=Facturée AskpricesupplierToClose=Demandes de prix à fermer AskpricesupplierToBill=Demandes de prix signées à facturer | |||||||||||||||||