Merge pull request #12265 from grandoc/new_branch_30_10_2019

add comment

htdocs/core/modules/mailings/advthirdparties.modules.php

@@ -31,6 +31,10 @@ class mailing_advthirdparties extends MailingTargets
     public $require_admin=0;
 
     public $require_module=array("none");	// This module should not be displayed as Selector in mailling
+
+    /**
+     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+     */
     public $picto='company';
 
 	/**

htdocs/core/modules/mailings/contacts1.modules.php

@@ -37,6 +37,10 @@ class mailing_contacts1 extends MailingTargets
 	public $desc='Contacts of thirdparties (prospects, customers, suppliers...)';
 	public $require_module=array("societe");               // Module mailing actif si modules require_module actifs
 	public $require_admin=0;                               // Module mailing actif pour user admin ou non
+
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto='contact';
 
 	/**

htdocs/core/modules/mailings/example.modules.php

@@ -36,6 +36,10 @@ class mailing_example extends MailingTargets
     public $tooltip='MyTooltipLangKey';
 
     public $require_module=array();
+
+    /**
+     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+     */
     public $picto='';
 
     /**

htdocs/core/modules/mailings/fraise.modules.php

@@ -40,6 +40,10 @@ class mailing_fraise extends MailingTargets
     public $require_admin=0;
 
     public $require_module=array('adherent');
+
+    /**
+     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+     */
     public $picto='user';
 
     /**

htdocs/core/modules/mailings/pomme.modules.php

@@ -35,6 +35,10 @@ class mailing_pomme extends MailingTargets
 	public $desc='Dolibarr users with emails';  		// Libelle utilise si aucune traduction pour MailingModuleDescXXX ou XXX=name trouv<75>e
 	public $require_module=array();                    // Module mailing actif si modules require_module actifs
 	public $require_admin=1;                           // Module mailing actif pour user admin ou non
+
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto='user';
 
 	/**

htdocs/core/modules/mailings/thirdparties.modules.php

@@ -30,6 +30,10 @@ class mailing_thirdparties extends MailingTargets
 	public $require_admin=0;
 
 	public $require_module=array("societe");	// This module allows to select by categories must be also enabled if category module is not activated
+
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto='company';
 
 	/**

htdocs/core/modules/mailings/thirdparties_services_expired.modules.php

@@ -28,6 +28,10 @@ class mailing_thirdparties_services_expired extends MailingTargets
     public $require_admin=0;
 
     public $require_module=array('contrat');
+
+    /**
+     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+     */
     public $picto='company';
 
     /**

htdocs/core/modules/mailings/xinputfile.modules.php

@@ -35,6 +35,10 @@ class mailing_xinputfile extends MailingTargets
     public $desc='EMails from a file';          // Libelle utilise si aucune traduction pour MailingModuleDescXXX ou XXX=name trouv<75>e
     public $require_module=array();             // Module mailing actif si modules require_module actifs
     public $require_admin=0;                    // Module mailing actif pour user admin ou non
+
+    /**
+     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+     */
     public $picto='generic';
     public $tooltip='UseFormatFileEmailToTarget';
 

htdocs/core/modules/mailings/xinputuser.modules.php

@@ -35,6 +35,10 @@ class mailing_xinputuser extends MailingTargets
 	public $desc='EMails input by user';        // Libelle utilise si aucune traduction pour MailingModuleDescXXX ou XXX=name trouv<75>e
 	public $require_module=array();            // Module mailing actif si modules require_module actifs
 	public $require_admin=0;                    // Module mailing actif pour user admin ou non
+
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto='generic';
 	public $tooltip='UseFormatInputEmailToTarget';
 

htdocs/core/modules/printing/printgcp.modules.php

