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

Fix: compatibility with element and subelement

Browse Source
This commit is contained in:
Regis Houssin 2011-02-22 15:54:15 +00:00
parent e24c9fa076
commit c7cf701c68
4 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/comm/propal.php
View File

@ -1558,7 +1558,13 @@ if ($id > 0 || ! empty($ref))
foreach($object->linked_object as $linked_object => $linked_objectid) foreach($object->linked_object as $linked_object => $linked_objectid)
{ {
if($conf->$linked_object->enabled && $linked_object != $object->element) $element = $subelement = $linked_object;
if (preg_match('/^([^_]+)_([^_]+)/i',$linked_object,$regs))
{
$element = $regs[1];
$subelement = $regs[2];
}
if($conf->$element->enabled && $element != $object->element)
{ {
$somethingshown=$object->showLinkedObjectBlock($linked_object,$linked_objectid,$somethingshown); $somethingshown=$object->showLinkedObjectBlock($linked_object,$linked_objectid,$somethingshown);
} }

8
htdocs/commande/fiche.php
View File

@ -1860,7 +1860,13 @@ else
foreach($object->linked_object as $linked_object => $linked_objectid) foreach($object->linked_object as $linked_object => $linked_objectid)
{ {
if($conf->$linked_object->enabled && $linked_object != $object->element) $element = $subelement = $linked_object;
if (preg_match('/^([^_]+)_([^_]+)/i',$linked_object,$regs))
{
$element = $regs[1];
$subelement = $regs[2];
}
if($conf->$element->enabled && $element != $object->element)
{ {
$somethingshown=$object->showLinkedObjectBlock($linked_object,$linked_objectid,$somethingshown); $somethingshown=$object->showLinkedObjectBlock($linked_object,$linked_objectid,$somethingshown);
} }

8
htdocs/compta/facture.php
View File

@ -2762,7 +2762,13 @@ else
foreach($object->linked_object as $linked_object => $linked_objectid) foreach($object->linked_object as $linked_object => $linked_objectid)
{ {
if($conf->$linked_object->enabled && $linked_object != $object->element) $element = $subelement = $linked_object;
if (preg_match('/^([^_]+)_([^_]+)/i',$linked_object,$regs))
{
$element = $regs[1];
$subelement = $regs[2];
}
if($conf->$element->enabled && $element != $object->element)
{ {
$somethingshown=$object->showLinkedObjectBlock($linked_object,$linked_objectid,$somethingshown); $somethingshown=$object->showLinkedObjectBlock($linked_object,$linked_objectid,$somethingshown);
} }

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

@ -1366,16 +1366,22 @@ class CommonObject
$num = sizeof($this->objectid); $num = sizeof($this->objectid);
if ($num) if ($num)
{ {
$classpath = $objecttype.'/class'; $element = $subelement = $objecttype;
$tplpath = $objecttype; if (preg_match('/^([^_]+)_([^_]+)/i',$objecttype,$regs))
if ($objecttype == 'facture') { $tplpath = 'compta/'.$objecttype; $classpath = $tplpath.'/class'; } // To work with non standard path {
if ($objecttype == 'propal') { $tplpath = 'comm/'.$objecttype; $classpath = $tplpath.'/class'; } // To work with non standard path $element = $regs[1];
if ($objecttype == 'invoice_supplier') { $tplpath = 'fourn/facture'; $classpath = 'fourn/class'; } // To work with non standard path $subelement = $regs[2];
if ($objecttype == 'order_supplier') { $tplpath = 'fourn/commande'; $classpath = 'fourn/class'; } // To work with non standard path }
$classpath = $element.'/class';
$tplpath = $element;
if ($element == 'facture') { $tplpath = 'compta/'.$element; $classpath = $tplpath.'/class'; } // To work with non standard path
if ($element == 'propal') { $tplpath = 'comm/'.$element; $classpath = $tplpath.'/class'; } // To work with non standard path
if ($element == 'invoice_supplier') { $tplpath = 'fourn/facture'; $classpath = 'fourn/class'; } // To work with non standard path
if ($element == 'order_supplier') { $tplpath = 'fourn/commande'; $classpath = 'fourn/class'; } // To work with non standard path
$classfile = strtolower($objecttype); $classname = ucfirst($objecttype); $classfile = strtolower($subelement); $classname = ucfirst($subelement);
if ($objecttype == 'invoice_supplier') { $classfile='fournisseur.facture'; $classname='FactureFournisseur'; } if ($subelement == 'invoice_supplier') { $classfile='fournisseur.facture'; $classname='FactureFournisseur'; }
if ($objecttype == 'order_supplier') { $classfile='fournisseur.commande'; $classname='CommandeFournisseur'; } if ($subelement == 'order_supplier') { $classfile='fournisseur.commande'; $classname='CommandeFournisseur'; }
//print $classfile." - ".$classpath." - ".$tplpath; //print $classfile." - ".$classpath." - ".$tplpath;
if(!class_exists($classname)) if(!class_exists($classname))
{ {