Trad: Traduction "Apercu"
This commit is contained in:
parent
554fd2a50b
commit
96e112dda7
@ -458,7 +458,7 @@ $html = new Form($db);
|
||||
if ($_GET["action"] == 'create')
|
||||
{
|
||||
|
||||
print_titre("Emettre une facture");
|
||||
print_titre($langs->trans("NewBill"));
|
||||
|
||||
if ($_GET["propalid"])
|
||||
{
|
||||
@ -686,7 +686,7 @@ if ($_GET["action"] == 'create')
|
||||
/*
|
||||
*
|
||||
*/
|
||||
print '<tr><td colspan="3" align="center"><input type="submit" name="bouton" value="Créer brouillon"></td></tr>';
|
||||
print '<tr><td colspan="3" align="center"><input type="submit" name="bouton" value="'.$langs->trans("CreateDraft").'"></td></tr>';
|
||||
print "</form>\n";
|
||||
print "</table>\n";
|
||||
|
||||
@ -695,11 +695,11 @@ if ($_GET["action"] == 'create')
|
||||
/*
|
||||
* Produits
|
||||
*/
|
||||
print_titre("Produits");
|
||||
print_titre($langs->trans("Products"));
|
||||
|
||||
print '<table class="noborder" width="100%">';
|
||||
print '<tr class="liste_titre"><td>'.$langs->trans("Ref").'</td><td>Produit</td>';
|
||||
print '<td align="right">'.$langs->trans("Price").'</td><td align="center">Remise</td><td align="center">Qté.</td></tr>';
|
||||
print '<tr class="liste_titre"><td>'.$langs->trans("Ref").'</td><td>'.$langs->trans("Product").'</td>';
|
||||
print '<td align="right">'.$langs->trans("Price").'</td><td align="center">'.$langs->trans("Discount").'</td><td align="center">'.$langs->trans("Qty").'</td></tr>';
|
||||
|
||||
$sql = "SELECT pt.rowid, p.label as product, p.ref, pt.price, pt.qty, p.rowid as prodid, pt.remise_percent";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."propaldet as pt, ".MAIN_DB_PREFIX."product as p WHERE pt.fk_product = p.rowid AND pt.fk_propal = ".$_GET["propalid"];
|
||||
@ -759,9 +759,9 @@ if ($_GET["action"] == 'create')
|
||||
{
|
||||
print_titre("Produits");
|
||||
|
||||
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="3">';
|
||||
print '<tr class="liste_titre"><td>'.$langs->trans("Ref").'</td><td>Produit</td>';
|
||||
print '<td align="right">'.$langs->trans("Price").'</td><td align="center">Remise</td><td align="center">Qté.</td></tr>';
|
||||
print '<table class="noborder" width="100%">';
|
||||
print '<tr class="liste_titre"><td>'.$langs->trans("Ref").'</td><td>'.$langs->trans("Product").'</td>';
|
||||
print '<td align="right">'.$langs->trans("Price").'</td><td align="center">'.$langs->trans("Discount").'</td><td align="center">'.$langs->trans("Qty").'</td></tr>';
|
||||
|
||||
$sql = "SELECT pt.rowid, p.label as product, p.ref, pt.subprice, pt.qty, p.rowid as prodid, pt.remise_percent";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as pt, ".MAIN_DB_PREFIX."product as p";
|
||||
@ -833,13 +833,13 @@ else
|
||||
$hselected = $h;
|
||||
$h++;
|
||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/apercu.php?facid='.$fac->id;
|
||||
$head[$h][1] = $langs->trans("Apercu");
|
||||
$head[$h][1] = $langs->trans("Preview");
|
||||
$h++;
|
||||
|
||||
if ($fac->mode_reglement == 3)
|
||||
{
|
||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$fac->id;
|
||||
$head[$h][1] = $langs->trans("StandingOrder");
|
||||
$head[$h][1] = $langs->trans("StandingOrders");
|
||||
$h++;
|
||||
}
|
||||
|
||||
@ -964,7 +964,7 @@ else
|
||||
print "</table>";
|
||||
$db->free();
|
||||
} else {
|
||||
print $db->error();
|
||||
dolibarr_print_error($db);
|
||||
}
|
||||
|
||||
print "</td></tr>";
|
||||
@ -1467,7 +1467,7 @@ else
|
||||
if ($num)
|
||||
{
|
||||
$i = 0; $total = 0;
|
||||
print "<p>";
|
||||
print "<br>";
|
||||
if ($num >1)
|
||||
{
|
||||
print_titre("Propositions commerciales associées");
|
||||
@ -1524,6 +1524,8 @@ else
|
||||
$month=$_GET["month"];
|
||||
$year=$_GET["year"];
|
||||
|
||||
$fac=new Facture($db);
|
||||
|
||||
if ($page == -1)
|
||||
{
|
||||
$page = 0 ;
|
||||
@ -1674,7 +1676,7 @@ else
|
||||
}
|
||||
}
|
||||
|
||||
print '<td><a href="facture.php?facid='.$objp->facid.'">'.img_object($langs->trans("Bill"),"bill")."</a> ";
|
||||
print '<td><a href="facture.php?facid='.$objp->facid.'">'.img_object($langs->trans("ShowBill"),"bill").'</a> ';
|
||||
print '<a href="facture.php?facid='.$objp->facid.'">'.$objp->facnumber.'</a>'.$objp->increment."</td>\n";
|
||||
|
||||
if ($objp->df > 0 )
|
||||
@ -1693,11 +1695,12 @@ else
|
||||
{
|
||||
print "<td align=\"center\"><b>!!!</b></td>\n";
|
||||
}
|
||||
print '<td><a href="fiche.php?socid='.$objp->idp.'">'.$objp->nom.'</a></td>';
|
||||
print '<td><a href="fiche.php?socid='.$objp->idp.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$objp->nom.'</a></td>';
|
||||
|
||||
print "<td align=\"right\">".price($objp->total)."</td>";
|
||||
print "<td align=\"right\">".price($objp->total_ttc)."</td>";
|
||||
print "<td align=\"right\">".price($objp->am)."</td>";
|
||||
|
||||
// Affiche statut de la facture
|
||||
if (! $objp->paye)
|
||||
{
|
||||
@ -1739,7 +1742,7 @@ else
|
||||
}
|
||||
|
||||
print "</table>";
|
||||
$db->free();
|
||||
$db->free($result);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@ -78,14 +78,14 @@ if ($_GET["facid"] > 0)
|
||||
$head[$h][1] = $langs->trans("CardBill");
|
||||
$h++;
|
||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/apercu.php?facid='.$fac->id;
|
||||
$head[$h][1] = $langs->trans("Apercu");
|
||||
$head[$h][1] = $langs->trans("Preview");
|
||||
$hselected = $h;
|
||||
$h++;
|
||||
|
||||
if ($fac->mode_reglement == 3)
|
||||
{
|
||||
$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("StandingOrders");
|
||||
$h++;
|
||||
}
|
||||
|
||||
@ -206,7 +206,8 @@ if ($_GET["facid"] > 0)
|
||||
imagick_writeimage( $handle, $file .".png");
|
||||
}
|
||||
else {
|
||||
print "Les fonctions <i>imagick</i> ne sont pas disponibles sur ce PHP";
|
||||
$langs->load("other");
|
||||
print $langs->trans("ErrorNoImagickReadimage");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -51,7 +51,7 @@ $head[$h][0] = DOL_URL_ROOT.'/compta/facture.php?facid='.$facture->id;
|
||||
$head[$h][1] = $langs->trans("CardBill");
|
||||
$h++;
|
||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/apercu.php?facid='.$facture->id;
|
||||
$head[$h][1] = $langs->trans("Apercu");
|
||||
$head[$h][1] = $langs->trans("Preview");
|
||||
$h++;
|
||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/note.php?facid='.$facture->id;
|
||||
$head[$h][1] = $langs->trans("Note");
|
||||
|
||||
@ -47,6 +47,9 @@ if ($user->societe_id > 0)
|
||||
}
|
||||
|
||||
|
||||
$facture = new Facture($db);
|
||||
$facture->fetch($_GET["facid"]);
|
||||
|
||||
|
||||
/******************************************************************************/
|
||||
/* Actions */
|
||||
@ -54,13 +57,10 @@ if ($user->societe_id > 0)
|
||||
|
||||
if ($_POST["action"] == 'update' && $user->rights->facture->creer)
|
||||
{
|
||||
|
||||
|
||||
$facture = new Facture($db);
|
||||
$facture->fetch($_GET["facid"]);
|
||||
$facture->update_note($_POST["note"]);
|
||||
}
|
||||
|
||||
|
||||
/******************************************************************************/
|
||||
/* Fin des Actions */
|
||||
/******************************************************************************/
|
||||
@ -68,15 +68,9 @@ if ($_POST["action"] == 'update' && $user->rights->facture->creer)
|
||||
|
||||
llxHeader();
|
||||
|
||||
$html = new Form($db);
|
||||
|
||||
|
||||
if ($_GET["facid"])
|
||||
{
|
||||
$facture = new Facture($db);
|
||||
if ( $facture->fetch($_GET["facid"]) )
|
||||
{
|
||||
|
||||
$soc = new Societe($db, $facture->socidp);
|
||||
$soc->fetch($facture->socidp);
|
||||
|
||||
@ -86,13 +80,13 @@ if ($_GET["facid"])
|
||||
$head[$h][1] = $langs->trans("CardBill");
|
||||
$h++;
|
||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/apercu.php?facid='.$facture->id;
|
||||
$head[$h][1] = $langs->trans("Apercu");
|
||||
$head[$h][1] = $langs->trans("Preview");
|
||||
$h++;
|
||||
|
||||
if ($facture->mode_reglement == 3)
|
||||
{
|
||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$facture->id;
|
||||
$head[$h][1] = $langs->trans("Prélèvement");
|
||||
$head[$h][1] = $langs->trans("StandingOrders");
|
||||
$h++;
|
||||
}
|
||||
|
||||
@ -108,30 +102,16 @@ if ($_GET["facid"])
|
||||
|
||||
|
||||
print '<table class="border" width="100%">';
|
||||
|
||||
print '<tr><td>'.$langs->trans("Company").'</td><td>';
|
||||
if ($soc->client == 1)
|
||||
{
|
||||
$url = DOL_URL_ROOT.'/compta/fiche.php?socid='.$soc->id;
|
||||
}
|
||||
else
|
||||
{
|
||||
$url = DOL_URL_ROOT.'/comm/prospect/fiche.php?socid='.$soc->id;
|
||||
}
|
||||
print '<a href="'.$url.'">'.$soc->nom.'</a></td>';
|
||||
print '<td>'.$langs->trans("Status").'</td><td align="center"><b>'.$facture->statut_libelle.'</b></td></tr>';
|
||||
|
||||
print '<tr><td>'.$langs->trans("Date").'</td><td>'.strftime("%A %d %B %Y",$facture->date);
|
||||
if ($facture->fin_validite)
|
||||
{
|
||||
print " (".strftime("%d %B %Y",$facture->fin_validite).")";
|
||||
}
|
||||
print '</td>';
|
||||
print '<tr><td>'.$langs->trans("Company").'</td>';
|
||||
print '<td>';
|
||||
print '<b><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></b></td>';
|
||||
|
||||
print '<td>'.$langs->trans("Author").'</td><td>';
|
||||
$author = new User($db, $facture->user_author);
|
||||
$author->fetch('');
|
||||
print $author->fullname.'</td></tr>';
|
||||
print "<td>Conditions de réglement</td><td>" . $facture->cond_reglement ."</td></tr>";
|
||||
|
||||
print '<tr><td>'.$langs->trans("Date").'</td>';
|
||||
print "<td>".strftime("%A %d %B %Y",$facture->date)."</td>\n";
|
||||
print "<td>Date limite de réglement</td><td>" . strftime("%d %B %Y",$facture->date_lim_reglement) ."</td></tr>";
|
||||
|
||||
print '<tr><td valign="top" colspan="4">'.$langs->trans("Note").' :</td></tr>';
|
||||
|
||||
@ -165,9 +145,9 @@ if ($_GET["facid"])
|
||||
print "</div>";
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter("<em>Dernière modification $Date$ révision $Revision$</em>");
|
||||
?>
|
||||
|
||||
@ -100,10 +100,10 @@ if ($_GET["facid"] > 0)
|
||||
$head[$h][1] = $langs->trans("CardBill");
|
||||
$h++;
|
||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/apercu.php?facid='.$fac->id;
|
||||
$head[$h][1] = $langs->trans("Apercu");
|
||||
$head[$h][1] = $langs->trans("Preview");
|
||||
$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("StandingOrders");
|
||||
$hselected = $h;
|
||||
$h++;
|
||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/note.php?facid='.$fac->id;
|
||||
|
||||
@ -173,4 +173,5 @@ ByUsers=By users
|
||||
Links=Links
|
||||
Link=Link
|
||||
Receipts=Receipts
|
||||
Rejects=Rejects
|
||||
Rejects=Rejects
|
||||
Preview=Preview
|
||||
@ -7,6 +7,7 @@ ErrorPasswordDiffers=Passwords differs, please type them again.
|
||||
ErrorForbidden=Access forbidden.<br>You try to access to a page, area or feature that is not allowed to your user.
|
||||
ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s.
|
||||
ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...).
|
||||
ErrorNoImagickReadimage=Function imagick_readimage is not found in this PHP. No preview can be available.
|
||||
AddTrip=Add trip
|
||||
Tools=Tools
|
||||
Birthday=Birthday
|
||||
|
||||
@ -174,4 +174,5 @@ ByUsers=Par utilisateurs
|
||||
Links=Liens
|
||||
Link=Lien
|
||||
Receipts=Bons
|
||||
Rejects=Rejets
|
||||
Rejects=Rejets
|
||||
Preview=Aperçu
|
||||
@ -7,6 +7,7 @@ ErrorPasswordDiffers=Les mots de passe ne sont pas identiques, veuillez les sais
|
||||
ErrorForbidden=Accès non autorisé.<br>Vous essayez d'accéder à une page, zone ou fonction qui n'est pas autorisée pour votre compte utilisateur.
|
||||
ErrorForbidden2=Les permissions pour ce login peuvent être attribuée par l'administrateur Dolibarr via le menu %s->%s.
|
||||
ErrorForbidden3=Dolibarr ne semble pas fonctionner au sein d'une session authentifiée. Consulter la documentation d'installation de Dolibarr pour connaitre comment gérer les autentifications (htaccess, mod_auth ou autre...).
|
||||
ErrorNoImagickReadimage=La fonction imagick_readimage n'est pas présente sur ce PHP. L'aperçu n'est donc pas disponible.
|
||||
AddTrip=Créer déplacement
|
||||
Tools=Outils
|
||||
Birthday=Anniversaire
|
||||
|
||||
Loading…
Reference in New Issue
Block a user