';
}
}
}
@@ -1923,6 +1949,7 @@ else
include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
}
+
/*
* Lines
*/
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index dc2c708cbec..7dc63fdace9 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -648,8 +648,7 @@ class Propal extends CommonObject
dol_syslog(get_class($this)."::create");
// Check parameters
- $soc = new Societe($this->db);
- $result=$soc->fetch($this->socid);
+ $result=$this->fetch_thirdparty();
if ($result < 0)
{
$this->error="Failed to fetch company";
@@ -670,8 +669,6 @@ class Propal extends CommonObject
$this->db->begin();
- $this->fetch_thirdparty();
-
// Insert into database
$sql = "INSERT INTO ".MAIN_DB_PREFIX."propal (";
$sql.= "fk_soc";
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 99168cdc6a0..a7d04670961 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -1,34 +1,34 @@
* Copyright (C) 2004-2013 Laurent Destailleur
- * Copyright (C) 2005 Marc Barilley / Ocebo
- * Copyright (C) 2005-2013 Regis Houssin
- * Copyright (C) 2006 Andre Cianfarani
- * Copyright (C) 2010-2013 Juanjo Menent
- * Copyright (C) 2011 Philippe Grand
- * Copyright (C) 2012 Christophe Battarel
- * Copyright (C) 2012 Marcos García
- * Copyright (C) 2013 Florian Henry
- *
- * 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 3 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, see .
- */
+* Copyright (C) 2005 Marc Barilley / Ocebo
+* Copyright (C) 2005-2013 Regis Houssin
+* Copyright (C) 2006 Andre Cianfarani
+* Copyright (C) 2010-2013 Juanjo Menent
+* Copyright (C) 2011 Philippe Grand
+* Copyright (C) 2012 Christophe Battarel
+* Copyright (C) 2012 Marcos García
+* Copyright (C) 2013 Florian Henry
+*
+* 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 3 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, see .
+*/
/**
* \file htdocs/commande/fiche.php
- * \ingroup commande
- * \brief Page to show customer order
- */
+* \ingroup commande
+* \brief Page to show customer order
+*/
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
@@ -2135,34 +2135,56 @@ else
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
if (empty($reshook) && ! empty($extrafields->attribute_label))
{
+ if ($action == 'edit_extras')
+ {
+ print '