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

Trad: Utilisation du bon terme "Remise absolue" et non "avoir". Un avoir est un concept diffrent en compta de facture ngative non gr pour l'instant.

Browse Source
This commit is contained in:
Laurent Destailleur 2006-05-21 12:20:36 +00:00
parent 30c0b05526
commit d3a614ca52
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/addpropal.php
View File

@ -125,7 +125,7 @@ if ($_GET["action"] == 'create')
$html->select_types_paiements($soc->mode_reglement,'mode_reglement_id'); $html->select_types_paiements($soc->mode_reglement,'mode_reglement_id');
print '</td></tr>'; print '</td></tr>';
// Remise relative // Réductions relatives (Remises-Ristournes-Rabbais)
$relative_discount=$soc->remise_client; $relative_discount=$soc->remise_client;
print '<tr><td>'.$langs->trans("CustomerRelativeDiscount").'</td>'; print '<tr><td>'.$langs->trans("CustomerRelativeDiscount").'</td>';
print '<td>'; print '<td>';
@ -141,7 +141,7 @@ if ($_GET["action"] == 'create')
} }
print '</td></tr>'; print '</td></tr>';
// Remise avoirs // Réductions absolues (Remises-Ristournes-Rabbais)
$absolute_discount=$soc->getCurrentDiscount(); $absolute_discount=$soc->getCurrentDiscount();
print '<tr><td>'.$langs->trans("CustomerAbsoluteDiscount").'</td>'; print '<tr><td>'.$langs->trans("CustomerAbsoluteDiscount").'</td>';
print '<td>'; print '<td>';

4
htdocs/comm/fiche.php
View File

@ -287,7 +287,7 @@ if ($socidp > 0)
print "</td>"; print "</td>";
print '</tr>'; print '</tr>';
// Remise permanente // Réductions relative (Remises-Ristournes-Rabbais)
print '<tr><td nowrap>'; print '<tr><td nowrap>';
print '<table width="100%" class="nobordernopadding"><tr><td nowrap>'; print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
print $langs->trans("CustomerRelativeDiscountShort"); print $langs->trans("CustomerRelativeDiscountShort");
@ -297,7 +297,7 @@ if ($socidp > 0)
print '</td><td colspan="3">'.($objsoc->remise_client?$objsoc->remise_client.'%':$langs->trans("DiscountNone")).'</td>'; print '</td><td colspan="3">'.($objsoc->remise_client?$objsoc->remise_client.'%':$langs->trans("DiscountNone")).'</td>';
print '</tr>'; print '</tr>';
// Remise avoirs // Réductions absolues (Remises-Ristournes-Rabbais)
print '<tr><td nowrap>'; print '<tr><td nowrap>';
print '<table width="100%" class="nobordernopadding">'; print '<table width="100%" class="nobordernopadding">';
print '<tr><td nowrap>'; print '<tr><td nowrap>';

4
htdocs/commande/fiche.php
View File

@ -553,7 +553,7 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer)
$html->select_types_paiements($soc->mode_reglement,'mode_reglement_id'); $html->select_types_paiements($soc->mode_reglement,'mode_reglement_id');
print '</td></tr>'; print '</td></tr>';
// Remise relative // Réductions relatives (Remises-Ristournes-Rabbais)
$relative_discount=$soc->remise_client; $relative_discount=$soc->remise_client;
print '<tr><td>'.$langs->trans("CustomerRelativeDiscount").'</td>'; print '<tr><td>'.$langs->trans("CustomerRelativeDiscount").'</td>';
print '<td>'; print '<td>';
@ -569,7 +569,7 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer)
} }
print '</td></tr>'; print '</td></tr>';
// Remise avoirs // Réductions (Remises-Ristournes-Rabbais)
$absolute_discount=$soc->getCurrentDiscount(); $absolute_discount=$soc->getCurrentDiscount();
print '<tr><td>'.$langs->trans("CustomerAbsoluteDiscount").'</td>'; print '<tr><td>'.$langs->trans("CustomerAbsoluteDiscount").'</td>';
print '<td>'; print '<td>';

4
htdocs/compta/facture.php
View File

