Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-23 09:51:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12176 from Ahuahuachi/develop

Browse Source 
Translation of some function documentation
This commit is contained in:
Laurent Destailleur
2019-10-20 13:31:25 +02:00
committed by GitHub
parent 9e7476cd1f 0db96ed0b5
commit 84f6fd64a9
3 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
htdocs/core/class/commoninvoice.class.php
View File

@@ -219,9 +219,9 @@ abstract class CommonInvoice extends CommonObject
} }
/** /**
* Renvoie tableau des ids de facture avoir issus de la facture * Returns array of credit note ids from the invoice
* *
* @return array Tableau d'id de factures avoirs * @return array Array of credit note ids
*/ */
public function getListIdAvoirFromInvoice() public function getListIdAvoirFromInvoice()
{ {
@@ -251,10 +251,10 @@ abstract class CommonInvoice extends CommonObject
} }
/** /**
* Renvoie l'id de la facture qui la remplace * Returns the id of the invoice that replaces it
* *
* @param string $option filtre sur statut ('', 'validated', ...) * @param string $option status filter ('', 'validated', ...)
* @return int <0 si KO, 0 si aucune facture ne remplace, id facture sinon * @return int <0 si KO, 0 if no invoice replaces it, id of invoice otherwise
*/ */
public function getIdReplacingInvoice($option = '') public function getIdReplacingInvoice($option = '')
{ {
@@ -264,10 +264,10 @@ abstract class CommonInvoice extends CommonObject
$sql.= ' AND type < 2'; $sql.= ' AND type < 2';
if ($option == 'validated') $sql.= ' AND fk_statut = 1'; if ($option == 'validated') $sql.= ' AND fk_statut = 1';
// PROTECTION BAD DATA // PROTECTION BAD DATA
// Au cas ou base corrompue et qu'il y a une facture de remplacement validee // In case the database is corrupted and there is a valid replectement invoice
// et une autre non, on donne priorite a la validee. // and another no, priority is given to the valid one.
// Ne devrait pas arriver (sauf si acces concurrentiel et que 2 personnes // Should not happen (unless concurrent access and 2 people have created a
// ont cree en meme temps une facture de remplacement pour la meme facture) // replacement invoice for the same invoice at the same time)
$sql.= ' ORDER BY fk_statut DESC'; $sql.= ' ORDER BY fk_statut DESC';
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
@@ -276,12 +276,12 @@ abstract class CommonInvoice extends CommonObject
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
if ($obj) if ($obj)
{ {
// Si il y en a // If there is any
return $obj->rowid; return $obj->rowid;
} }
else else
{ {
// Si aucune facture ne remplace // If no invoice replaces it
return 0; return 0;
} }
} }
@@ -544,8 +544,8 @@ abstract class CommonInvoice extends CommonObject
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Renvoi une date limite de reglement de facture en fonction des * Returns an invoice payment deadline based on the invoice settlement
* conditions de reglements de la facture et date de facturation. * conditions and billing date.
* *
* @param integer $cond_reglement Condition of payment (code or id) to use. If 0, we use current condition. * @param integer $cond_reglement Condition of payment (code or id) to use. If 0, we use current condition.
* @return integer Date limite de reglement si ok, <0 si ko * @return integer Date limite de reglement si ok, <0 si ko
@@ -589,14 +589,14 @@ abstract class CommonInvoice extends CommonObject
/* Definition de la date limite */ /* Definition de la date limite */
// 0 : ajout du nombre de jours // 0 : adding the number of days
if ($cdr_type == 0) if ($cdr_type == 0)
{ {
$datelim = $this->date + ($cdr_nbjour * 3600 * 24); $datelim = $this->date + ($cdr_nbjour * 3600 * 24);
$datelim += ($cdr_decalage * 3600 * 24); $datelim += ($cdr_decalage * 3600 * 24);
} }
// 1 : application de la regle "fin de mois" // 1 : application of the "end of the month" rule
elseif ($cdr_type == 1) elseif ($cdr_type == 1)
{ {
$datelim = $this->date + ($cdr_nbjour * 3600 * 24); $datelim = $this->date + ($cdr_nbjour * 3600 * 24);
@@ -612,13 +612,13 @@ abstract class CommonInvoice extends CommonObject
{ {
$mois += 1; $mois += 1;
} }
// On se deplace au debut du mois suivant, et on retire un jour // We move at the beginning of the next month, and we take a day off
$datelim=dol_mktime(12, 0, 0, $mois, 1, $annee); $datelim=dol_mktime(12, 0, 0, $mois, 1, $annee);
$datelim -= (3600 * 24); $datelim -= (3600 * 24);
$datelim += ($cdr_decalage * 3600 * 24); $datelim += ($cdr_decalage * 3600 * 24);
} }
// 2 : application de la règle, le N du mois courant ou suivant // 2 : application of the rule, the N of the current or next month
elseif ($cdr_type == 2 && !empty($cdr_decalage)) elseif ($cdr_type == 2 && !empty($cdr_decalage))
{ {
include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
@@ -733,7 +733,7 @@ abstract class CommonInvoiceLine extends CommonObjectLine
public $total_ttc; public $total_ttc;
/** /**
* Liste d'options cumulables: * List of cumulative options:
* Bit 0: 0 si TVA normal - 1 si TVA NPR * Bit 0: 0 si TVA normal - 1 si TVA NPR
* Bit 1: 0 si ligne normal - 1 si bit discount (link to line into llx_remise_except) * Bit 1: 0 si ligne normal - 1 si bit discount (link to line into llx_remise_except)
* @var int * @var int

4
htdocs/core/class/html.form.class.php
View File

@@ -7129,8 +7129,8 @@ class Form
// Left part of banner // Left part of banner
if ($morehtmlleft) if ($morehtmlleft)
{ {
if ($conf->browser->layout == 'phone') $ret.='<!-- morehmltleft --><div class="floatleft">'.$morehtmlleft.'</div>'; // class="center" to have photo in middle if ($conf->browser->layout == 'phone') $ret.='<!-- morehtmlleft --><div class="floatleft">'.$morehtmlleft.'</div>'; // class="center" to have photo in middle
else $ret.='<!-- morehmltleft --><div class="inline-block floatleft">'.$morehtmlleft.'</div>'; else $ret.='<!-- morehtmlleft --><div class="inline-block floatleft">'.$morehtmlleft.'</div>';
} }
//if ($conf->browser->layout == 'phone') $ret.='<div class="clearboth"></div>'; //if ($conf->browser->layout == 'phone') $ret.='<div class="clearboth"></div>';

17
htdocs/core/lib/functions.lib.php
View File

@@ -45,9 +45,9 @@ include_once DOL_DOCUMENT_ROOT .'/core/lib/json.lib.php';
* *
* @param string $type Type of database (mysql, pgsql...) * @param string $type Type of database (mysql, pgsql...)
* @param string $host Address of database server * @param string $host Address of database server
* @param string $user Nom de l'utilisateur autorise * @param string $user Authorized username
* @param string $pass Mot de passe * @param string $pass Password
* @param string $name Nom de la database * @param string $name Name of database
* @param int $port Port of database server * @param int $port Port of database server
* @return DoliDB A DoliDB instance * @return DoliDB A DoliDB instance
*/ */
@@ -3390,7 +3390,7 @@ function img_edit_remove($titlealt = 'default', $other = '')
* Show logo editer/modifier fiche * Show logo editer/modifier fiche
* *
* @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @param integer $float Si il faut y mettre le style "float: right" * @param integer $float If you have to put the style "float: right"
* @param string $other Add more attributes on img * @param string $other Add more attributes on img
* @return string Return tag img * @return string Return tag img
*/ */
@@ -3407,7 +3407,7 @@ function img_edit($titlealt = 'default', $float = 0, $other = '')
* Show logo view card * Show logo view card
* *
* @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @param integer $float Si il faut y mettre le style "float: right" * @param integer $float If you have to put the style "float: right"
* @param string $other Add more attributes on img * @param string $other Add more attributes on img
* @return string Return tag img * @return string Return tag img
*/ */
@@ -3765,10 +3765,9 @@ function info_admin($text, $infoonimgalt = 0, $nodiv = 0, $admin = '1', $morecss
/** /**
* Affiche message erreur system avec toutes les informations pour faciliter le diagnostic et la remontee des bugs. * Displays error message system with all the information to facilitate the diagnosis and the escalation of the bugs.
* On doit appeler cette fonction quand une erreur technique bloquante est rencontree. * This function must be called when a blocking technical error is encountered.
* Toutefois, il faut essayer de ne l'appeler qu'au sein de pages php, les classes devant * However, one must try to call it only within php pages, classes must return their error through their property "error".
* renvoyer leur erreur par l'intermediaire de leur propriete "error".
* *
* @param DoliDB $db Database handler * @param DoliDB $db Database handler
* @param mixed $error String or array of errors strings to show * @param mixed $error String or array of errors strings to show