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

Qual: childelement is a protected property

Browse Source
This commit is contained in:
Laurent Destailleur 2011-12-07 19:22:12 +01:00
parent f9e5f25fd2
commit 8fb4108163
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1731,8 +1731,8 @@ abstract class CommonObject
/** /**
* Function to check if an object is used by others * Function to check if an object is used by others
* *
* @param id Id of object * @param int $id Id of object
* @return int <0 if KO, 0 if not used, >0 if already used * @return int <0 if KO, 0 if not used, >0 if already used
*/ */
function isObjectUsed($id) function isObjectUsed($id)
{ {
@ -1807,8 +1807,7 @@ abstract class CommonObject
/** /**
* * List urls of elemùent
* Enter description here ...
* *
* @param unknown_type $objectid * @param unknown_type $objectid
* @param unknown_type $objecttype * @param unknown_type $objecttype

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

@ -2230,7 +2230,7 @@ class Form
* @param string $action Action * @param string $action Action
* @param array $formquestion An array with complementary inputs to add into forms: array(array('label'=> ,'type'=> , )) * @param array $formquestion An array with complementary inputs to add into forms: array(array('label'=> ,'type'=> , ))
* @param string $selectedchoice "" or "no" or "yes" * @param string $selectedchoice "" or "no" or "yes"
* @param int $useajax 0=No, 1=Yes, 2=Yes but submit page with &confirm=no if choice is No * @param int $useajax 0=No, 1=Yes, 2=Yes but submit page with &confirm=no if choice is No, 'xxx'=preoutput confirm box with div id=dialog-confirm-xxx
* @param int $height Force height of box * @param int $height Force height of box
* @return string 'ajax' if a confirm ajax popup is shown, 'html' if it's an html form * @return string 'ajax' if a confirm ajax popup is shown, 'html' if it's an html form
*/ */
@ -2313,7 +2313,8 @@ class Form
{ {
$autoOpen=true; $autoOpen=true;
$dialogconfirm='dialog-confirm'; $dialogconfirm='dialog-confirm';
if (! is_int($useajax)) { if (! is_int($useajax))
{
$button=$useajax; $button=$useajax;
$useajax=1; $useajax=1;
$autoOpen=false; $autoOpen=false;

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

@ -37,7 +37,7 @@ class Product extends CommonObject
public $element='product'; public $element='product';
public $table_element='product'; public $table_element='product';
public $fk_element='fk_product'; public $fk_element='fk_product';
public $childtables=array('propaldet','commandedet','facturedet','contratdet','product_fournisseur_price'); protected $childtables=array('propaldet','commandedet','facturedet','contratdet','product_fournisseur_price');
protected $isnolinkedbythird = 1; // No field fk_soc protected $isnolinkedbythird = 1; // No field fk_soc
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe

1
htdocs/product/fiche.php
View File

@ -649,6 +649,7 @@ llxHeader('',$langs->trans("CardProduct".$_GET["type"]),$helpurl);
$form = new Form($db); $form = new Form($db);
$formproduct = new FormProduct($db); $formproduct = new FormProduct($db);
if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
{ {
// ----------------------------------------- // -----------------------------------------

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

@ -39,7 +39,7 @@ class Societe extends CommonObject
public $element='societe'; public $element='societe';
public $table_element = 'societe'; public $table_element = 'societe';
public $fk_element='fk_soc'; public $fk_element='fk_soc';
public $childtables=array("propal","commande","facture","contrat","facture_fourn","commande_fournisseur"); protected $childtables=array("propal","commande","facture","contrat","facture_fourn","commande_fournisseur");
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
var $id; var $id;