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

Merge pull request #9716 from grandoc/new_branch_09_10_2018

Browse Source 
Standardize and update code
This commit is contained in:
Laurent Destailleur 2018-10-09 16:07:43 +02:00 committed by GitHub
commit 4fc1f3be4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 169 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,6 +171,10 @@ class Account extends CommonObject
* @var string
*/
public $account_number;
/**
* @var int ID
*/
public $fk_accountancy_journal;
/**
@ -1704,16 +1708,37 @@ class AccountLine extends CommonObject
public $label;
public $note;
/**
* @var int ID
*/
public $fk_user_author;
/**
* @var int ID
*/
public $fk_user_rappro;
/**
* @var int ID
*/
public $fk_type;
public $rappro; // Is it conciliated
public $num_releve; // If conciliated, what is bank statement
public $num_chq; // Num of cheque
public $bank_chq; // Bank of cheque
public $fk_bordereau; // Id of cheque receipt
public $fk_account; // Id of bank account
/**
* @var int ID of cheque receipt
*/
public $fk_bordereau;
/**
* @var int ID of bank account
*/
public $fk_account;
public $bank_account_label; // Label of bank account
/**

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

@ -69,9 +69,25 @@ class PaymentVarious extends CommonObject
public $label;
public $accountancy_code;
/**
* @var int ID
*/
public $fk_project;
/**
* @var int ID
*/
public $fk_bank;
/**
* @var int ID
*/
public $fk_user_author;
/**
* @var int ID
*/
public $fk_user_modif;

4
htdocs/compta/deplacement/class/deplacement.class.php
View File

@ -59,6 +59,10 @@ class Deplacement extends CommonObject
public $datec; // Creation date
public $dated;
/**
* @var int ID
*/
public $fk_user_author;
/**

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

@ -98,8 +98,17 @@ class Facture extends CommonInvoice
public $socid;
public $author;
/**
* @var int ID
*/
public $fk_user_author;
/**
* @var int ID
*/
public $fk_user_valid;
public $date; // Date invoice
public $date_creation; // Creation date
public $date_validation; // Validation date
@ -138,7 +147,11 @@ class Facture extends CommonInvoice
public $date_lim_reglement;
public $cond_reglement_code; // Code in llx_c_paiement
public $mode_reglement_code; // Code in llx_c_paiement
public $fk_bank; // Field to store bank id to use when payment mode is withdraw
/**
* @var int ID Field to store bank id to use when payment mode is withdraw
*/
public $fk_bank;
/**
* @deprecated
@ -157,7 +170,11 @@ class Facture extends CommonInvoice
public $fac_rec;
// Multicurrency
/**
* @var int ID
*/
public $fk_multicurrency;
public $multicurrency_code;
public $multicurrency_tx;
public $multicurrency_total_ht;
@ -4318,42 +4335,42 @@ class FactureLigne extends CommonInvoiceLine
*/
public $table_element='facturedet';
var $oldline;
public $oldline;
//! From llx_facturedet
//! Id facture
var $fk_facture;
public $fk_facture;
//! Id parent line
var $fk_parent_line;
public $fk_parent_line;
/**
* @deprecated
*/
var $label;
public $label;
//! Description ligne
var $desc;
public $desc;
var $localtax1_type; // Local tax 1 type
var $localtax2_type; // Local tax 2 type
var $fk_remise_except; // Link to line into llx_remise_except
var $rang = 0;
public $localtax1_type; // Local tax 1 type
public $localtax2_type; // Local tax 2 type
public $fk_remise_except; // Link to line into llx_remise_except
public $rang = 0;
var $fk_fournprice;
var $pa_ht;
var $marge_tx;
var $marque_tx;
public $fk_fournprice;
public $pa_ht;
public $marge_tx;
public $marque_tx;
var $special_code; // Liste d'options non cumulabels:
public $special_code; // Liste d'options non cumulabels:
// 1: frais de port
// 2: ecotaxe
// 3: ??
var $origin;
var $origin_id;
public $origin;
public $origin_id;
var $fk_code_ventilation = 0;
public $fk_code_ventilation = 0;
var $date_start;
var $date_end;
public $date_start;
public $date_end;
// Ne plus utiliser
//var $price; // P.U. HT apres remise % de ligne (exemple 80)
@ -4364,17 +4381,17 @@ class FactureLigne extends CommonInvoiceLine
* @deprecated
* @see product_ref
*/
var $ref; // Product ref (deprecated)
var $product_ref; // Product ref
public $ref; // Product ref (deprecated)
public $product_ref; // Product ref
/**
* @deprecated
* @see product_label
*/
var $libelle; // Product label (deprecated)
var $product_label; // Product label
var $product_desc; // Description produit
public $libelle; // Product label (deprecated)
public $product_label; // Product label
public $product_desc; // Description produit
var $skip_update_total; // Skip update price total for special lines
public $skip_update_total; // Skip update price total for special lines
/**
* @var int Situation advance percentage
@ -4387,12 +4404,12 @@ class FactureLigne extends CommonInvoiceLine
public $fk_prev_id;
// Multicurrency
var $fk_multicurrency;
var $multicurrency_code;
var $multicurrency_subprice;
var $multicurrency_total_ht;
var $multicurrency_total_tva;
var $multicurrency_total_ttc;
public $fk_multicurrency;
public $multicurrency_code;
public $multicurrency_subprice;
public $multicurrency_total_ht;
public $multicurrency_total_tva;
public $multicurrency_total_ttc;
/**
* Load invoice line from database

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

@ -55,8 +55,19 @@ class Localtax extends CommonObject
*/
public $label;
/**
* @var int ID
*/
public $fk_bank;
/**
* @var int ID
*/
public $fk_user_creat;
/**
* @var int ID
*/
public $fk_user_modif;
/**

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

@ -56,7 +56,12 @@ class PaymentSalary extends CommonObject
public $datep;
public $datev;
public $amount;
/**
* @var int ID
*/
public $fk_project;
public $type_payment;
public $num_payment;
@ -67,8 +72,20 @@ class PaymentSalary extends CommonObject
public $datesp;
public $dateep;
/**
* @var int ID
*/
public $fk_bank;
/**
* @var int ID
*/
public $fk_user_author;
/**
* @var int ID
*/
public $fk_user_modif;

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

@ -48,7 +48,12 @@ class Cchargesociales
public $deductible;
public $active;
public $code;
/**
* @var int ID
*/
public $fk_pays;
public $module;
public $accountancy_code;

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

@ -64,7 +64,15 @@ class ChargeSociales extends CommonObject
public $date_creation;
public $date_modification;
public $date_validation;
/**
* @var int ID
*/
public $fk_account;
/**
* @var int ID
*/
public $fk_project;

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

@ -46,7 +46,11 @@ class PaymentSocialContribution extends CommonObject
*/
public $picto = 'payment';
/**
* @var int ID
*/
public $fk_charge;
public $datec='';
public $tms='';
public $datep='';
@ -59,10 +63,27 @@ class PaymentSocialContribution extends CommonObject
public $amount; // Total amount of payment
public $amounts=array(); // Array of amounts
/**
* @var int ID
*/
public $fk_typepaiement;
public $num_paiement;
/**
* @var int ID
*/
public $fk_bank;
/**
* @var int ID
*/
public $fk_user_creat;
/**
* @var int ID
*/
public $fk_user_modif;
/**

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

@ -60,8 +60,19 @@ class Tva extends CommonObject
*/
public $label;
/**
* @var int ID
*/
public $fk_bank;
/**
* @var int ID
*/
public $fk_user_creat;
/**
* @var int ID
*/
public $fk_user_modif;
/**