Trad: Traduction statut des commandes
This commit is contained in:
Laurent Destailleur
parent
8dc3f8f53d
commit
3878d46e57
@ -1,6 +1,6 @@
|
||||
<?php
|
||||
/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
*
|
||||
* 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,17 +21,17 @@
|
||||
*
|
||||
*/
|
||||
|
||||
/*!
|
||||
\file htdocs/commande/commande.class.php
|
||||
\ingroup commande
|
||||
\brief Fichier des classes de commandes
|
||||
\version $Revision$
|
||||
/**
|
||||
\file htdocs/commande/commande.class.php
|
||||
\ingroup commande
|
||||
\brief Fichier des classes de commandes
|
||||
\version $Revision$
|
||||
*/
|
||||
|
||||
|
||||
/*!
|
||||
\class Commande
|
||||
\brief Classe de gestion de commande
|
||||
/**
|
||||
\class Commande
|
||||
\brief Classe de gestion de commande
|
||||
*/
|
||||
|
||||
class Commande
|
||||
@ -40,10 +40,13 @@ class Commande
|
||||
var $id ;
|
||||
var $brouillon;
|
||||
|
||||
/*! \brief Constructeur
|
||||
/** \brief Constructeur
|
||||
*/
|
||||
function Commande($DB)
|
||||
{
|
||||
global $langs;
|
||||
$langs->load("orders");
|
||||
|
||||
$this->db = $DB;
|
||||
|
||||
$this->sources[0] = "Proposition commerciale";
|
||||
@ -53,16 +56,16 @@ class Commande
|
||||
$this->sources[4] = "Fax";
|
||||
$this->sources[5] = "Commercial";
|
||||
|
||||
$this->statuts[-1] = "Annulée";
|
||||
$this->statuts[0] = "Brouillon";
|
||||
$this->statuts[1] = "Validée";
|
||||
$this->statuts[2] = "En traitement";
|
||||
$this->statuts[3] = "Traitée";
|
||||
$this->statuts[-1] = $langs->trans("StatusOrderCanceled");
|
||||
$this->statuts[0] = $langs->trans("StatusOrderDraft");
|
||||
$this->statuts[1] = $langs->trans("StatusOrderValidated");
|
||||
$this->statuts[2] = $langs->trans("StatusOrderOnProcess");
|
||||
$this->statuts[3] = $langs->trans("StatusOrderProcessed");
|
||||
|
||||
$this->products = array();
|
||||
}
|
||||
|
||||
/*! \brief Créé la facture depuis une propale existante
|
||||
/** \brief Créé la facture depuis une propale existante
|
||||
\param user Utilisateur qui crée
|
||||
\param propale_id id de la propale qui sert de modèle
|
||||
*/
|
||||
@ -102,7 +105,7 @@ class Commande
|
||||
return $this->create($user);
|
||||
}
|
||||
|
||||
/*! \brief Valide la commande
|
||||
/** \brief Valide la commande
|
||||
\param user Utilisateur qui valide
|
||||
*/
|
||||
function valid($user)
|
||||
@ -793,7 +796,7 @@ class Commande
|
||||
|
||||
}
|
||||
|
||||
/*! \class CommandeLigne
|
||||
/** \class CommandeLigne
|
||||
\brief Classe de gestion des lignes de commande
|
||||
*/
|
||||
|
||||
|
||||
@ -21,7 +21,8 @@
|
||||
*
|
||||
*/
|
||||
|
||||
/** \file htdocs/commande/fiche.php
|
||||
/**
|
||||
\file htdocs/commande/fiche.php
|
||||
\ingroup commande
|
||||
\brief Fiche commande
|
||||
\version $Revision$
|
||||
@ -251,7 +252,7 @@ if ($_GET["action"] == 'create')
|
||||
print '<tr><td>'.$langs->trans("Ref").' :</td><td>Provisoire</td></tr>';
|
||||
print '<input name="facnumber" type="hidden" value="provisoire">';
|
||||
|
||||
print "<tr><td>Source :</td><td>";
|
||||
print '<tr><td>'.$langs->trans("Source").' :</td><td>';
|
||||
$html->select_array("source_id",$new_commande->sources,2);
|
||||
print "</td></tr>";
|
||||
|
||||
@ -471,7 +472,7 @@ else
|
||||
print '<tr><td>'.$langs->trans("Date").'</td>';
|
||||
print "<td colspan=\"2\">".strftime("%A %d %B %Y",$commande->date)."</td>\n";
|
||||
|
||||
print '<td width="50%">Source : ' . $commande->sources[$commande->source] ;
|
||||
print '<td width="50%">'.$langs->trans("Source").' : ' . $commande->sources[$commande->source] ;
|
||||
if ($commande->source == 0)
|
||||
{
|
||||
/* Propale */
|
||||
@ -578,7 +579,7 @@ else
|
||||
print '<td align="center">'.$objp->qty.'</td>';
|
||||
if ($objp->remise_percent > 0)
|
||||
{
|
||||
print '<td align="right">'.$objp->remise_percent." %</td>\n";
|
||||
print '<td align="right">'.$objp->remise_percent."%</td>\n";
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -607,9 +608,9 @@ else
|
||||
print '<input type="hidden" name="elrowid" value="'.$_GET["rowid"].'">';
|
||||
print "<tr $bc[$var]>";
|
||||
print '<td colspan="2"><textarea name="eldesc" cols="60" rows="2">'.stripslashes($objp->description).'</textarea></td>';
|
||||
print '<td align="center"><input size="4" type="text" name="elqty" value="'.$objp->qty.'"></TD>';
|
||||
print '<td align="right"><input size="3" type="text" name="elremise_percent" value="'.$objp->remise_percent.'"> %</td>';
|
||||
print '<td align="right"><input size="8" type="text" name="elprice" value="'.price($objp->subprice).'"></td>';
|
||||
print '<td align="center"><input size="4" type="text" name="elqty" value="'.$objp->qty.'"></td>';
|
||||
print '<td align="right"><input size="3" type="text" name="elremise_percent" value="'.$objp->remise_percent.'">%</td>';
|
||||
print '<td align="right"><input size="7" type="text" name="elprice" value="'.price($objp->subprice).'"></td>';
|
||||
print '<td align="right" colspan="2"><input type="submit" value="'.$langs->trans("Save").'"></td>';
|
||||
print '</tr>' . "\n";
|
||||
print "</form>\n";
|
||||
@ -621,7 +622,7 @@ else
|
||||
}
|
||||
else
|
||||
{
|
||||
print $db->error();
|
||||
dolibarr_print_error($db);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -668,15 +669,15 @@ else
|
||||
print $html->select_tva("tva_tx",$conf->defaulttx);
|
||||
print '</td>';
|
||||
print '<td align="center"><input type="text" name="qty" value="1" size="2"></td>';
|
||||
print '<td align="right"><input type="text" name="remise_percent" size="4" value="0"> %</td>';
|
||||
print '<td align="right"><input type="text" name="pu" size="8"></td>';
|
||||
print '<td align="right"><input type="text" name="remise_percent" size="3" value="0">%</td>';
|
||||
print '<td align="right"><input type="text" name="pu" size="7"></td>';
|
||||
|
||||
print '<td align="center" colspan="3"><input type="submit" value="'.$langs->trans("Add").'"></td></tr>';
|
||||
|
||||
$var=!$var;
|
||||
print "<tr $bc[$var]><td colspan=\"2\"><select name=\"p_idprod\">$opt</select></td>";
|
||||
print '<td align="center"><input type="text" size="2" name="pqty" value="1"></td>';
|
||||
print '<td align="right"><input type="text" size="4" name="premise" value="0"> %</td>';
|
||||
print '<td align="right"><input type="text" size="3" name="premise" value="0">%</td>';
|
||||
print '<td> </td>';
|
||||
print '<td align="center" colspan="3"><input type="submit" value="'.$langs->trans("Add").'"></td></tr>';
|
||||
print "</tr>\n";
|
||||
|
||||
@ -9,6 +9,11 @@ OrdersToValid=Orders to valid
|
||||
OrdersToBill=Orders to bill
|
||||
OrdersInProcess=Orders in process
|
||||
OrdersToProcess=Orders to process
|
||||
StatusOrderCanceled=Canceld
|
||||
StatusOrderDraft=Draft
|
||||
StatusOrderValidated=Validated
|
||||
StatusOrderOnProcess=On process
|
||||
StatusOrderProcessed=Processed
|
||||
SearchOrder=Search order
|
||||
Sending=Sending
|
||||
Sendings=Sendings
|
||||
|
||||
@ -10,6 +10,11 @@ OrdersToValid=Commandes
|
||||
OrdersToBill=Commandes à facturer
|
||||
OrdersInProcess=Commandes en traitement
|
||||
OrdersToProcess=Commandes à traiter
|
||||
StatusOrderCanceled=Annulée
|
||||
StatusOrderDraft=Brouillon
|
||||
StatusOrderValidated=Validée
|
||||
StatusOrderOnProcess=Traitement en cours
|
||||
StatusOrderProcessed=Traitée
|
||||
SearchOrder=Rechercher une commande
|
||||
Sending=Expédition
|
||||
Sendings=Expéditions
|
||||
|
||||
Loading…
Reference in New Issue
Block a user