diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 1f75e6caf74c8dfa7278222b08d778a0c7515ab9..e1b59f3477243e59974a74ded5ec31d34f1440a4 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -242,7 +242,8 @@ class Commande extends CommonOrder
}
else
{
- dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
+ $this->error=$obj->error;
+ //dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
return "";
}
}
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 5fda77a1cc812bafddb8e5c7f7e25e972e5ffe4b..b80919c48b4abc24d9d817d8f78c0459f63e975e 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3251,7 +3251,8 @@ class Facture extends CommonInvoice
* set up mask.
*/
if ($mode != 'last' && !$numref) {
- dol_print_error($this->db,"Facture::getNextNumRef ".$obj->error);
+ $this->error=$obj->error;
+ //dol_print_error($this->db,"Facture::getNextNumRef ".$obj->error);
return "";
}
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index 7cda584abbf393edfc8b4b4ee49ff27f588a4ea5..9fc8c7627dd8cb7bbb8cd4cf8f5787d48fa89925 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -524,13 +524,14 @@ class PaymentExpenseReport extends CommonObject
{
if ($mode == 'payment_expensereport')
{
- $euser = new User($this->db);
- $euser->fetch($key);
+ $er = new ExpenseReport($this->db);
+ $er->fetch($key);
+ $er->fetch_user($er->fk_user_author);
$result=$acc->add_url_line(
$bank_line_id,
- $euser->id,
+ $er->user->id,
DOL_URL_ROOT.'/user/card.php?id=',
- $euser->getFullName($langs),
+ $er->user->getFullName($langs),
'user'
);
if ($result <= 0)
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 29b52fe45c127fce1ad5eb018e85360c26d20a05..6c0d493373cf20a7c2555e0f9dd603618e812572 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1929,6 +1929,7 @@ class FactureFournisseur extends CommonInvoice
}
else
{
+ $this->error=$obj->error;
//dol_print_error($db,get_class($this)."::getNextNumRef ".$obj->error);
return false;
}
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 90647b7c65ab37b2e7143b630bf7845f1da5d1f9..49de2dac7a349adfebc38624e8db2e007a78a806 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -77,6 +77,7 @@ $search_total_vat=GETPOST('search_total_vat','alpha');
$search_total_ttc=GETPOST('search_total_ttc','alpha');
$optioncss = GETPOST('optioncss','alpha');
$billed = GETPOST('billed','int');
+$search_project_ref=GETPOST('search_project_ref','alpha');
$page = GETPOST('page','int');
$sortorder = GETPOST('sortorder','alpha');
@@ -204,6 +205,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
$deliverymonth='';
$deliveryyear='';
$billed='';
+ $search_project_ref='';
$search_array_options=array();
}
@@ -350,6 +352,7 @@ if ($search_user > 0) $sql.= " AND ec.fk_c_type_contact = tc.rowid AND tc.elemen
if ($search_total_ht != '') $sql.= natural_search('cf.total_ht', $search_total_ht, 1);
if ($search_total_vat != '') $sql.= natural_search('cf.tva', $search_total_vat, 1);
if ($search_total_ttc != '') $sql.= natural_search('cf.total_ttc', $search_total_ttc, 1);
+if ($search_project_ref != '') $sql.= natural_search("p.ref",$search_project_ref);
// Add where from extra fields
foreach ($search_array_options as $key => $val)