From 7935967c626b6b83edcbbe0dbec53d1353b6c82d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 21 May 2016 12:30:58 +0200 Subject: [PATCH] Fix duplicate translation key --- htdocs/cashdesk/tpl/facturation1.tpl.php | 2 +- htdocs/cashdesk/tpl/validation1.tpl.php | 2 +- htdocs/compta/bank/treso.php | 2 +- htdocs/core/boxes/box_factures.php | 4 ++-- htdocs/core/boxes/box_factures_fourn.php | 2 +- htdocs/core/boxes/box_factures_fourn_imp.php | 2 +- htdocs/core/boxes/box_factures_imp.php | 2 +- htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 2 +- htdocs/langs/en_US/bills.lang | 1 - 9 files changed, 9 insertions(+), 10 deletions(-) diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php index ecb11c3e6ee..8ddd7e48a85 100644 --- a/htdocs/cashdesk/tpl/facturation1.tpl.php +++ b/htdocs/cashdesk/tpl/facturation1.tpl.php @@ -203,7 +203,7 @@ $langs->load("cashdesk"); ?> " onclick="javascript: verifClic('DIF');" /> trans("DateEcheance").' :'; + print $langs->trans("DateDue").' :'; print $form->select_date(-1,'txtDatePaiement',0,0,0,'paymentmode',1,0,1); print ''; ?> diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php index 047d597a6ef..bb6bd92c8bd 100644 --- a/htdocs/cashdesk/tpl/validation1.tpl.php +++ b/htdocs/cashdesk/tpl/validation1.tpl.php @@ -83,7 +83,7 @@ $langs->load("bills"); // Affichage des infos en fonction du mode de paiement if ( $obj_facturation->getsetPaymentMode() == 'DIF' ) { - echo (''.$langs->trans("DateEcheance").''.$obj_facturation->paiementLe().''); + echo (''.$langs->trans("DateDue").''.$obj_facturation->paiementLe().''); } else { diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php index 0cee6211b49..26be80caa68 100644 --- a/htdocs/compta/bank/treso.php +++ b/htdocs/compta/bank/treso.php @@ -118,7 +118,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) // Ligne de titre tableau des ecritures print ''; - print ''.$langs->trans("DateEcheance").''; + print ''.$langs->trans("DateDue").''; print ''.$langs->trans("Description").''; print ''.$langs->trans("ThirdParty").''; print ''.$langs->trans("Debit").''; diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php index f50bff34a86..7b5a01d6bca 100644 --- a/htdocs/core/boxes/box_factures.php +++ b/htdocs/core/boxes/box_factures.php @@ -95,7 +95,7 @@ class box_factures extends ModeleBoxes $now=dol_now(); $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) { $objp = $db->fetch_object($result); @@ -118,7 +118,7 @@ class box_factures extends ModeleBoxes $late = ''; 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( diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php index 7c90bb69683..88b64947f05 100644 --- a/htdocs/core/boxes/box_factures_fourn.php +++ b/htdocs/core/boxes/box_factures_fourn.php @@ -95,7 +95,7 @@ class box_factures_fourn extends ModeleBoxes $num = $db->num_rows($result); $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) { $objp = $db->fetch_object($result); diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php index 4e54b590955..27441f22ea5 100644 --- a/htdocs/core/boxes/box_factures_fourn_imp.php +++ b/htdocs/core/boxes/box_factures_fourn_imp.php @@ -88,7 +88,7 @@ class box_factures_fourn_imp extends ModeleBoxes $num = $db->num_rows($result); $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); diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php index 63ce986e181..783aa8b2c64 100644 --- a/htdocs/core/boxes/box_factures_imp.php +++ b/htdocs/core/boxes/box_factures_imp.php @@ -96,7 +96,7 @@ class box_factures_imp extends ModeleBoxes $now=dol_now(); $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) { diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 4f2ac6b3f18..046a47a699e 100644 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -1535,7 +1535,7 @@ class pdf_crabe extends ModelePDFFactures $posy+=3; $pdf->SetXY($posx,$posy); $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) diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index a159e7aae8d..a4e2ba643b3 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -222,7 +222,6 @@ RelatedCommercialProposals=Related commercial proposals RelatedRecurringCustomerInvoices=Related recurring customer invoices MenuToValid=To valid DateMaxPayment=Payment due before -DateEcheance=Due date limit DateInvoice=Invoice date NoInvoice=No invoice ClassifyBill=Classify invoice