Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

develop

Conflicts:
	htdocs/user/list.php

htdocs/accountancy/class/accountancyexport.class.php

@@ -54,6 +54,7 @@ class AccountancyExport
 	public static $EXPORT_TYPE_COGILOG = 8;
 	public static $EXPORT_TYPE_AGIRIS = 9;
 	public static $EXPORT_TYPE_CONFIGURABLE = 10;
+	public static $EXPORT_TYPE_FEC = 11;
 
 
 	/**
@@ -107,6 +108,7 @@ class AccountancyExport
 				self::$EXPORT_TYPE_COGILOG => $langs->trans('Modelcsv_cogilog'),
 				self::$EXPORT_TYPE_AGIRIS => $langs->trans('Modelcsv_agiris'),
 				self::$EXPORT_TYPE_CONFIGURABLE => $langs->trans('Modelcsv_configurable'),
+				self::$EXPORT_TYPE_FEC => $langs->trans('Modelcsv_FEC'),
 			);
 	}
 
@@ -161,6 +163,10 @@ class AccountancyExport
 					'ACCOUNTING_EXPORT_ENDLINE' => empty($conf->global->ACCOUNTING_EXPORT_ENDLINE)?1:$conf->global->ACCOUNTING_EXPORT_ENDLINE,
 					'ACCOUNTING_EXPORT_DATE' => empty($conf->global->ACCOUNTING_EXPORT_DATE)?'%d%m%Y':$conf->global->ACCOUNTING_EXPORT_DATE,
 				),
+				self::$EXPORT_TYPE_FEC => array(
+					'label' => $langs->trans('Modelcsv_FEC'),
+					'ACCOUNTING_EXPORT_FORMAT' => 'txt',
+				),
 			),
 			'cr'=> array (
 				'1' => $langs->trans("Unix"),
@@ -228,6 +234,9 @@ class AccountancyExport
 			case self::$EXPORT_TYPE_CONFIGURABLE :
 				$this->exportConfigurable($TData);
 				break;
+			case self::$EXPORT_TYPE_FEC :
+				$this->exportFEC($TData);
+				break;
 			default:
 				$this->errors[] = $langs->trans('accountancy_error_modelnotfound');
 				break;
@@ -613,6 +622,80 @@ class AccountancyExport
 		}
 	}
 
+	/**
+	 * Export format : FEC
+	 *
+	 * @param array $objectLines data
+	 *
+	 * @return void
+	 */
+	public function exportFEC($objectLines)
+	{
+		$separator = ';';
+		$end_line = "\n";
+
+		foreach ( $objectLines as $line ) {
+			$date_creation = dol_print_date($line->date_creation, '%d%m%Y');
+			$date_doc = dol_print_date($line->doc_date, '%d%m%Y');
+			$date_valid = dol_print_date($line->date_validated, '%d%m%Y');
+
+			// FEC:JournalCode
+			print $line->code_journal;
+
+			// FEC:JournalLib
+			print $line->journal_label;
+
+			// FEC:EcritureNum
+			print $line->piece_num . $separator;
+
+			// FEC:EcritureDate
+			print $date_creation . $separator;
+
+			// FEC:CompteNum
+			print $line->numero_compte . $separator
+
+			// FEC:CompteLib
+			print $line->label_compte . $separator;
+
+			// FEC:CompAuxNum
+			print $line->subledger_account . $separator;
+
+			// FEC:CompAuxLib
+			print $line->subledger_label . $separator;
+
+			// FEC:PieceRef
+			print $line->doc_ref . $separator;
+
+			// FEC:PieceDate
+			print $date_doc . $separator;
+
+			// FEC:EcritureLib
+			print $line->label_operation . $separator;
+
+			// FEC:Debit
+			print price($line->debit) . $separator;
+
+			// FEC:Credit
+			print price($line->credit) . $separator;
+
+			// FEC:EcritureLet
+			print $line->lettering_code . $separator;
+
+			// FEC:DateLet
+			print $line->date_lettering . $separator;
+
+			// FEC:ValidDate
+			print $date_valid . $separator;
+
+			// FEC:Montantdevise
+			print $line->multicurrency_amount . $separator;
+
+			// FEC:Idevise
+			print $line->multicurrency_code;
+
+			print $end_line;
+		}
+	}
 
 	/**
 	 *

htdocs/accountancy/class/accountancysystem.class.php

@@ -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;
 

htdocs/accountancy/class/accountingaccount.class.php

@@ -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;
 
     /**

htdocs/accountancy/class/accountingjournal.class.php

@@ -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

htdocs/accountancy/class/bookkeeping.class.php

@@ -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;
@@ -718,6 +732,10 @@ class BookKeeping extends CommonObject
 		$sql .= " t.credit,";
 		$sql .= " t.montant,";
 		$sql .= " t.sens,";
+		$sql .= " t.multicurrency_amount,";
+		$sql .= " t.multicurrency_code,";
+		$sql .= " t.lettering_code,";
+		$sql .= " t.date_lettering,";
 		$sql .= " t.fk_user_author,";
 		$sql .= " t.import_key,";
 		$sql .= " t.code_journal,";
@@ -786,6 +804,10 @@ class BookKeeping extends CommonObject
 				$line->credit = $obj->credit;
 				$line->montant = $obj->montant;
 				$line->sens = $obj->sens;
+				$line->multicurrency_amount = $obj->multicurrency_amount;
+				$line->multicurrency_code = $obj->multicurrency_code;
+				$line->lettering_code = $obj->lettering_code;
+				$line->date_lettering = $obj->date_lettering;
 				$line->fk_user_author = $obj->fk_user_author;
 				$line->import_key = $obj->import_key;
 				$line->code_journal = $obj->code_journal;
@@ -1871,8 +1893,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 +1914,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;

htdocs/adherents/class/adherent.class.php

@@ -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;
 

htdocs/adherents/class/adherent_type.class.php

@@ -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

htdocs/adherents/class/subscription.class.php

@@ -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;
 
 

htdocs/admin/prelevement.php

@@ -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);

htdocs/asset/class/asset.class.php

@@ -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

htdocs/asset/class/asset_type.class.php

@@ -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

htdocs/bookmarks/class/bookmark.class.php

@@ -38,7 +38,11 @@ class Bookmark extends CommonObject
      */
     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
