fix french doc (#36895)
* fix french doc * fix french * Update sync_members_types_dolibarr2ldap.php * fix french doc * Update translate.class.php * Update export-bank-receipts.php * Update product.class.php * Update product.class.php
This commit is contained in:
Frédéric FRANCE
GitHub
parent
d770d37e29
commit
b6a49cb4bd
6 changed files with 47 additions and 46 deletions
|
|
@ -1,9 +1,9 @@
|
|||
<?php
|
||||
/* Copyright (C) 2001 Eric Seigne <erics@rycks.com>
|
||||
* Copyright (C) 2004-2015 Destailleur Laurent <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2005-2010 Regis Houssin <regis.houssin@inodbox.com>
|
||||
/* Copyright (C) 2001 Eric Seigne <erics@rycks.com>
|
||||
* Copyright (C) 2004-2015 Destailleur Laurent <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2005-2010 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024-2026 Frédéric France <frederic.france@free.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -733,11 +733,11 @@ class Translate
|
|||
* Parameters of this method must not contain any HTML tags.
|
||||
*
|
||||
* @param string $key Key to translate
|
||||
* @param string $param1 chaine de param1
|
||||
* @param string $param2 chaine de param2
|
||||
* @param string $param3 chaine de param3
|
||||
* @param string $param4 chaine de param4
|
||||
* @param string $param5 chaine de param5
|
||||
* @param string $param1 param1 string
|
||||
* @param string $param2 param2 string
|
||||
* @param string $param3 param3 string
|
||||
* @param string $param4 param4 string
|
||||
* @param string $param5 param5 string
|
||||
* @return string Translated string (encoded into UTF8)
|
||||
*/
|
||||
public function transnoentities($key, $param1 = '', $param2 = '', $param3 = '', $param4 = '', $param5 = '')
|
||||
|
|
@ -754,11 +754,11 @@ class Translate
|
|||
* Parameters of this method must not contains any HTML tags.
|
||||
*
|
||||
* @param string $key Key to translate
|
||||
* @param string $param1 chaine de param1
|
||||
* @param string $param2 chaine de param2
|
||||
* @param string $param3 chaine de param3
|
||||
* @param string $param4 chaine de param4
|
||||
* @param string $param5 chaine de param5
|
||||
* @param string $param1 param1 string
|
||||
* @param string $param2 param2 string
|
||||
* @param string $param3 param3 string
|
||||
* @param string $param4 param4 string
|
||||
* @param string $param5 param5 string
|
||||
* @return string Translated string
|
||||
*/
|
||||
public function tr($key, $param1 = '', $param2 = '', $param3 = '', $param4 = '', $param5 = '')
|
||||
|
|
@ -774,11 +774,11 @@ class Translate
|
|||
* Parameters of this method must not contains any HTML tags.
|
||||
*
|
||||
* @param string $key Key to translate
|
||||
* @param string $param1 chaine de param1
|
||||
* @param string $param2 chaine de param2
|
||||
* @param string $param3 chaine de param3
|
||||
* @param string $param4 chaine de param4
|
||||
* @param string $param5 chaine de param5
|
||||
* @param string $param1 param1 string
|
||||
* @param string $param2 param2 string
|
||||
* @param string $param3 param3 string
|
||||
* @param string $param4 param4 string
|
||||
* @param string $param5 param5 string
|
||||
* @return string Translated string
|
||||
*/
|
||||
public function transnoentitiesnoconv($key, $param1 = '', $param2 = '', $param3 = '', $param4 = '', $param5 = '')
|
||||
|
|
@ -982,7 +982,7 @@ class Translate
|
|||
|
||||
if ($searchalt) {
|
||||
$filenamealt = null;
|
||||
// Test si fichier dans repertoire de la langue alternative
|
||||
// Test if file is in directory of alternate language
|
||||
if ($this->defaultlang != "en_US") {
|
||||
$filenamealt = $searchdir . "/langs/en_US/" . $filename;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
* Copyright (C) 2014 Ion agorria <ion@agorria.com>
|
||||
* Copyright (C) 2016-2024 Ferran Marcet <fmarcet@2byte.es>
|
||||
* Copyright (C) 2017 Gustavo Novaro
|
||||
* Copyright (C) 2019-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2019-2026 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2023 Benjamin Falière <benjamin.faliere@altairis.fr>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2025 Lenin Rivas <lenin.rivas777@gmail.com>
|
||||
|
|
@ -978,7 +978,7 @@ class Product extends CommonObject
|
|||
if (empty($this->tva_npr)) {
|
||||
$this->tva_npr = 0;
|
||||
}
|
||||
//Local taxes
|
||||
// Local taxes
|
||||
if (empty($this->localtax1_tx)) {
|
||||
$this->localtax1_tx = 0;
|
||||
}
|
||||
|
|
@ -1353,6 +1353,7 @@ class Product extends CommonObject
|
|||
|
||||
$mod = new $module();
|
||||
'@phan-var-force ModeleNumRefBarCode $mod';
|
||||
/** @var ModeleNumRefBarCode $mod */
|
||||
|
||||
dol_syslog(get_class($this)."::check_barcode value=".$valuetotest." type=".$typefortest." module=".$module);
|
||||
$result = $mod->verif($this->db, $valuetotest, $this, 0, $typefortest);
|
||||
|
|
@ -1872,7 +1873,7 @@ class Product extends CommonObject
|
|||
include_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
|
||||
include_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination2ValuePair.class.php';
|
||||
|
||||
//If it is a parent product, then we remove the association with child products
|
||||
// If it is a parent product, then we remove the association with child products
|
||||
$prodcomb = new ProductCombination($this->db);
|
||||
|
||||
if ($prodcomb->deleteByFkProductParent($user, $this->id) < 0) {
|
||||
|
|
@ -1880,7 +1881,7 @@ class Product extends CommonObject
|
|||
$this->errors[] = 'Error deleting combinations';
|
||||
}
|
||||
|
||||
//We also check if it is a child product
|
||||
// We also check if it is a child product
|
||||
if (!$error && ($prodcomb->fetchByFkProductChild($this->id) > 0) && ($prodcomb->delete($user) < 0)) {
|
||||
$error++;
|
||||
$this->errors[] = 'Error deleting child combination';
|
||||
|
|
@ -2677,7 +2678,7 @@ class Product extends CommonObject
|
|||
$result = $obj->fk_product;
|
||||
return $result;
|
||||
} else {
|
||||
return -1; // Ce produit n'existe pas avec cet id tarif fournisseur ou existe mais qte insuffisante, ni pour le couple produit/ref fournisseur dans la quantité.
|
||||
return -1; // This product does not exist with this supplier price ID, or it exists but with insufficient quantity; nor does it exist for the product/supplier ref pair in the required quantity.
|
||||
}
|
||||
} else {
|
||||
$this->error = $this->db->lasterror();
|
||||
|
|
@ -2820,8 +2821,8 @@ class Product extends CommonObject
|
|||
|
||||
$this->db->begin();
|
||||
|
||||
// Ne pas mettre de quote sur les numeriques decimaux.
|
||||
// Ceci provoque des stockages avec arrondis en base au lieu des valeurs exactes.
|
||||
// Don't put quotes here on decimal numbers.
|
||||
// This causes storage with base rounding instead of exact values.
|
||||
$sql = "UPDATE ".$this->db->prefix()."product SET";
|
||||
$sql .= " price_base_type = '".$this->db->escape($newpricebase)."',";
|
||||
$sql .= " price = ".(float) $price.",";
|
||||
|
|
@ -5384,10 +5385,10 @@ class Product extends CommonObject
|
|||
|
||||
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
|
||||
/**
|
||||
* Recopie les fournisseurs et prix fournisseurs d'un produit/service sur un autre
|
||||
* Copies the suppliers and supplier pricing of a product/service onto another one.
|
||||
*
|
||||
* @param int $fromId Id produit source
|
||||
* @param int $toId Id produit cible
|
||||
* @param int $fromId Id source product
|
||||
* @param int $toId Id target product
|
||||
* @return int Return integer < 0 si erreur, > 0 si ok
|
||||
*/
|
||||
public function clone_fournisseurs($fromId, $toId)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
/*
|
||||
* Copyright (C) 2013 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2024-2025 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>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -236,10 +236,10 @@ if ($resql) {
|
|||
return -1;
|
||||
}
|
||||
|
||||
// Genere en-tete
|
||||
// Generate header
|
||||
$objmodel->write_header($outputlangs);
|
||||
|
||||
// Genere ligne de titre
|
||||
// Generate title line
|
||||
$objmodel->write_title($array_fields, $array_selected, $outputlangs, $array_export_TypeFields);
|
||||
}
|
||||
|
||||
|
|
@ -281,13 +281,13 @@ if ($resql) {
|
|||
// Date operation
|
||||
$dateop = $db->jdate($objp->do);
|
||||
|
||||
// Date de valeur
|
||||
// Value date
|
||||
$datevalue = $db->jdate($objp->dv);
|
||||
|
||||
// Num cheque
|
||||
$numchq = ($objp->num_chq ? $objp->num_chq : '');
|
||||
|
||||
// Libelle
|
||||
// Label
|
||||
$reg = array();
|
||||
preg_match('/\((.+)\)/i', $objp->label, $reg); // Si texte entoure de parentheses on tente recherche de traduction
|
||||
if ($reg[1] && $langs->transnoentitiesnoconv($reg[1]) != $reg[1]) {
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#!/usr/bin/env php
|
||||
<?php
|
||||
/**
|
||||
* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2006-2008 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2006-2008 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
/**
|
||||
* \file scripts/members/sync_members_dolibarr2ldap.php
|
||||
* \ingroup ldap member
|
||||
* \brief Script de mise a jour des adherents dans LDAP depuis base Dolibarr
|
||||
* \brief Script to update members in LDAP from the Dolibarr database
|
||||
*/
|
||||
|
||||
if (!defined('NOSESSION')) {
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#!/usr/bin/env php
|
||||
<?php
|
||||
/**
|
||||
* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2006-2015 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2006-2015 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
*
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
/**
|
||||
* \file scripts/members/sync_members_ldap2dolibarr.php
|
||||
* \ingroup ldap member
|
||||
* \brief Script de mise a jour des adherents dans Dolibarr depuis LDAP
|
||||
* \brief Script to update Dolibarr members from LDAP
|
||||
*/
|
||||
|
||||
if (!defined('NOSESSION')) {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
#!/usr/bin/env php
|
||||
<?php
|
||||
/**
|
||||
* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2006 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2017 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2006 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2017 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2024-2026 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
/**
|
||||
* \file scripts/members/sync_members_types_dolibarr2ldap.php
|
||||
* \ingroup ldap core
|
||||
* \brief Script de mise a jour des types de membres dans LDAP depuis base Dolibarr
|
||||
* \brief Script to update member types in LDAP from the Dolibarr database
|
||||
*/
|
||||
|
||||
if (!defined('NOSESSION')) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue