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

Merge pull request #12192 from Ahuahuachi/develop

Browse Source 
Translate documentation and minor code improvement
This commit is contained in:
Laurent Destailleur 2019-10-22 12:32:40 +02:00 committed by GitHub
commit 9be9f912af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 69 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/compta/facture/card.php
View File

@ -2566,6 +2566,7 @@ $form = new Form($db);
$formother = new FormOther($db); $formother = new FormOther($db);
$formfile = new FormFile($db); $formfile = new FormFile($db);
$formmargin = new FormMargin($db); $formmargin = new FormMargin($db);
$soc = new Societe($db);
$paymentstatic=new Paiement($db); $paymentstatic=new Paiement($db);
$bankaccountstatic = new Account($db); $bankaccountstatic = new Account($db);
if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); } if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
@ -2586,7 +2587,6 @@ if ($action == 'create')
print load_fiche_titre($langs->trans('NewBill'), '', 'invoicing'); print load_fiche_titre($langs->trans('NewBill'), '', 'invoicing');
$soc = new Societe($db);
if ($socid > 0) if ($socid > 0)
$res = $soc->fetch($socid); $res = $soc->fetch($socid);
@ -3465,7 +3465,6 @@ elseif ($id > 0 || ! empty($ref))
$result = $object->fetch_thirdparty(); $result = $object->fetch_thirdparty();
$soc = new Societe($db);
$result=$soc->fetch($object->socid); $result=$soc->fetch($object->socid);
if ($result < 0) dol_print_error($db); if ($result < 0) dol_print_error($db);
$selleruserevenustamp = $mysoc->useRevenueStamp(); $selleruserevenustamp = $mysoc->useRevenueStamp();

28
htdocs/core/class/translate.class.php
View File

