vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FIX: Translate French code comments to English in expensereport, expedition and fichinter modules

Browse source
This commit is contained in:
Frédéric FRANCE 2026-06-28 13:28:32 +02:00
parent 8223a28e99
commit 6d6eabcbb4
No known key found for this signature in database
GPG key ID: C06E4A9656127239
5 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
htdocs/expedition/dispatch.php
View file

@ -7,7 +7,7 @@
* Copyright (C) 2014 Cedric Gross <c.gross@kreiz-it.fr>
* Copyright (C) 2016 Florian Henry <florian.henry@atm-consulting.fr>
* Copyright (C) 2017-2022 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2018-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2018-2026 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2019-2020 Christophe Battarel <christophe@altairis.fr>
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
*
@ -1702,7 +1702,7 @@ if ($object->id > 0 || !empty($object->ref)) {
print $formother->getHTMLScannerForm("barcodescannerjs", 'all', 1);
}
// traitement entrepot par défaut
// default warehouse handling
print '<script type="text/javascript">
$(document).ready(function () {
$("select[name=fk_default_warehouse]").change(function() {

26
htdocs/expensereport/card.php
View file

@ -2698,7 +2698,7 @@ if ($action == 'create') {
print '</td>';
print '</tr>';
} // Fin si c'est payé/validé
} // End if paid/validated
print '</table>';
print '</div>';
@ -2739,7 +2739,7 @@ if ($action == 'create') {
path += "&vatrate="+tva;
path += "&qty="+qty;
if (type_fee == 4) { // frais_kilométriques
if (type_fee == 4) { // mileage expenses
if (tax_cat == "" || parseInt(tax_cat) <= 0){
return ;
}
@ -2820,9 +2820,9 @@ if ($action != 'create' && $action != 'edit' && $action != 'editline') {
}
/* If status is "Draft"
* ET user à droit "creer/supprimer"
* ET fk_user_author == user courant
* Afficher : "Enregistrer" / "Modifier" / "Supprimer"
* AND user has "create/delete" right
* AND fk_user_author == current user
* Show: "Save" / "Modify" / "Delete"
*/
if ($user->hasRight('expensereport', 'creer') && $object->status == ExpenseReport::STATUS_DRAFT) {
if (in_array($object->fk_user_author, $childids) || $user->hasRight('expensereport', 'writeall_advance')) {
@ -2836,10 +2836,10 @@ if ($action != 'create' && $action != 'edit' && $action != 'editline') {
}
}
/* If status if "Refused"
* ET user à droit "creer/supprimer"
* ET fk_user_author == user courant
* Afficher : "Enregistrer" / "Modifier" / "Supprimer"
/* If status is "Refused"
* AND user has "create/delete" right
* AND fk_user_author == current user
* Show: "Save" / "Modify" / "Delete"
*/
if ($user->hasRight('expensereport', 'creer') && $object->status == ExpenseReport::STATUS_REFUSED) {
if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid) {
@ -2857,10 +2857,10 @@ if ($action != 'create' && $action != 'edit' && $action != 'editline') {
}
}
/* Si l'état est "En attente d'approbation"
* ET user à droit de "approve"
* ET fk_user_validator == user courant
* Afficher : "Valider" / "Refuser" / "Supprimer"
/* If status is "Pending approval"
* AND user has "approve" right
* AND fk_user_validator == current user
* Show: "Validate" / "Refuse" / "Delete"
*/
if ($object->status == ExpenseReport::STATUS_VALIDATED) {
if (in_array($object->fk_user_author, $childids)) {

6
htdocs/expensereport/class/expensereport.class.php
View file

@ -6,7 +6,7 @@
* Copyright (c) 2018-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2016-2020 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2026 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2025 William Mead <william@m34d.com>
*
* This program is free software; you can redistribute it and/or modify
@ -1467,7 +1467,7 @@ class ExpenseReport extends CommonObject
public function set_save_from_refuse($fuser)
{
// phpcs:enable
// Sélection de la date de début de la NDF
// Select the start date of the expense report
$sql = 'SELECT date_debut';
$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
$sql .= " WHERE rowid = ".((int) $this->id);
@ -2107,7 +2107,7 @@ class ExpenseReport extends CommonObject
$this->error = 'ExpenseReportConstraintViolationError';
$this->errors[] = $this->error;
$new_current_total_ttc -= $amount_to_test - $rule->amount; // ex, entered 16€, limit 12€, subtracts 4€;
$new_current_total_ttc -= $amount_to_test - $rule->amount; // ex: entered 16 EUR, limit 12 EUR, subtracts 4 EUR
$rule_warning_message_tab[] = $langs->trans('ExpenseReportConstraintViolationError', $rule->id, price($amount_to_test, 0, $langs, 1, -1, -1, $conf->currency), price($rule->amount, 0, $langs, 1, -1, -1, $conf->currency));
} else {
$this->error = 'ExpenseReportConstraintViolationWarning';

2
htdocs/fichinter/card-rec.php
View file

@ -153,7 +153,7 @@ if ($action == 'add' && $permissiontoadd) {
$error++;
}
// gestion des fréquences et des échéances
// frequency and due date management
$frequency = GETPOSTINT('frequency');
$rec_year = GETPOST('rec_year');
$rec_month = GETPOST('rec_month');

6
htdocs/fichinter/class/fichinterrec.class.php
View file

@ -8,7 +8,7 @@
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2016-2018 Charlie Benke <charlie@patas-monkey.com>
* Copyright (C) 2024 William Mead <william.mead@manchenumerique.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2026 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -129,7 +129,7 @@ class FichinterRec extends Fichinter
{
$this->db = $db;
//status dans l'ordre de l'intervention
// status in intervention order
$this->labelStatus[0] = 'Draft';
$this->labelStatus[1] = 'Closed';
@ -875,7 +875,7 @@ class FichinterRec extends Fichinter
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
$sql .= ' SET nb_gen_done = nb_gen_done + 1';
$sql .= ' , date_last_gen = now()';
// si on et arrivé à la fin des génération
// if we have reached the end of the generation cycle
if ($this->nb_gen_max <= $this->nb_gen_done + 1) {
$sql .= ' , status = 1';
}