瀏覽代碼

Fix warnings

Laurent Destailleur 1 年之前
父節點
當前提交
ff11a7442e
共有 29 個文件被更改,包括 60 次插入15 次删除
  1. 1 1
      htdocs/core/lib/agenda.lib.php
  2. 3 0
      htdocs/core/modules/expedition/modules_expedition.php
  3. 3 0
      htdocs/core/modules/expensereport/modules_expensereport.php
  4. 3 0
      htdocs/core/modules/facture/modules_facture.php
  5. 3 0
      htdocs/core/modules/fichinter/modules_fichinter.php
  6. 3 0
      htdocs/core/modules/hrm/modules_evaluation.php
  7. 1 1
      htdocs/core/modules/movement/doc/pdf_standard.modules.php
  8. 3 0
      htdocs/core/modules/mrp/modules_mo.php
  9. 3 0
      htdocs/core/modules/propale/modules_propale.php
  10. 5 1
      htdocs/core/modules/reception/modules_reception.php
  11. 3 0
      htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
  12. 3 0
      htdocs/core/modules/supplier_order/modules_commandefournisseur.php
  13. 3 0
      htdocs/core/modules/supplier_payment/modules_supplier_payment.php
  14. 3 0
      htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
  15. 3 0
      htdocs/core/modules/ticket/modules_ticket.php
  16. 3 0
      htdocs/core/modules/workstation/modules_workstation.php
  17. 1 1
      htdocs/mrp/mo_movements.php
  18. 2 0
      htdocs/product/stock/class/productstockentrepot.class.php
  19. 1 1
      htdocs/product/stock/movement_card.php
  20. 1 1
      htdocs/product/stock/movement_list.php
  21. 1 1
      htdocs/product/stock/productlot_card.php
  22. 1 1
      htdocs/product/stock/stats/commande_fournisseur.php
  23. 1 1
      htdocs/product/stock/stats/expedition.php
  24. 1 1
      htdocs/product/stock/stats/mo.php
  25. 1 1
      htdocs/product/stock/stats/reception.php
  26. 1 1
      htdocs/resource/agenda.php
  27. 1 1
      htdocs/resource/contact.php
  28. 1 1
      htdocs/resource/document.php
  29. 1 1
      htdocs/resource/note.php

+ 1 - 1
htdocs/core/lib/agenda.lib.php

