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

Standardize and update code

Browse Source
This commit is contained in:
Philippe GRAND 2018-09-05 10:31:12 +02:00
parent ab8155f170
commit 38ca6096b2
14 changed files with 122 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/commande/class/commande.class.php
View File

@ -64,6 +64,9 @@ class Commande extends CommonOrder
*/ */
public $fk_element = 'fk_commande'; public $fk_element = 'fk_commande';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'order'; public $picto = 'order';
/** /**

6
htdocs/compta/bank/class/account.class.php
View File

@ -46,6 +46,9 @@ class Account extends CommonObject
*/ */
public $table_element = 'bank_account'; public $table_element = 'bank_account';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'account'; public $picto = 'account';
/** /**
@ -1664,6 +1667,9 @@ class AccountLine extends CommonObject
*/ */
public $table_element='bank'; public $table_element='bank';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'generic'; public $picto = 'generic';
/** /**

5
htdocs/compta/bank/class/bankcateg.class.php
View File

@ -30,7 +30,10 @@ class BankCateg // extends CommonObject
{ {
//public $element='bank_categ'; //!< Id that identify managed objects //public $element='bank_categ'; //!< Id that identify managed objects
//public $table_element='bank_categ'; //!< Name of table without prefix where object is stored //public $table_element='bank_categ'; //!< Name of table without prefix where object is stored
public $picto='generic'; /**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto='generic';
/** /**
* @var int ID * @var int ID

3
htdocs/compta/bank/class/paymentvarious.class.php
View File

@ -40,6 +40,9 @@ class PaymentVarious extends CommonObject
*/ */
public $table_element='payment_various'; public $table_element='payment_various';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'bill'; public $picto = 'bill';
/** /**

3
htdocs/compta/facture/class/facture-rec.class.php
View File

@ -59,6 +59,9 @@ class FactureRec extends CommonInvoice
*/ */
public $fk_element='fk_facture'; public $fk_element='fk_facture';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto='bill'; public $picto='bill';
public $entity; public $entity;

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

@ -73,6 +73,9 @@ class Facture extends CommonInvoice
*/ */
public $fk_element = 'fk_facture'; public $fk_element = 'fk_facture';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto='bill'; public $picto='bill';
/** /**

19
htdocs/compta/localtax/class/localtax.class.php
View File

@ -39,22 +39,25 @@ class Localtax extends CommonObject
*/ */
public $table_element='localtax'; public $table_element='localtax';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto='payment'; public $picto='payment';
var $ltt; public $ltt;
var $tms; public $tms;
var $datep; public $datep;
var $datev; public $datev;
var $amount; public $amount;
/** /**
* @var string local tax * @var string local tax
*/ */
public $label; public $label;
var $fk_bank; public $fk_bank;
var $fk_user_creat; public $fk_user_creat;
var $fk_user_modif; public $fk_user_modif;
/** /**
* Constructor * Constructor

9
htdocs/compta/paiement/cheque/class/remisecheque.class.php
View File

@ -43,12 +43,15 @@ class RemiseCheque extends CommonObject
*/ */
public $table_element='bordereau_cheque'; public $table_element='bordereau_cheque';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'payment'; public $picto = 'payment';
var $num; public $num;
var $intitule; public $intitule;
//! Numero d'erreur Plage 1024-1279 //! Numero d'erreur Plage 1024-1279
var $errno; public $errno;
public $amount; public $amount;
public $date_bordereau; public $date_bordereau;

36
htdocs/compta/paiement/class/paiement.class.php
View File

