diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 3af718dbe66..efc1596d288 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -26,7 +26,7 @@
* \file htdocs/comm/propal.php
* \ingroup propale
* \brief Page of commercial proposals card and list
- * \version $Id: propal.php,v 1.622 2011/08/23 15:23:19 hregis Exp $
+ * \version $Id: propal.php,v 1.623 2011/08/23 18:40:45 hregis Exp $
*/
require("../main.inc.php");
@@ -1367,10 +1367,10 @@ if ($id > 0 || ! empty($ref))
print $langs->trans('Project').'';
if ($user->rights->propale->creer)
{
- if ($action != 'classer') print '| '.img_edit($langs->trans('SetProject')).' | ';
+ if ($action != 'classify') print ''.img_edit($langs->trans('SetProject')).' | ';
print '';
print '';
- if ($action == 'classer')
+ if ($action == 'classify')
{
$html->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid');
}
@@ -1401,7 +1401,7 @@ if ($id > 0 || ! empty($ref))
}
// Insert hooks
- $parameters=array('colspan'=>'colspan="3"');
+ $parameters=array('colspan'=>' colspan="3"');
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
// Amount HT
@@ -1936,6 +1936,6 @@ else
}
$db->close();
-llxFooter('$Date: 2011/08/23 15:23:19 $ - $Revision: 1.622 $');
+llxFooter('$Date: 2011/08/23 18:40:45 $ - $Revision: 1.623 $');
?>
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index ca7c07e48b3..dde65c1d627 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -25,7 +25,7 @@
* \file htdocs/commande/fiche.php
* \ingroup commande
* \brief Page to show customer order
- * \version $Id: fiche.php,v 1.536 2011/08/23 15:23:19 hregis Exp $
+ * \version $Id: fiche.php,v 1.537 2011/08/23 18:40:45 hregis Exp $
*/
require("../main.inc.php");
@@ -1757,11 +1757,11 @@ else
print '';
print ' | ';
//print "$object->id, $object->socid, $object->fk_project";
- if ($action == 'classer')
+ if ($action == 'classify')
{
$html->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid');
}
@@ -1773,7 +1773,7 @@ else
}
// Insert hooks
- $parameters=array('colspan'=>'colspan="2"');
+ $parameters=array('colspan'=>' colspan="2"');
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
// Lignes de 3 colonnes
@@ -2077,5 +2077,5 @@ else
$db->close();
-llxFooter('$Date: 2011/08/23 15:23:19 $ - $Revision: 1.536 $');
+llxFooter('$Date: 2011/08/23 18:40:45 $ - $Revision: 1.537 $');
?>
diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php
index 97027bb143e..5a0dd2e6e22 100644
--- a/htdocs/compta/deplacement/fiche.php
+++ b/htdocs/compta/deplacement/fiche.php
@@ -20,7 +20,7 @@
/**
* \file htdocs/compta/deplacement/fiche.php
* \brief Page to show a trip card
- * \version $Id: fiche.php,v 1.56 2011/08/03 00:46:35 eldy Exp $
+ * \version $Id: fiche.php,v 1.57 2011/08/23 18:40:45 hregis Exp $
*/
require("../../main.inc.php");
@@ -364,15 +364,15 @@ else
print '';
print ' | ';
- if ($_GET['action'] == 'classin')
+ if ($_GET['action'] == 'classify')
{
$html->form_project($_SERVER['PHP_SELF'].'?id='.$deplacement->id, $deplacement->socid, $deplacement->fk_project,'projectid');
}
@@ -432,5 +432,5 @@ print '';
$db->close();
-llxFooter('$Date: 2011/08/03 00:46:35 $ - $Revision: 1.56 $');
+llxFooter('$Date: 2011/08/23 18:40:45 $ - $Revision: 1.57 $');
?>
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 45aa8252935..2867fdc3b5f 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -25,7 +25,7 @@
* \file htdocs/compta/facture.php
* \ingroup facture
* \brief Page to create/see an invoice
- * \version $Id: facture.php,v 1.856 2011/08/23 15:23:19 hregis Exp $
+ * \version $Id: facture.php,v 1.857 2011/08/23 18:40:47 hregis Exp $
*/
require('../main.inc.php');
@@ -2524,16 +2524,16 @@ else
print '';
print ' | ';
- if ($action == 'classin')
+ if ($action == 'classify')
{
$html->form_project($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->socid,$object->fk_project,'projectid');
}
@@ -2546,7 +2546,7 @@ else
}
// Insert hooks
- $parameters=array('colspan'=>'colspan="3"');
+ $parameters=array('colspan'=>' colspan="3"');
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
print '
';
@@ -3193,5 +3193,5 @@ else
$db->close();
-llxFooter('$Date: 2011/08/23 15:23:19 $ - $Revision: 1.856 $');
+llxFooter('$Date: 2011/08/23 18:40:47 $ - $Revision: 1.857 $');
?>
diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php
index 2bad4a3fb46..204582e8fe1 100644
--- a/htdocs/compta/propal.php
+++ b/htdocs/compta/propal.php
@@ -24,7 +24,7 @@
* \file htdocs/compta/propal.php
* \ingroup propale
* \brief Page liste des propales (vision compta)
- * \version $Id: propal.php,v 1.194 2011/08/03 00:46:24 eldy Exp $
+ * \version $Id: propal.php,v 1.195 2011/08/23 18:40:48 hregis Exp $
*/
require('../main.inc.php');
@@ -40,6 +40,11 @@ $langs->load('compta');
$langs->load('orders');
$langs->load('bills');
+$id=GETPOST('id');
+$ref=GETPOST('ref');
+$socid=GETPOST('socid');
+$action=GETPOST('action');
+
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
@@ -63,9 +68,9 @@ if (! empty($_GET["socid"]))
$module='societe';
$dbtable='';
}
-else if (! empty($_GET["id"]))
+else if (! empty($id))
{
- $objectid=$_GET["id"];
+ $objectid=$id;
$module='propale';
$dbtable='propal';
}
@@ -81,18 +86,18 @@ $object = new Propal($db);
/* Actions */
/******************************************************************************/
-if ($_GET["action"] == 'setstatut')
+if ($action == 'setstatut')
{
// Close proposal
- $object->id = $_GET["id"];
+ $object->id = $id;
$object->cloture($user, $_GET["statut"], $note);
}
// Set project
-if ($_POST['action'] == 'classin')
+if ($action == 'classin')
{
- $object->fetch($_GET["id"]);
+ $object->fetch($id);
$object->setProject($_POST['projectid']);
}
@@ -114,15 +119,13 @@ $propalstatic=new Propal($db);
$now=gmmktime();
-$id = $_GET["id"];
-$ref= $_GET["ref"];
if ($id > 0 || ! empty($ref))
{
if ($mesg) print "$mesg
";
$product_static=new Product($db);
- $object->fetch($_GET["id"],$_GET["ref"]);
+ $object->fetch($id,$ref);
$societe = new Societe($db);
$societe->fetch($object->socid);
@@ -148,7 +151,7 @@ if ($id > 0 || ! empty($ref))
print '';
print ' | ';
print $object->ref_client;
@@ -209,10 +212,10 @@ if ($id > 0 || ! empty($ref))
print '';
print ' | ';
- if ($_GET['action'] == 'editconditions')
+ if ($action == 'editconditions')
{
$html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id');
}
@@ -228,10 +231,10 @@ if ($id > 0 || ! empty($ref))
print '';
print ' | ';
- if ($_GET['action'] == 'editmode')
+ if ($action == 'editmode')
{
$html->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
}
@@ -250,10 +253,10 @@ if ($id > 0 || ! empty($ref))
print $langs->trans('Project').' | ';
if (1 == 2 && $user->rights->propale->creer)
{
- if ($_GET['action'] != 'classer') print ''.img_edit($langs->trans('SetProject')).' | ';
+ if ($action != 'classify') print ''.img_edit($langs->trans('SetProject')).' | ';
print '';
print '';
- if ($_GET['action'] == 'classer')
+ if ($action == 'classify')
{
$html->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid');
}
@@ -367,7 +370,7 @@ if ($id > 0 || ! empty($ref))
if (! empty($objp->date_start)) $type=1;
if (! empty($objp->date_end)) $type=1;
- if ($_GET['action'] != 'editline' || $_GET['rowid'] != $objp->rowid)
+ if ($action != 'editline' || $_GET['rowid'] != $objp->rowid)
{
print ' | ';
if ($objp->fk_product > 0)
@@ -701,6 +704,6 @@ else
$db->close();
-llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.194 $');
+llxFooter('$Date: 2011/08/23 18:40:48 $ - $Revision: 1.195 $');
?>
diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index 8884bbe7af4..06a5b29b891 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -23,7 +23,7 @@
* \file htdocs/contrat/fiche.php
* \ingroup contrat
* \brief Page of a contract
- * \version $Id: fiche.php,v 1.200 2011/08/13 13:03:20 eldy Exp $
+ * \version $Id: fiche.php,v 1.201 2011/08/23 18:40:48 hregis Exp $
*/
require ("../main.inc.php");
@@ -681,10 +681,10 @@ else
print '';
print '| ';
- if ($action == "classer")
+ if ($action == "classify")
{
$form->form_project("fiche.php?id=$id",$object->socid,$object->fk_project,"projectid");
}
@@ -1287,5 +1287,5 @@ else
$db->close();
-llxFooter('$Date: 2011/08/13 13:03:20 $ - $Revision: 1.200 $');
+llxFooter('$Date: 2011/08/23 18:40:48 $ - $Revision: 1.201 $');
?>
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 6cfa547028c..3017e44706e 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -22,7 +22,7 @@
/**
* \file htdocs/expedition/shipment.php
* \ingroup expedition
- * \version $Id: shipment.php,v 1.30 2011/07/31 23:50:53 eldy Exp $
+ * \version $Id: shipment.php,v 1.31 2011/08/23 18:40:48 hregis Exp $
*/
require("../main.inc.php");
@@ -342,10 +342,10 @@ if ($id > 0 || ! empty($ref))
print '';
print ' | ';
- if ($_GET['action'] == 'classer')
+ if ($_GET['action'] == 'classify')
{
$html->form_project($_SERVER['PHP_SELF'].'?id='.$commande->id, $commande->socid, $commande->fk_project, 'projectid');
}
@@ -667,5 +667,5 @@ if ($id > 0 || ! empty($ref))
$db->close();
-llxFooter('$Date: 2011/07/31 23:50:53 $ - $Revision: 1.30 $');
+llxFooter('$Date: 2011/08/23 18:40:48 $ - $Revision: 1.31 $');
?>
diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php
index 53045359d42..a00339a5030 100644
--- a/htdocs/fichinter/fiche.php
+++ b/htdocs/fichinter/fiche.php
@@ -22,7 +22,7 @@
* \file htdocs/fichinter/fiche.php
* \brief Fichier fiche intervention
* \ingroup ficheinter
- * \version $Id: fiche.php,v 1.173 2011/07/31 23:50:53 eldy Exp $
+ * \version $Id: fiche.php,v 1.174 2011/08/23 18:40:49 hregis Exp $
*/
require("../main.inc.php");
@@ -843,15 +843,15 @@ elseif ($fichinterid)
print '';
print ' | ';
- if ($action == 'classin')
+ if ($action == 'classify')
{
$html->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project,'projectid');
}
@@ -1218,5 +1218,5 @@ elseif ($fichinterid)
$db->close();
-llxFooter('$Date: 2011/07/31 23:50:53 $ - $Revision: 1.173 $');
+llxFooter('$Date: 2011/08/23 18:40:49 $ - $Revision: 1.174 $');
?>
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index 6fa6f56e97b..f75dda89da2 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -25,7 +25,7 @@
* \file htdocs/fourn/commande/fiche.php
* \ingroup supplier, order
* \brief Card supplier order
- * \version $Id: fiche.php,v 1.234 2011/08/20 23:56:04 eldy Exp $
+ * \version $Id: fiche.php,v 1.235 2011/08/23 18:40:49 hregis Exp $
*/
require("../../main.inc.php");
@@ -981,11 +981,11 @@ if ($id > 0 || ! empty($ref))
print '';
print ' | ';
//print "$object->id, $object->socid, $object->fk_project";
- if ($action == 'classer')
+ if ($action == 'classify')
{
$html->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid');
}
@@ -1542,5 +1542,5 @@ if ($id > 0 || ! empty($ref))
$db->close();
-llxFooter('$Date: 2011/08/20 23:56:04 $ - $Revision: 1.234 $');
+llxFooter('$Date: 2011/08/23 18:40:49 $ - $Revision: 1.235 $');
?>
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index b6453dbba2d..9323de8a7a0 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -24,7 +24,7 @@
* \file htdocs/fourn/facture/fiche.php
* \ingroup facture, fournisseur
* \brief Page for supplier invoice card (view, edit, validate)
- * \version $Id: fiche.php,v 1.263 2011/08/04 21:46:50 eldy Exp $
+ * \version $Id: fiche.php,v 1.264 2011/08/23 18:40:49 hregis Exp $
*/
require("../../main.inc.php");
@@ -1458,16 +1458,16 @@ else
print '';
print ' | ';
- if ($_GET['action'] == 'classer')
+ if ($_GET['action'] == 'classify')
{
$html->form_project($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->socid,$fac->fk_project,'projectid');
}
@@ -1915,5 +1915,5 @@ else
$db->close();
-llxFooter('$Date: 2011/08/04 21:46:50 $ - $Revision: 1.263 $');
+llxFooter('$Date: 2011/08/23 18:40:49 $ - $Revision: 1.264 $');
?>
|