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

[CORE] renomage de variables pour le module + modification de traductions (#new_ask_price).

Browse Source
This commit is contained in:
phf 2015-01-29 12:12:22 +01:00
parent ffb533a4e4
commit 2f8ceea587
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/askpricesupplier/apercu.php
View File

@ -133,7 +133,7 @@ if ($id > 0 || ! empty($ref))
print '<table class="nobordernopadding" width="100%">';
print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Documents").'</td></tr>';
print '<tr '.$bc[$var].'><td>'.$langs->trans("Proposal").' PDF</td>';
print '<tr '.$bc[$var].'><td>'.$langs->trans("CommRequest").' PDF</td>';
print '<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=propal&file='.urlencode($relativepath).'">'.$object->ref.'.pdf</a></td>';

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

@ -39,7 +39,7 @@ function askpricesupplier_prepare_head($object)
$head = array();
$head[$h][0] = DOL_URL_ROOT.'/comm/askpricesupplier.php?id='.$object->id;
$head[$h][1] = $langs->trans('ProposalCard');
$head[$h][1] = $langs->trans('AskPriceSupplierCard');
$head[$h][2] = 'comm';
$h++;
@ -89,7 +89,7 @@ function askpricesupplier_prepare_head($object)
}
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$upload_dir = $conf->propal->dir_output . "/" . dol_sanitizeFileName($object->ref);
$upload_dir = $conf->askpricesupplier->dir_output . "/" . dol_sanitizeFileName($object->ref);
$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
$head[$h][0] = DOL_URL_ROOT.'/comm/askpricesupplier/document.php?id='.$object->id;
$head[$h][1] = $langs->trans('Documents');

4
htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php
View File

@ -230,7 +230,7 @@ class doc_generic_askpricesupplier_odt extends ModelePDFAskPriceSupplier
$outputlangs->load("companies");
$outputlangs->load("bills");
if ($conf->propal->dir_output)
if ($conf->askpricesupplier->dir_output)
{
// If $object is id instead of object
if (! is_object($object))
@ -245,7 +245,7 @@ class doc_generic_askpricesupplier_odt extends ModelePDFAskPriceSupplier
}
}
$dir = $conf->propal->dir_output;
$dir = $conf->askpricesupplier->dir_output;
$objectref = dol_sanitizeFileName($object->ref);
if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
$file = $dir . "/" . $objectref . ".odt";

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

@ -13,7 +13,6 @@ ProposalsDraft=Propositions commerciales brouillons
ProposalDraft=Proposition commerciale brouillon
ProposalsOpened=Propositions commerciales ouvertes
Prop=Propositions commerciales
ProposalCard=Fiche proposition
NewProp=Nouvelle proposition commerciale
NewProposal=Nouvelle proposition commerciale
NewPropal=Nouvelle proposition
@ -77,6 +76,7 @@ ConfirmReOpenAsk=Êtes-vous sûr de vouloir réouvrir la demande de prix <b>%s</
SendAskByMail=Envoyer demande de prix par email
SendAskRef=Envoi de la demande de prix %s
AskPriceSupplierCard=Fiche demande
ConfirmDeleteAsk=Êtes-vous sûr de vouloir effacer cette demande de prix ?
ListOfAskPriceSupplier=Liste des devis/propositions commerciales
@ -93,8 +93,7 @@ DefaultAskDurationValidity=Délai de validité par défaut (en jours)
DocModelAuroreDescription=Modèle de demande de prix fournisseur complet (logo…)
CommercialAsk=Demande commerciale
CommercialAsks=Demandes commerciales
CommercialAsk=Demande de prix
# #

1
htdocs/langs/fr_FR/main.lang
View File

@ -291,6 +291,7 @@ UnitPriceHT=Prix unitaire HT
UnitPriceTTC=Prix unitaire TTC
PriceU=P.U.
PriceUHT=P.U. HT
AskPriceSupplierUHT=P.U. HT Demandé
PriceUTTC=P.U. TTC
Amount=Montant
AmountInvoice=Montant facture