';
- print '';
+ print '| ';
print $langs->trans('RefCustomer').' | ';
print ' | ';
if ($action != 'refclient' && $object->brouillon) print ''.img_edit($langs->trans('Modify')).' | ';
@@ -1817,7 +1824,7 @@ else
print '';
print '';
print ' | ';
- print '';
+ print ' | ';
print $langs->trans('Month').': ';
print ' '.$langs->trans('Year').': ';
$syear = $year;
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index e553641f54c..62591e8251c 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -495,14 +495,14 @@ class Propal extends CommonObject
$staticline=new PropaleLigne($this->db);
$staticline->fetch($rowid);
$this->line->oldline = $staticline;
-
+
// Reorder if fk_parent_line change
if (! empty($fk_parent_line) && ! empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line)
{
$rangmax = $this->line_max($fk_parent_line);
$this->line->rang = $rangmax + 1;
}
-
+
$this->line->rowid = $rowid;
$this->line->desc = $desc;
$this->line->qty = $qty;
@@ -530,7 +530,7 @@ class Propal extends CommonObject
{
// Reorder if child line
if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
-
+
$this->update_price(1);
$this->fk_propal = $this->id;
@@ -2265,10 +2265,11 @@ class Propal extends CommonObject
/**
- * \brief Renvoie la reference de propale suivante non utilisee en fonction du module
- * de numerotation actif defini dans PROPALE_ADDON
- * \param soc objet societe
- * \return string reference libre pour la propale
+ * Renvoie la reference de propale suivante non utilisee en fonction du module
+ * de numerotation actif defini dans PROPALE_ADDON
+ *
+ * @param Societe $soc Object thirdparty
+ * @return string Reference libre pour la propale
*/
function getNextNumRef($soc)
{
@@ -2296,7 +2297,8 @@ class Propal extends CommonObject
}
else
{
- dol_print_error($db,"Propale::getNextNumRef ".$obj->error);
+ $this->error=$obj->error;
+ //dol_print_error($db,"Propale::getNextNumRef ".$obj->error);
return "";
}
}
diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php
index 3e99e1addef..c581aab6fa0 100644
--- a/htdocs/comm/prospect/fiche.php
+++ b/htdocs/comm/prospect/fiche.php
@@ -37,7 +37,7 @@ $langs->load('projects');
$langs->load('propal');
// Security check
-$socid = isset($_GET["socid"])?$_GET["socid"]:'';
+$socid = GETPOST("socid");
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'societe',$socid,'');
@@ -226,7 +226,6 @@ if ($socid > 0)
{
$propal_static=new Propal($db);
- print '';
$sql = "SELECT s.nom, s.rowid as socid, p.rowid as propalid, p.fk_statut, p.total_ht, p.ref, p.remise, ";
$sql.= " p.datep as dp, p.fin_validite as datelimite,";
$sql.= " c.label as statut, c.id as statutid";
@@ -248,7 +247,8 @@ if ($socid > 0)
if ($num > 0)
{
- print '';
+ print '';
+ print '';
print ' | ';
@@ -273,13 +273,14 @@ if ($socid > 0)
$i++;
}
$db->free();
+
+ if ($num > 0) print " ";
}
else
{
dol_print_error($db);
}
- print " ";
}
print " | ";
diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php
index a9a45f3c432..1db7e2c9b96 100644
--- a/htdocs/fourn/fiche.php
+++ b/htdocs/fourn/fiche.php
@@ -253,11 +253,12 @@ if ( $societe->fetch($socid) )
{
$i = 0 ;
$num = $db->num_rows($resql);
- print '';
if ($num > 0)
{
- print '';
+ print '';
+
+ print '';
print '| ';
print '";
+
+ if ($num >0) print " | ";
}
else
{
@@ -318,10 +320,11 @@ if ( $societe->fetch($socid) )
{
$i = 0 ;
$num = $db->num_rows($resql);
- print '';
if ($num > 0)
{
- print '';
+ print '';
+
+ print '';
print '| ';
print '';
+ if ($num > 0) print ' | ';
}
else
{
diff --git a/htdocs/index.php b/htdocs/index.php
index 9a0fd731a5f..42ce536bccb 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -98,7 +98,7 @@ print '';
*/
print ' ';
-print '| '.$langs->trans("Informations").' | ';
+print '| '.$langs->trans("Informations").' |
|---|
';
print '';
print '| '.$langs->trans("User").' | '.$user->getNomUrl(0).' | ';
print '';
@@ -123,8 +123,8 @@ if ($user->societe_id == 0)
print '
';
print '';
print '';
- print '| '.$langs->trans("DolibarrStateBoard").' | ';
- print ' | ';
+ print ''.$langs->trans("DolibarrStateBoard").' | ';
+ print ' | ';
print ' ';
$var=true;
@@ -266,12 +266,12 @@ $dashboardlines=array();
print '';
print '';
-print '| '.$langs->trans("DolibarrWorkBoard").' | ';
-print ''.$langs->trans("Number").' | ';
-print ''.$langs->trans("Late").' | ';
-print ' | ';
-print ' | ';
-if ($showweather) print ' | ';
+print ''.$langs->trans("DolibarrWorkBoard").' | ';
+print ''.$langs->trans("Number").' | ';
+print ''.$langs->trans("Late").' | ';
+print ' | ';
+print ' | ';
+if ($showweather) print ' | ';
print ' ';
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index f692a2edf29..6efc3f1e058 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -38,6 +38,9 @@ $socid=0;
if ($user->societe_id > 0) $socid=$user->societe_id;
if (!$user->rights->projet->lire) accessforbidden();
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+
/*
* View
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index 6afcd465ec5..bbd9938994d 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -62,7 +62,7 @@ print '
|
|