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

Merge pull request #12203 from grandoc/new_branch_22_10_2019

Browse Source 
Internationalization
This commit is contained in:
Laurent Destailleur 2019-10-22 19:24:23 +02:00 committed by GitHub
commit 5d9e7215ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/don/class/don.class.php
View File

@ -6,7 +6,7 @@
* Copyright (C) 2015-2017 Alexandre Spangaro <aspangaro@open-dsi.fr>
* Copyright (C) 2016 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2019 Thibault FOUCART <support@ptibogxiv.net>
* Copyright (C) 2019 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2019 Frédéric France <frederic.france@netlogic.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
@ -62,7 +62,15 @@ class Don extends CommonObject
*/
public $picto = 'generic';
/**
* @var string Date of the donation
*/
public $date;
/**
* amount of donation
* @var double
*/
public $amount;
/**
@ -133,7 +141,7 @@ class Don extends CommonObject
/**
* Retourne le libelle du statut d'un don (brouillon, validee, abandonnee, payee)
* Returns the donation status label (draft, valid, abandoned, paid)
*
* @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long
* @return string Libelle
@ -145,7 +153,7 @@ class Don extends CommonObject
// 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 $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto

15
htdocs/don/class/donstats.class.php
View File

@ -19,7 +19,7 @@
*/
/**
* \file htdocs/don/class/dontats.class.php
* \file htdocs/don/class/donstats.class.php
* \ingroup donations
* \brief File of class to manage donations statistics
*/
@ -39,11 +39,22 @@ class DonationStats extends Stats
*/
public $table_element;
public $socid;
public $socid;
public $userid;
/**
* @var string FROM
*/
public $from;
/**
* @var string field
*/
public $field;
/**
* @var string WHERE
*/
public $where;