@@ -61,10 +65,15 @@ class Bookmark extends CommonObject
 	public $fk_user;
 
     public $datec;
+
     public $url;
+
     public $target;	// 0=replace, 1=new window
+
     public $title;
+
     public $position;
+
     public $favicon;
 
 

htdocs/categories/class/categorie.class.php

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

htdocs/comm/action/class/actioncommreminder.class.php

@@ -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
 
 

htdocs/comm/action/index.php

@@ -1596,13 +1596,13 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                                 $cachecontacts[$event->contact->id]=$contact;
                             }
                             else $contact=$cachecontacts[$event->contact->id];
-                            if ($linerelatedto) $linerelatedto.=' / ';
+                            if ($linerelatedto) $linerelatedto.=' ';
                             if (! empty($contact->id)) $linerelatedto.=$contact->getNomUrl(1,'',0);
                         }
                         if (! empty($event->fk_element) && $event->fk_element > 0 && ! empty($event->elementtype) && ! empty($conf->global->AGENDA_SHOW_LINKED_OBJECT))
                         {
                             include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-                            if ($linerelatedto) $linerelatedto.=' / ';
+                            if ($linerelatedto) $linerelatedto.='<br>';
                             $linerelatedto.=dolGetElementUrl($event->fk_element,$event->elementtype,1);
                         }
                         if ($linerelatedto) print '<br>'.$linerelatedto;

htdocs/comm/propal/class/propal.class.php

@@ -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;

htdocs/commande/class/commande.class.php

@@ -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;

htdocs/compta/deplacement/class/deplacement.class.php

@@ -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;

htdocs/compta/facture/class/facture-rec.class.php

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

htdocs/compta/index.php

@@ -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();

htdocs/contact/class/contact.class.php

@@ -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

htdocs/core/boxes/modules_boxes.php

@@ -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';

htdocs/core/class/commondocgenerator.class.php

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

htdocs/core/class/events.class.php

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

htdocs/core/class/fiscalyear.class.php

@@ -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();

htdocs/core/class/google.class.php

@@ -36,7 +36,7 @@ class GoogleAPI
 	 */
 	public $error='';
 
-	var $key;
+	public $key;
 
 	/**
 	 * Constructor

htdocs/core/class/html.form.class.php

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

htdocs/core/class/notify.class.php

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

htdocs/core/modules/mailings/modules_mailings.php

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

htdocs/cron/class/cronjob.class.php

@@ -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;

htdocs/don/class/don.class.php

@@ -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;
+
+    /**
+	 * @var string Address
+	 */
 	public $address;