@ -753,7 +753,7 @@ if ($_GET['action'] == 'create')
$html->select_types_paiements($mode_reglement_id,'mode_reglement_id'); $html->select_types_paiements($mode_reglement_id,'mode_reglement_id');
print '</td></tr>'; print '</td></tr>';
// Remise relative // Réductions absolues (Remises-Ristournes-Rabbais)
print '<tr><td>'.$langs->trans("CustomerRelativeDiscount").'</td>'; print '<tr><td>'.$langs->trans("CustomerRelativeDiscount").'</td>';
print '<td>'; print '<td>';
if (! $_GET['propalid'] && ! $_GET['commandeid'] && ! $_GET['contratid']) print '<input type="text" name="remise_percent" size="1" value="'; if (! $_GET['propalid'] && ! $_GET['commandeid'] && ! $_GET['contratid']) print '<input type="text" name="remise_percent" size="1" value="';
@ -772,7 +772,7 @@ if ($_GET['action'] == 'create')
} }
print '</td></tr>'; print '</td></tr>';
// Remise avoirs // Réductions absolues (Remises-Ristournes-Rabbais)
print '<tr><td>'.$langs->trans("CustomerAbsoluteDiscount").'</td>'; print '<tr><td>'.$langs->trans("CustomerAbsoluteDiscount").'</td>';
print '<td>'; print '<td>';
if (! $_GET['propalid'] && ! $_GET['commandeid'] && ! $_GET['contratid']) print '<input type="text" name="remise_absolue" size="1" value="'; if (! $_GET['propalid'] && ! $_GET['commandeid'] && ! $_GET['contratid']) print '<input type="text" name="remise_absolue" size="1" value="';

2
htdocs/compta/fiche.php
View File

@ -183,7 +183,7 @@ if ($socid > 0)
print '</td><td colspan="3">'.($societe->remise_client?$societe->remise_client.'%':$langs->trans("DiscountNone")).'</td>'; print '</td><td colspan="3">'.($societe->remise_client?$societe->remise_client.'%':$langs->trans("DiscountNone")).'</td>';
print '</tr>'; print '</tr>';
// Remise avoirs // Réductions (Remises-Ristournes-Rabbais)
print '<tr><td nowrap>'; print '<tr><td nowrap>';
print '<table width="100%" class="nobordernopadding">'; print '<table width="100%" class="nobordernopadding">';
print '<tr><td nowrap>'; print '<tr><td nowrap>';

8
htdocs/langs/en_US/companies.lang
View File

@ -73,15 +73,15 @@ CustomerCard=Customer Card
Customer=Customer Customer=Customer
CustomerDiscount=Customer Discount CustomerDiscount=Customer Discount
CustomerRelativeDiscount=Relative global discount CustomerRelativeDiscount=Relative global discount
CustomerAbsoluteDiscount=Credit note CustomerAbsoluteDiscount=Absolute discount
CustomerRelativeDiscountShort=Relative discount CustomerRelativeDiscountShort=Relative discount
CustomerAbsoluteDiscountShort=Credit note CustomerAbsoluteDiscountShort=Absolute discount
CompanyHasRelativeDiscount=This customer has a discount of %s%% CompanyHasRelativeDiscount=This customer has a discount of %s%%
CompanyHasNoRelativeDiscount=This customer has no discount by default CompanyHasNoRelativeDiscount=This customer has no discount by default
CompanyHasAbsoluteDiscount=This customer has a %s %s discount credit CompanyHasAbsoluteDiscount=This customer has a %s %s discount credit
CompanyHasNoAbsoluteDiscount=This customer has no discount credit available CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
CustomerAbsoluteDiscountAllUsers=Credit note (granted by all users) CustomerAbsoluteDiscountAllUsers=Absolute discounts (granted by all users)
CustomerAbsoluteDiscountMy=Credit note (granted by yourself) CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself)
DiscountNone=None DiscountNone=None
Supplier=Supplier Supplier=Supplier
CompanyList=Companies' list CompanyList=Companies' list

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

@ -80,8 +80,8 @@ CompanyHasRelativeDiscount=Ce client a une remise par d
CompanyHasNoRelativeDiscount=Ce client n'a pas de remise par défaut CompanyHasNoRelativeDiscount=Ce client n'a pas de remise par défaut
CompanyHasAbsoluteDiscount=Ce client a %s %s d'avoirs disponibles CompanyHasAbsoluteDiscount=Ce client a %s %s d'avoirs disponibles
CompanyHasNoAbsoluteDiscount=Ce client n'a pas ou plus d'avoirs disponibles CompanyHasNoAbsoluteDiscount=Ce client n'a pas ou plus d'avoirs disponibles
CustomerAbsoluteDiscountAllUsers=Avoirs en cours (accordée par tout utilisateur) CustomerAbsoluteDiscountAllUsers=Remises en cours (accordées par tout utilisateur)
CustomerAbsoluteDiscountMy=Avoirs en cours (accordé personnellement) CustomerAbsoluteDiscountMy=Remises en cours (accordées personnellement)
DiscountNone=Aucune DiscountNone=Aucune
Supplier=Fournisseur Supplier=Fournisseur
CompanyList=Liste des sociétés CompanyList=Liste des sociétés