Standardize and update code

This commit is contained in:
Philippe GRAND 2018-09-20 14:43:54 +02:00
parent 7c92157636
commit 49fe6d3b79
5 changed files with 63 additions and 21 deletions

View File

@ -45,17 +45,23 @@ class CommActionRapport
*/
public $description;
var $date_edition;
var $year;
var $month;
public $date_edition;
var $title;
var $subject;
public $year;
var $marge_gauche;
var $marge_droite;
var $marge_haute;
var $marge_basse;
public $month;
public $title;
public $subject;
public $marge_gauche;
public $marge_droite;
public $marge_haute;
public $marge_basse;
/**
@ -67,7 +73,7 @@ class CommActionRapport
*/
function __construct($db, $month, $year)
{
global $conf,$langs;
global $conf, $langs;
// Load translation files required by the page
$langs->loadLangs(array("commercial","projects"));

View File

@ -33,11 +33,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/barcode/modules_barcode.class.php'
*/
class mod_barcode_product_standard extends ModeleNumRefBarCode
{
var $name='Standard'; // Model Name
var $code_modifiable; // Editable code
var $code_modifiable_invalide; // Modified code if it is invalid
var $code_modifiable_null; // Modified code if it is null
var $code_null; // Optional code
public $name='Standard'; // Model Name
public $code_modifiable; // Editable code
public $code_modifiable_invalide; // Modified code if it is invalid
public $code_modifiable_null; // Modified code if it is null
public $code_null; // Optional code
/**
* Dolibarr version of the loaded document
@ -45,11 +49,13 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
var $code_auto; // Automatic Numbering
public $code_auto; // Automatic Numbering
var $searchcode; // Search string
var $numbitcounter; // Number of digits the counter
var $prefixIsRequired; // The prefix field of third party must be filled when using {pre}
public $searchcode; // Search string
public $numbitcounter; // Number of digits the counter
public $prefixIsRequired; // The prefix field of third party must be filled when using {pre}
/**

View File

@ -42,8 +42,18 @@ class mod_commande_marbre extends ModeleNumRefCommandes
*/
public $error='';
/**
* @var string
* @deprecated
* @see name
*/
public $nom='Marbre';
/**
* @var string name
*/
public $name='Marbre';
/**
* Return description of numbering module

View File

@ -44,7 +44,17 @@ class mod_commande_saphir extends ModeleNumRefCommandes
*/
public $error = '';
public $nom = 'Saphir';
/**
* @var string nom
* @deprecated
* @see name
*/
public $nom='Saphir';
/**
* @var string name
*/
public $name='Saphir';
/**

View File

@ -40,7 +40,17 @@ class mod_contract_magre extends ModelNumRefContracts
*/
public $error = '';
public $nom = 'Magre';
/**
* @var string nom
* @deprecated
* @see name
*/
public $nom='Magre';
/**
* @var string name
*/
public $name='Magre';
public $code_auto=1;