+
     public $zip;
     public $town;
     public $email;

htdocs/expedition/class/expedition.class.php

@@ -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

htdocs/expensereport/class/expensereport.class.php

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

htdocs/expensereport/class/expensereport_ik.class.php

@@ -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';
 
 	/**

htdocs/expensereport/class/expensereport_rule.class.php

@@ -39,6 +39,9 @@ class ExpenseReportRule extends CoreObject
 	 */
 	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';
 
 	/**

htdocs/expensereport/class/paymentexpensereport.class.php

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

htdocs/fourn/class/fournisseur.commande.dispatch.class.php

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

htdocs/fourn/commande/dispatch.php

@@ -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);
 

htdocs/holiday/class/holiday.class.php

@@ -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';
 
 	/**

htdocs/hrm/class/establishment.class.php

@@ -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

htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql

@@ -22,8 +22,8 @@ CREATE TABLE llx_accounting_bookkeeping
   rowid                 integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
   entity                integer DEFAULT 1 NOT NULL,	-- 					| multi company id
   doc_date              date NOT NULL,				-- FEC:PieceDate
-  doc_type              varchar(30) NOT NULL,		-- FEC:PieceRef		| facture_client/reglement_client/facture_fournisseur/reglement_fournisseur
+  doc_type              varchar(30) NOT NULL,		-- 					| facture_client/reglement_client/facture_fournisseur/reglement_fournisseur
-  doc_ref               varchar(300) NOT NULL,		-- 					| facture_client/reglement_client/... reference number
+  doc_ref               varchar(300) NOT NULL,		-- FEC:PieceRef		| facture_client/reglement_client/... reference number
   fk_doc                integer NOT NULL,			-- 					| facture_client/reglement_client/... rowid
   fk_docdet             integer NOT NULL,			-- 					| facture_client/reglement_client/... line rowid
   thirdparty_code       varchar(32),                -- Third party code (customer or supplier) when record is saved (may help debug) 

htdocs/langs/ar_SA/languages.lang

@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - languages
 Language_ar_AR=العربية
-Language_ar_EG=Arabic (Egypt)
+Language_ar_EG=العربيه مصر
 Language_ar_SA=العربية
 Language_bn_BD=بنغالي
 Language_bg_BG=البلغارية
@@ -86,3 +86,4 @@ Language_uz_UZ=الأوزبكي
 Language_vi_VN=الفيتنامية
 Language_zh_CN=الصينية
 Language_zh_TW=الصينية (التقليدية)
+Language_bh_MY=الماليزية

htdocs/langs/en_US/accountancy.lang

@@ -267,6 +267,7 @@ Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
 Modelcsv_agiris=Export towards Agiris
 Modelcsv_configurable=Export Configurable
+Modelcsv_FEC=Export FEC (Art. L47 A) (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service

htdocs/langs/en_US/languages.lang

@@ -86,3 +86,4 @@ Language_uz_UZ=Uzbek
 Language_vi_VN=Vietnamese
 Language_zh_CN=Chinese
 Language_zh_TW=Chinese (Traditional)
+Language_bh_MY=Malay

htdocs/mailmanspip/class/mailmanspip.class.php

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

htdocs/modulebuilder/template/class/myobject.class.php

@@ -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;

htdocs/product/class/product.class.php

@@ -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}

htdocs/product/class/productcustomerprice.class.php

@@ -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;

htdocs/product/inventory/class/inventory.class.php

@@ -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;

htdocs/product/stock/class/entrepot.class.php

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

htdocs/product/stock/class/productlot.class.php

@@ -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;
 
 	/**

htdocs/projet/class/project.class.php

@@ -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';
 
     /**

htdocs/resource/class/html.formresource.class.php

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

htdocs/societe/class/address.class.php

@@ -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;

htdocs/societe/class/companypaymentmode.class.php

@@ -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;

htdocs/societe/class/societe.class.php

@@ -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;
 

htdocs/societe/class/societeaccount.class.php

@@ -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
 
 

htdocs/supplier_proposal/class/supplier_proposal.class.php

@@ -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';

htdocs/user/class/user.class.php

@@ -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

htdocs/user/class/usergroup.class.php

@@ -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';
 

htdocs/variants/card.php

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

htdocs/variants/combinations.php

@@ -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');

htdocs/website/class/websitepage.class.php

@@ -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;