| ".$langs->trans("SubCats").' | ';
if ($user->rights->categorie->creer)
{
- print "";
+ print "";
print img_picto($langs->trans("Create"),'filenew');
print "";
}
@@ -214,10 +205,10 @@ else
}
// List of products
-if ($c->type == 0)
+if ($object->type == 0)
{
- $prods = $c->get_type("product","Product");
+ $prods = $object->get_type("product","Product");
if ($prods < 0)
{
dol_print_error();
@@ -253,9 +244,9 @@ if ($c->type == 0)
}
}
-if ($c->type == 1)
+if ($object->type == 1)
{
- $socs = $c->get_type("societe","Fournisseur","fournisseur");
+ $socs = $object->get_type("societe","Fournisseur","fournisseur");
if ($socs < 0)
{
dol_print_error();
@@ -291,9 +282,9 @@ if ($c->type == 1)
}
}
-if($c->type == 2)
+if($object->type == 2)
{
- $socs = $c->get_type("societe","Societe");
+ $socs = $object->get_type("societe","Societe");
if ($socs < 0)
{
dol_print_error();
@@ -329,14 +320,14 @@ if($c->type == 2)
}
// List of members
-if ($c->type == 3)
+if ($object->type == 3)
{
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
- $prods = $c->get_type("member","Adherent");
+ $prods = $object->get_type("member","Adherent");
if ($prods < 0)
{
- dol_print_error($db,$c->error);
+ dol_print_error($db,$object->error);
}
else
{
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 9eacdd5907c..0635ee861a6 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -45,23 +45,28 @@ $langs->load('bills');
$langs->load('orders');
$langs->load('products');
+$id=GETPOST('id');
+$ref=GETPOST('ref');
+$socid=GETPOST('socid');
+$action=GETPOST('action');
+$confirm=GETPOST('confirm');
+
$sall=GETPOST("sall");
$mesg=(GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg"));
$year=GETPOST("year");
$month=GETPOST("month");
-$socid=GETPOST('socid');
// Security check
$module='propale';
-if (isset($_GET["socid"]))
+if (isset($socid))
{
- $objectid=$_GET["socid"];
+ $objectid=$socid;
$module='societe';
$dbtable='';
}
-else if (isset($_GET["id"]) && $_GET["id"] > 0)
+else if (isset($id) && $id > 0)
{
- $objectid=$_GET["id"];
+ $objectid=$id;
$module='propale';
$dbtable='propal';
}
diff --git a/htdocs/lib/categories.lib.php b/htdocs/lib/categories.lib.php
new file mode 100644
index 00000000000..e3d99f899b6
--- /dev/null
+++ b/htdocs/lib/categories.lib.php
@@ -0,0 +1,58 @@
+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ * \file htdocs/lib/categories.lib.php
+ * \brief Ensemble de fonctions de base pour le module categorie
+ * \ingroup categorie
+ * \version $Id$
+ *
+ * Ensemble de fonctions de base de dolibarr sous forme d'include
+ */
+
+function categories_prepare_head($object,$type)
+{
+ global $langs, $conf, $user;
+
+ $langs->load("categories");
+
+ $h = 0;
+ $head = array();
+
+ $head[$h][0] = DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type;
+ $head[$h][1] = $langs->trans("Card");
+ $head[$h][2] = 'card';
+ $h++;
+
+ $head[$h][0] = DOL_URL_ROOT.'/categories/photos.php?id='.$object->id.'&type='.$type;
+ $head[$h][1] = $langs->trans("Photos");
+ $head[$h][2] = 'photos';
+ $h++;
+
+ // Show more tabs from modules
+ // Entries must be declared in modules descriptor with line
+ // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
+ // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab
+ complete_head_from_modules($conf,$langs,$object,$head,$h,'categories_'.$type);
+
+ return $head;
+}
+
+
+?>
\ No newline at end of file
|