From 6872b3f0c484508e30f7fe507a1d038b2c7d1da6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 11 Jun 2013 10:06:22 +0200 Subject: [PATCH 1/5] Trans: Add missing entries --- htdocs/langs/en_US/main.lang | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 From 5f9f709a70c8882fb2e8718f90077413de46a8c8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 11 Jun 2013 10:21:28 +0200 Subject: [PATCH 2/5] Fix: vars must be cleaned for next call --- htdocs/core/class/hookmanager.class.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php index 58c7063e40a..a98886cfa9d 100755 --- a/htdocs/core/class/hookmanager.class.php +++ b/htdocs/core/class/hookmanager.class.php @@ -188,6 +188,9 @@ class HookManager //print "method=".$method." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." result=".$result." resaction=".$resaction; } + + unset($actionclassinstance->results); + unset($actionclassinstance->resprints); } } From 40cd45c16692f6f30c76dff7a361c27cc4c6d81e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 11 Jun 2013 11:49:59 +0200 Subject: [PATCH 3/5] Fix: Better fix for cleaning vars --- htdocs/core/class/hookmanager.class.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php index a98886cfa9d..2fd003f042e 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,11 +188,11 @@ 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; + $actionclassinstance->results=''; + $actionclassinstance->resprints=''; + + //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); } } From 897d1251c884744cb78c7acab89390cbe8e46cc0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 11 Jun 2013 12:10:02 +0200 Subject: [PATCH 4/5] Fix: Better fix for cleaning vars (i'm tired today) --- htdocs/core/class/hookmanager.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php index 2fd003f042e..bfd8f63d9a4 100755 --- a/htdocs/core/class/hookmanager.class.php +++ b/htdocs/core/class/hookmanager.class.php @@ -188,10 +188,10 @@ class HookManager if (! is_array($result) && ! is_numeric($result)) $this->resPrint.=$result; } - $actionclassinstance->results=''; - $actionclassinstance->resprints=''; - //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); } } } From 4ba24ed8d7bd8bf855a2bc783b31116b1182b7be Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 11 Jun 2013 12:58:52 +0200 Subject: [PATCH 5/5] Fix: Missing empty value --- htdocs/product/fiche.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ''.$langs->trans("Nature").''; $statutarray=array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial")); - print $form->selectarray('finished',$statutarray,GETPOST('finished')); + print $form->selectarray('finished',$statutarray,GETPOST('finished'),1); print ''; }