Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4984] trunk
|
From: <dai...@us...> - 2012-02-28 09:38:33
|
Revision: 4984
http://web-erp.svn.sourceforge.net/web-erp/?rev=4984&view=rev
Author: daintree
Date: 2012-02-28 09:38:19 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
various
Modified Paths:
--------------
trunk/Departments.php
trunk/SelectOrderItems.php
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/upgrade4.07-4.08.sql
Modified: trunk/Departments.php
===================================================================
--- trunk/Departments.php 2012-02-27 22:29:51 UTC (rev 4983)
+++ trunk/Departments.php 2012-02-28 09:38:19 UTC (rev 4984)
@@ -25,7 +25,7 @@
//first off validate inputs sensible
- if (strpos($_POST['DepartmentName'],'&')>0 OR strpos($_POST['DepartmentName'],"'")>0) {
+ if (ContainsIllegalCharacters($_POST['DepartmentName'])) {
$InputError = 1;
prnMsg( _('The description of the department must not contain the character') . " '&' " . _('or the character') ." '",'error');
}
@@ -34,7 +34,9 @@
prnMsg( _('The Name of the Department should not be empty'), 'error');
}
- if (isset($_POST['SelectedDepartmentID']) AND $_POST['SelectedDepartmentID']!='' AND $InputError !=1) {
+ if (isset($_POST['SelectedDepartmentID'])
+ AND $_POST['SelectedDepartmentID']!=''
+ AND $InputError !=1) {
/*SelectedDepartmentID could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
@@ -48,21 +50,21 @@
$InputError = 1;
prnMsg( _('This department name already exists.'),'error');
} else {
- // Get the old name and check that the record still exist neet to be very carefull here
- // idealy this is one of those sets that should be in a stored procedure simce even the checks are
- // relavant
- $sql = "SELECT description FROM departments
- WHERE departmentid = '" . $SelectedDepartmentID . "'";
+ // Get the old name and check that the record still exist neet to be very careful here
+
+ $sql = "SELECT description
+ FROM departments
+ WHERE departmentid = '" . $SelectedDepartmentID . "'";
$result = DB_query($sql,$db);
if ( DB_num_rows($result) != 0 ) {
// This is probably the safest way there is
- $myrow = DB_fetch_row($result);
- $OldDepartmentName = $myrow[0];
+ $myrow = DB_fetch_array($result);
+ $OldDepartmentName = $myrow['description'];
$sql = array();
$sql[] = "UPDATE departments
- SET description='" . $_POST['DepartmentName'] . "',
- authoriser='" . $_POST['Authoriser'] . "'
- WHERE description ".LIKE." '".$OldDepartmentName."'";
+ SET description='" . $_POST['DepartmentName'] . "',
+ authoriser='" . $_POST['Authoriser'] . "'
+ WHERE description ". LIKE . " '" . $OldDepartmentName . "'";
} else {
$InputError = 1;
prnMsg( _('The Department does not exist.'),'error');
@@ -72,20 +74,17 @@
} elseif ($InputError !=1) {
/*SelectedDepartmentID is null cos no item selected on first time round so must be adding a record*/
$sql = "SELECT count(*) FROM departments
- WHERE description " .LIKE. " '".$_POST['DepartmentName'] ."'";
+ WHERE description " . LIKE . " '" . $_POST['DepartmentName'] . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
if ( $myrow[0] > 0 ) {
$InputError = 1;
prnMsg( _('There is already a Department with the specified name.'),'error');
} else {
- $sql = "INSERT INTO departments (
- description,
- authoriser )
- VALUES (
- '" . $_POST['DepartmentName'] ."',
- '" . $_POST['Authoriser'] ."'
- )";
+ $sql = "INSERT INTO departments (description,
+ authoriser )
+ VALUES ('" . $_POST['DepartmentName'] . "',
+ '" . $_POST['Authoriser'] . "')";
}
$msg = _('The new department has been created');
}
@@ -94,10 +93,10 @@
//run the SQL from either of the above possibilites
if (is_array($sql)) {
$result = DB_Txn_Begin($db);
- $tmpErr = _('The department could not be inserted');
- $tmpDbg = _('The sql that failed was') . ':';
+ $ErrMsg = _('The department could not be inserted');
+ $DbgMsg = _('The sql that failed was') . ':';
foreach ($sql as $stmt ) {
- $result = DB_query($stmt,$db, $tmpErr,$tmpDbg,true);
+ $result = DB_query($stmt,$db, $ErrMsg,$DbgMsg,true);
if(!$result) {
$InputError = 1;
break;
@@ -119,25 +118,28 @@
} elseif (isset($_GET['delete'])) {
//the link to delete a selected record was clicked instead of the submit button
-// PREVENT DELETES IF DEPENDENT RECORDS IN 'stockmaster'
- // Get the original name of the unit of measure the ID is just a secure way to find the unit of measure
- $sql = "SELECT description FROM departments
- WHERE departmentid = '" . $SelectedDepartmentID . "'";
+
+
+ $sql = "SELECT description
+ FROM departments
+ WHERE departmentid = '" . $SelectedDepartmentID . "'";
$result = DB_query($sql,$db);
if ( DB_num_rows($result) == 0 ) {
- // This is probably the safest way there is
prnMsg( _('You cannot delete this Department'),'warn');
} else {
$myrow = DB_fetch_row($result);
$OldDepartmentName = $myrow[0];
- $sql= "SELECT COUNT(*) FROM dispatch,departments WHERE dispatch.departmentid=departments.departmentid and description ".LIKE." '" . $OldDepartmentName . "'";
+ $sql= "SELECT COUNT(*)
+ FROM dispatch INNER JOIN departments
+ ON dispatch.departmentid=departments.departmentid
+ WHERE description " . LIKE . " '" . $OldDepartmentName . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
if ($myrow[0]>0) {
prnMsg( _('You cannot delete this Department'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('There are items related to this department');
} else {
- $sql="DELETE FROM departments WHERE description ".LIKE."'" . $OldDepartmentName . "'";
+ $sql="DELETE FROM departments WHERE description " . LIKE . "'" . $OldDepartmentName . "'";
$result = DB_query($sql,$db);
prnMsg( $OldDepartmentName . ' ' . _('The department has been removed') . '!','success');
}
@@ -152,17 +154,9 @@
if (!isset($SelectedDepartmentID)) {
-/* An unit of measure could be posted when one has been edited and is being updated
- or GOT when selected for modification
- SelectedDepartmentID will exist because it was sent with the page in a GET .
- If its the first time the page has been displayed with no parameters
- then none of the above are true and the list of account groups will be displayed with
- links to delete or edit each. These will call the same page again and allow update/input
- or deletion of the records*/
-
$sql = "SELECT departmentid,
- description,
- authoriser
+ description,
+ authoriser
FROM departments
ORDER BY departmentid";
@@ -186,11 +180,11 @@
$k++;
}
- echo '<td>' . $myrow['description'] . '</td>';
- echo '<td>' . $myrow['authoriser'] . '</td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedDepartmentID=' . $myrow['departmentid'] . '">' . _('Edit') . '</a></td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedDepartmentID=' . $myrow['departmentid'] . '&delete=1">' . _('Delete') .'</a></td>';
- echo '</tr>';
+ echo '<td>' . $myrow['description'] . '</td>
+ <td>' . $myrow['authoriser'] . '</td>
+ <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedDepartmentID=' . $myrow['departmentid'] . '">' . _('Edit') . '</a></td>
+ <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedDepartmentID=' . $myrow['departmentid'] . '&delete=1">' . _('Delete') .'</a></td>
+ </tr>';
} //END WHILE LIST LOOP
echo '</table>';
@@ -212,7 +206,7 @@
//editing an existing section
$sql = "SELECT departmentid,
- description
+ description
FROM departments
WHERE departmentid='" . $SelectedDepartmentID . "'";
@@ -235,10 +229,12 @@
echo '<table class="selection">';
}
echo '<tr>
- <td>' . _('Department Name') . ':' . '</td>
- <td><input type="text" name="DepartmentName" size="50" maxlength="100" value="' . $_POST['DepartmentName'] . '" /></td>
+ <td>' . _('Department Name') . ':' . '</td>
+ <td><input type="text" name="DepartmentName" size="50" maxlength="100" value="' . $_POST['DepartmentName'] . '" /></td>
</tr>';
- echo '<tr><td>'._('Authoriser').'</td><td><select name="Authoriser">';
+ echo '<tr>
+ <td>'._('Authoriser').'</td>
+ <td><select name="Authoriser">';
$usersql="SELECT userid FROM www_users";
$userresult=DB_query($usersql,$db);
while ($myrow=DB_fetch_array($userresult)) {
@@ -248,13 +244,16 @@
echo '<option value="'.$myrow['userid'].'">'.$myrow['userid'].'</option>';
}
}
- echo '</select></td></tr>';
- echo '</table><br />';
+ echo '</select></td>
+ </tr>
+ </table>
+ <br />';
- echo '<div class="centre"><input type="submit" name="Submit" value="' . _('Enter Information') . '" /></div>';
+ echo '<div class="centre">
+ <input type="submit" name="Submit" value="' . _('Enter Information') . '" />
+ </div>
+ </form>';
- echo '</form>';
-
} //end if record deleted no point displaying form to add record
include('includes/footer.inc');
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2012-02-27 22:29:51 UTC (rev 4983)
+++ trunk/SelectOrderItems.php 2012-02-28 09:38:19 UTC (rev 4984)
@@ -1502,23 +1502,21 @@
$ImageSource = _('No Image');
// Find the quantity in stock at location
$QOHSQL = "SELECT sum(locstock.quantity) AS qoh
- FROM locstock INNER JOIN stockmaster
- ON locstock.stockid=stockmaster.stockid
- WHERE locstock.stockid='" .$myrow['stockid'] . "' AND
- loccode = '" . $_SESSION['Items'.$identifier]->Location . "'";
+ FROM locstock
+ WHERE stockid='" .$myrow['stockid'] . "'
+ AND loccode = '" . $_SESSION['Items'.$identifier]->Location . "'";
$QOHResult = DB_query($QOHSQL,$db);
$QOHRow = DB_fetch_array($QOHResult);
$QOH = $QOHRow['qoh'];
// Find the quantity on outstanding sales orders
$sql = "SELECT SUM(salesorderdetails.quantity-salesorderdetails.qtyinvoiced) AS dem
- FROM salesorderdetails,
- salesorders
- WHERE salesorders.orderno = salesorderdetails.orderno
- AND salesorders.fromstkloc='" . $_SESSION['Items'.$identifier]->Location . "'
- AND salesorderdetails.completed=0
- AND salesorders.quotation=0
- AND salesorderdetails.stkcode='" . $myrow['stockid'] . "'";
+ FROM salesorderdetails INNER JOIN salesorders
+ ON salesorders.orderno = salesorderdetails.orderno
+ WHERE salesorders.fromstkloc='" . $_SESSION['Items'.$identifier]->Location . "'
+ AND salesorderdetails.completed=0
+ AND salesorders.quotation=0
+ AND salesorderdetails.stkcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The demand for this product from') . ' ' . $_SESSION['Items'.$identifier]->Location . ' ' .
_('cannot be retrieved because');
Modified: trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2012-02-27 22:29:51 UTC (rev 4983)
+++ trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2012-02-28 09:38:19 UTC (rev 4984)
@@ -9,7 +9,7 @@
"Project-Id-Version: weberp 3.12\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-02-11 17:15+1300\n"
-"PO-Revision-Date: 2012-02-21 21:15+0100\n"
+"PO-Revision-Date: 2012-02-28 00:33+0100\n"
"Last-Translator: James Dupin <jam...@gm...>\n"
"Language-Team: French <none>\n"
"MIME-Version: 1.0\n"
@@ -92,11 +92,12 @@
msgid "The SQL that was used to update the account group was"
msgstr "Commande SQL de modification du groupe:"
+# JDN
#: AccountGroups.php:136
#: AccountSections.php:104
#: PaymentMethods.php:82
msgid "Record Updated"
-msgstr "Fiche mise à jour"
+msgstr "Enregistrement mis à jour"
#: AccountGroups.php:154
msgid "An error occurred in inserting the account group"
@@ -106,11 +107,12 @@
msgid "The SQL that was used to insert the account group was"
msgstr "Échec de la commande SQL d'ajoût du groupe:"
+# JDN
#: AccountGroups.php:156
#: AccountSections.php:116
#: PaymentMethods.php:103
msgid "Record inserted"
-msgstr "Fiche créée"
+msgstr "Enregistrement créé"
#: AccountGroups.php:173
msgid "An error occurred in retrieving the group information from chartmaster"
@@ -921,6 +923,7 @@
msgid "The contact email address is not a valid email address"
msgstr "L'adresse courriel est incorrecte"
+# JDN
#: AddCustomerContacts.php:61
#: AddCustomerNotes.php:52
#: AddCustomerTypeNotes.php:49
@@ -943,7 +946,7 @@
#: Suppliers.php:513
#: SupplierTypes.php:67
msgid "has been updated"
-msgstr "a été mis à jour"
+msgstr "a été mis(e) à jour"
#: AddCustomerContacts.php:76
msgid "The contact record has been added"
@@ -978,7 +981,7 @@
#: WWW_Access.php:107
#: WWW_Access.php:169
msgid "Role"
-msgstr "Rôle"
+msgstr "Rôle de sécurité"
#: AddCustomerContacts.php:130
msgid "Phone no"
@@ -1035,7 +1038,7 @@
#: WOSerialNos.php:291
#: WOSerialNos.php:297
msgid "Notes"
-msgstr "Notes"
+msgstr "Commentaires"
#: AddCustomerContacts.php:150
#: SupplierContacts.php:164
@@ -1214,7 +1217,7 @@
#: AddCustomerTypeNotes.php:5
#: SelectCustomer.php:693
msgid "Customer Type (Group) Notes"
-msgstr "Type de client (en groupe) Notes"
+msgstr ""
#: AddCustomerTypeNotes.php:31
msgid "The Contact priority must be an integer."
@@ -1561,7 +1564,7 @@
#: AgedDebtors.php:468
#: AgedSuppliers.php:296
msgid "All balances or overdues only"
-msgstr "Tous les soldes ou les écheances uniquement"
+msgstr "Tous les soldes ou arrièrés uniquement"
#: AgedDebtors.php:470
msgid "All customers with balances"
@@ -1570,7 +1573,7 @@
#: AgedDebtors.php:471
#: AgedSuppliers.php:299
msgid "Overdue accounts only"
-msgstr "Seulement les comptes à écheance"
+msgstr "Arrièrés seulement"
#: AgedDebtors.php:472
msgid "Held accounts only"
@@ -1663,7 +1666,7 @@
#: AgedSuppliers.php:264
#: AgedSuppliers.php:274
msgid "Aged Supplier Analysis"
-msgstr "Analyse de fournisseur à écheance"
+msgstr ""
#: AgedSuppliers.php:288
#: OutstandingGRNs.php:168
@@ -1671,7 +1674,7 @@
#: SupplierBalsAtPeriodEnd.php:131
#: SuppPaymentRun.php:264
msgid "From Supplier Code"
-msgstr "À partir du code fournisseur"
+msgstr "À partir du code"
#: AgedSuppliers.php:292
#: OutstandingGRNs.php:172
@@ -1679,7 +1682,7 @@
#: SupplierBalsAtPeriodEnd.php:135
#: SuppPaymentRun.php:268
msgid "To Supplier Code"
-msgstr "Au code fournisseur"
+msgstr "Jusqu'au code"
#: AgedSuppliers.php:298
msgid "All suppliers with balances"
@@ -1687,16 +1690,18 @@
#: AgedSuppliers.php:303
msgid "For suppliers trading in"
-msgstr "Pour les fournisseurs \"trading in\""
+msgstr "Devise fournisseur"
+# JDN
#: AgedSuppliers.php:319
#: InventoryValuation.php:259
msgid "Summary or Detailed Report"
-msgstr "Sommaire ou Rapport détaillé"
+msgstr "Type de rapport"
+# JDN
#: Areas.php:7
msgid "Sales Area Maintenance"
-msgstr "Gestion de la zone d'achalandage"
+msgstr "Gestion des zones d'achalandage"
#: Areas.php:40
msgid "The area code must be three characters or less long"
@@ -1710,25 +1715,29 @@
msgid "The area description must be twenty five characters or less long"
msgstr "La description de la région doit être 25 caractères ou moins long"
+# JDN
#: Areas.php:55
msgid "The area code may not be empty"
-msgstr "L'indicatif régional ne doit pas être vide"
+msgstr "Un indicatif doit être saisi"
#: Areas.php:60
msgid "The area description may not be empty"
msgstr "La description de la région ne peut pas être vide"
+# JDN
#: Areas.php:73
msgid "Area code"
-msgstr "Indicatif régional"
+msgstr "Indicatif"
+# JDN
#: Areas.php:87
msgid "New area code"
-msgstr "Nouveau code zone"
+msgstr "la zone"
+# JDN
#: Areas.php:87
msgid "has been inserted"
-msgstr "a été ajouté"
+msgstr "a été ajouté(e)"
#: Areas.php:94
msgid "The area could not be added or updated because"
@@ -1778,46 +1787,51 @@
#: SupplierTypes.php:151
#: Z_DeleteInvoice.php:146
msgid "has been deleted"
-msgstr "a été supprimé"
+msgstr "a été supprimé(e)"
+# JDN
#: Areas.php:149
#: Areas.php:220
msgid "Area Name"
-msgstr "Nom zone"
+msgstr "Nom"
+# JDN
#: Areas.php:165
msgid "Are you sure you wish to delete this sales area?"
-msgstr "Voulez-vous supprimer ce département de ventes?"
+msgstr "Voulez-vous supprimer cette zone?"
#: Areas.php:166
msgid "View Customers from this Area"
msgstr "Afficher les clients de cette zone"
+# JDN
#: Areas.php:175
msgid "Review Areas Defined"
-msgstr "Afficher les Secteurs existants"
+msgstr "Afficher les zones d'achalandage"
#: AuditTrail.php:7
msgid "Audit Trail"
-msgstr "Audit Trail"
+msgstr "Journal des événements"
#: AuditTrail.php:21
msgid "Incorrect date format used, please re-enter"
msgstr "Format de date incorrect"
+# JDN
#: AuditTrail.php:41
#: BOMIndented.php:316
#: BOMIndentedReverse.php:296
#: MRPCalendar.php:263
msgid "From Date"
-msgstr "De Date"
+msgstr "Depuis le"
+# JDN
#: AuditTrail.php:43
#: BOMIndented.php:317
#: BOMIndentedReverse.php:297
#: MRPCalendar.php:265
msgid "To Date"
-msgstr "Pour Date"
+msgstr "Jusqu'au"
#: AuditTrail.php:47
#: PO_AuthorisationLevels.php:124
@@ -1825,7 +1839,7 @@
#: PO_AuthorisationLevels.php:175
#: UserSettings.php:112
msgid "User ID"
-msgstr "ID utilisateur"
+msgstr "Identifiant"
#: AuditTrail.php:49
#: AuditTrail.php:62
@@ -1892,7 +1906,7 @@
#: WorkOrderIssue.php:647
#: WorkOrderIssue.php:650
msgid "All"
-msgstr "Tous"
+msgstr "Tout(e)"
#: AuditTrail.php:60
msgid "Table "
@@ -1908,11 +1922,11 @@
#: SelectContract.php:193
#: SelectProduct.php:772
msgid "View"
-msgstr "Vue"
+msgstr "Afficher"
#: AuditTrail.php:163
msgid "Date/Time"
-msgstr "Date/Heure"
+msgstr "Date / Heure"
#: AuditTrail.php:164
#: PcReportTab.php:259
@@ -1957,14 +1971,14 @@
#: AuditTrail.php:166
msgid "Table"
-msgstr "Tableau"
+msgstr "Table"
#: AuditTrail.php:167
#: api/api_xml-rpc.php:314
#: api/api_xml-rpc.php:780
#: api/api_xml-rpc.php:2189
msgid "Field Name"
-msgstr "Nom du champ"
+msgstr "Champ"
#: AuditTrail.php:168
#: SystemParameters.php:334
@@ -2099,25 +2113,29 @@
msgid "GL Account Code"
msgstr "Code compte GL"
+# JDN
#: BankAccounts.php:192
#: BankAccounts.php:326
msgid "Bank Account Name"
-msgstr "Nom de compte bancaire"
+msgstr "Nom"
+# JDN
#: BankAccounts.php:193
#: BankAccounts.php:328
msgid "Bank Account Code"
-msgstr "Code de compte bancaire"
+msgstr "Code"
+# JDN
#: BankAccounts.php:194
#: BankAccounts.php:330
msgid "Bank Account Number"
-msgstr "Compte bancaire n°"
+msgstr "N°"
+# JDN
#: BankAccounts.php:195
#: BankAccounts.php:332
msgid "Bank Address"
-msgstr "Référence bancaire (adresse postale)"
+msgstr "Adresse postale"
#: BankAccounts.php:196
#: CustomerAllocations.php:333
@@ -2166,7 +2184,7 @@
#: BankAccounts.php:379
#: BankAccounts.php:383
msgid "Fall Back Default"
-msgstr "Solution de repli par défaut"
+msgstr ""
#: BankAccounts.php:214
#: BankAccounts.php:370
@@ -2183,7 +2201,7 @@
#: BankAccounts.php:248
msgid "Show All Bank Accounts Defined"
-msgstr "Afficher tous les comptes bancaires définis"
+msgstr "Afficher tous les comptes bancaires"
#: BankAccounts.php:282
#: BankAccounts.php:287
@@ -2505,7 +2523,7 @@
#: BankMatching.php:342
msgid "Update Matching"
-msgstr "Mise à jour des rapporchements"
+msgstr "Mise à jour des rapprochements"
#: BankReconciliation.php:7
msgid "Bank Reconciliation"
@@ -3367,7 +3385,7 @@
#: WorkOrderEntry.php:601
#: WorkOrderIssue.php:664
msgid "Enter text extracts in the"
-msgstr "Saisir un extrait de texte dans le/la"
+msgstr "Saisir une partie de "
#: BOMInquiry.php:28
#: BOMs.php:837
@@ -3378,7 +3396,7 @@
#: WorkOrderEntry.php:601
#: WorkOrderIssue.php:664
msgid "description"
-msgstr "Description"
+msgstr "description"
#: BOMInquiry.php:30
#: BOMs.php:839
@@ -3439,7 +3457,7 @@
#: WorkOrderEntry.php:605
#: WorkOrderIssue.php:667
msgid "Enter extract of the"
-msgstr "Saisir un extrait du"
+msgstr "Saisir une partie du "
#: BOMInquiry.php:31
#: BOMs.php:840
@@ -3477,7 +3495,7 @@
#: Z_ChangeStockCategory.php:90
#: Z_ChangeStockCode.php:319
msgid "Stock Code"
-msgstr "Code stock"
+msgstr "Code"
#: BOMInquiry.php:37
#: BOMs.php:844
@@ -3507,7 +3525,7 @@
#: WorkOrderEntry.php:609
#: WorkOrderIssue.php:672
msgid "Search Now"
-msgstr "Chercher maintenant"
+msgstr "Rechercher"
#: BOMInquiry.php:49
#: BOMs.php:775
@@ -3631,7 +3649,7 @@
#: includes/DefineLabelClass.php:21
#: includes/PDFInventoryValnPageHeader.inc:34
msgid "Units"
-msgstr "Unités"
+msgstr "Unité"
#: BOMInquiry.php:179
msgid "The bill of material could not be retrieved because"
@@ -3674,7 +3692,7 @@
#: SpecialOrder.php:725
#: StockAdjustments.php:380
msgid "Unit Cost"
-msgstr "Cot Unitaire"
+msgstr "Coût unitaire"
#: BOMInquiry.php:202
#: BOMInquiry.php:250
@@ -4290,13 +4308,13 @@
#: Suppliers.php:594
#: SystemParameters.php:323
msgid "Validation failed"
-msgstr "la validation a échoué"
+msgstr " "
#: CompanyPreferences.php:148
#: Suppliers.php:594
#: SystemParameters.php:323
msgid "no updates or deletes took place"
-msgstr "Il n'y a pas eu de mis à jour ou de suppression"
+msgstr " Rien n'a été modifié."
#: CompanyPreferences.php:189
msgid "The company preferences could not be retrieved because"
@@ -4312,7 +4330,7 @@
#: CompanyPreferences.php:233
msgid "Tax Authority Reference"
-msgstr "N° TVA Intracommunautaire"
+msgstr ""
#: CompanyPreferences.php:238
#: Factors.php:210
@@ -4352,7 +4370,7 @@
#: CompanyPreferences.php:268
msgid "Telephone Number"
-msgstr "n° tél"
+msgstr "N° tél"
#: CompanyPreferences.php:273
msgid "Facsimile Number"
@@ -4477,7 +4495,7 @@
#: ConfirmDispatchControlled_Invoice.php:39
#: ConfirmDispatch_Invoice.php:27
msgid "Select a sales order to invoice"
-msgstr "Sélectionner une commande à facturer"
+msgstr "Facturer une commande"
#: ConfirmDispatchControlled_Invoice.php:41
msgid "This page can only be opened if a sales order and line item has been selected Please do that first"
@@ -4611,6 +4629,7 @@
msgid "Customer"
msgstr "Client"
+# JDN
#: ConfirmDispatch_Invoice.php:260
#: CustEDISetup.php:93
#: Customers.php:440
@@ -4627,7 +4646,7 @@
#: includes/PDFTransPageHeader.inc:46
#: includes/PDFTransPageHeaderPortrait.inc:55
msgid "Customer Code"
-msgstr "Code Client"
+msgstr "Code client"
#: ConfirmDispatch_Invoice.php:261
#: CustEDISetup.php:96
@@ -4653,7 +4672,7 @@
#: SelectCustomer.php:415
#: SelectOrderItems.php:710
msgid "Customer Name"
-msgstr "Nom Client"
+msgstr "Société"
#: ConfirmDispatch_Invoice.php:264
msgid "Invoice amounts stated in"
@@ -5767,7 +5786,7 @@
#: Suppliers.php:965
#: includes/MiscFunctions.php:36
msgid "WARNING"
-msgstr "ATTENTION"
+msgstr "AVERTISSEMENT"
#: ConfirmDispatch_Invoice.php:939
#: CounterSales.php:1324
@@ -6466,7 +6485,7 @@
#: SelectCompletedOrder.php:524
#: SelectCreditItems.php:969
msgid "Enter text extracts in the description"
-msgstr "Saisir un extraitde texte dans la description"
+msgstr "Saisir une partie de la description"
#: ContractBOM.php:325
#: CounterSales.php:2177
@@ -6897,7 +6916,7 @@
#: Stocks.php:53
#: Z_MakeNewCompany.php:50
msgid "Only jpg files are supported - a file extension of .jpg is expected"
-msgstr "Seuls les fichiers jpg sont pris en charge -. Une extension de fichier jpg est prévu de"
+msgstr "Format d'image incorrect - Seuls les fichiers .jpg sont pris en charge"
#: Contracts.php:114
#: FixedAssetItems.php:37
@@ -7145,7 +7164,7 @@
#: Contracts.php:608
#: SelectOrderItems.php:303
msgid "At least one Customer Branch Name keyword OR an extract of a Customer Branch Code or Branch Phone Number must be entered for the search"
-msgstr "Au moins un mot-clé à la clientèle Direction Nom ou un extrait d'un code client ou de la Direction Direction numéro de téléphone doivent être inscrits pour la recherche"
+msgstr "Vous devez saisir un critère de recherche dans une des boîtes ci-dessous"
#: Contracts.php:663
#: CustomerReceipt.php:600
@@ -7157,24 +7176,28 @@
#: Contracts.php:670
#: SelectOrderItems.php:337
msgid "No Customer Branch records contain the search criteria"
-msgstr "Aucune fiche de succursale ne contient les critères de recherche"
+msgstr "Pas de succursale correspondante aux critères de recherche"
+# NE PAS CHANGER sans raison (plus que) valable.
+# La notice d'information contenant ce texte est bien trop longue avec ce texte inutile à la compréhension de l'action à mener sur la page SelectOrderItems.php?identifier=1329948142
+# should not be changed except for a pretty good reason.
+# It makes the information message way too long in SelectOrderItems.php?identifier=1329948142
#: Contracts.php:670
#: SelectOrderItems.php:337
msgid "please try again"
-msgstr "s'il vous plaît essayer à nouveau"
+msgstr " "
#: Contracts.php:670
#: SelectOrderItems.php:337
msgid "Note a Customer Branch Name may be different to the Customer Name"
-msgstr "Note: un nom de succursale peut être différent du nom du client"
+msgstr "Note: le nom de la succursale ne correspond pas forcément au nom du client"
#: Contracts.php:683
#: SelectCreditItems.php:134
#: SelectCustomer.php:189
#: SelectOrderItems.php:350
msgid "Unable to identify the selected customer"
-msgstr "Impossible d'identifier le client choisi"
+msgstr "Pas de succursale correspondant à la recherche"
#: Contracts.php:714
msgid "The customer record selected"
@@ -7267,12 +7290,12 @@
#: Contracts.php:757
#: SelectOrderItems.php:588
msgid "Part of the Customer Branch Code"
-msgstr "Partie du code de la succursale"
+msgstr "Partie du code succursale"
#: Contracts.php:760
#: SelectOrderItems.php:591
msgid "Part of the Branch Phone Number"
-msgstr "Partie du numéro de téléphone succursale"
+msgstr "Partie du n° de tél. de la succursale"
#: Contracts.php:765
#: Customers.php:611
@@ -7468,7 +7491,7 @@
#: SupplierInvoice.php:263
#: SuppPaymentRun.php:296
msgid "Exchange Rate"
-msgstr "Taux de Change"
+msgstr "Taux de change"
#: Contracts.php:919
msgid "Contract Status"
@@ -7498,7 +7521,7 @@
#: SelectContract.php:67
#: SelectContract.php:73
msgid "Completed"
-msgstr "Terminé"
+msgstr "Close"
#: Contracts.php:927
msgid "Contract Setup"
@@ -7707,7 +7730,7 @@
#: WorkOrderEntry.php:156
#: WorkOrderIssue.php:472
msgid "There are no products available meeting the criteria specified"
-msgstr "Il n'y a pas de produits répondant aux critères de recherche"
+msgstr "Il n'y a pas d'article répondant aux critères de recherche"
#: CounterSales.php:426
#: SelectOrderItems.php:903
@@ -7942,7 +7965,7 @@
#: DeliveryDetails.php:499
#: DeliveryDetails.php:685
msgid "an item on this sales order, the cost of this item as accumulated from the sum of the component costs is nil. This could be because there is no bill of material set up ... you may wish to double check this"
-msgstr "un article sur cet ordre de vente, le coût de cet article accumulé de la somme des coûts des composants est nul. Ce pourrait être parce qu'il n'y a aucun projet de loi de matériel mis en place ... vous pouvez vérifier ce"
+msgstr "un article sur cet ordre de vente, le coût de cet article accumulé de la somme des coûts des composants est nul. Ce pourrait être parce qu'il n'y a aucun projet de loi de matériel mis en place ..."
#: CounterSales.php:1185
#: DeliveryDetails.php:513
@@ -8047,7 +8070,7 @@
#: DeliveryDetails.php:564
#: SpecialOrder.php:567
msgid "has been entered"
-msgstr "a été saisi"
+msgstr "a été saisie"
#: CounterSales.php:1833
msgid "The SQL that failed to insert the GL transaction for the bank account debit was"
@@ -8184,12 +8207,12 @@
#: CounterSales.php:2147
#: CounterSales.php:2148
msgid "Search for Items"
-msgstr "Chercher des articles"
+msgstr "Rechercher un article"
#: CounterSales.php:2148
#: SelectOrderItems.php:1607
msgid ", Searches the database for items, you can narrow the results by selecting a stock category, or just enter a partial item description or partial item code"
-msgstr ", recherche dans la base de données des articles, affinez les résultats en sélectionnant une catégorie de stock ou entrez une description partielle de l'article ou une partie de son code"
+msgstr ": recherche d'un article dans la base de données. Affinez les résultats en sélectionnant une catégorie, une description partielle de l'article ou une partie d'un code"
#: CounterSales.php:2149
#: SelectOrderItems.php:1608
@@ -8201,15 +8224,16 @@
msgid "Enter partial Description"
msgstr "Saisir une description partielle"
+# NE PAS CHANGER sans raison (plus que) valable.
#: CounterSales.php:2182
#: SelectOrderItems.php:1647
msgid "Use Quick Entry"
-msgstr "Utiliser la Saisie rapide"
+msgstr "Vente directe"
#: CounterSales.php:2193
#: SelectOrderItems.php:1660
msgid "Select an item by entering the quantity required. Click Order when ready."
-msgstr "Sélectionner un article en entrant la quantité requise. Cliquer ensuite sur commander."
+msgstr "Saisir une quantité pour sélectionner un article puis cliquer sur \"Ajouter à la vente\". Utiliser les boutons \"Suivant\" ou \"Précédent\" pour faire défiler les articles."
#: CounterSales.php:2204
#: CounterSales.php:2327
@@ -8235,22 +8259,24 @@
#: CounterSales.php:2337
msgid "Use this form to add items quickly if the item codes are already known"
-msgstr "Utilisez ce formulaire pour ajouter des éléments rapidement si les codes de commande sont déjà connus"
+msgstr "Utilisez ce formulaire pour faire une vente directe. Entrez le code de l'article et la quantité vendue."
+# need to see if it can apply to all php where it is used.
+# Written vs CounterSales.php
#: CounterSales.php:2362
#: SelectCreditItems.php:981
#: SelectCreditItems.php:1032
#: SelectOrderItems.php:1796
#: SelectOrderItems.php:1822
msgid "Quick Entry"
-msgstr "Écriture rapide"
+msgstr "Appliquer"
#: CounterSales.php:2363
#: SelectCreditItems.php:1050
#: SelectOrderItems.php:1823
#: SelectOrderItems.php:1843
msgid "Search Parts"
-msgstr "Chercher des pièces détachées"
+msgstr "Rechercher un article"
#: CounterSales.php:2367
msgid "Cancel Sale"
@@ -8607,33 +8633,39 @@
msgid "Credit of Controlled Item"
msgstr "Crédit de l'objet contrôlé"
+# JDN (à revoir?)
#: CreditStatus.php:6
msgid "Credit Status Code Maintenance"
-msgstr "Gestion des Codes Solvabilit"
+msgstr "Gestion des codes de solvabilité"
+# JDN
#: CreditStatus.php:42
msgid "The credit status code already exists in the database"
-msgstr "Le code d'état de crédit existe déjà dans la base de données"
+msgstr "Le code existe déjà dans la base de données"
+# JDN
#: CreditStatus.php:48
msgid "The status code name must be an integer"
-msgstr "Le code statut doit être un nombre entier"
+msgstr "Le code doit être un nombre entier"
#: CreditStatus.php:54
msgid "The credit status description must be thirty characters or less long"
msgstr "La description du statut de solvabilité ne doit pas dépasser 30 caractères"
+# JDN
#: CreditStatus.php:58
msgid "The credit status description must be entered"
-msgstr "La description de l'état de crédit doit être inscrit"
+msgstr "La description du code doit être saisi"
+# JDN
#: CreditStatus.php:80
msgid "The credit status record has been updated"
-msgstr "Le code solvabilité à été mis à jour"
+msgstr "Le code de solvabilité à été mis à jour"
+# JDN
#: CreditStatus.php:103
msgid "A new credit status record has been inserted"
-msgstr "Un nouveau code solvabilité a été ajouté"
+msgstr "Un nouveau code de solvabilité a été ajouté"
#: CreditStatus.php:124
msgid "Cannot delete this credit status code because customer accounts have been created referring to it"
@@ -8643,15 +8675,17 @@
msgid "customer accounts that refer to this credit status code"
msgstr "Comptes Clients se servant de ce code solvabilité"
+# JDN
#: CreditStatus.php:131
msgid "This credit status code has been deleted"
-msgstr "Ce code solvabilité a été supprimé"
+msgstr "Le code de solvabilité a été supprimé"
+# JDN
#: CreditStatus.php:151
#: CreditStatus.php:221
#: CreditStatus.php:232
msgid "Status Code"
-msgstr "Code Statut"
+msgstr "Code"
#: CreditStatus.php:153
#: CreditStatus.php:246
@@ -8669,11 +8703,12 @@
#: CreditStatus.php:175
#, php-format
msgid "Are you sure you wish to delete this credit stuatus record?"
-msgstr "Voulez-vous supprimer ce contact?"
+msgstr "Voulez-vous supprimer ce code?"
+# JDN
#: CreditStatus.php:192
msgid "Show Defined Credit Status Codes"
-msgstr "Afficher les codes solvabilité existants"
+msgstr "Afficher les codes de solvabilité"
#: Currencies.php:6
msgid "Currencies Maintenance"
@@ -8687,14 +8722,15 @@
msgid "The currency abbreviation must be 3 characters or less long and for automated currency updates to work correctly be one of the ISO4217 currency codes"
msgstr "L'abréviation de change doit être de 3 caractères ou moins longues et des mises à jour automatiques de devises pour fonctionner correctement l'un des codes de devises ISO4217"
+# JDN
#: Currencies.php:63
msgid "The exchange rate must be numeric"
-msgstr "Le Taux de Change doit être numérique"
+msgstr "Le taux de change doit être numérique"
+# JDN
#: Currencies.php:69
-#, fuzzy
msgid "The number of decimal places to display for amounts in this currency must be numeric"
-msgstr "Le nombre de jours ou le jour du mois suivant doit �re num�ique"
+msgstr "Le nombre de décimales doit être numérique"
#: Currencies.php:74
msgid "The number of decimal places to display for amounts in this currency must be positive or zero"
@@ -8739,13 +8775,15 @@
msgid "or a space"
msgstr "ou un espace"
+# JDN
#: Currencies.php:122
msgid "The currency definition record has been updated"
-msgstr "La définition de la devise a été mise à jour"
+msgstr "La devise a été mise à jour"
+# JDN
#: Currencies.php:139
msgid "The currency definition record has been added"
-msgstr "La définition de la devise a été ajouté"
+msgstr "La fiche devise a été ajoutée"
#: Currencies.php:165
msgid "Cannot delete this currency because customer accounts have been created referring to this currency"
@@ -8777,7 +8815,7 @@
#: Currencies.php:189
msgid "The currency definition record has been deleted"
-msgstr "La définition de la devise a été supprimé"
+msgstr "La devise a été supprimée"
#: Currencies.php:215
msgid "ISO4217 Code"
@@ -8786,7 +8824,7 @@
#: Currencies.php:216
#: Currencies.php:358
msgid "Currency Name"
-msgstr "Nom de la devise"
+msgstr "Nom"
#: Currencies.php:217
#: Currencies.php:366
@@ -8800,7 +8838,7 @@
#: Currencies.php:219
msgid "Decimal Places"
-msgstr "Emplacement des décimales"
+msgstr "Décimales"
#: Currencies.php:221
msgid "Ex Rate - ECB"
@@ -8818,11 +8856,12 @@
#: Currencies.php:295
msgid "Functional Currency"
-msgstr "Devise de base"
+msgstr "Devise de référence"
+# JDN
#: Currencies.php:304
msgid "Show all currency definitions"
-msgstr "Afficher toutes les définitions de devises"
+msgstr "Afficher les devises"
#: Currencies.php:326
#: geo_displaymap_customers.php:12
@@ -8834,13 +8873,14 @@
msgid "ISO 4217 Currency Code"
msgstr "Code de devise ISO 4217"
+# JDN
#: Currencies.php:352
msgid "Currency Abbreviation"
-msgstr "Abréviation devise"
+msgstr "Abréviation"
#: Currencies.php:382
msgid "Decimal Places to Display"
-msgstr "Nombre de décimales à afficher"
+msgstr "Nombre de décimales"
#: CustEDISetup.php:6
msgid "Customer EDI Set Up"
@@ -9027,7 +9067,7 @@
#: WWW_Users.php:276
#: WWW_Users.php:415
msgid "User Login"
-msgstr "Utilisateur"
+msgstr "Identifiant"
#: CustLoginSetup.php:149
#: SMTPServer.php:59
@@ -9051,7 +9091,7 @@
#: SuppLoginSetup.php:143
#: WWW_Users.php:455
msgid "Telephone No"
-msgstr "n° tél"
+msgstr "N° tél"
#: CustLoginSetup.php:166
#: CustomerBranches.php:552
@@ -9063,11 +9103,12 @@
msgid "Branch Code"
msgstr "Code succursale"
+# JDN
#: CustLoginSetup.php:186
#: SuppLoginSetup.php:205
#: WWW_Users.php:555
msgid "Reports Page Size"
-msgstr "Format des Rapports"
+msgstr "Format des rapports"
#: CustLoginSetup.php:190
#: CustLoginSetup.php:192
@@ -9239,7 +9280,7 @@
#: SupplierAllocations.php:640
#: includes/PDFStatementPageHeader.inc:167
msgid "Trans Type"
-msgstr "Type de trans"
+msgstr "Type"
#: CustomerAllocations.php:328
msgid "Cust No"
@@ -9249,7 +9290,7 @@
#: SupplierAllocations.php:570
#: SupplierAllocations.php:645
msgid "To Alloc"
-msgstr "A Attribuer"
+msgstr "À Attribuer"
#: CustomerAllocations.php:334
msgid "Action"
@@ -9654,7 +9695,7 @@
#: CustomerBranches.php:616
msgid "Street Address 2 (Suburb/City)"
-msgstr "Adresse 2 (Banlieue/Ville)"
+msgstr "Adresse 2 (Banlieue / Ville)"
#: CustomerBranches.php:623
msgid "Street Address 3 (State)"
@@ -9700,12 +9741,13 @@
msgid "Define Sales People"
msgstr "Définir les vendeurs"
+# JDN
#: CustomerBranches.php:690
#: DailySalesInquiry.php:42
#: SalesPeople.php:170
#: WWW_Users.php:283
msgid "Salesperson"
-msgstr "Vendeur"
+msgstr "Le vendeur (la vendeuse)"
#: CustomerBranches.php:712
msgid "There are no areas defined as yet"
@@ -9860,6 +9902,7 @@
msgid "Credit Limit"
msgstr "Limite de crédit"
+# JDN
#: CustomerInquiry.php:129
#: CustomerReceipt.php:956
#: Customers.php:544
@@ -9870,7 +9913,7 @@
#: Customers.php:940
#: index.php:1090
msgid "Credit Status"
-msgstr "Solvabilité"
+msgstr "Codes de solvabilité"
#: CustomerInquiry.php:133
#: CustomerReceipt.php:960
@@ -9884,6 +9927,7 @@
msgid "Total Balance"
msgstr "Total Solde"
+# JDN
#: CustomerInquiry.php:139
#: CustomerReceipt.php:967
#: PrintCustStatements.php:358
@@ -9895,7 +9939,7 @@
#: includes/PDFAgedDebtorsPageHeader.inc:50
#: includes/PDFAgedSuppliersPageHeader.inc:36
msgid "Current"
-msgstr "Courant"
+msgstr "Actif"
#: CustomerInquiry.php:140
#: CustomerReceipt.php:968
@@ -9910,24 +9954,24 @@
#: SupplierInquiry.php:145
#: SupplierInquiry.php:146
msgid "Days Overdue"
-msgstr "Jours de retard"
+msgstr "jours de retard"
#: CustomerInquiry.php:142
#: CustomerReceipt.php:970
#: PrintCustStatements.php:361
#: SupplierInquiry.php:146
msgid "Over"
-msgstr "Au delà"
+msgstr "Plus de"
#: CustomerInquiry.php:157
#: SupplierInquiry.php:162
msgid "Show all transactions after"
-msgstr "Afficher toutes les transactions après"
+msgstr "Afficher les transactions à partir du"
#: CustomerInquiry.php:158
#: SupplierInquiry.php:163
msgid "Refresh Inquiry"
-msgstr "Actualiser la consultation"
+msgstr "Actualiser la recherche"
#: CustomerInquiry.php:183
#: SupplierInquiry.php:189
@@ -10188,15 +10232,16 @@
#: CustomerReceipt.php:609
#: SelectCustomer.php:176
msgid "No customer records contain the selected text"
-msgstr "Aucune fiche client ne contient le texte sélectionné"
+msgstr "Il n'y a pas de client correspondant à la recherche"
+# JDN
#: CustomerReceipt.php:609
#: PO_Header.php:351
#: SelectCreditItems.php:119
#: SelectCustomer.php:176
#: includes/PO_ReadInOrder.inc:124
msgid "please alter your search criteria and try again"
-msgstr "Modifiez vos critères de recherche et recommencez"
+msgstr "Modifier les critères de recherche"
#: CustomerReceipt.php:683
#: CustomerReceipt.php:711
@@ -10288,7 +10333,7 @@
#: SupplierTypes.php:254
#: Z_CheckDebtorsControl.php:68
msgid "Accept"
-msgstr "Accepter"
+msgstr "Valider"
#: CustomerReceipt.php:893
msgid "Banked"
@@ -10509,14 +10554,14 @@
#: Customers.php:408
msgid "In order to create a new customer you must first set up at least one sales type/price list"
-msgstr "Afin de créer un nouveau client, vous devez d'abord configurer au moins un type de liste des ventes / prix"
+msgstr "Définissez une liste de type / prix de vente pour pouvoir créer un client"
#: Customers.php:409
#: Customers.php:418
#: includes/ConnectDB_mysqli.inc:30
#: includes/ConnectDB_mysql.inc:25
msgid "Click"
-msgstr "Cliquer sur"
+msgstr "Cliquer"
#: Customers.php:409
#: Customers.php:418
@@ -10533,15 +10578,15 @@
#: Customers.php:409
msgid "to set up your price lists"
-msgstr "de mettre en place vos listes de prix"
+msgstr "pour définir un tarif"
#: Customers.php:417
msgid "In order to create a new customer you must first set up at least one customer type"
-msgstr "Afin de créer un nouveau client, vous devez d'abord configurer au moins un type de client"
+msgstr "Définissez un type de client pour pouvoir créer un client"
#: Customers.php:418
msgid "to set up your customer types"
-msgstr "pour configurer votre types de clients"
+msgstr "pour définir un type de client"
#: Customers.php:423
msgid "Click here to continue"
@@ -10563,7 +10608,7 @@
#: SupplierTenderCreate.php:135
#: WWW_Users.php:278
msgid "Telephone"
-msgstr "n° tél"
+msgstr "Téléphone"
#: Customers.php:447
#: PrintCustTrans.php:713
@@ -10592,7 +10637,7 @@
#: Suppliers.php:664
#: Suppliers.php:846
msgid "Address Line 2 (Suburb/City)"
-msgstr "Adresse ligne 2 (Banlieue/Ville)"
+msgstr "Adresse ligne 2 (Banlieue / Ville)"
#: Customers.php:455
#: Customers.php:712
@@ -10600,7 +10645,7 @@
#: Suppliers.php:667
#: Suppliers.php:848
msgid "Address Line 3 (State/Province)"
-msgstr "Adresse ligne 3 (État/Province)"
+msgstr "Adresse ligne 3 (État / Province)"
#: Customers.php:457
#: Customers.php:716
@@ -10629,11 +10674,12 @@
msgid "No Customer types/price lists defined"
msgstr "Aucun type/prix de client défini"
+# JDN
#: Customers.php:489
#: Customers.php:783
#: Customers.php:789
msgid "Customer Type"
-msgstr "Type de client"
+msgstr "Le type de client"
#: Customers.php:500
#: Customers.php:803
@@ -10684,7 +10730,7 @@
#: includes/PO_PDFOrderPageHeader.inc:62
#: includes/PO_PDFOrderPageHeader.inc:64
msgid "Payment Terms"
-msgstr "Conditions de réglement"
+msgstr "Conditions de paiement"
#: Customers.php:551
msgid "There are no credit statuses currently defined - go to the setup tab of the main menu and set at least one up first"
@@ -10700,7 +10746,7 @@
#: Customers.php:590
msgid "Customer PO Line on SO"
-msgstr "Line PO client sur le SO"
+msgstr ""
#: Customers.php:598
#: Customers.php:962
@@ -10726,7 +10772,7 @@
#: Customers.php:611
#: Customers.php:1083
msgid "Add New Customer"
-msgstr "Ajouter un nouveau client"
+msgstr "Ajouter un client"
#: Customers.php:918
msgid "Customers Currency"
@@ -10850,7 +10896,7 @@
#: CustomerTypes.php:21
#: index.php:1080
msgid "Customer Types"
-msgstr "Types de clients"
+msgstr "Types de client"
#: CustomerTypes.php:6
#: index.php:1517
@@ -10861,19 +10907,20 @@
#: CustomerTypes.php:22
msgid "Customer Type Setup"
-msgstr "Type d'installation à la clientèle"
+msgstr "Gestion des types de client"
#: CustomerTypes.php:23
msgid "Add/edit/delete Customer Types"
-msgstr "Ajouter/Modifier/Supprimer des types clients"
+msgstr "Ajouter / Modifier / Supprimer"
#: CustomerTypes.php:37
msgid "The customer type name description must be 100 characters or less long"
msgstr "La description du nom du client type doit être de 100 caractères ou moins long"
+# JDN
#: CustomerTypes.php:45
msgid "The customer type name description must contain at least one character"
-msgstr "La description du nom du client type doit contenir au moins un caractère"
+msgstr "Le nom doit comporter au moins un caractère"
#: CustomerTypes.php:58
msgid "You already have a customer type called"
@@ -10894,10 +10941,11 @@
msgid " already exist."
msgstr " existe déjà."
+# JDN
#: CustomerTypes.php:93
#: CustomerTypes.php:164
msgid "Customer type"
-msgstr "Type de client"
+msgstr "Le type de client "
#: CustomerTypes.php:93
#: PcAssignCashToTab.php:112
@@ -10949,7 +10997,7 @@
#: SupplierTypes.php:172
#: SupplierTypes.php:238
msgid "Type ID"
-msgstr "Type ID"
+msgstr "ID"
#: CustomerTypes.php:186
#: CustomerTypes.php:258
@@ -10957,7 +11005,7 @@
#: SupplierTypes.php:173
#: SupplierTypes.php:247
msgid "Type Name"
-msgstr "Nom Type"
+msgstr "Nom"
#: CustomerTypes.php:203
#, php-format
@@ -10967,7 +11015,7 @@
#: CustomerTypes.php:219
#: SupplierTypes.php:208
msgid "Show All Types Defined"
-msgstr "Afficher tous les types définis"
+msgstr "Afficher tous les types"
#: CustWhereAlloc.php:6
msgid "Customer How Paid Inquiry"
@@ -11130,7 +11178,7 @@
#: DailySalesInquiry.php:6
#: index.php:186
msgid "Daily Sales Inquiry"
-msgstr "Quotidien ventes enquête"
+msgstr "Ventes journalières"
#: DailySalesInquiry.php:10
msgid "Daily Sales"
@@ -11246,14 +11294,15 @@
msgid "Order Delivery Details"
msgstr "Détails de la livraison"
+# NE PAS CHANGER sans raison (plus que) valable.
#: DeliveryDetails.php:25
msgid "This page can only be read if an order has been entered"
-msgstr "Cette page ne peut être lu si une ordonnance a été conclu"
+msgstr "Cette page ne peut être rechargée après la création d'une commande."
#: DeliveryDetails.php:25
#: DeliveryDetails.php:31
msgid "To enter an order select customer transactions then sales order entry"
-msgstr "Pour entrer dans les transactions d'une commande client, puis sélectionnez l'entrée des commandes de vente"
+msgstr "Pour modifier une commande, sélectionner le menu F"
#: DeliveryDetails.php:31
msgid "This page can only be read if an there are items on the order"
@@ -11327,15 +11376,16 @@
#: DeliveryDetails.php:265
#: DeliveryDetails.php:1125
msgid "Modify Order Lines"
-msgstr "Modifiez les lignes de commande"
+msgstr "Modifier une commande"
#: DeliveryDetails.php:268
msgid "You should automatically be forwarded to the entry of the order line details page"
msgstr "Vous devriez être automatiquement transmis à l'entrée de la page en ligne pour plus de détails"
+# JDN
#: DeliveryDetails.php:281
msgid "The freight charge has been updated"
-msgstr "Les frais de transport a été mis à jour"
+msgstr "Les frais de transport ont été mis à jour"
#: DeliveryDetails.php:281
msgid "Please reconfirm that the order and the freight charges are acceptable and then confirm the order again if OK"
@@ -11574,14 +11624,15 @@
msgid "Show Company Details/Logo"
msgstr "Informations sur la société Show / Logo"
+# JDN
#: DeliveryDetails.php:1059
#: DeliveryDetails.php:1062
msgid "Hide Company Details/Logo"
-msgstr "Masquer les informations/logo de la société"
+msgstr "Masquer les informations / logo de la société"
#: DeliveryDetails.php:1069
msgid "Reprint packing slip"
-msgstr "Ré-Imprimer le bordereau de préparation"
+msgstr "Ré-Imprimer le bordereau d'expédition"
#: DeliveryDetails.php:1073
msgid "Last printed"
@@ -11862,7 +11913,7 @@
#: EDIMessageFormat.php:192
msgid "Review Message Lines"
-msgstr "Reviser les messages / Lignes"
+msgstr ""
#: EDIMessageFormat.php:213
#: EDIMessageFormat.php:215
@@ -11889,13 +11940,14 @@
#: EDIMessageFormat.php:240
msgid "Line Text"
-msgstr "Ligne de Texte"
+msgstr ""
+# JDN
#: EDIMessageFormat.php:246
#: FixedAssetLocations.php:151
#: PO_AuthorisationLevels.php:256
msgid "Update Information"
-msgstr "Mise à jour de l'information"
+msgstr "Mettre à jour"
#: EDIProcessOrders.php:7
msgid "Process EDI Orders"
@@ -12223,7 +12275,7 @@
#: SelectCompletedOrder.php:496
#: SpecialOrder.php:608
msgid "Customer Ref"
-msgstr "Réf. Clt"
+msgstr "Réf. client"
#: EDIProcessOrders.php:376
msgid "Import Licence"
@@ -12391,7 +12443,7 @@
#: PrintCustOrder.php:108
#: SelectSalesOrder.php:383
msgid "Outstanding Sales Orders"
-msgstr "Cdes En Attente"
+msgstr "Commandes clients en cours"
#: EmailConfirmation.php:24
#: EmailConfirmation.php:96
@@ -12545,7 +12597,7 @@
#: SelectOrderItems.php:1801
#: SelectOrderItems.php:1831
msgid "PO Line"
-msgstr "ligne de cde"
+msgstr ""
#: EmailConfirmation.php:193
#: PO_AuthoriseMyOrders.php:113
@@ -12608,11 +12660,11 @@
#: ExchangeRateTrend.php:6
msgid "View Currency Trends"
-msgstr "Tendances Monnaie Voir"
+msgstr "Courbe monétaire"
#: ExchangeRateTrend.php:27
msgid "View Currency Trend"
-msgstr "Trend Monnaie Voir"
+msgstr "Courbe monétaire"
#: ExchangeRateTrend.php:64
msgid "Trend Currently Unavailable"
@@ -12827,7 +12879,7 @@
#: FixedAssetCategories.php:162
#: StockCategories.php:214
msgid "Cat Code"
-msgstr "Code Cat."
+msgstr "Code"
#: FixedAssetCategories.php:164
msgid "Cost GL"
@@ -12859,7 +12911,7 @@
#: StockCategories.php:310
#: StockCategories.php:320
msgid "Category Code"
-msgstr "Code Catégorie"
+msgstr "Code"
#: FixedAssetCategories.php:277
#: POReport.php:741
@@ -13125,9 +13177,10 @@
msgid "The SQL that was used to add the asset failed was"
msgstr "Échec de la commande SQL d'ajoût d'actif:"
+# JDN
#: FixedAssetItems.php:272
msgid "The new asset has been added to the database with an asset code of:"
-msgstr "Le nouvel atout a été ajouté à la base de données avec un code d'actif de:"
+msgstr "Le nouvel actif a été ajouté à la base de données avec le code:"
#: FixedAssetItems.php:282
#: Stocks.php:599
@@ -13252,7 +13305,7 @@
#: FixedAssetItems.php:562
#: FixedAssetItems.php:565
msgid "Straight Line"
-msgstr "Straight Line"
+msgstr ""
#: FixedAssetItems.php:563
#: FixedAssetItems.php:566
@@ -13421,7 +13474,7 @@
#: FixedAssetRegister.php:281
#: SuppPriceList.php:222
msgid "ALL"
-msgstr "TOUS"
+msgstr "Toute"
#: FixedAssetRegister.php:299
msgid " From Date"
@@ -13507,9 +13560,10 @@
msgid "Move To :"
msgstr "Déplacer vers:"
+# JDN
#: FormDesigner.php:5
msgid "Form Designer"
-msgstr "Créateur de formulaire"
+msgstr "Gestion des formulaires"
#: FormDesigner.php:16
#: FormDesigner.php:36
@@ -13558,15 +13612,15 @@
#: FormDesigner.php:146
msgid "Edit Form Layout"
-msgstr "Modifier le formulaire Layout"
+msgstr "Modifier le formulaire"
#: FormDesigner.php:156
msgid "Form Design"
-msgstr "Création de formulaire"
+msgstr "Éditeur de formulaire"
#: FormDesigner.php:157
msgid "Enter the changes that you want in the form layout below."
-msgstr "Faites les modifications désirées dans le formulaire ci-dessous."
+msgstr "Faire les modifications désirées dans le formulaire ci-dessous."
#: FormDesigner.php:157
msgid "All measurements are in millimetres"
@@ -13578,11 +13632,11 @@
#: FormDesigner.php:165
msgid "Paper Size"
-msgstr "Format de papier"
+msgstr "Format papier"
#: FormDesigner.php:180
msgid "Line Height"
-msgstr "Hauteur de ligne"
+msgstr "la hauteur des lignes"
#: FormDesigner.php:188
#: FormDesigner.php:236
@@ -13602,19 +13656,19 @@
#: FormDesigner.php:253
msgid "Start x co-ordinate"
-msgstr "Coordonnées x de départ"
+msgstr "Coordonnées x: départ"
#: FormDesigner.php:254
msgid "Start y co-ordinate"
-msgstr "Coordonnées y de départ"
+msgstr "Coordonnées y: départ"
#: FormDesigner.php:255
msgid "End x co-ordinate"
-msgstr "Fin coordonnées x "
+msgstr "Coordonnées x: fin "
#: FormDesigner.php:256
msgid "End y co-ordinate"
-msgstr "Fin coordonnées y"
+msgstr "Coordonnées y: fin"
#: FormDesigner.php:267
msgid "Preview the Form Layout"
@@ -13780,7 +13834,7 @@
#: SelectRecurringSalesOrder.php:88
#: SelectSalesOrder.php:834
msgid "Cust Order"
-msgstr "Cde Client"
+msgstr "Commande client"
#: FTP_RadioBeacon.php:54
#: MRPReschedules.php:193
@@ -13831,7 +13885,7 @@
#: SelectRecurringSalesOrder.php:92
#: SelectSalesOrder.php:838
msgid "Order Total"
-msgstr "Montant Total"
+msgstr "Total"
#: FTP_RadioBeacon.php:58
msgid "Last Send"
@@ -13929,7 +13983,7 @@
#: GeocodeSetup.php:229
#: index.php:1050
msgid "Geocode Setup"
-msgstr "Configuration géocode"
+msgstr "Géoréférencement"
#: geocode.php:26
msgid "Geocoding of Customers and Suppliers"
@@ -13945,7 +13999,7 @@
#: geocode.php:127
msgid "Supplier Code: "
-msgstr "Code Fournisseur: "
+msgstr "Code fournisseur: "
#: geocode.php:135
msgid "Go back to Geocode Setup"
@@ -13953,15 +14007,16 @@
#: GeocodeSetup.php:6
msgid "Geocode Maintenance"
-msgstr "Gestion géocode"
+msgstr "Gestion géoréférencement"
#: GeocodeSetup.php:38
msgid "That geocode ID already exists in the database"
msgstr "C'est ID géocoder existe déjà dans la base de données"
+# JDN
#: GeocodeSetup.php:59
msgid "The geocode status record has been updated"
-msgstr "L'acte de l'état géocodage a été mis à jour"
+msgstr "La fiche de statut de géoréférencement a été mis à jour"
#: GeocodeSetup.php:98
msgid "A new geocode status record has been inserted"
@@ -13974,7 +14029,7 @@
#: GeocodeSetup.php:136
#: GeocodeSetup.php:229
msgid "Setup configuration for Geocoding of Customers and Suppliers"
-msgstr "Configuration de l'installation pour le géocodage des clients et des fournisseurs"
+msgstr "Configuration du géoréférencement"
#: GeocodeSetup.php:137
msgid "Get a google API key at "
@@ -13986,16 +14041,16 @@
#: GeocodeSetup.php:141
msgid "Set the maps centre point using the Center Longitude and Center Latitude. Set the maps screen size using the height and width in pixels (px)"
-msgstr "Réglez le point central des cartes en utilisant le Centre de Longitude et Latitude Center. Définissez la taille de l'écran des cartes en utilisant la hauteur et la largeur en pixels (px)"
+msgstr "Régler le point central des cartes en utilisant le centre de longitude et de latitude. </br>Définir la taille de l'écran des cartes en utilisant la hauteur et la largeur en pixels (px)"
#: GeocodeSetup.php:146
msgid "Geocode ID"
-msgstr "ID géocode"
+msgstr "ID"
#: GeocodeSetup.php:147
#: GeocodeSetup.php:250
msgid "Geocode Key"
-msgstr "Clef géocode"
+msgstr "Clef"
#: GeocodeSetup.php:148
msgid "Center Longitude"
@@ -14015,7 +14070,7 @@
#: GeocodeSetup.php:152
msgid "Map host"
-msgstr "Carte d'accueil"
+msgstr ""
#: GeocodeSetup.php:195
msgid "Show Defined Geocode Param Codes"
@@ -14035,35 +14090,35 @@
#: GeocodeSetup.php:261
msgid "Geocode Map Height"
-msgstr "Hauteur Carte géocode"
+msgstr "Hauteur carte"
#: GeocodeSetup.php:264
msgid "Geocode Map Width"
-msgstr "Largeur Carte géocode"
+msgstr "Largeur carte"
#: GeocodeSetup.php:267
msgid "Geocode Host"
-msgstr "Hôte géocode"
+msgstr "Hôte"
#: GeocodeSetup.php:274
msgid "When ready, click on the link below to run the GeoCode process. This will Geocode all Branches and Suppliers. This may take some time. Errors will be returned to the screen."
-msgstr "Lorsque vous êtes prêt, cliquez sur le lien ci-dessous pour lancer le processus GeoCode. Ce sera géocode toutes les directions générales et les fournisseurs. Cela peut prendre un certain temps. Les erreurs seront retournés à l'écran."
+msgstr "Cliquer sur le lien ci-dessous pour lancer le processus de géoréférencement. Tous les fournissuers et clients seront alors géoréférencés. Attention, cette opération peut être très longue."
#: GeocodeSetup.php:275
msgid "Suppliers and Customer Branches are geocoded when being entered/updated. You can rerun the geocode process from this screen at any time."
-msgstr "Les fournisseurs et les clients des succursales sont géocodées lors de son entrée / mise à jour. Vous pouvez relancer le processus de géocodage partir de cet écran à tout moment."
+msgstr "Les fournisseurs et les clients sont géoréférencés lors de leur création / mise à jour. Vous pouvez relancer le processus de géoréférencement à partir de cette page."
#: GeocodeSetup.php:277
msgid "Run GeoCode process (may take a long time)"
-msgstr "Exécuter le traitement GeoCode"
+msgstr "Lancer le géoréférencement (ceci peut prendre beaucoup de temps)"
#: GeocodeSetup.php:278
msgid "Display Map of Customer Branches"
-msgstr "Affichage de la carte de branches à la clientèle"
+msgstr "Afficher les clients sur la carte"
#: GeocodeSetup.php:279
msgid "Display Map of Suppliers"
-msgstr "Affichage de la carte des fournisseurs"
+msgstr "Afficher les fournisseurs sur la carte"
#: geo_displaymap_customers.php:5
msgid "Geocoded Customer Branches Report"
@@ -14201,11 +14256,12 @@
msgid "Balance C/Fwd"
msgstr "Balance"
+# JDN
#: GLAccountCSV.php:261
#: POReport.php:1486
#: StockQties_csv.php:43
msgid "to view the file"
-msgstr "pour afficher le fichier"
+msgstr "pour voir le fichier"
#: GLAccountInquiry.php:24
msgid "Use the keyboard Shift key to select multiple periods"
@@ -14758,7 +14814,7 @@
#: GLJournal.php:284
msgid "Journal Line Entry"
-msgstr "Ligne d'écriture"
+msgstr "Écriture"
#: GLJournal.php:290
#: GLJournal.php:382
@@ -15021,7 +15077,7 @@
#: GLTags.php:66
#: SecurityTokens.php:105
msgid "Insert"
-msgstr "Insérer"
+msgstr "Ajouter"
#: GLTags.php:76
msgid "Tag ID"
@@ -15033,11 +15089,11 @@
#: GLTransInquiry.php:6
msgid "General Ledger Transaction Inquiry"
-msgstr "Relevé des transactions sur le Grand Livre"
+msgstr "Relevé des transactions du Grand Livre"
#: GLTransInquiry.php:9
msgid "General Ledger Menu"
-msgstr "Menu du grand livre général"
+msgstr "Menu du Grand Livre"
#: GLTransInquiry.php:12
msgid "This page requires a valid transaction type and number"
@@ -15049,12 +15105,12 @@
#: GLTransInquiry.php:45
msgid "Debits"
-msgstr "Débits"
+msgstr "Débit"
#: GLTransInquiry.php:46
#: includes/PDFStatementPageHeader.inc:171
msgid "Credits"
-msgstr "Crédits"
+msgstr "Crédit"
#: GLTransInquiry.php:48
#: PcAuthorizeExpenses.php:91
@@ -15158,7 +15214,7 @@
#: GoodsReceivedControlled.php:43
msgid "This page can only be opened if a Line Item on a PO has been selected"
-msgstr "Cette page ne peut �re ouverte que si une ligne d'une Commande Achat a ��s�ectionn�"
+msgstr "Cette page ne peut être ouverte que si une ligne d'une commande a été sélectionnée"
#: GoodsReceivedControlled.php:54
msgid "Back to the Purchase Order"
@@ -15179,12 +15235,12 @@
#: GoodsReceived.php:22
#: index.php:595
msgid "Receive Purchase Orders"
-msgstr "Recevez les bons de commande"
+msgstr ""
#: GoodsReceived.php:25
#: PO_Header.php:251
msgid "Back to Purchase Orders"
-msgstr "Retour aux bons de commande"
+msgstr "Retour aux commandes forunisseurs en cours"
#: GoodsReceived.php:33
msgid "This page can only be opened if a purchase order has been selected. Please select a purchase order first"
@@ -15317,15 +15373,15 @@
#: GoodsReceived.php:324
msgid "Contract Reference of the Line Item"
-msgstr "Référence du contrat de la rubrique"
+msgstr "Référence du contrat du poste"
#: GoodsReceived.php:329
msgid "Quantity Invoiced of the Line Item"
-msgstr "Quantité facturée de la rubrique"
+msgstr "Quantité facturée du poste"
#: GoodsReceived.php:334
msgid "Stock Code of the Line Item"
-msgstr "Code libre de droits de la rubrique"
+msgstr "Code stock du poste"
#: GoodsReceived.php:339
msgid "Order Quantity of the Line Item"
@@ -15481,13 +15537,13 @@
#: SuppLoginSetup.php:21
#: WWW_Users.php:13
msgid "Receivables"
-msgstr "Clients"
+msgstr "Créances clients"
#: index.php:13
#: SuppLoginSetup.php:22
#: WWW_Users.php:14
msgid "Payables"
-msgstr "Fournisseurs"
+msgstr "Créances fournisseurs"
#: index.php:14
msgid "Purchases"
@@ -15559,7 +15615,7 @@
#: index.php:40
#: WWW_Users.php:681
msgid "Account Status"
-msgstr "Statut du Compte"
+msgstr "Statut du compte"
#: index.php:45
msgid "Place An Order"
@@ -15576,20 +15632,20 @@
#: index.php:127
msgid "Enter An Order or Quotation"
-msgstr "Saisir une commande ou un devis"
+msgstr "Commande ou devis"
#: index.php:132
msgid "Enter Counter Sales"
-msgstr "Saisir ventes au comptoir"
+msgstr "Vente directe"
#: index.php:137
#: PDFPickingList.php:46
msgid "Print Picking Lists"
-msgstr "Imprimer la cueillette des listes"
+msgstr "Imprimer la liste des bordereaux d'expédition"
#: index.php:142
msgid "Outstanding Sales Orders/Quotations"
-msgstr "Encours des commandes clients / Citations"
+msgstr "Commandes / Devis en attente"
#: index.php:147
msgid "Special Order"
@@ -15605,55 +15661,57 @@
#: index.php:166
msgid "Order Inquiry"
-msgstr "Consultation de commande"
+msgstr "Commande"
#: index.php:171
msgid "Print Price Lists"
msgstr "Imprimer un tarif"
+# We are already in the Inquiries and reports section. No need to repeat "Reports"
#: index.php:176
#: PDFOrderStatus.php:23
#: PDFOrderStatus.php:30
#: PDFOrderStatus.php:81
msgid "Order Status Report"
-msgstr "Rapport d'état des commandes"
+msgstr "Statut des commandes"
+# We are already...
[truncated message content] |