@ -586,18 +586,18 @@ class Translate
/** /**
* Return text translated of text received as parameter (and encode it into HTML) * Return text translated of text received as parameter (and encode it into HTML)
* Si il n'y a pas de correspondance pour ce texte, on cherche dans fichier alternatif * If there is no match for this text, we look in alternative file and if still not found,
* et si toujours pas trouve, il est retourne tel quel * it is returned as it is
* Les parametres de cette methode peuvent contenir de balises HTML. * The parameters of this method can contain HTML tags
* *
* @param string $key Key to translate * @param string $key Key to translate
* @param string $param1 chaine de param1 * @param string $param1 param1 string
* @param string $param2 chaine de param2 * @param string $param2 param2 string
* @param string $param3 chaine de param3 * @param string $param3 param3 string
* @param string $param4 chaine de param4 * @param string $param4 param4 string
* @param int $maxsize Max length of text * @param int $maxsize Max length of text
* @return string Translated string (encoded into HTML entities and UTF8) * @return string Translated string (encoded into HTML entities and UTF8)
*/ */
public function trans($key, $param1 = '', $param2 = '', $param3 = '', $param4 = '', $maxsize = 0) public function trans($key, $param1 = '', $param2 = '', $param3 = '', $param4 = '', $maxsize = 0)
{ {
global $conf; global $conf;
@ -647,9 +647,9 @@ class Translate
/** /**
* Return translated value of a text string * Return translated value of a text string
* Si il n'y a pas de correspondance pour ce texte, on cherche dans fichier alternatif * If there is no match for this text, we look in alternative file and if still not found
* et si toujours pas trouve, il est retourne tel quel. * it is returned as is.
* Parameters of this method must not contains any HTML tags. * Parameters of this method must not contain any HTML tags.
* *
* @param string $key Key to translate * @param string $key Key to translate
* @param string $param1 chaine de param1 * @param string $param1 chaine de param1
@ -667,9 +667,9 @@ class Translate
/** /**
* Return translated value of a text string * Return translated value of a text string
* Si il n'y a pas de correspondance pour ce texte, on cherche dans fichier alternatif * If there is no match for this text, we look in alternative file and if still not found,
* et si toujours pas trouve, il est retourne tel quel. * it is returned as is.
* No convert to encoding charset of lang object is done. * No conversion to encoding charset of lang object is done.
* Parameters of this method must not contains any HTML tags. * Parameters of this method must not contains any HTML tags.
* *
* @param string $key Key to translate * @param string $key Key to translate

108
htdocs/societe/class/societe.class.php
View File

@ -821,7 +821,7 @@ class Societe extends CommonObject
* Update parameters of third party * Update parameters of third party
* *
* @param int $id Id of company (deprecated, use 0 here and call update on an object loaded by a fetch) * @param int $id Id of company (deprecated, use 0 here and call update on an object loaded by a fetch)
* @param User $user Utilisateur qui demande la mise a jour * @param User $user User who requests the update
* @param int $call_trigger 0=no, 1=yes * @param int $call_trigger 0=no, 1=yes
* @param int $allowmodcodeclient Inclut modif code client et code compta * @param int $allowmodcodeclient Inclut modif code client et code compta
* @param int $allowmodcodefournisseur Inclut modif code fournisseur et code compta fournisseur * @param int $allowmodcodefournisseur Inclut modif code fournisseur et code compta fournisseur
@ -1638,13 +1638,13 @@ class Societe extends CommonObject
return 0; return 0;
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Definit la societe comme un client * Defines the company as a customer
* *
* @param float $remise Valeur en % de la remise * @param float $remise Value in % of the discount
* @param string $note Note/Motif de modification de la remise * @param string $note Note/Reason for changing the discount
* @param User $user Utilisateur qui definie la remise * @param User $user User who sets the discount
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
public function set_remise_client($remise, $note, User $user) public function set_remise_client($remise, $note, User $user)
@ -1652,7 +1652,7 @@ class Societe extends CommonObject
// phpcs:enable // phpcs:enable
global $conf, $langs; global $conf, $langs;
// Nettoyage parametres // Parameter cleaning
$note=trim($note); $note=trim($note);
if (! $note) if (! $note)
{ {
@ -1668,7 +1668,7 @@ class Societe extends CommonObject
$now=dol_now(); $now=dol_now();
// Positionne remise courante // Position current discount
$sql = "UPDATE ".MAIN_DB_PREFIX."societe "; $sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
$sql.= " SET remise_client = '".$this->db->escape($remise)."'"; $sql.= " SET remise_client = '".$this->db->escape($remise)."'";
$sql.= " WHERE rowid = " . $this->id; $sql.= " WHERE rowid = " . $this->id;
@ -1680,7 +1680,7 @@ class Societe extends CommonObject
return -1; return -1;
} }
// Ecrit trace dans historique des remises // Writes trace in discount history
$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise";
$sql.= " (entity, datec, fk_soc, remise_client, note, fk_user_author)"; $sql.= " (entity, datec, fk_soc, remise_client, note, fk_user_author)";
$sql.= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',"; $sql.= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
@ -1701,13 +1701,13 @@ class Societe extends CommonObject
} }
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Definit la societe comme un client * Defines the company as a customer
* *
* @param float $remise Valeur en % de la remise * @param float $remise Value in % of the discount
* @param string $note Note/Motif de modification de la remise * @param string $note Note/Reason for changing the discount
* @param User $user Utilisateur qui definie la remise * @param User $user User who sets the discount
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
public function set_remise_supplier($remise, $note, User $user) public function set_remise_supplier($remise, $note, User $user)
@ -1715,7 +1715,7 @@ class Societe extends CommonObject
// phpcs:enable // phpcs:enable
global $conf, $langs; global $conf, $langs;
// Nettoyage parametres // Parameter cleaning
$note=trim($note); $note=trim($note);
if (! $note) if (! $note)
{ {
@ -1731,7 +1731,7 @@ class Societe extends CommonObject
$now=dol_now(); $now=dol_now();
// Positionne remise courante // Position current discount
$sql = "UPDATE ".MAIN_DB_PREFIX."societe "; $sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
$sql.= " SET remise_supplier = '".$this->db->escape($remise)."'"; $sql.= " SET remise_supplier = '".$this->db->escape($remise)."'";
$sql.= " WHERE rowid = " . $this->id; $sql.= " WHERE rowid = " . $this->id;
@ -1743,7 +1743,7 @@ class Societe extends CommonObject
return -1; return -1;
} }
// Ecrit trace dans historique des remises // Writes trace in discount history
$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise_supplier"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise_supplier";
$sql.= " (entity, datec, fk_soc, remise_supplier, note, fk_user_author)"; $sql.= " (entity, datec, fk_soc, remise_supplier, note, fk_user_author)";
$sql.= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',"; $sql.= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
@ -1827,10 +1827,10 @@ class Societe extends CommonObject
} }
/** /**
* Renvoie montant TTC des reductions/avoirs en cours disponibles de la societe * Returns amount of included taxes of the current discounts/credits available from the company
* *
* @param User $user Filtre sur un user auteur des remises * @param User $user Filter on a user author of discounts
* @param string $filter Filtre autre * @param string $filter Other filter
* @param integer $maxvalue Filter on max value for discount * @param integer $maxvalue Filter on max value for discount
* @param int $discount_type 0 => customer discount, 1 => supplier discount * @param int $discount_type 0 => customer discount, 1 => supplier discount
* @return int <0 if KO, Credit note amount otherwise * @return int <0 if KO, Credit note amount otherwise
@ -2264,13 +2264,13 @@ class Societe extends CommonObject
return $this->LibStatut($this->status, $mode); return $this->LibStatut($this->status, $mode);
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Renvoi le libelle d'un statut donne * Return the label of a given status
* *
* @param int $statut Id statut * @param int $statut Status id
* @param int $mode 0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto * @param int $mode 0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
* @return string Libelle du statut * @return string Status label
*/ */
public function LibStatut($statut, $mode = 0) public function LibStatut($statut, $mode = 0)
{ {
@ -2429,11 +2429,11 @@ class Societe extends CommonObject
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Renvoie la liste des contacts de cette societe * Returns the contact list of this company
* *
* @return array tableau des contacts * @return array array of contacts
*/ */
public function contact_array() public function contact_array()
{ {
@ -2463,11 +2463,11 @@ class Societe extends CommonObject
return $contacts; return $contacts;
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Renvoie la liste des contacts de cette societe * Returns the contact list of this company
* *
* @return array $contacts tableau des contacts * @return array $contacts array of contacts
*/ */
public function contact_array_objects() public function contact_array_objects()
{ {
@ -2608,9 +2608,9 @@ class Societe extends CommonObject
} }
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Attribut un code client a partir du module de controle des codes. * Assigns a customer code from the code control module.
* Return value is stored into this->code_client * Return value is stored into this->code_client
* *
* @param Societe $objsoc Object thirdparty * @param Societe $objsoc Object thirdparty
@ -2640,9 +2640,9 @@ class Societe extends CommonObject
} }
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Attribut un code fournisseur a partir du module de controle des codes. * Assigns a vendor code from the code control module.
* Return value is stored into this->code_fournisseur * Return value is stored into this->code_fournisseur
* *
* @param Societe $objsoc Object thirdparty * @param Societe $objsoc Object thirdparty
@ -2671,10 +2671,10 @@ class Societe extends CommonObject
} }
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Verifie si un code client est modifiable en fonction des parametres * Check if a client code is editable based on the parameters of the
* du module de controle des codes. * code control module.
* *
* @return int 0=No, 1=Yes * @return int 0=No, 1=Yes
*/ */
@ -2708,9 +2708,9 @@ class Societe extends CommonObject
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Verifie si un code fournisseur est modifiable dans configuration du module de controle des codes * Check if a vendor code is editable in the code control module configuration
* *
* @return int 0=No, 1=Yes * @return int 0=No, 1=Yes
*/ */
@ -2818,11 +2818,11 @@ class Societe extends CommonObject
} }
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Renvoie un code compta, suivant le module de code compta. * Returns an accounting code, following the accounting code module.
* Peut etre identique a celui saisit ou genere automatiquement. * May be identical to the one entered or generated automatically.
* A ce jour seule la generation automatique est implementee * To date only the automatic generation is implemented
* *
* @param string $type Type of thirdparty ('customer' or 'supplier') * @param string $type Type of thirdparty ('customer' or 'supplier')
* @return string Code compta si ok, 0 si aucun, <0 si ko * @return string Code compta si ok, 0 si aucun, <0 si ko
@ -2847,7 +2847,7 @@ class Societe extends CommonObject
$classname = $conf->global->SOCIETE_CODECOMPTA_ADDON; $classname = $conf->global->SOCIETE_CODECOMPTA_ADDON;
$mod = new $classname; $mod = new $classname;
// Defini code compta dans $mod->code // Set code count in $mod->code
$result = $mod->get_code($this->db, $this, $type); $result = $mod->get_code($this->db, $this, $type);
if ($type == 'customer') $this->code_compta = $mod->code; if ($type == 'customer') $this->code_compta = $mod->code;
@ -2999,9 +2999,9 @@ class Societe extends CommonObject
else return false; else return false;
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Verifie la validite d'un identifiant professionnel en fonction du pays de la societe (siren, siret, ...) * Check the validity of a professional identifier according to the country of the company (siren, siret, ...)
* *
* @param int $idprof 1,2,3,4 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm) * @param int $idprof 1,2,3,4 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm)
* @param Societe $soc Objet societe * @param Societe $soc Objet societe
@ -3017,7 +3017,7 @@ class Societe extends CommonObject
if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) return 1; if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) return 1;
// Verifie SIREN si pays FR // Check SIREN if country FR
if ($idprof == 1 && $soc->country_code == 'FR') if ($idprof == 1 && $soc->country_code == 'FR')
{ {
$chaine=trim($this->idprof1); $chaine=trim($this->idprof1);
@ -3207,11 +3207,11 @@ class Societe extends CommonObject
return ''; return '';
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Indique si la societe a des projets * Indicates if the company has projects
* *
* @return bool true si la societe a des projets, false sinon * @return bool true if the company has projects, false otherwise
*/ */
public function has_projects() public function has_projects()
{ {
@ -3313,9 +3313,9 @@ class Societe extends CommonObject
return isInEEC($this); return isInEEC($this);
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Charge la liste des categories fournisseurs * Load the list of provider categories
* *
* @return int 0 if success, <> 0 if error * @return int 0 if success, <> 0 if error
*/ */
@ -3704,11 +3704,11 @@ class Societe extends CommonObject
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Set prospect level * Set prospect level
* *
* @param User $user Utilisateur qui definie la remise * @param User $user User who sets the discount
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
* @deprecated Use update function instead * @deprecated Use update function instead
*/ */