@ -46,34 +46,40 @@ class Paiement extends CommonObject
*/ */
public $table_element='paiement'; public $table_element='paiement';
public $picto = 'payment'; /**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'payment';
public $facid;
public $datepaye;
var $facid;
var $datepaye;
/** /**
* @deprecated * @deprecated
* @see amount, amounts * @see amount, amounts
*/ */
var $total; public $total;
/** /**
* @deprecated * @deprecated
* @see amount, amounts * @see amount, amounts
*/ */
var $montant; public $montant;
var $amount; // Total amount of payment
var $amounts=array(); // Array of amounts public $amount; // Total amount of payment
var $multicurrency_amounts=array(); // Array of amounts public $amounts=array(); // Array of amounts
var $author; public $multicurrency_amounts=array(); // Array of amounts
var $paiementid; // Type de paiement. Stocke dans fk_paiement public $author;
public $paiementid; // Type de paiement. Stocke dans fk_paiement
// de llx_paiement qui est lie aux types de // de llx_paiement qui est lie aux types de
//paiement de llx_c_paiement //paiement de llx_c_paiement
var $num_paiement; // Numero du CHQ, VIR, etc... public $num_paiement; // Numero du CHQ, VIR, etc...
var $num_payment; // Numero du CHQ, VIR, etc... public $num_payment; // Numero du CHQ, VIR, etc...
var $bank_account; // Id compte bancaire du paiement public $bank_account; // Id compte bancaire du paiement
var $bank_line; // Id de la ligne d'ecriture bancaire public $bank_line; // Id de la ligne d'ecriture bancaire
// fk_paiement dans llx_paiement est l'id du type de paiement (7 pour CHQ, ...) // fk_paiement dans llx_paiement est l'id du type de paiement (7 pour CHQ, ...)
// fk_paiement dans llx_paiement_facture est le rowid du paiement // fk_paiement dans llx_paiement_facture est le rowid du paiement
var $fk_paiement; // Type of paiment public $fk_paiement; // Type of paiment
/** /**

35
htdocs/compta/prelevement/class/bonprelevement.class.php
View File

@ -49,27 +49,30 @@ class BonPrelevement extends CommonObject
*/ */
public $table_element='prelevement_bons'; public $table_element='prelevement_bons';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'payment'; public $picto = 'payment';
var $date_echeance; public $date_echeance;
var $raison_sociale; public $raison_sociale;
var $reference_remise; public $reference_remise;
var $emetteur_code_guichet; public $emetteur_code_guichet;
var $emetteur_numero_compte; public $emetteur_numero_compte;
var $emetteur_code_banque; public $emetteur_code_banque;
var $emetteur_number_key; public $emetteur_number_key;
var $emetteur_iban; public $emetteur_iban;
var $emetteur_bic; public $emetteur_bic;
var $emetteur_ics; public $emetteur_ics;
var $total; public $total;
var $_fetched; public $_fetched;
var $statut; // 0-Wait, 1-Trans, 2-Done public $statut; // 0-Wait, 1-Trans, 2-Done
var $labelstatut=array(); public $labelstatut=array();
var $invoice_in_error=array(); public $invoice_in_error=array();
var $thirdparty_in_error=array(); public $thirdparty_in_error=array();
/** /**

3
htdocs/compta/salaries/class/paymentsalary.class.php
View File

@ -41,6 +41,9 @@ class PaymentSalary extends CommonObject
*/ */
public $table_element='payment_salary'; public $table_element='payment_salary';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto='payment'; public $picto='payment';
public $tms; public $tms;

29
htdocs/compta/sociales/class/chargesociales.class.php
View File

@ -44,25 +44,28 @@ class ChargeSociales extends CommonObject
*/ */
public $table_element='chargesociales'; public $table_element='chargesociales';
public $picto = 'bill'; /**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'bill';
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
protected $table_ref_field = 'ref'; protected $table_ref_field = 'ref';
var $date_ech; public $date_ech;
var $lib; public $lib;
var $type; public $type;
var $type_libelle; public $type_libelle;
var $amount; public $amount;
var $paye; public $paye;
var $periode; public $periode;
var $date_creation; public $date_creation;
var $date_modification; public $date_modification;
var $date_validation; public $date_validation;
var $fk_account; public $fk_account;
var $fk_project; public $fk_project;
/** /**

5
htdocs/compta/sociales/class/paymentsocialcontribution.class.php
View File

@ -41,17 +41,22 @@ class PaymentSocialContribution extends CommonObject
*/ */
public $table_element='paiementcharge'; public $table_element='paiementcharge';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'payment'; public $picto = 'payment';
public $fk_charge; public $fk_charge;
public $datec=''; public $datec='';
public $tms=''; public $tms='';
public $datep=''; public $datep='';
/** /**
* @deprecated * @deprecated
* @see amount * @see amount
*/ */
public $total; public $total;
public $amount; // Total amount of payment public $amount; // Total amount of payment
public $amounts=array(); // Array of amounts public $amounts=array(); // Array of amounts
public $fk_typepaiement; public $fk_typepaiement;

21
htdocs/compta/tva/class/tva.class.php
View File

@ -43,23 +43,26 @@ class Tva extends CommonObject
*/ */
public $table_element='tva'; public $table_element='tva';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto='payment'; public $picto='payment';
var $tms; public $tms;
var $datep; public $datep;
var $datev; public $datev;
var $amount; public $amount;
var $type_payment; public $type_payment;
var $num_payment; public $num_payment;
/** /**
* @var string label * @var string label
*/ */
public $label; public $label;
var $fk_bank; public $fk_bank;
var $fk_user_creat; public $fk_user_creat;
var $fk_user_modif; public $fk_user_modif;
/** /**
* Constructor * Constructor