diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 58c7063e40a..bfd8f63d9a4 100755
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -143,6 +143,8 @@ class HookManager
{
foreach($modules as $module => $actionclassinstance)
{
+ //print "Before hook ".get_class($actionclassinstance)." method=".$method." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." result=".$result." resaction=".$resaction."
\n";
+
//print 'class='.get_class($actionclassinstance).' method='.$method.' action='.$action;
// jump to next class if method does not exists
if (! method_exists($actionclassinstance,$method)) continue;
@@ -186,7 +188,10 @@ class HookManager
if (! is_array($result) && ! is_numeric($result)) $this->resPrint.=$result;
}
- //print "method=".$method." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." result=".$result." resaction=".$resaction;
+ //print "After hook ".get_class($actionclassinstance)." method=".$method." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." result=".$result." resaction=".$resaction."
\n";
+
+ unset($actionclassinstance->results);
+ unset($actionclassinstance->resprints);
}
}
}
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 8a297b6adce..6b5f0574d13 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1,6 +1,12 @@
-# Dolibarr language file - en_US - main
+# Dolibarr language file - Source file is en_US - main
CHARSET=UTF-8
DIRECTION=ltr
+# Note for chinese:
+# msungstdlight or cid0ct are for traditionnal chinese (traditionnal does not render with ubuntu pdf reader)
+# stsongstdlight or cid0cs are for simplified chinese
+# To read chinese pdf with linux: sudo apt-get install poppler-data
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
SeparatorDecimal=.
SeparatorThousand=,
FormatDateShort=%m/%d/%Y
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index fa1f0fa5621..8971b93a3df 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -732,7 +732,7 @@ else
{
print '