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

Merge pull request #9690 from grandoc/new_branch_05_10_2018

Browse Source 
clean code
This commit is contained in:
Laurent Destailleur 2018-10-09 12:40:03 +02:00 committed by GitHub
commit 1297f25468
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
58 changed files with 393 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/accountancy/class/accountancysystem.class.php
View File

@ -38,8 +38,16 @@ class AccountancySystem
*/
public $error='';
/**
* @var int ID
*/
public $rowid;
/**
* @var int ID
*/
public $fk_pcg_version;
public $pcg_type;
public $pcg_subtype;

9
htdocs/accountancy/class/accountingaccount.class.php
View File

@ -80,12 +80,21 @@ class AccountingAccount extends CommonObject
public $rowid;
public $datec; // Creation date
/**
* @var int ID
*/
public $fk_pcg_version;
public $pcg_type;
public $pcg_subtype;
public $account_number;
public $account_parent;
public $account_category;
/**
* @var int Status
*/
public $status;
/**

6
htdocs/accountancy/class/accountingjournal.class.php
View File

@ -41,7 +41,11 @@ class AccountingJournal extends CommonObject
*/
public $fk_element = '';
public $ismultientitymanaged = 0; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int
*/
public $ismultientitymanaged = 0;
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png

28
htdocs/accountancy/class/bookkeeping.class.php
View File

@ -70,8 +70,17 @@ class BookKeeping extends CommonObject
public $date_lim_reglement;
public $doc_type;
public $doc_ref;
/**
* @var int ID
*/
public $fk_doc;
/**
* @var int ID
*/
public $fk_docdet;
public $thirdparty_code;
public $subledger_account;
public $subledger_label;
@ -82,7 +91,12 @@ class BookKeeping extends CommonObject
public $credit;
public $montant;
public $sens;
/**
* @var int ID
*/
public $fk_user_author;
public $import_key;
public $code_journal;
public $journal_label;
@ -1871,8 +1885,17 @@ class BookKeepingLine
public $doc_date = '';
public $doc_type;
public $doc_ref;
/**
* @var int ID
*/
public $fk_doc;
/**
* @var int ID
*/
public $fk_docdet;
public $thirdparty_code;
public $subledger_account;
public $subledger_label;
@ -1883,7 +1906,12 @@ class BookKeepingLine
public $credit;
public $montant;
public $sens;
/**
* @var int ID
*/
public $fk_user_author;
public $import_key;
public $code_journal;
public $journal_label;

15
htdocs/adherents/class/adherent.class.php
View File

@ -51,7 +51,11 @@ class Adherent extends CommonObject
*/
public $table_element='adherent';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int
*/
public $ismultientitymanaged = 1;
public $mesgs;
@ -65,8 +69,17 @@ class Adherent extends CommonObject
public $pass_indatabase_crypted;
public $societe;
/**
* @var Societe $company {@type Societe}
*/
public $company;
/**
* @var string Address
*/
public $address;
public $zip;
public $town;

6
htdocs/adherents/class/adherent_type.class.php
View File

@ -47,7 +47,11 @@ class AdherentType extends CommonObject
*/
public $picto = 'group';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int
*/
public $ismultientitymanaged = 1;
/**
* @var string

9
htdocs/adherents/class/subscription.class.php
View File

@ -51,8 +51,17 @@ class Subscription extends CommonObject
public $datem; // Date modification
public $dateh; // Subscription start date (date subscription)
public $datef; // Subscription end date
/**
* @var int ID
*/
public $fk_adherent;
public $amount;
/**
* @var int ID
*/
public $fk_bank;

2
htdocs/admin/prelevement.php
View File

