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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2022-06-17 12:30:51 +02:00
commit 9d7dcf6f72
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/class/commonobject.class.php
View File

@ -186,6 +186,12 @@ abstract class CommonObject
*/ */
public $projet; public $projet;
/**
* @deprecated
* @see fk_project
*/
public $fk_projet;
/** /**
* @var Contact a related contact * @var Contact a related contact
* @see fetch_contact() * @see fetch_contact()

6
htdocs/core/class/validate.class.php
View File

@ -300,13 +300,13 @@ class Validate
/** /**
* Check for all values in db * Check for all values in db
* *
* @param array $values Boolean to validate * @param integer $id of element
* @param string $classname the class name * @param string $classname the class name
* @param string $classpath the class path * @param string $classpath the class path
* @return boolean Validity is ok or not * @return boolean Validity is ok or not
* @throws Exception * @throws Exception
*/ */
public function isFetchable($values, $classname, $classpath) public function isFetchable($id, $classname, $classpath)
{ {
if (!empty($classpath)) { if (!empty($classpath)) {
if (dol_include_once($classpath)) { if (dol_include_once($classpath)) {
@ -319,7 +319,7 @@ class Validate
return false; return false;
} }
if (!empty($object->table_element) && $object->isExistingObject($object->table_element, $values)) { if (!empty($object->table_element) && $object->isExistingObject($object->table_element, $id)) {
return true; return true;
} else { $this->error = $this->outputLang->trans('RequireValidExistingElement'); } } else { $this->error = $this->outputLang->trans('RequireValidExistingElement'); }
} else { $this->error = $this->outputLang->trans('BadSetupOfFieldClassNotFoundForValidation'); } } else { $this->error = $this->outputLang->trans('BadSetupOfFieldClassNotFoundForValidation'); }

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

@ -106,6 +106,8 @@ class Delivery extends CommonObject
*/ */
public $model_pdf; public $model_pdf;
public $commande_id;
public $lines = array(); public $lines = array();