From 1f00794c9807bc58d990d161f794ea894e673b4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
<marcosgdf@gmail.com>
Date: Thu, 25 Dec 2014 21:47:39 +0100
Subject: [PATCH] Fixed bug which didn't show documents in auto GED when an
object had '/' in its ref
---
htdocs/comm/propal/class/propal.class.php | 5 +++
htdocs/commande/class/commande.class.php | 5 +++
htdocs/compta/facture/class/facture.class.php | 6 +++-
.../sociales/class/chargesociales.class.php | 5 +++
htdocs/contrat/class/contrat.class.php | 5 +++
htdocs/core/class/commonobject.class.php | 32 +++++++++++++++++++
htdocs/core/class/html.formfile.class.php | 15 +++++++--
htdocs/fichinter/class/fichinter.class.php | 5 +++
.../class/fournisseur.commande.class.php | 5 +++
.../fourn/class/fournisseur.facture.class.php | 5 +++
htdocs/product/class/product.class.php | 5 +++
htdocs/projet/class/project.class.php | 5 +++
12 files changed, 95 insertions(+), 3 deletions(-)
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index be22043e4b5..589afedd00c 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -47,6 +47,11 @@ class Propal extends CommonObject
public $fk_element='fk_propal';
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+ /**
+ * {@inheritdoc}
+ */
+ protected $table_ref_field = 'ref';
+
var $id;
var $socid; // Id client
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 49ba2536bfa..06f381a41a9 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -44,6 +44,11 @@ class Commande extends CommonOrder
public $fk_element = 'fk_commande';
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+ /**
+ * {@inheritdoc}
+ */
+ protected $table_ref_field = 'ref';
+
var $id;
var $socid; // Id client
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 632381c8541..f81fb37849f 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -50,6 +50,11 @@ class Facture extends CommonInvoice
public $fk_element = 'fk_facture';
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+ /**
+ * {@inheritdoc}
+ */
+ protected $table_ref_field = 'facnumber';
+
var $id;
//! Id client
var $socid;
@@ -833,7 +838,6 @@ class Facture extends CommonInvoice
return $result;
}
-
/**
* Get object and lines from database
*
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index fb8bc162c83..1d684c65552 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -34,6 +34,11 @@ class ChargeSociales extends CommonObject
public $table='chargesociales';
public $table_element='chargesociales';
+ /**
+ * {@inheritdoc}
+ */
+ protected $table_ref_field = 'ref';
+
var $id;
var $ref;
var $date_ech;
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index ae384195162..5265f7025c5 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -44,6 +44,11 @@ class Contrat extends CommonObject
public $fk_element='fk_contrat';
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+ /**
+ * {@inheritdoc}
+ */
+ protected $table_ref_field = 'ref';
+
var $id;
var $ref;
var $ref_ext;
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 54c7b9d860d..9fb4841c0a9 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -54,6 +54,12 @@ abstract class CommonObject
// No constructor as it is an abstract class
+ /**
+ * Column name of the ref field.
+ * @var string
+ */
+ protected $table_ref_field = '';
+
/**
* Check an object id/ref exists
@@ -631,6 +637,32 @@ abstract class CommonObject
}
+ /**
+ * Looks for an object with ref matching the wildcard provided
+ * It does only work when $this->table_ref_field is set
+ *
+ * @param string $ref Wildcard
+ * @return int >1 = OK, 0 = Not found or table_ref_field not defined, <0 = KO
+ */
+ public function fetchOneLike($ref)
+ {
+ if (!$this->table_ref_field) {
+ return 0;
+ }
+
+ $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE '.$this->table_ref_field.' LIKE "'.$this->db->escape($ref).'" LIMIT 1';
+
+ $query = $this->db->query($sql);
+
+ if (!$this->db->num_rows($query)) {
+ return 0;
+ }
+
+ $result = $this->db->fetch_object($query);
+
+ return $this->fetch($result->rowid);
+ }
+
/**
* Load data for barcode into properties ->barcode_type*
* Properties ->barcode_type that is id of barcode. Type is used to find other properties, but
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 1ef5045c845..34f6418de34 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -997,7 +997,6 @@ class FormFile
if ($modulepart == 'user') { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg); $id=(isset($reg[1])?$reg[1]:'');}
if (! $id && ! $ref) continue;
-
$found=0;
if (! empty($this->cache_objects[$modulepart.'_'.$id.'_'.$ref]))
{
@@ -1006,7 +1005,19 @@ class FormFile
else
{
//print 'Fetch '.$id." - ".$ref.'<br>';
- $result=$object_instance->fetch($id,$ref);
+
+ if ($id) {
+ $result = $object_instance->fetch($id);
+ } else {
+ //fetchOneLike looks for objects with wildcards in its reference.
+ //It is useful for those masks who get underscores instead of their actual symbols
+ //fetchOneLike requires some info in the object. If it doesn't have it, then 0 is returned
+ //that's why we look only look fetchOneLike when fetch returns 0
+ if (!$result = $object_instance->fetch('', $ref)) {
+ $result = $object_instance->fetchOneLike($ref);
+ }
+ }
+
if ($result > 0) { $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]=dol_clone($object_instance); } // Save object into a cache
if ($result == 0) { $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]='notfound'; unset($filearray[$key]); }
}
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 28ef737de13..4ab0cfdb96b 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -37,6 +37,11 @@ class Fichinter extends CommonObject
public $fk_element='fk_fichinter';
public $table_element_line='fichinterdet';
+ /**
+ * {@inheritdoc}
+ */
+ protected $table_ref_field = 'ref';
+
var $id;
var $socid; // Id client
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 7593dcf9903..4fe4675f5d8 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -45,6 +45,11 @@ class CommandeFournisseur extends CommonOrder
public $fk_element = 'fk_commande';
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+ /**
+ * {@inheritdoc}
+ */
+ protected $table_ref_field = 'ref';
+
var $id;
var $ref; // TODO deprecated
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 95da7550db7..d9a4469481f 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -43,6 +43,11 @@ class FactureFournisseur extends CommonInvoice
public $fk_element='fk_facture_fourn';
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+ /**
+ * {@inheritdoc}
+ */
+ protected $table_ref_field = 'ref';
+
var $rowid;
var $ref;
var $product_ref;
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 390f250f5d9..ba179aef616 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -46,6 +46,11 @@ class Product extends CommonObject
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
+ /**
+ * {@inheritdoc}
+ */
+ protected $table_ref_field = 'ref';
+
var $regeximgext='\.jpg|\.jpeg|\.bmp|\.gif|\.png|\.tiff';
//! Identifiant unique
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 41ae40a259d..f762b10d2ca 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -38,6 +38,11 @@ class Project extends CommonObject
public $fk_element = 'fk_projet';
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+ /**
+ * {@inheritdoc}
+ */
+ protected $table_ref_field = 'ref';
+
var $id;
var $ref;
var $description;
--
GitLab