lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[CORE] retrait de liens ou champs inutile (#new_ask_price).

Browse Source
This commit is contained in:
phf 2015-02-02 16:17:07 +01:00
parent 4ec611e4b9
commit 38551dd468
4 changed files with 14 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/askpricesupplier/document.php
View File

@ -109,6 +109,7 @@ if ($object->id > 0)
print '</td></tr>';
// Ref client
/* PHFAVRE retrait en temporaire
print '<tr><td>';
print '<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';
print $langs->trans('RefCustomer').'</td><td align="left">';
@ -118,7 +119,8 @@ if ($object->id > 0)
print $object->ref_client;
print '</td>';
print '</tr>';
*/
// Customer
print "<tr><td>".$langs->trans("Company")."</td>";
print '<td colspan="3">'.$object->thirdparty->getNomUrl(1).'</td></tr>';

12
htdocs/comm/askpricesupplier/note.php
View File

@ -87,6 +87,7 @@ if ($id > 0 || ! empty($ref))
print '</td></tr>';
// Ref client
/* PHFAVRE retrait en temporaire
print '<tr><td>';
print '<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';
print $langs->trans('RefCustomer').'</td><td align="left">';
@ -96,7 +97,8 @@ if ($id > 0 || ! empty($ref))
print $object->ref_client;
print '</td>';
print '</tr>';
*/
// Customer
if ( is_null($object->client) )
$object->fetch_thirdparty();
@ -104,6 +106,7 @@ if ($id > 0 || ! empty($ref))
print '<td colspan="3">'.$object->client->getNomUrl(1).'</td></tr>';
// Ligne info remises tiers
/* PHFAVRE retrait en temporaire
print '<tr><td>'.$langs->trans('Discounts').'</td><td colspan="3">';
if ($societe->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$societe->remise_percent);
else print $langs->trans("CompanyHasNoRelativeDiscount");
@ -113,7 +116,8 @@ if ($id > 0 || ! empty($ref))
else print $langs->trans("CompanyHasNoAbsoluteDiscount");
print '.';
print '</td></tr>';
*/
// Date
print '<tr><td>'.$langs->trans('Date').'</td><td colspan="3">';
print dol_print_date($object->date,'daytext');
@ -121,6 +125,7 @@ if ($id > 0 || ! empty($ref))
print '</tr>';
// Date fin propal
/* PHFAVRE retrait en temporaire
print '<tr>';
print '<td>'.$langs->trans('DateEndAsk').'</td><td colspan="3">';
if ($object->fin_validite)
@ -134,7 +139,8 @@ if ($id > 0 || ! empty($ref))
}
print '</td>';
print '</tr>';
*/
print "</table>";
print '<br>';

26
htdocs/core/lib/askpricesupplier.lib.php
View File

@ -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

4
htdocs/langs/fr_FR/askpricesupplier.lang
View File

@ -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