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

Merge pull request #10423 from grandoc/new_branch_27_01_2019

Browse Source 
fix translations
This commit is contained in:
Laurent Destailleur 2019-01-27 17:55:05 +01:00 committed by GitHub
commit a268a13c89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/core/modules/expedition/modules_expedition.php
View File

@ -5,7 +5,7 @@
* Copyright (C) 2005-2011 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2011-2013 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2011-2019 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
@ -44,7 +44,7 @@ abstract class ModelePdfExpedition extends CommonDocGenerator
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Return list of active generation modules
* Return list of active generation models
*
* @param DoliDB $db Database handler
* @param integer $maxfilenamelength Max length of value to show
@ -56,12 +56,12 @@ abstract class ModelePdfExpedition extends CommonDocGenerator
global $conf;
$type='shipping';
$liste=array();
$list=array();
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$liste=getListOfModels($db,$type,$maxfilenamelength);
$list=getListOfModels($db,$type,$maxfilenamelength);
return $liste;
return $list;
}
}
@ -112,7 +112,7 @@ abstract class ModelNumRefExpedition
/**
* Test if existing numbers make problems with numbering
*
* @return boolean false if conflit, true if ok
* @return boolean false if conflict, true if ok
*/
function canBeActivated()
{

14
htdocs/core/modules/expensereport/mod_expensereport_jade.php
View File

@ -19,12 +19,12 @@
/**
* \file htdocs/core/modules/expensereport/mod_expensereport_jade.php
* \ingroup expensereport
* \brief File of class to manage customer order numbering rules Jade
* \brief File of class to manage expensereport numbering rules Jade
*/
require_once DOL_DOCUMENT_ROOT .'/core/modules/expensereport/modules_expensereport.php';
/**
* Class to manage customer order numbering rules Jade
* Class to manage expensereport numbering rules Jade
*/
class mod_expensereport_jade extends ModeleNumRefExpenseReport
{
@ -55,7 +55,7 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
/**
* Return description of numbering module
* Return description of numbering model
*
* @return string Text with description
*/
@ -67,7 +67,7 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
/**
* Renvoi un exemple de numerotation
* Returns an example of numbering
*
* @return string Example
*/
@ -78,8 +78,8 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
/**
* Test si les numeros deje en vigueur dans la base ne provoquent pas de
* de conflits qui empechera cette numerotation de fonctionner.
* Test whether the numbers already in force in the base do not cause conflicts
* that would prevent this numbering from working.
*
* @return boolean false si conflit, true si ok
*/
@ -174,7 +174,7 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
return $newref;
}
// D'abord on recupere la valeur max
// First we get the max value
$posindice=8;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql.= " FROM ".MAIN_DB_PREFIX."expensereport";

36
htdocs/core/modules/expensereport/modules_expensereport.php
View File

@ -31,7 +31,7 @@ abstract class ModeleExpenseReport extends CommonDocGenerator
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/**
* Return list of active generation modules
* Return list of active models generation
*
* @param DoliDB $db Database handler
* @param integer $maxfilenamelength Max length of value to show
@ -43,12 +43,12 @@ abstract class ModeleExpenseReport extends CommonDocGenerator
global $conf;
$type='expensereport';
$liste=array();
$list=array();
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$liste=getListOfModels($db,$type,$maxfilenamelength);
$list=getListOfModels($db,$type,$maxfilenamelength);
return $liste;
return $list;
}
}
@ -57,10 +57,10 @@ abstract class ModeleExpenseReport extends CommonDocGenerator
* expensereport_pdf_create
*
* @param DoliDB $db Database handler
* @param ExpenseReport $object Object order
* @param ExpenseReport $object Object ExpenseReport
* @param string $message Message
* @param string $modele Force le modele a utiliser ('' to not force)
* @param Translate $outputlangs objet lang a utiliser pour traduction
* @param string $modele Force the model to use ('' to not force)
* @param Translate $outputlangs lang object to use for translation
* @param int $hidedetails Hide details of lines
* @param int $hidedesc Hide description
* @param int $hideref Hide ref
@ -85,9 +85,9 @@ abstract class ModeleNumRefExpenseReport
public $error='';
/**
* Return if a module can be used or not
* Return if a model can be used or not
*
* @return boolean true if module can be used
* @return boolean true if model can be used
*/
function isEnabled()
{
@ -95,9 +95,9 @@ abstract class ModeleNumRefExpenseReport
}
/**
* Renvoie la description par defaut du modele de numerotation
* Returns the default description of the numbering model
*
* @return string Texte descripif
* @return string Descriptive text
*/
function info()
{
@ -107,7 +107,7 @@ abstract class ModeleNumRefExpenseReport
}
/**
* Renvoie un exemple de numerotation
* Returns an example of numbering
*
* @return string Example
*/
@ -119,9 +119,9 @@ abstract class ModeleNumRefExpenseReport
}
/**
* Test si les numeros deja en vigueur dans la base ne provoquent pas de conflits qui empecheraient cette numerotation de fonctionner.
* Test whether the numbers already in force in the base do not cause conflicts that would prevent this numbering from working.
*
* @return boolean false si conflit, true si ok
* @return boolean false if conflict, true if ok
*/
function canBeActivated()
{
@ -129,10 +129,10 @@ abstract class ModeleNumRefExpenseReport
}
/**
* Renvoie prochaine valeur attribuee
* Returns next assigned value
*
* @param Object $object Object we need next value for
* @return string Valeur
* @return string Value
*/
function getNextValue($object)
{
@ -141,9 +141,9 @@ abstract class ModeleNumRefExpenseReport
}
/**
* Renvoie version du module numerotation
* Returns the version of the numbering module
*
* @return string Valeur
* @return string Value
*/
function getVersion()
{