diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php index ecb11c3e6ee3e8fa3a94c9a8e1a5dbdd3dfc55a4..8ddd7e48a85cd1d30283f959ea24a7a6cc0df704 100644 --- a/htdocs/cashdesk/tpl/facturation1.tpl.php +++ b/htdocs/cashdesk/tpl/facturation1.tpl.php @@ -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');" /> <?php - print $langs->trans("DateEcheance").' :'; + print $langs->trans("DateDue").' :'; print $form->select_date(-1,'txtDatePaiement',0,0,0,'paymentmode',1,0,1); print '</div>'; ?> diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php index 047d597a6ef09442d2f56f967555d2d75ed45113..bb6bd92c8bdad7a4ceaa2be3888e0eb8185e2069 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 ('<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 { diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php index 0cee6211b493a5177014edfeda4f8fe221620f98..26be80caa685b974983e0a5c39b6555ff1876ac6 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 '<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("ThirdParty").'</td>'; print '<td align="right">'.$langs->trans("Debit").'</td>'; diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php index f50bff34a863e4f60bd323ed499f1cfe79b633c2..7b5a01d6bca6e7ced3e3903df6c99af500759188 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 7c90bb696833112b34a67c816bf1a08dacca5838..88b64947f05a4e96babb41514b6ea98a589b6946 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 4e54b590955bb3568756d1d16768bab22f359a83..27441f22ea5921d9c5bc11aad8daad0616a1dc56 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 63ce986e18139478688594fd957ac4458747d914..783aa8b2c6427773147d4932b1c174a540f390a3 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 4f2ac6b3f1894c3fbc851e84aecb8943d7e28a93..046a47a699e8a8c89e04e291097ff73090cd4bec 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 a159e7aae8d92ef8efa3b61eab5ab229b0a5753b..a4e2ba643b365eadce8731cf8cdb89688f327f78 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