diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 8bcabf7f17b5b50d9e550be3f7a2d5632038417d..6d1e417f4eac378efacb71f11dc3081741b43180 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1152,7 +1152,7 @@ class AccountLine extends CommonObject
if ($this->rappro)
{
// Protection to avoid any delete of consolidated lines
- $this->error="DeleteNotPossibleLineIsConsolidated";
+ $this->error="ErrorDeleteNotPossibleLineIsConsolidated";
return -1;
}
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index e89f2a273f87b04989e6ffb0a9bff21e590c08d3..a2640bcbc9cd6657725160085148647c827ec063 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -313,17 +313,20 @@ class PaymentSocialContribution extends CommonObject
{
global $conf, $langs;
$error=0;
+
+ dol_syslog(get_class($this)."::delete");
$this->db->begin();
- if (! $error)
+ if ($this->bank_line > 0)
{
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url";
- $sql.= " WHERE type='payment_sc' AND url_id=".$this->id;
-
- dol_syslog(get_class($this)."::delete sql=".$sql);
- $resql = $this->db->query($sql);
- if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+ $accline = new AccountLine($this->db);
+ $accline->fetch($this->bank_line);
+ $result = $accline->delete();
+ if($result < 0) {
+ $this->errors[] = $accline->error;
+ $error++;
+ }
}
if (! $error)
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index a5c3764fd2881462c40645148405a3d8571dec88..fc6d8ee7ad1b2c09aa3568cdc36d322d42cda527 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -555,7 +555,7 @@ class Contact extends CommonObject
$this->country_id = $obj->country_id;
$this->country_code = $obj->country_id?$obj->country_code:'';
- $this->country = ($obj->country_id > 0)?$langs->transnoentitiesnoconv("Country".$obj->country_code):'';
+ $this->country = $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->transnoentities('Country'.$obj->country_code):$obj->country):'';
$this->socid = $obj->fk_soc;
$this->socname = $obj->socname;
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 03d044a2ee6d91a1334cfedd949046d03a9c5bbd..7111b2387bdfd72a6d6f576a258b100fc1c4db22 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -69,8 +69,8 @@ abstract class CommonObject
$sql = "SELECT rowid, ref, ref_ext";
$sql.= " FROM ".MAIN_DB_PREFIX.$element;
- $sql.= " WHERE entity IN (".getEntity($element).")" ;
-
+ $sql.= " WHERE entity IN (".getEntity($element, true).")" ;
+
if ($id > 0) $sql.= " AND rowid = ".$db->escape($id);
else if ($ref) $sql.= " AND ref = '".$db->escape($ref)."'";
else if ($ref_ext) $sql.= " AND ref_ext = '".$db->escape($ref_ext)."'";
diff --git a/htdocs/core/modules/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php
index ce058a934551298b211680f5691a14ff337b1a98..58f4f036d5e3a28c81b8117b5fb1f8f8c3a050be 100644
--- a/htdocs/core/modules/export/export_csv.modules.php
+++ b/htdocs/core/modules/export/export_csv.modules.php
@@ -252,6 +252,13 @@ class ExportCsv extends ModeleExports
$newvalue=$this->csv_clean($newvalue,$outputlangs->charset_output);
+ if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7))
+ {
+ $array = unserialize($typefield);
+ $array = $array['options'];
+ $newvalue = $array[$newvalue];
+ }
+
fwrite($this->handle,$newvalue.$this->separator);
$this->col++;
}
diff --git a/htdocs/core/modules/export/export_excel.modules.php b/htdocs/core/modules/export/export_excel.modules.php
index 46ab465f42ef0c8f41eb79b20b1d5651db982004..6cad56f07bbcdf6b1dd0f0244d43acfe9d6466bb 100644
--- a/htdocs/core/modules/export/export_excel.modules.php
+++ b/htdocs/core/modules/export/export_excel.modules.php
@@ -305,7 +305,14 @@ class ExportExcel extends ModeleExports
$newvalue=$this->excel_clean($newvalue);
$typefield=isset($array_types[$code])?$array_types[$code]:'';
-
+
+ if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7))
+ {
+ $array = unserialize($typefield);
+ $array = $array['options'];
+ $newvalue = $array[$newvalue];
+ }
+
// Traduction newvalue
if (preg_match('/^\((.*)\)$/i',$newvalue,$reg))
{
diff --git a/htdocs/core/modules/export/export_tsv.modules.php b/htdocs/core/modules/export/export_tsv.modules.php
index 409102fd85719e4ab3dad9c3afa10a919200cab9..a077cc1772e2dd252e17a9038f3797e2188e88aa 100644
--- a/htdocs/core/modules/export/export_tsv.modules.php
+++ b/htdocs/core/modules/export/export_tsv.modules.php
@@ -226,7 +226,14 @@ class ExportTsv extends ModeleExports
if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) $newvalue=$outputlangs->transnoentities($reg[1]);
$newvalue=$this->tsv_clean($newvalue,$outputlangs->charset_output);
-
+
+ if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7))
+ {
+ $array = unserialize($typefield);
+ $array = $array['options'];
+ $newvalue = $array[$newvalue];
+ }
+
fwrite($this->handle,$newvalue.$this->separator);
$this->col++;
}
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 4367aae3789948fa583cd651981746f039a9e90f..ea77a39e21bbca0115f8e9ce21fa34fe2c9b469b 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -355,6 +355,9 @@ class modSociete extends DolibarrModules
case 'sellist':
$typeFilter="List:".$obj->param;
break;
+ case 'select':
+ $typeFilter="Select:".$obj->param;
+ break;
}
$this->export_fields_array[$r][$fieldname]=$fieldlabel;
$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index e824cd06b13423b663cc991832ff95dc652c8f19..35e7044157f4e40c845a4cc2bc124f45830c407a 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -194,11 +194,11 @@ if ($resql)
if ($sref || $snom || $sall || GETPOST('search'))
{
- print_barre_liste($texte, $page, "reassort.php", "&sref=".$sref."&snom=".$snom."&sall=".$sall."&tosell=".$tosell."&tobuy=".$tobuy, $sortfield, $sortorder,'',$num);
+ print_barre_liste($texte, $page, "reassort.php", "&sref=".$sref."&snom=".$snom."&sall=".$sall."&tosell=".$tosell."&tobuy=".$tobuy.(!empty($search_categ) ? '&search_categ='.$search_categ : '').(!empty($toolowstock) ? '&toolowstock='.$toolowstock : ''), $sortfield, $sortorder,'',$num);
}
else
{
- print_barre_liste($texte, $page, "reassort.php", "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&type=$type":""), $sortfield, $sortorder,'',$num);
+ print_barre_liste($texte, $page, "reassort.php", "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&type=$type":"").(!empty($search_categ) ? '&search_categ='.$search_categ : '').(!empty($toolowstock) ? '&toolowstock='.$toolowstock : ''), $sortfield, $sortorder,'',$num);
}
if (! empty($catid))
@@ -342,11 +342,11 @@ if ($resql)
{
if ($sref || $snom || $sall || GETPOST('search'))
{
- print_barre_liste('', $page, "reassort.php", "&sref=".$sref."&snom=".$snom."&sall=".$sall."&tosell=".$tosell."&tobuy=".$tobuy, $sortfield, $sortorder,'',$num, 0, '');
+ print_barre_liste('', $page, "reassort.php", "&sref=".$sref."&snom=".$snom."&sall=".$sall."&tosell=".$tosell."&tobuy=".$tobuy.(!empty($search_categ) ? '&search_categ='.$search_categ : '').(!empty($toolowstock) ? '&toolowstock='.$toolowstock : ''), $sortfield, $sortorder,'',$num, 0, '');
}
else
{
- print_barre_liste('', $page, "reassort.php", "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&type=$type":"")."&tosell=".$tosell."&tobuy=".$tobuy, $sortfield, $sortorder,'',$num, 0, '');
+ print_barre_liste('', $page, "reassort.php", "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&type=$type":"")."&tosell=".$tosell."&tobuy=".$tobuy.(!empty($search_categ) ? '&search_categ='.$search_categ : '').(!empty($toolowstock) ? '&toolowstock='.$toolowstock : ''), $sortfield, $sortorder,'',$num, 0, '');
}
}
diff --git a/htdocs/projet/liste.php b/htdocs/projet/liste.php
index 39fcdb64a01f5e84dd51ce3689ec37ae9f0334ad..857d8949c9d88bf53745a514aa5ad05569074c60 100644
--- a/htdocs/projet/liste.php
+++ b/htdocs/projet/liste.php
@@ -119,16 +119,23 @@ if ($resql)
if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").'<br><br>';
else print $langs->trans("ProjectsPublicDesc").'<br><br>';
}
+
+ $param='';
+ if ($mine) $param.='mode=mine';
+ if ($socid) $param.='&socid='.$socid;
+ if ($search_ref) $param.='&search_ref='.$search_ref;
+ if ($search_label) $param.='&search_label='.$search_label;
+ if ($search_societe) $param.='&search_societe='.$search_societe;
print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
- print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"p.ref","","","",$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"p.title","","","",$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom","","","",$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Visibility"),$_SERVER["PHP_SELF"],"p.public","","","",$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],'p.fk_statut',"","",'align="right"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"p.ref","",$param,"",$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"p.title","",$param,"",$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Visibility"),$_SERVER["PHP_SELF"],"p.public","",$param,"",$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],'p.fk_statut',"",$param,'align="right"',$sortfield,$sortorder);
print "</tr>\n";
print '<tr class="liste_titre">';