@@ -434,7 +434,7 @@ function actions_prepare_head($object)
 	// Tab to link resources
 	if (isModEnabled('resource')) {
 		include_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
-		$resource = new DolResource($db);
+		$resource = new Dolresource($db);
 
 		$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=action&element_id='.$object->id;
 		$listofresourcelinked = $resource->getElementResources($object->element, $object->id);

+ 3 - 0
htdocs/core/modules/expedition/modules_expedition.php

@@ -74,6 +74,9 @@ abstract class ModelNumRefExpedition
 	 */
 	public $error = '';
 
+	public $version;
+
+
 	/** Return if a model can be used or not
 	 *
 	 *  @return		boolean     true if model can be used

+ 3 - 0
htdocs/core/modules/expensereport/modules_expensereport.php

@@ -115,6 +115,9 @@ abstract class ModeleNumRefExpenseReport
 	 */
 	public $error = '';
 
+	public $version;
+
+
 	/**
 	 *	Return if a model can be used or not
 	 *

+ 3 - 0
htdocs/core/modules/facture/modules_facture.php

@@ -258,6 +258,9 @@ abstract class ModeleNumRefFactures
 	 */
 	public $error = '';
 
+	public $version;
+
+
 	/**
 	 * Return if a module can be used or not
 	 *

+ 3 - 0
htdocs/core/modules/fichinter/modules_fichinter.php

@@ -72,6 +72,9 @@ abstract class ModeleNumRefFicheinter
 	 */
 	public $error = '';
 
+	public $version;
+
+
 	/**
 	 * 	Return if a module can be used or not
 	 *

+ 3 - 0
htdocs/core/modules/hrm/modules_evaluation.php

@@ -71,6 +71,9 @@ abstract class ModeleNumRefEvaluation
 	 */
 	public $error = '';
 
+	public $version;
+
+
 	/**
 	 *	Return if a module can be used or not
 	 *

+ 1 - 1
htdocs/core/modules/movement/doc/pdf_standard.modules.php

@@ -236,7 +236,7 @@ class pdf_standard extends ModelePDFMovement
 		$extrafields->fetch_name_optionals_label('movement');
 		$search_array_options = $extrafields->getOptionalsFromPost('movement', '', 'search_');
 
-		$productlot = new ProductLot($this->db);
+		$productlot = new Productlot($this->db);
 		$productstatic = new Product($this->db);
 		$warehousestatic = new Entrepot($this->db);
 		$movement = new MouvementStock($this->db);

+ 3 - 0
htdocs/core/modules/mrp/modules_mo.php

@@ -72,6 +72,9 @@ abstract class ModeleNumRefMos
 	 */
 	public $error = '';
 
+	public $version;
+
+
 	/**
 	 *	Return if a module can be used or not
 	 *

+ 3 - 0
htdocs/core/modules/propale/modules_propale.php

@@ -91,6 +91,9 @@ abstract class ModeleNumRefPropales
 	 */
 	public $error = '';
 
+	public $version;
+
+
 	/**
 	 * Return if a module can be used or not
 	 *

+ 5 - 1
htdocs/core/modules/reception/modules_reception.php

@@ -61,7 +61,11 @@ abstract class ModelNumRefReception
 {
 	public $error = '';
 
-	/** Return if a model can be used or not
+	public $version;
+
+
+	/**
+	 *  Return if a model can be used or not
 	 *
 	 *  @return		boolean     true if model can be used
 	 */

+ 3 - 0
htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php

@@ -71,6 +71,9 @@ abstract class ModeleNumRefSuppliersInvoices
 	 */
 	public $error = '';
 
+	public $version;
+
+
 	/**  Return if a model can be used or not
 	 *
 	 *   @return	boolean     true if model can be used

+ 3 - 0
htdocs/core/modules/supplier_order/modules_commandefournisseur.php

@@ -93,6 +93,9 @@ abstract class ModeleNumRefSuppliersOrders
 	 */
 	public $error = '';
 
+	public $version;
+
+
 	/**  Return if a model can be used or not
 	 *
 	 *   @return	boolean     true if model can be used

+ 3 - 0
htdocs/core/modules/supplier_payment/modules_supplier_payment.php

@@ -99,6 +99,9 @@ abstract class ModeleNumRefSupplierPayments
 	 */
 	public $error = '';
 
+	public $version;
+
+
 	/**
 	 *	Return if a module can be used or not
 	 *

+ 3 - 0
htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php

@@ -74,6 +74,9 @@ abstract class ModeleNumRefSupplierProposal
 	 */
 	public $error = '';
 
+	public $version;
+
+
 	/**
 	 * Return if a module can be used or not
 	 *

+ 3 - 0
htdocs/core/modules/ticket/modules_ticket.php

@@ -65,6 +65,9 @@ abstract class ModeleNumRefTicket
 	 */
 	public $error = '';
 
+	public $version;
+
+
 	/**
 	 *  Return if a module can be used or not
 	 *

+ 3 - 0
htdocs/core/modules/workstation/modules_workstation.php

@@ -72,6 +72,9 @@ abstract class ModeleNumRefWorkstation
 	 */
 	public $error = '';
 
+	public $version;
+
+
 	/**
 	 *	Return if a module can be used or not
 	 *

+ 1 - 1
htdocs/mrp/mo_movements.php

@@ -253,7 +253,7 @@ $form = new Form($db);
 $formproject = new FormProjets($db);
 $formproduct = new FormProduct($db);
 $productstatic = new Product($db);
-$productlot = new ProductLot($db);
+$productlot = new Productlot($db);
 $warehousestatic = new Entrepot($db);
 $userstatic = new User($db);
 

+ 2 - 0
htdocs/product/stock/class/productstockentrepot.class.php

@@ -592,6 +592,8 @@ class ProductStockEntrepot extends CommonObject
 				return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
 			}
 		}
+
+		return '';
 	}
 
 

+ 1 - 1
htdocs/product/stock/movement_card.php

@@ -418,7 +418,7 @@ if (empty($reshook) && $action != 'remove_file') {
  * View
  */
 
-$productlot = new ProductLot($db);
+$productlot = new Productlot($db);
 $productstatic = new Product($db);
 $warehousestatic = new Entrepot($db);
 $movement = new MouvementStock($db);

+ 1 - 1
htdocs/product/stock/movement_list.php

@@ -596,7 +596,7 @@ $formproduct = new FormProduct($db);
 if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
-$productlot = new ProductLot($db);
+$productlot = new Productlot($db);
 $productstatic = new Product($db);
 $warehousestatic = new Entrepot($db);
 $movement = new MouvementStock($db);

+ 1 - 1
htdocs/product/stock/productlot_card.php

@@ -47,7 +47,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'my
 $backtopage = GETPOST('backtopage', 'alpha');
 
 // Initialize technical objects
-$object = new ProductLot($db);
+$object = new Productlot($db);
 $extrafields = new ExtraFields($db);
 $hookmanager->initHooks(array('productlotcard', 'globalcard')); // Note that conf->hooks_modules contains array
 

+ 1 - 1
htdocs/product/stock/stats/commande_fournisseur.php

@@ -95,7 +95,7 @@ $form = new Form($db);
 $formother = new FormOther($db);
 
 if ($id > 0 || !empty($ref)) {
-	$object = new ProductLot($db);
+	$object = new Productlot($db);
 	if ($ref) {
 		$tmp = explode('_', $ref);
 		$objectid = $tmp[0];

+ 1 - 1
htdocs/product/stock/stats/expedition.php

@@ -95,7 +95,7 @@ $form = new Form($db);
 $formother = new FormOther($db);
 
 if ($id > 0 || !empty($ref)) {
-	$object = new ProductLot($db);
+	$object = new Productlot($db);
 	if ($ref) {
 		$tmp = explode('_', $ref);
 		$objectid = $tmp[0];

+ 1 - 1
htdocs/product/stock/stats/mo.php

@@ -88,7 +88,7 @@ $form = new Form($db);
 $formother = new FormOther($db);
 
 if ($id > 0 || !empty($ref)) {
-	$object = new ProductLot($db);
+	$object = new Productlot($db);
 	if ($ref) {
 		$tmp = explode('_', $ref);
 		$objectid = $tmp[0];

+ 1 - 1
htdocs/product/stock/stats/reception.php

@@ -95,7 +95,7 @@ $form = new Form($db);
 $formother = new FormOther($db);
 
 if ($id > 0 || !empty($ref)) {
-	$object = new ProductLot($db);
+	$object = new Productlot($db);
 	if ($ref) {
 		$tmp = explode('_', $ref);
 		$objectid = $tmp[0];

+ 1 - 1
htdocs/resource/agenda.php

@@ -80,7 +80,7 @@ if (!$sortorder) {
 $extrafields = new ExtraFields($db);
 $hookmanager->initHooks(array('agendaresource'));
 
-$object = new DolResource($db);
+$object = new Dolresource($db);
 
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.

+ 1 - 1
htdocs/resource/contact.php

@@ -41,7 +41,7 @@ $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
-$object = new DolResource($db);
+$object = new Dolresource($db);
 
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';     // Must be include, not include_once

+ 1 - 1
htdocs/resource/document.php

@@ -70,7 +70,7 @@ if (!$sortfield) {
 }
 
 
-$object = new DolResource($db);
+$object = new Dolresource($db);
 
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.

+ 1 - 1
htdocs/resource/note.php

@@ -44,7 +44,7 @@ if ($user->socid) {
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('resourcenote'));
 
-$object = new DolResource($db);
+$object = new Dolresource($db);
 
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.