lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Trad: Utilisation du bon terme "Rduction" au lieu de "Remise".

Browse Source 
En effet une rduc en pourcentage sur une ligne facture s'appelle de manire gnrique "Rduction" et non "Remise" car
"Remise" est un cas particulier de "Rduction" au niveau ligne facture.
Rduction = Remise ou Rabais ou Ristourne = % sur ligne facture.
This commit is contained in:
Laurent Destailleur 2006-05-21 00:04:52 +00:00
parent 43329f7ec5
commit f7f1c89792
18 changed files with 58 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/comm/addpropal.php
View File

@ -305,7 +305,11 @@ if ($_GET["action"] == 'create')
$lib=$langs->trans("ProductsAndServices");
print '<table class="border">';
print '<tr><td>'.$lib.'</td><td>'.$langs->trans("Qty").'</td><td>'.$langs->trans("Discount").'</td></tr>';
print '<tr>';
print '<td>'.$lib.'</td>';
print '<td>'.$langs->trans("Qty").'</td>';
print '<td>'.$langs->trans("ReductionShort").'</td>';
print '</tr>';
for ($i = 1 ; $i <= $conf->global->PROPALE_NEW_FORM_NB_PRODUCT ; $i++)
{
print '<tr><td>';

4
htdocs/comm/remise.php
View File

@ -118,7 +118,7 @@ if ($_socid > 0)
/*
* Liste de l'historique des remises
* Liste de l'historique des avoirs
*/
$sql = "SELECT rc.rowid,rc.remise_client,".$db->pdate("rc.datec")." as dc,";
$sql.= " u.rowid as user_id, u.code";
@ -134,7 +134,7 @@ if ($_socid > 0)
$tag = !$tag;
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Date").'</td>';
print '<td>'.$langs->trans("Discount").'</td>';
print '<td>'.$langs->trans("CreditNote").'</td>';
print '<td align="center">'.$langs->trans("User").'</td>';
print '</tr>';
$i = 0 ;

12
htdocs/compta/facture.php
View File

@ -904,7 +904,7 @@ if ($_GET['action'] == 'create')
// Zone de choix des produits prédéfinis à la création
print '<table class="noborder">';
print '<tr><td>'.$langs->trans('ProductsAndServices').'</td><td>'.$langs->trans('Qty').'</td><td>'.$langs->trans('Discount').'</td><td> &nbsp; &nbsp; </td>';
print '<tr><td>'.$langs->trans('ProductsAndServices').'</td><td>'.$langs->trans('Qty').'</td><td>'.$langs->trans('Reduction').'</td><td> &nbsp; &nbsp; </td>';
if ($conf->service->enabled)
{
print '<td>'.$langs->trans('ServiceLimitedDuration').'</td></tr>';
@ -989,7 +989,7 @@ if ($_GET['action'] == 'create')
print '<td align="right">'.$langs->trans('VAT').'</td>';
print '<td align="right">'.$langs->trans('PriceUHT').'</td>';
print '<td align="right">'.$langs->trans('Qty').'</td>';
print '<td align="right">'.$langs->trans('Discount').'</td></tr>';
print '<td align="right">'.$langs->trans('Reduction').'</td></tr>';
// Lignes de propal produits prédéfinis
$sql = 'SELECT pt.rowid, p.label as product, p.ref, pt.tva_tx, pt.price, pt.qty, p.rowid as prodid, pt.remise_percent, pt.description';
@ -1069,7 +1069,7 @@ if ($_GET['action'] == 'create')
print '<td align="right">'.$langs->trans('VAT').'</td>';
print '<td align="right">'.$langs->trans('PriceUHT').'</td>';
print '<td align="right">'.$langs->trans('Qty').'</td>';
print '<td align="right">'.$langs->trans('Discount').'</td></tr>';
print '<td align="right">'.$langs->trans('Reduction').'</td></tr>';
$sql = 'SELECT pt.rowid, pt.subprice, pt.tva_tx, pt.qty, pt.remise_percent, pt.description,';
$sql.= ' p.label as product, p.ref, p.rowid as prodid';
@ -1152,7 +1152,7 @@ if ($_GET['action'] == 'create')
print '<td align="right">'.$langs->trans('VAT').'</td>';
print '<td align="right">'.$langs->trans('PriceUHT').'</td>';
print '<td align="right">'.$langs->trans('Qty').'</td>';
print '<td align="right">'.$langs->trans('Discount').'</td></tr>';
print '<td align="right">'.$langs->trans('Reduction').'</td></tr>';
// Lignes de contrat produits prédéfinis
$sql = 'SELECT pt.rowid, pt.subprice, pt.tva_tx, pt.qty, pt.remise_percent, pt.description,';
@ -1554,7 +1554,7 @@ else
print '<td align="right" width="50">'.$langs->trans('VAT').'</td>';
print '<td align="right" width="80">'.$langs->trans('PriceUHT').'</td>';
print '<td align="right" width="50">'.$langs->trans('Qty').'</td>';
print '<td align="right" width="50">'.$langs->trans('Discount').'</td>';
print '<td align="right" width="50">'.$langs->trans('Reduction').'</td>';
print '<td align="right" width="50">'.$langs->trans('AmountHT').'</td>';
print '<td width="16">&nbsp;</td>';
print '<td width="16">&nbsp;</td>';
@ -1816,7 +1816,7 @@ else
print '<td align="right">'.$langs->trans('VAT').'</td>';
print '<td align="right">'.$langs->trans('PriceUHT').'</td>';
print '<td align="right">'.$langs->trans('Qty').'</td>';
print '<td align="right">'.$langs->trans('Discount').'</td>';
print '<td align="right">'.$langs->trans('Reduction').'</td>';
print '<td>&nbsp;</td>';
print '<td>&nbsp;</td>';
print '<td>&nbsp;</td>';

6
htdocs/compta/facture/fiche-rec.php
View File

@ -178,7 +178,7 @@ if ($_GET["action"] == 'create')
print '<td width="54%">'.$langs->trans("Description").'</td>';
print '<td width="8%" align="center">'.$langs->trans("VAT").'</td>';
print '<td width="8%" align="center">'.$langs->trans("Qty").'</td>';
print '<td width="8%" align="right">'.$langs->trans("Discount").'</td>';
print '<td width="8%" align="right">'.$langs->trans("ReductionShort").'</td>';
print '<td width="12%" align="right">'.$langs->trans("PriceU").'</td>';
print '<td width="12%" align="right">N.P.</td>';
print "</tr>\n";
@ -336,7 +336,9 @@ else
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>';
print '<td align="right">'.$langs->trans("Price").'</td>';
print '<td align="center">'.$langs->trans("ReductionShort").'</td>';
print '<td align="center">'.$langs->trans("Qty").'</td></tr>';
$num = sizeof($fac->lignes);
$i = 0;

8
htdocs/contrat/fiche.php
View File

@ -424,7 +424,9 @@ if ($_GET["action"] == 'create')
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>';
print '<td align="right">'.$langs->trans("Price").'</td>';
print '<td align="center">'.$langs->trans("ReductionShort").'</td>';
print '<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 = $propalid";
@ -647,7 +649,7 @@ else
print '<td width="50" align="center">'.$langs->trans("VAT").'</td>';
print '<td width="50" align="right">'.$langs->trans("PriceUHT").'</td>';
print '<td width="30" align="center">'.$langs->trans("Qty").'</td>';
print '<td width="50" align="right">'.$langs->trans("Discount").'</td>';
print '<td width="50" align="right">'.$langs->trans("ReductionShort").'</td>';
print '<td width="30">&nbsp;</td>';
print '<td width="30" align="center">'.$langs->trans("Status").'</td>';
print "</tr>\n";
@ -841,7 +843,7 @@ else
print '<td align="center">'.$langs->trans("VAT").'</td>';
print '<td align="right">'.$langs->trans("PriceUHT").'</td>';
print '<td align="center">'.$langs->trans("Qty").'</td>';
print '<td align="right">'.$langs->trans("Discount").'</td>';
print '<td align="right">'.$langs->trans("ReductionShort").'</td>';
print '<td>&nbsp;</td>';
print '<td>&nbsp;</td>';
print "</tr>\n";

2
htdocs/contrat/ligne.php
View File

@ -236,7 +236,7 @@ if ($id > 0)
print '<td width="50" align="center">'.$langs->trans("VAT").'</td>';
print '<td width="50" align="right">'.$langs->trans("PriceUHT").'</td>';
print '<td width="30" align="center">'.$langs->trans("Qty").'</td>';
print '<td width="50" align="right">'.$langs->trans("Discount").'</td>';
print '<td width="50" align="right">'.$langs->trans("ReductionShort").'</td>';
print '<td width="16">&nbsp;</td>';
print '<td width="30" align="center">'.$langs->trans("Status").'</td>';
print "</tr>\n";

22
htdocs/facture.class.php
View File

@ -1057,7 +1057,7 @@ class Facture
*/
function updateline($rowid, $desc, $pu, $qty, $remise_percent=0, $datestart, $dateend, $tva_tx)
{
dolibarr_syslog('Facture::UpdateLine');
dolibarr_syslog("Facture::UpdateLine $rowid, $desc, $pu, $qty, $remise_percent, $datestart, $dateend, $tva_tx");
if ($this->brouillon)
{
@ -2206,13 +2206,19 @@ class FactureLigne
{
// From llx_facturedet
var $desc;
var $qty;
var $price; // Prix unitaire HT apres remise % de ligne
//var $price_ttc;
var $subprice; // Prix unitaire HT
var $tva_taux; // Taux tva produit/service
var $remise_percent; // % de la remise
var $remise; // Montant unitaire calculé de la remise %
var $qty; // Quantité (exemple 2)
var $subprice; // P.U. HT (exemple 100)
var $remise_percent; // % de la remise ligne (exemple 20%)
var $price; // P.U. HT apres remise % de ligne (exemple 80)
var $tva_taux; // Taux tva produit/service (exemple 19.6)
var $remise; // Montant calculé de la remise % sur PU HT (exemple 20)
// subprice = price + remise
var $total_ht; // Total HT de la ligne toute quantité et incluant
// la remise ligne et remise globale.
var $total_ttc;
var $produit_id;
var $date_start;
var $date_end;

4
htdocs/fourn/commande/fiche.php
View File

@ -418,7 +418,7 @@ if ($_GET["id"] > 0)
print '<td>'.$langs->trans("Description").'</td>';
print '<td align="center">'.$langs->trans("VAT").'</td>';
print '<td align="center">'.$langs->trans("Qty").'</td>';
print '<td align="right">'.$langs->trans("Discount").'</td>';
print '<td align="right">'.$langs->trans("ReductionShort").'</td>';
print '<td align="right">'.$langs->trans("PriceU").'</td>';
print '<td>&nbsp;</td><td width="10%">&nbsp;</td>';
print "</tr>\n";
@ -497,7 +497,7 @@ if ($_GET["id"] > 0)
print '<td colspan="2">'.$langs->trans("Description").'</td>';
print '<td align="center">'.$langs->trans("VAT").'</td>';
print '<td align="center">'.$langs->trans("Qty").'</td>';
print '<td align="right">'.$langs->trans("Discount").'</td>';
print '<td align="right">'.$langs->trans("ReductionShort").'</td>';
print '<td align="right">'.$langs->trans("PriceU").'</td>';
print '<td>&nbsp;</td><td>&nbsp;</td>'."</tr>\n";

2
htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php
View File

@ -607,7 +607,7 @@ class pdf_muscadet extends ModelePDFCommandesSuppliers
if ($this->atleastonediscount)
{
$pdf->SetXY ($this->posxdiscount-1, $tab_top+2);
$pdf->MultiCell(16,2, $langs->trans("Discount"),'','C');
$pdf->MultiCell(16,2, $langs->trans("ReductionShort"),'','C');
}
if ($this->atleastonediscount)

2
htdocs/includes/modules/commande/pdf_edison.modules.php
View File

@ -201,7 +201,7 @@ class pdf_edison extends ModelePDFCommandes
$pdf->MultiCell(42, $tab2_lh, $langs->trans("TotalHT"), 0, 'R', 0);
$pdf->SetXY (132, $tab2_top + $tab2_lh);
$pdf->MultiCell(42, $tab2_lh, $langs->trans("Discount"), 0, 'R', 0);
$pdf->MultiCell(42, $tab2_lh, $langs->trans("Reduction"), 0, 'R', 0);
$pdf->SetXY (132, $tab2_top + $tab2_lh*2);
$pdf->MultiCell(42, $tab2_lh, "Total HT après remise", 0, 'R', 0);

2
htdocs/includes/modules/commande/pdf_einstein.modules.php
View File

@ -605,7 +605,7 @@ class pdf_einstein extends ModelePDFCommandes
if ($this->atleastonediscount)
{
$pdf->SetXY ($this->posxdiscount-1, $tab_top+2);
$pdf->MultiCell(16,2, $langs->trans("Discount"),'','C');
$pdf->MultiCell(16,2, $langs->trans("ReductionShort"),'','C');
}
if ($this->atleastonediscount)

2
htdocs/includes/modules/facture/pdf_crabe.modules.php
View File

@ -725,7 +725,7 @@ class pdf_crabe extends ModelePDFFactures
if ($this->atleastonediscount)
{
$pdf->SetXY ($this->posxdiscount-1, $tab_top+2);
$pdf->MultiCell(16,2, $langs->trans("Discount"),'','C');
$pdf->MultiCell(16,2, $langs->trans("ReductionShort"),'','C');
}
if ($this->atleastonediscount)

2
htdocs/includes/modules/propale/pdf_propale_azur.modules.php
View File

@ -644,7 +644,7 @@ class pdf_propale_azur extends ModelePDFPropales
if ($this->atleastonediscount)
{
$pdf->SetXY ($this->posxdiscount-1, $tab_top+2);
$pdf->MultiCell(16,2, $langs->trans("Discount"),'','C');
$pdf->MultiCell(16,2, $langs->trans("ReductionShort"),'','C');
}
if ($this->atleastonediscount)

2
htdocs/includes/modules/propale/pdf_propale_vert.modules.php
View File

@ -266,7 +266,7 @@ class pdf_propale_vert extends ModelePDFPropales
$pdf->line(166, $tab_top, 166, $tab_top + $tab_height);
$pdf->SetXY(166, $yt);
$pdf->MultiCell(14,5,$langs->trans("Discount"),0,'C');
$pdf->MultiCell(14,5,$langs->trans("ReductionShort"),0,'C');
$pdf->line(180, $tab_top, 180, $tab_top + $tab_height);
$pdf->SetXY(180, $yt);

4
htdocs/langs/en_US/bills.lang
View File

@ -77,7 +77,6 @@ ConfirmValidateBill=Are you sure you want to validate this invoice with referenc
ConfirmClassifyPayedBill=Are you sure you want to change invoice %s to status payed ?
ConfirmCancelBill=Are you sure you want to cancel invoice %s ?
ValidateBill=Validate invoice
GlobalDiscount=Global discount
NumberOfBills=Nb of invoices
NumberOfBillsByMonth=Nb of invoices by month
ShowBill=Show invoice
@ -121,6 +120,9 @@ ChangeIntoRepeatableInvoice=Change into repeatable
CreateRepeatableInvoice=Create repeatable invoice
ExportDataset_invoice_1=Customer invoices list and invoices' lines
ProformaBill=Proforma Bill:
Reduction=Reduction
ReductionShort=Reduc
GlobalDiscount=Global discount
CreditNote=Credit note
CreditNotes=Credit notes
NewGlobalDiscount=New discount

4
htdocs/langs/fr_FR/bills.lang
View File

@ -77,7 +77,6 @@ ConfirmValidateBill=
ConfirmClassifyPayedBill=Êtes-vous sûr de vouloir classer la facture %s comme payée ?
ConfirmCancelBill=Êtes-vous sûr de vouloir annuler la facture %s ?
ValidateBill=Valider facture
GlobalDiscount=Remise globale
NumberOfBills=Nb de factures
NumberOfBillsByMonth=Nb de factures par mois
ShowBill=Afficher facture
@ -121,6 +120,9 @@ ChangeIntoRepeatableInvoice=Modifier en r
CreateRepeatableInvoice=Créer facture récurrente
ExportDataset_invoice_1=Factures clients et lignes de facture
ProformaBill=Facture Proforma :
Reduction=Réduction
ReductionShort=Réduc.
GlobalDiscount=Remise globale
CreditNote=Avoir
CreditNotes=Avoirs
NewGlobalDiscount=Nouvel avoir

2
htdocs/livraison/mods/pdf/pdf_typhon.modules.php
View File

@ -605,7 +605,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
if ($this->atleastonediscount)
{
$pdf->SetXY ($this->posxdiscount-1, $tab_top+2);
$pdf->MultiCell(16,2, $langs->trans("Discount"),'','C');
$pdf->MultiCell(16,2, $langs->trans("ReductionShort"),'','C');
}
if ($this->atleastonediscount)

12
htdocs/product/fiche.php
View File

@ -812,7 +812,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status)
print "<td><a href=\"../comm/fiche.php?socid=$objp->idp\">".dolibarr_trunc($objp->nom,18)."</a></td>\n";
print "<td nowrap=\"nowrap\">".dolibarr_print_date($objp->dp,"%d %b")."</td>\n";
print '<td><input type="hidden" name="propalid" value="'.$objp->propalid.'">';
print '<input type="text" class="flat" name="qty" size="1" value="1"></td><td nowrap>'.$langs->trans("Discount");
print '<input type="text" class="flat" name="qty" size="1" value="1"></td><td nowrap>'.$langs->trans("ReductionShort");
print '<input type="text" class="flat" name="remise_percent" size="1" value="0">%';
print " ".$product->stock_proposition;
print '</td><td align="right">';
@ -851,7 +851,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status)
$html->select_array("propalid", $otherprop);
print '</td></tr>';
print '<tr '.$bc[$var].'><td nowrap="nowrap" colspan="2">'.$langs->trans("Qty");
print '<input type="text" class="flat" name="qty" size="1" value="1"></td><td nowrap>'.$langs->trans("Discount");
print '<input type="text" class="flat" name="qty" size="1" value="1"></td><td nowrap>'.$langs->trans("ReductionShort");
print '<input type="text" class="flat" name="remise_percent" size="1" value="0">%';
print '</td><td align="right">';
print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
@ -920,7 +920,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status)
print "<td><a href=\"../comm/fiche.php?socid=$objc->idp\">".dolibarr_trunc($objc->nom,18)."</a></td>\n";
print "<td nowrap=\"nowrap\">".dolibarr_print_date($objc->dc,"%d %b")."</td>\n";
print '<td><input type="hidden" name="commandeid" value="'.$objc->commandeid.'">';
print '<input type="text" class="flat" name="qty" size="1" value="1"></td><td nowrap>'.$langs->trans("Discount");
print '<input type="text" class="flat" name="qty" size="1" value="1"></td><td nowrap>'.$langs->trans("ReductionShort");
print '<input type="text" class="flat" name="remise_percent" size="1" value="0">%';
print " ".$product->stock_proposition;
print '</td><td align="right">';
@ -959,7 +959,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status)
$html->select_array("commandeid", $othercom);
print '</td></tr>';
print '<tr '.$bc[$var].'><td colspan="2">'.$langs->trans("Qty");
print '<input type="text" class="flat" name="qty" size="1" value="1"></td><td nowrap>'.$langs->trans("Discount");
print '<input type="text" class="flat" name="qty" size="1" value="1"></td><td nowrap>'.$langs->trans("ReductionShort");
print '<input type="text" class="flat" name="remise_percent" size="1" value="0">%';
print '</td><td align="right">';
print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
@ -1024,7 +1024,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status)
print "<td><a href=\"../comm/fiche.php?socid=$objp->idp\">".dolibarr_trunc($objp->nom,18)."</a></td>\n";
print "<td nowrap=\"nowrap\">".dolibarr_print_date($objp->df,"%d %b")."</td>\n";
print '<td><input type="hidden" name="factureid" value="'.$objp->factureid.'">';
print '<input type="text" class="flat" name="qty" size="1" value="1"></td><td nowrap>'.$langs->trans("Discount");
print '<input type="text" class="flat" name="qty" size="1" value="1"></td><td nowrap>'.$langs->trans("ReductionShort");
print '<input type="text" class="flat" name="remise_percent" size="1" value="0">%';
print '</td><td align="right">';
print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
@ -1082,7 +1082,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status)
print '<input type="hidden" name="action" value="addinfacture">';
print "</td>";
print '<td><input type="hidden" name="factureid" value="'.$objp->factureid.'">';
print '<input type="text" class="flat" name="qty" size="1" value="1"></td><td nowrap>'.$langs->trans("Discount");
print '<input type="text" class="flat" name="qty" size="1" value="1"></td><td nowrap>'.$langs->trans("ReductionShort");
print '<input type="text" class="flat" name="remise_percent" size="1" value="0">%';
print '</td><td align="right">';
print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';