From a7fae40345d6d107bc849828860ea163e896d915 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 7 Jan 2005 21:18:52 +0000 Subject: [PATCH] Trad: Quelques traductions de plus --- htdocs/compta/facture/note.php | 8 ++++---- htdocs/compta/facture/pre.inc.php | 16 +++++++++------- htdocs/compta/facture/prelevement.php | 19 ++++++++++--------- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php index 7e24dfc8297..12c6e25ca5b 100644 --- a/htdocs/compta/facture/note.php +++ b/htdocs/compta/facture/note.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004 Laurent Destailleur +/* Copyright (C) 2004 Rodolphe Quiedeville + * Copyright (C) 2004-2005 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ * */ -/*! \file htdocs/compta/facture/note.php +/** \file htdocs/compta/facture/note.php \ingroup facture \brief Fiche de notes sur une facture \version $Revision$ @@ -126,7 +126,7 @@ if ($_GET["facid"]) $author->fetch(''); print $author->fullname.''; - print 'Note :'; + print ''.$langs->trans("Note").' :'; print ''.nl2br($facture->note).""; diff --git a/htdocs/compta/facture/pre.inc.php b/htdocs/compta/facture/pre.inc.php index 42a60eb1ed5..ba18c63fe64 100644 --- a/htdocs/compta/facture/pre.inc.php +++ b/htdocs/compta/facture/pre.inc.php @@ -1,5 +1,6 @@ + * Copyright (C) 2005 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,11 +21,11 @@ * */ -/*! - \file htdocs/compta/facture/pre.inc.php - \ingroup facture - \brief Fichier de gestion du menu gauche du module facture - \version $Revision$ +/** + \file htdocs/compta/facture/pre.inc.php + \ingroup facture + \brief Fichier de gestion du menu gauche du module facture + \version $Revision$ */ require("../../main.inc.php"); @@ -32,7 +33,8 @@ require_once("../../facture.class.php"); function llxHeader($head = "", $title="", $help_url='') { global $conf, $langs; - + $langs->load("companies"); + $langs->load("bills"); /* * * @@ -41,7 +43,7 @@ function llxHeader($head = "", $title="", $help_url='') { $menu = new Menu(); - $menu->add(DOL_URL_ROOT."/compta/clients.php", "Clients"); + $menu->add(DOL_URL_ROOT."/compta/clients.php", $langs->trans("Customers")); $langs->load("bills"); $menu->add(DOL_URL_ROOT."/compta/facture.php",$langs->trans("Bills")); diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index ea1f01b8415..7b3a062331a 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -1,7 +1,7 @@ * Copyright (C) 2004 Éric Seigne - * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004-2005 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ * */ -/*! +/** \file htdocs/compta/facture/prelevement.php \ingroup facture \brief Gestion des prelevement d'une facture @@ -103,7 +103,7 @@ if ($_GET["facid"] > 0) $head[$h][1] = $langs->trans("Apercu"); $h++; $head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$fac->id; - $head[$h][1] = $langs->trans("Prélèvement"); + $head[$h][1] = $langs->trans("Prélévement"); $hselected = $h; $h++; $head[$h][0] = DOL_URL_ROOT.'/compta/facture/note.php?facid='.$fac->id; @@ -133,11 +133,11 @@ if ($_GET["facid"] > 0) print ''.$langs->trans("AmountHT").''; print ''.price($fac->total_ht).''; - print ''.$conf->monnaie.' HT '; + print ''.$conf->monnaie.' '; print ''.$langs->trans("AmountTTC").''; print ''.price($fac->total_ttc).''; - print ''.$conf->monnaie.' HT '; + print ''.$conf->monnaie.' '; print ""; @@ -152,16 +152,17 @@ if ($_GET["facid"] > 0) } } print "
"; + /* * Prélèvement */ - print ''; + print '
'; print ''; print ''; print ''; print ''; - print ''; + print ''; print ''; $var=True; @@ -204,7 +205,7 @@ if ($_GET["facid"] > 0) } else { - print $db->error() . ' ' . $sql; + dolibarr_print_error($db); } $sql = "SELECT pfd.rowid, pfd.traite,".$db->pdate("pfd.date_demande")." as date_demande"; @@ -250,7 +251,7 @@ if ($_GET["facid"] > 0) } else { - print $db->error() . ' ' . $sql; + dolibarr_print_error($db); } print "
Date demandeDate traitementBon prélèvementUtilisateur  '.$langs->trans("User").'  
";