@ -465,7 +465,6 @@ if (! empty($conf->global->MAIN_MODULE_NOTIFICATION))
{
$num = $db->num_rows($resql);
$i = 0;
$var = false;
while ($i < $num)
{
$obj = $db->fetch_object($resql);
@ -511,7 +510,6 @@ if (! empty($conf->global->MAIN_MODULE_NOTIFICATION))
{
$num = $db->num_rows($resql);
$i = 0;
$var = false;
while ($i < $num)
{
$obj = $db->fetch_object($resql);

16
htdocs/asset/class/asset.class.php
View File

@ -106,6 +106,9 @@ class Asset extends CommonObject
*/
public $ref;
/**
* @var int Entity
*/
public $entity;
/**
@ -129,9 +132,22 @@ class Asset extends CommonObject
public $note_private;
public $date_creation;
public $tms;
/**
* @var int ID
*/
public $fk_user_creat;
/**
* @var int ID
*/
public $fk_user_modif;
public $import_key;
/**
* @var int Status
*/
public $status;
// If this object has a subtable with lines

6
htdocs/asset/class/asset_type.class.php
View File

@ -44,7 +44,11 @@ class AssetType extends CommonObject
*/
public $picto = 'group';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int
*/
public $ismultientitymanaged = 1;
/**
* @var string Asset type label

29
htdocs/bookmarks/class/bookmark.class.php
View File

@ -29,21 +29,25 @@
class Bookmark extends CommonObject
{
/**
* @var string ID to identify managed object
*/
public $element='bookmark';
* @var string ID to identify managed object
*/
public $element='bookmark';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='bookmark';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int
*/
public $ismultientitymanaged = 1;
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'bookmark';
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'bookmark';
/**
* @var DoliDB Database handler.
@ -56,15 +60,20 @@ class Bookmark extends CommonObject
public $id;
/**
* @var int User ID
*/
public $fk_user;
* @var int User ID
*/
public $fk_user;
public $datec;
public $url;
public $target; // 0=replace, 1=new window
public $title;
public $position;
public $favicon;

3
htdocs/categories/class/categorie.class.php
View File

@ -161,6 +161,9 @@ class Categorie extends CommonObject
*/
public $table_element='categorie';
/**
* @var int ID
*/
public $fk_parent;
/**

10
htdocs/comm/action/class/actioncommreminder.class.php
View File

@ -81,7 +81,12 @@ class ActionCommReminder extends CommonObject
'offsetunit' => array('type'=>'varchar(1)', 'label'=>'OffsetUnit', 'visible'=>1, 'enabled'=>1, 'position'=>57, 'notnull'=>1, 'comment'=>"m, h, d, w",),
'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'default'=>0, 'index'=>0, 'arrayofkeyval'=>array('0'=>'ToDo', '1'=>'Done')),
);
/**
* @var int ID
*/
public $rowid;
public $dateremind;
public $typeremind;
@ -92,7 +97,12 @@ class ActionCommReminder extends CommonObject
public $offsetvalue;
public $offsetunit;
/**
* @var int Status
*/
public $status;
// END MODULEBUILDER PROPERTIES

9
htdocs/comm/propal/class/propal.class.php
View File

@ -168,7 +168,12 @@ class Propal extends CommonObject
public $remise = 0;
public $remise_percent = 0;
public $remise_absolue = 0;
/**
* @var int ID
*/
public $fk_address;
public $address_type;
public $address;
public $availability_id;
@ -191,7 +196,11 @@ class Propal extends CommonObject
public $specimen;
// Multicurrency
/**
* @var int ID
*/
public $fk_multicurrency;
public $multicurrency_code;
public $multicurrency_tx;
public $multicurrency_total_ht;

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

@ -111,6 +111,9 @@ class Commande extends CommonOrder
public $brouillon;
public $cond_reglement_code;
/**
* @var int ID
*/
public $fk_account;
/**
@ -160,7 +163,12 @@ class Commande extends CommonOrder
public $date_commande;
public $date_livraison; // Date expected of shipment (date starting shipment, not the reception that occurs some days after)
/**
* @var int ID
*/
public $fk_remise_except;
public $remise_percent;
public $remise_absolue;
public $info_bits;
@ -180,7 +188,11 @@ class Commande extends CommonOrder
public $lines = array();
// Multicurrency
/**
* @var int ID
*/
public $fk_multicurrency;
public $multicurrency_code;
public $multicurrency_tx;
public $multicurrency_total_ht;

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

@ -51,7 +51,11 @@ class Deplacement extends CommonObject
*/
public $fk_element = '';
public $ismultientitymanaged = 0; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int
*/
public $ismultientitymanaged = 0;
public $datec; // Creation date
public $dated;

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

@ -64,7 +64,11 @@ class FactureRec extends CommonInvoice
*/
public $picto='bill';
/**
* @var int Entity
*/
public $entity;
public $number;
public $date;
public $amount;

9
htdocs/compta/index.php
View File

@ -162,7 +162,6 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
if ( $resql )
{
$var = false;
$num = $db->num_rows($resql);
print '<table class="noborder" width="100%">';
@ -350,7 +349,6 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
$resql = $db->query($sql);
if ($resql)
{
$var=false;
$num = $db->num_rows($resql);
$i = 0;
@ -473,7 +471,6 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
$resql=$db->query($sql);
if ($resql)
{
$var=false;
$num = $db->num_rows($resql);
print '<table class="noborder" width="100%">';
@ -520,7 +517,6 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
$total_ttc += $obj->total_ttc;
$totalam += $obj->am;
$i++;
$var = !$var;
}
}
else
@ -1069,7 +1065,7 @@ if ($resql)
$obj = $db->fetch_object($resql);
print "<tr ".$bc[$var]."><td>".dol_print_date($db->jdate($obj->da),"day")."</td>";
print '<tr class="oddeven"><td>'.dol_print_date($db->jdate($obj->da),"day").'</td>';
print '<td><a href="action/card.php">'.$obj->libelle.' '.$obj->label.'</a></td></tr>';
$i++;
}
@ -1080,7 +1076,6 @@ if ($resql)
print '</div></div></div>';
// End of page
llxFooter();
$db->close();

6
htdocs/contact/class/contact.class.php
View File

@ -47,7 +47,11 @@ class Contact extends CommonObject
*/
public $table_element='socpeople';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int
*/
public $ismultientitymanaged = 1;
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png

1
htdocs/core/boxes/modules_boxes.php
View File

@ -213,7 +213,6 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
require_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
$MAXLENGTHBOX=60; // Mettre 0 pour pas de limite
$var = false;
$cachetime = 900; // 900 : 15mn
$cachedir = DOL_DATA_ROOT.'/boxes/temp';

3
htdocs/core/class/commondocgenerator.class.php
View File

@ -38,6 +38,9 @@ abstract class CommonDocGenerator
*/
public $error='';
/**
* @var DoliDB Database handler.
*/
protected $db;

5
htdocs/core/class/events.class.php
View File

@ -61,7 +61,12 @@ class Events // extends CommonObject
public $tms;
public $type;
/**
* @var int Entity
*/
public $entity;
public $dateevent;
/**

10
htdocs/core/class/fiscalyear.class.php
View File

@ -48,7 +48,11 @@ class Fiscalyear extends CommonObject
*/
public $fk_element = '';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int
*/
public $ismultientitymanaged = 1;
/**
* @var int ID
@ -64,6 +68,10 @@ class Fiscalyear extends CommonObject
public $date_end;
public $datec;
public $statut; // 0=open, 1=closed
/**
* @var int Entity
*/
public $entity;
public $statuts=array();

4
htdocs/core/class/google.class.php
View File

@ -30,13 +30,13 @@ class GoogleAPI
* @var DoliDB Database handler.
*/
public $db;
/**
* @var string Error code (or message)
*/
public $error='';
var $key;
public $key;
/**
* Constructor

14
htdocs/core/class/html.form.class.php
View File

@ -58,15 +58,15 @@ class Form
*/
public $error='';
var $num;
public $num;
// Cache arrays
var $cache_types_paiements=array();
var $cache_conditions_paiements=array();
var $cache_availability=array();
var $cache_demand_reason=array();
var $cache_types_fees=array();
var $cache_vatrates=array();
public $cache_types_paiements=array();
public $cache_conditions_paiements=array();
public $cache_availability=array();
public $cache_demand_reason=array();
public $cache_types_fees=array();
public $cache_vatrates=array();
/**

10
htdocs/core/class/notify.class.php
View File

@ -51,11 +51,11 @@ class Notify
*/
public $errors = array();
var $author;
var $ref;
var $date;
var $duree;
var $note;
public $author;
public $ref;
public $date;
public $duree;
public $note;
/**
* @var int Project ID

2
htdocs/core/modules/mailings/modules_mailings.php
View File

@ -41,7 +41,7 @@ class MailingTargets // This can't be abstract as it is used for some method
*/
public $error='';
var $tooltip='';
public $tooltip='';
/**

10
htdocs/cron/class/cronjob.class.php
View File

@ -76,7 +76,12 @@ class Cronjob extends CommonObject
public $lastoutput;
public $unitfrequency;
public $frequency;
/**
* @var int Status
*/
public $status;
public $processing;
public $fk_user_author;
public $fk_user_mod;
@ -1379,7 +1384,12 @@ class Cronjobline
public $lastoutput;
public $unitfrequency;
public $frequency;
/**
* @var int Status
*/
public $status;
public $fk_user_author;
public $fk_user_mod;
public $note;

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

@ -49,7 +49,11 @@ class Don extends CommonObject
*/
public $fk_element = 'fk_donation';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int
*/
public $ismultientitymanaged = 1;
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
@ -59,7 +63,12 @@ class Don extends CommonObject
public $date;
public $amount;
public $societe;
public $address;
/**
* @var string Address
*/
public $address;
public $zip;
public $town;
public $email;

9
htdocs/expedition/class/expedition.class.php
View File

@ -50,6 +50,9 @@ class Expedition extends CommonObject
*/
public $element="shipping";
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element="fk_expedition";
/**
@ -62,7 +65,11 @@ class Expedition extends CommonObject
*/
public $table_element_line="expeditiondet";
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int
*/
public $ismultientitymanaged = 1;
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png

30
htdocs/expensereport/class/expensereport.class.php
View File

@ -2416,22 +2416,26 @@ class ExpenseReportLine
*/
public $error='';
var $rowid;
var $comments;
var $qty;
var $value_unit;
var $date;
/**
* @var int ID
*/
public $rowid;
var $fk_c_type_fees;
var $fk_c_exp_tax_cat;
var $fk_projet;
var $fk_expensereport;
public $comments;
public $qty;
public $value_unit;
public $date;
var $type_fees_code;
var $type_fees_libelle;
public $fk_c_type_fees;
public $fk_c_exp_tax_cat;
public $fk_projet;
public $fk_expensereport;
var $projet_ref;
var $projet_title;
public $type_fees_code;
public $type_fees_libelle;
public $projet_ref;
public $projet_title;
var $vatrate;
var $total_ht;

3
htdocs/expensereport/class/expensereport_ik.class.php
View File

@ -39,6 +39,9 @@ class ExpenseReportIk extends CoreObject
*/
public $table_element='expensereport_ik';
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element='fk_expense_ik';
/**

7
htdocs/expensereport/class/expensereport_rule.class.php
View File

@ -33,12 +33,15 @@ class ExpenseReportRule extends CoreObject
* @var string ID to identify managed object
*/
public $element='expenserule';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='expensereport_rules';
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element='fk_expense_rule';
/**

3
htdocs/expensereport/class/paymentexpensereport.class.php
View File

@ -45,6 +45,9 @@ class PaymentExpenseReport extends CommonObject
*/
public $picto = 'payment';
/**
* @var int ID
*/
public $rowid;
public $fk_expensereport;

5
htdocs/fourn/class/fournisseur.commande.dispatch.class.php
View File

@ -78,7 +78,12 @@ class CommandeFournisseurDispatch extends CommonObject
public $datec='';
public $comment;
/**
* @var int Status
*/
public $status;
public $tms='';
public $batch;
public $eatby='';

4
htdocs/fourn/commande/dispatch.php
View File

@ -533,7 +533,6 @@ if ($id > 0 || ! empty($ref)) {
$nbproduct = 0; // Nb of predefined product lines to dispatch (already done or not) if SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED is off (default)
// or nb of line that remain to dispatch if SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED is on.
$var = false;
while ( $i < $num ) {
$objp = $db->fetch_object($resql);
@ -794,8 +793,6 @@ if ($id > 0 || ! empty($ref)) {
print '<td>' . $langs->trans("Date") . '</td>';
print "</tr>\n";
$var = false;
while ( $i < $num ) {
$objp = $db->fetch_object($resql);
@ -869,7 +866,6 @@ if ($id > 0 || ! empty($ref)) {
print "</tr>\n";
$i ++;
$var = ! $var;
}
$db->free($resql);

11
htdocs/holiday/class/holiday.class.php
View File

@ -42,8 +42,17 @@ class Holiday extends CommonObject
*/
public $table_element='holiday';
public $ismultientitymanaged = 0; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int
*/
public $ismultientitymanaged = 0;
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element = 'fk_holiday';
public $picto = 'holiday';
/**

18
htdocs/hrm/class/establishment.class.php
View File

@ -49,7 +49,12 @@ class Establishment extends CommonObject
*/
public $fk_element = 'fk_establishment';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int
*/
public $ismultientitymanaged = 1;
public $picto='building';
/**
@ -68,10 +73,19 @@ class Establishment extends CommonObject
public $rowid;
public $name;
/**
* @var string Address
*/
public $address;
public $zip;
public $town;
public $status; // 0=open, 1=closed
/**
* @var int Status 0=open, 1=closed
*/
public $status;
/**
* @var int Entity

8
htdocs/mailmanspip/class/mailmanspip.class.php
View File

@ -48,10 +48,10 @@ class MailmanSpip
*/
public $error='';
var $mladded_ok;
var $mladded_ko;
var $mlremoved_ok;
var $mlremoved_ko;
public $mladded_ok;
public $mladded_ko;
public $mlremoved_ok;
public $mlremoved_ko;
/**

5
htdocs/modulebuilder/template/class/myobject.class.php
View File

@ -122,7 +122,12 @@ class MyObject extends CommonObject
public $label;
public $amount;
/**
* @var int Status
*/
public $status;
public $date_creation;
public $tms;
public $fk_user_creat;

7
htdocs/product/class/product.class.php
View File

@ -59,7 +59,12 @@ class Product extends CommonObject
public $fk_element='fk_product';
protected $childtables=array('supplier_proposaldet', 'propaldet','commandedet','facturedet','contratdet','facture_fourn_det','commande_fournisseurdet'); // To test if we can delete object
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int
*/
public $ismultientitymanaged = 1;
/**
* {@inheritdoc}

8
htdocs/product/class/productcustomerprice.class.php
View File

@ -38,7 +38,11 @@ class Productcustomerprice extends CommonObject
*/
public $table_element = 'product_customer_price';
/**
* @var int Entity
*/
public $entity;
public $datec = '';
public $tms = '';
public $fk_product;
@ -976,7 +980,11 @@ class PriceByCustomerLine
*/
public $id;
/**
* @var int Entity
*/
public $entity;
public $datec = '';
public $tms = '';
public $fk_product;

5
htdocs/product/inventory/class/inventory.class.php
View File

@ -117,7 +117,12 @@ class Inventory extends CommonObject
public $fk_warehouse;
public $date_inventory;
public $title;
/**
* @var int Status
*/
public $status;
public $date_creation;
public $date_validation;
public $tms;

5
htdocs/product/stock/class/entrepot.class.php
View File

@ -69,7 +69,12 @@ class Entrepot extends CommonObject
public $statut;
public $lieu;
/**
* @var string Address
*/
public $address;
//! Code Postal
public $zip;
public $town;

4
htdocs/product/stock/class/productlot.class.php
View File

@ -47,6 +47,10 @@ class Productlot extends CommonObject
public $picto='barcode';
/**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int
*/
public $ismultientitymanaged = 1;
/**

7
htdocs/projet/class/project.class.php
View File

@ -53,7 +53,12 @@ class Project extends CommonObject
*/
public $fk_element = 'fk_projet';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int
*/
public $ismultientitymanaged = 1;
public $picto = 'projectpub';
/**

5
htdocs/resource/class/html.formresource.class.php
View File

@ -38,8 +38,9 @@ class FormResource
*/
public $db;
var $substit=array();
var $param=array();
public $substit=array();
public $param=array();
/**
* @var string Error code (or message)

10
htdocs/societe/class/address.class.php
View File

@ -47,7 +47,12 @@ class Address
public $socid;
public $name;
/**
* @var string Address
*/
public $address;
public $zip;
public $town;
public $country_id;
@ -522,7 +527,12 @@ class AddressLine
public $label;
public $name;
/**
* @var string Address
*/
public $address;
public $zip;
public $town;
public $country_id;

7
htdocs/societe/class/companypaymentmode.class.php
View File

@ -127,7 +127,7 @@ class CompanyPaymentMode extends CommonObject
/**
* @var int Thirdparty ID
*/
public $fk_soc;
public $fk_soc;
/**
* @var string company payment mode label
@ -161,7 +161,12 @@ class CompanyPaymentMode extends CommonObject
public $preapproval_key;
public $total_amount_of_all_payments;
public $stripe_card_ref;
/**
* @var int Status
*/
public $status;
public $starting_date;
public $ending_date;
public $datec;

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

@ -66,6 +66,7 @@ class Societe extends CommonObject
* @var int
*/
public $ismultientitymanaged = 1;
/**
* 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
* @var integer
@ -119,7 +120,12 @@ class Societe extends CommonObject
public $name_alias;
public $particulier;
/**
* @var string Address
*/
public $address;
public $zip;
public $town;

9
htdocs/societe/class/societeaccount.class.php
View File

@ -99,6 +99,10 @@ class SocieteAccount extends CommonObject
'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'visible'=>-2, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1, 'index'=>1,),
'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'default'=>1, 'arrayofkeyval'=>array('1'=>'Active','0'=>'Disabled')),
);
/**
* @var int ID
*/
public $rowid;
/**
@ -126,7 +130,12 @@ class SocieteAccount extends CommonObject
public $fk_user_creat;
public $fk_user_modif;
public $import_key;
/**
* @var int Status
*/
public $status;
// END MODULEBUILDER PROPERTIES

2
htdocs/stripe/class/stripe.class.php
View File

@ -36,7 +36,7 @@ class Stripe extends CommonObject
/**
* @var int Thirdparty ID
*/
public $fk_soc;
public $fk_soc;
public $fk_key;

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

@ -60,6 +60,9 @@ class SupplierProposal extends CommonObject
*/
public $table_element_line='supplier_proposaldet';
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element='fk_supplier_proposal';
public $picto='propal';

15
htdocs/user/class/user.class.php
View File

@ -50,8 +50,16 @@ class User extends CommonObject
*/
public $table_element='user';
/**
* @var int Field with ID of parent key if this field has a parent
*/
public $fk_element='fk_user';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int
*/
public $ismultientitymanaged = 1;
public $id=0;
public $statut;
@ -64,7 +72,12 @@ class User extends CommonObject
public $skype;
public $job; // job position
public $signature;
/**
* @var string Address
*/
public $address;
public $zip;
public $town;
public $state_id; // The state/department

6
htdocs/user/class/usergroup.class.php
View File

@ -45,7 +45,11 @@ class UserGroup extends CommonObject
*/
public $table_element='usergroup';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
* @var int
*/
public $ismultientitymanaged = 1;
public $picto='group';

1
htdocs/variants/card.php
View File

@ -133,7 +133,6 @@ if ($confirm == 'yes') {
$langs->load('products');
$title = $langs->trans('ProductAttributeName', dol_htmlentities($object->label));
$var = false;
llxHeader('', $title);

1
htdocs/variants/combinations.php
View File

@ -27,7 +27,6 @@ require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination2ValuePair.cla
$langs->loadLangs(array("products", "other"));
$var = false;
$id = GETPOST('id', 'int');
$valueid = GETPOST('valueid', 'int');
$ref = GETPOST('ref');

5
htdocs/website/class/websitepage.class.php
View File

@ -64,7 +64,12 @@ class WebsitePage extends CommonObject
public $htmlheader;
public $content;
public $grabbed_from;
/**
* @var int Status
*/
public $status;
public $date_creation;
public $date_modification;