Extra test to fix PhanTypeInvalidPropertyName

Dolibarr · Mar 24, 2024 · 9c95335 · 9c95335
1 parent 0a925dd
commit 9c95335
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/htdocs/reception/contact.php b/htdocs/reception/contact.php
@@ -58,11 +58,7 @@
  }
 
  // Linked documents
-<<<<<<<
  if ($origin == 'order_supplier' && $object->origin_object->id && isModEnabled("supplier_order")) {
-=======
- if ($origin == 'order_supplier' && is_string($typeobject) && $typeobject != '' && is_string($typeobject) && $object->$typeobject->id && isModEnabled("supplier_order")) {
->>>>>>>
  $objectsrc = new CommandeFournisseur($db);
  $objectsrc->fetch($object->origin_object->id);
  }
@@ -202,11 +198,7 @@
 
  print '<table class="border centpercent tableforfield">';
  // Linked documents
-<<<<<<< HEAD
  if ($origin == 'order_supplier' && $object->origin_object->id && isModEnabled("supplier_order")) {
-=======
- if ($origin == 'order_supplier' && is_string($typeobject) && $typeobject != '' && $object->$typeobject->id && isModEnabled("supplier_order")) {
->>>>>>> b56fd32716c (Extra test to fix PhanTypeInvalidPropertyName)
  print '<tr><td class="titlefield">';
  $objectsrc = new CommandeFournisseur($db);
  $objectsrc->fetch($object->origin_object->id);