diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 27cdedc4e1e..2e20005420c 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -418,6 +418,20 @@ class ActionComm extends CommonObject
$this->id=0;
+ if (!is_object($fuser))
+ {
+ if ($fuser > 0)
+ {
+ $u = new User($db);
+ $u->fetch($fuser);
+ $fuser = $u;
+ }
+ else
+ {
+ $fuser = $user;
+ }
+ }
+
// Create clone
$result=$this->add($fuser);
if ($result < 0) $error++;
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index c6c34d87129..712549b1166 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -276,7 +276,7 @@ if ($action == 'create')
// Label
print '
| '.$langs->trans("LabelBankCashAccount").' | ';
- print ' |
';
+ print ' | ';
// Type
print '| '.$langs->trans("AccountType").' | ';
@@ -477,19 +477,19 @@ if ($action == 'create')
if (! empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED))
{
print '
| '.$langs->trans("AccountancyCode").' | ';
- print 'account_number).'"> |
';
+ print 'account_number).'"> | ';
}
else
{
print '| '.$langs->trans("AccountancyCode").' | ';
- print 'account_number).'"> |
';
+ print 'account_number).'"> | ';
}
// Accountancy journal
if (! empty($conf->accounting->enabled))
{
print '| '.$langs->trans("AccountancyJournal").' | ';
- print 'accountancy_journal).'"> |
';
+ print 'accountancy_journal).'"> | ';
}
print '';
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 518c31e38e0..9fa6f7c7938 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -3655,7 +3655,7 @@ else if ($id > 0 || ! empty($ref))
}
else
{
- print '';
+ print '';
}
}
diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
index 1d0a84b6a5b..16338efc225 100644
--- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -1088,7 +1088,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$pdf->SetTextColor(0,0,60);
$usehourmin='day';
- if (empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) $usehourmin='dayhour';
+ if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) $usehourmin='dayhour';
if (! empty($object->date_livraison))
{
$posy+=4;
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 83961d4f274..e31d89ff87e 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -190,7 +190,7 @@ if ($resql)
print_liste_field_titre($langs->trans("TotalHT"),$_SERVER["PHP_SELF"],"d.total_ht","",$param,'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("TotalVAT"),$_SERVER["PHP_SELF"],"d.total_tva","",$param,'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("TotalTTC"),$_SERVER["PHP_SELF"],"d.total_ttc","",$param,'align="right"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Statut"),$_SERVER["PHP_SELF"],"","",$param,'align="right"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"","",$param,'align="right"',$sortfield,$sortorder);
print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
print "\n";
diff --git a/htdocs/opensurvey/wizard/index.php b/htdocs/opensurvey/wizard/index.php
index 1f324a52a58..ce38dc12c6c 100644
--- a/htdocs/opensurvey/wizard/index.php
+++ b/htdocs/opensurvey/wizard/index.php
@@ -1,6 +1,7 @@
- * Copyright (C) 2014 Marcos García
+/* Copyright (C) 2013 Laurent Destailleur
+ * Copyright (C) 2014 Marcos García
+ * Copyright (C) 2016 Regis Houssin
*
* 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
@@ -22,7 +23,7 @@
//if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1');
//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+//if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';