@@ -37,6 +37,10 @@ class printing_printgcp extends PrintingDriver
 {
     public $name = 'printgcp';
     public $desc = 'PrintGCPDesc';
+
+    /**
+     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+     */
     public $picto = 'printer';
     public $active = 'PRINTING_PRINTGCP';
     public $conf = array();

htdocs/core/modules/printing/printipp.modules.php

@@ -32,6 +32,10 @@ class printing_printipp extends PrintingDriver
 {
     public $name = 'printipp';
     public $desc = 'PrintIPPDesc';
+
+    /**
+     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+     */
     public $picto = 'printer';
     public $active = 'PRINTING_PRINTIPP';
     public $conf = array();

htdocs/don/card.php

@@ -564,7 +564,7 @@ if (! empty($id) && $action == 'edit')
     }
     // Payment mode
     print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
-    if ($object->modepaymentid) $selected = $object->modepaymentid;
+    if ($object->mode_reglement_id) $selected = $object->mode_reglement_id;
     else $selected = '';
     $form->select_types_paiements($selected, 'modepayment', 'CRDT', 0, 1);
     print "</td></tr>\n";
@@ -708,7 +708,7 @@ if (! empty($id) && $action != 'edit')
 
 	// Payment mode
 	print "<tr><td>".$langs->trans("PaymentMode")."</td><td>";
-	$form->form_modes_reglement(null, $object->modepaymentid, 'none');
+	$form->form_modes_reglement(null, $object->mode_reglement_id, 'none');
 	print "</td></tr>\n";
 
 	// Other attributes

htdocs/expensereport/class/expensereport.class.php

@@ -46,6 +46,10 @@ class ExpenseReport extends CommonObject
 
     public $table_element_line = 'expensereport_det';
     public $fk_element = 'fk_expensereport';
+
+    /**
+     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+     */
     public $picto = 'trip';
 
     public $lines=array();

htdocs/fichinter/class/fichinterrec.class.php

@@ -42,6 +42,10 @@ class FichinterRec extends Fichinter
     public $table_element = 'fichinter_rec';
     public $table_element_line = 'fichinter_rec';
     public $fk_element = 'fk_fichinter';
+
+    /**
+     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+     */
     public $picto = 'intervention';
 
     public $title;

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

@@ -62,7 +62,10 @@ class CommandeFournisseur extends CommonOrder
 	 */
 	public $fk_element = 'fk_commande';
 
-    public $picto='order';
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto='order';
 
     /**
      * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe

htdocs/fourn/class/fournisseur.facture.class.php

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

htdocs/fourn/class/paiementfourn.class.php

@@ -46,6 +46,9 @@ class PaiementFourn extends Paiement
 	 */
 	public $table_element='paiementfourn';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'payment';
 
 	public $statut;        //Status of payment. 0 = unvalidated; 1 = validated

htdocs/holiday/class/holiday.class.php

@@ -54,6 +54,9 @@ class Holiday extends CommonObject
 	 */
 	public $fk_element = 'fk_holiday';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'holiday';
 
 	/**

htdocs/hrm/class/establishment.class.php

@@ -55,7 +55,10 @@ class Establishment extends CommonObject
 	 */
 	public $ismultientitymanaged = 1;
 
-    public $picto='building';
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto='building';
 
     /**
 	 * @var int ID

htdocs/loan/class/loan.class.php

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

htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php

@@ -26,6 +26,10 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets
 
     public $enabled=0;
     public $require_module=array();
+
+    /**
+     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+     */
     public $picto='mymodule@mymodule';
 
     /**

htdocs/opensurvey/class/opensurveysondage.class.php

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

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

@@ -44,6 +44,9 @@ class Entrepot extends CommonObject
 	 */
 	public $table_element='entrepot';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto='stock';
 	public $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 

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

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

htdocs/projet/class/project.class.php

@@ -60,6 +60,9 @@ class Project extends CommonObject
 	 */
     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 = 'projectpub';
 
     /**

htdocs/projet/class/task.class.php

@@ -47,6 +47,9 @@ class Task extends CommonObject
 	 */
 	public $fk_element='fk_task';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'task';
 
 	/**

htdocs/reception/class/reception.class.php

@@ -48,7 +48,11 @@ class Reception extends CommonObject
 	public $table_element="reception";
 	public $table_element_line="commande_fournisseur_dispatch";
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-    public $picto = 'reception';
+
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'reception';
 
     public $socid;
     public $ref_supplier;

htdocs/resource/class/dolresource.class.php

@@ -39,7 +39,10 @@ class Dolresource extends CommonObject
 	 */
 	public $table_element='resource';
 
-    public $picto = 'resource';
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'resource';
 
 	public $resource_id;
 	public $resource_type;

htdocs/societe/class/societe.class.php

@@ -69,6 +69,9 @@ class Societe extends CommonObject
 	 */
 	protected $childtablesoncascade=array("societe_prices", "societe_log", "societe_address", "product_fournisseur_price", "product_customer_price_log", "product_customer_price", "socpeople", "adherent", "societe_account", "societe_rib", "societe_remise", "societe_remise_except", "societe_commerciaux", "categorie", "notify", "notify_def", "actioncomm");
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'company';
 
 	/**

htdocs/supplier_proposal/class/supplier_proposal.class.php

@@ -66,6 +66,9 @@ class SupplierProposal extends CommonObject
      */
     public $fk_element='fk_supplier_proposal';
 
+    /**
+     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+     */
     public $picto='propal';
 
     /**

htdocs/user/class/usergroup.class.php

@@ -52,7 +52,10 @@ class UserGroup extends CommonObject
 	 */
 	public $ismultientitymanaged = 1;
 
-    public $picto='group';
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto='group';
 
 	/**
 	 * @var int Entity of group