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

Fix duplicate translation key

Browse Source
This commit is contained in:
Laurent Destailleur 2016-05-21 12:30:58 +02:00
parent 5fd64c81a6
commit 7935967c62
9 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/cashdesk/tpl/facturation1.tpl.php
View File

@ -203,7 +203,7 @@ $langs->load("cashdesk");
?> ?>
<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="<?php echo $langs->trans("Reported"); ?>" onclick="javascript: verifClic('DIF');" /> <input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="<?php echo $langs->trans("Reported"); ?>" onclick="javascript: verifClic('DIF');" />
<?php <?php
print $langs->trans("DateEcheance").' :'; print $langs->trans("DateDue").' :';
print $form->select_date(-1,'txtDatePaiement',0,0,0,'paymentmode',1,0,1); print $form->select_date(-1,'txtDatePaiement',0,0,0,'paymentmode',1,0,1);
print '</div>'; print '</div>';
?> ?>

2
htdocs/cashdesk/tpl/validation1.tpl.php
View File

@ -83,7 +83,7 @@ $langs->load("bills");
// Affichage des infos en fonction du mode de paiement // Affichage des infos en fonction du mode de paiement
if ( $obj_facturation->getsetPaymentMode() == 'DIF' ) { if ( $obj_facturation->getsetPaymentMode() == 'DIF' ) {
echo ('<tr><td class="resume_label">'.$langs->trans("DateEcheance").'</td><td>'.$obj_facturation->paiementLe().'</td></tr>'); echo ('<tr><td class="resume_label">'.$langs->trans("DateDue").'</td><td>'.$obj_facturation->paiementLe().'</td></tr>');
} else { } else {

2
htdocs/compta/bank/treso.php
View File

@ -118,7 +118,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
// Ligne de titre tableau des ecritures // Ligne de titre tableau des ecritures
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("DateEcheance").'</td>'; print '<td>'.$langs->trans("DateDue").'</td>';
print '<td>'.$langs->trans("Description").'</td>'; print '<td>'.$langs->trans("Description").'</td>';
print '<td>'.$langs->trans("ThirdParty").'</td>'; print '<td>'.$langs->trans("ThirdParty").'</td>';
print '<td align="right">'.$langs->trans("Debit").'</td>'; print '<td align="right">'.$langs->trans("Debit").'</td>';

4
htdocs/core/boxes/box_factures.php
View File

@ -95,7 +95,7 @@ class box_factures extends ModeleBoxes
$now=dol_now(); $now=dol_now();
$line = 0; $line = 0;
$l_due_date = $langs->trans('Late').' ('.strtolower($langs->trans('DateEcheance')).': %s)'; $l_due_date = $langs->trans('Late').' ('.$langs->trans('DateDue').': %s)';
while ($line < $num) { while ($line < $num) {
$objp = $db->fetch_object($result); $objp = $db->fetch_object($result);
@ -118,7 +118,7 @@ class box_factures extends ModeleBoxes
$late = ''; $late = '';
if ($facturestatic->hasDelay()) { if ($facturestatic->hasDelay()) {
$late = img_warning(sprintf($l_due_date,dol_print_date($datelimite,'day'))); $late = img_warning(sprintf($l_due_date, dol_print_date($datelimite,'day')));
} }
$this->info_box_contents[$line][] = array( $this->info_box_contents[$line][] = array(

2
htdocs/core/boxes/box_factures_fourn.php
View File

@ -95,7 +95,7 @@ class box_factures_fourn extends ModeleBoxes
$num = $db->num_rows($result); $num = $db->num_rows($result);
$line = 0; $line = 0;
$l_due_date = $langs->trans('Late').' ('.$langs->trans('DateEcheance').': %s)'; $l_due_date = $langs->trans('Late').' ('.$langs->trans('DateDue').': %s)';
while ($line < $num) { while ($line < $num) {
$objp = $db->fetch_object($result); $objp = $db->fetch_object($result);

2
htdocs/core/boxes/box_factures_fourn_imp.php
View File

@ -88,7 +88,7 @@ class box_factures_fourn_imp extends ModeleBoxes
$num = $db->num_rows($result); $num = $db->num_rows($result);
$line = 0; $line = 0;
$l_due_date = $langs->trans('Late').' ('.$langs->trans('DateEcheance').': %s)'; $l_due_date = $langs->trans('Late').' ('.$langs->trans('DateDue').': %s)';
$facturestatic = new FactureFournisseur($db); $facturestatic = new FactureFournisseur($db);

2
htdocs/core/boxes/box_factures_imp.php
View File

@ -96,7 +96,7 @@ class box_factures_imp extends ModeleBoxes
$now=dol_now(); $now=dol_now();
$line = 0; $line = 0;
$l_due_date = $langs->trans('Late').' ('.strtolower($langs->trans('DateEcheance')).': %s)'; $l_due_date = $langs->trans('Late').' ('.strtolower($langs->trans('DateDue')).': %s)';
while ($line < $num) while ($line < $num)
{ {

2
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@ -1535,7 +1535,7 @@ class pdf_crabe extends ModelePDFFactures
$posy+=3; $posy+=3;
$pdf->SetXY($posx,$posy); $pdf->SetXY($posx,$posy);
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DateEcheance")." : " . dol_print_date($object->date_lim_reglement,"day",false,$outputlangs,true), '', 'R'); $pdf->MultiCell($w, 3, $outputlangs->transnoentities("DateDue")." : " . dol_print_date($object->date_lim_reglement,"day",false,$outputlangs,true), '', 'R');
} }
if ($object->thirdparty->code_client) if ($object->thirdparty->code_client)

1
htdocs/langs/en_US/bills.lang
View File

@ -222,7 +222,6 @@ RelatedCommercialProposals=Related commercial proposals
RelatedRecurringCustomerInvoices=Related recurring customer invoices RelatedRecurringCustomerInvoices=Related recurring customer invoices
MenuToValid=To valid MenuToValid=To valid
DateMaxPayment=Payment due before DateMaxPayment=Payment due before
DateEcheance=Due date limit
DateInvoice=Invoice date DateInvoice=Invoice date
NoInvoice=No invoice NoInvoice=No invoice
ClassifyBill=Classify invoice ClassifyBill=Classify invoice