lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4

Browse Source
This commit is contained in:
Laurent Destailleur 2013-06-12 22:12:37 +02:00
commit 32244743d2
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/class/hookmanager.class.php
View File

@ -143,6 +143,8 @@ class HookManager
{ {
foreach($modules as $module => $actionclassinstance) 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."<br>\n";
//print 'class='.get_class($actionclassinstance).' method='.$method.' action='.$action; //print 'class='.get_class($actionclassinstance).' method='.$method.' action='.$action;
// jump to next class if method does not exists // jump to next class if method does not exists
if (! method_exists($actionclassinstance,$method)) continue; if (! method_exists($actionclassinstance,$method)) continue;
@ -186,7 +188,10 @@ class HookManager
if (! is_array($result) && ! is_numeric($result)) $this->resPrint.=$result; 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."<br>\n";
unset($actionclassinstance->results);
unset($actionclassinstance->resprints);
} }
} }
} }

8
htdocs/langs/en_US/main.lang
View File

@ -1,6 +1,12 @@
# Dolibarr language file - en_US - main # Dolibarr language file - Source file is en_US - main
CHARSET=UTF-8 CHARSET=UTF-8
DIRECTION=ltr 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=. SeparatorDecimal=.
SeparatorThousand=, SeparatorThousand=,
FormatDateShort=%m/%d/%Y FormatDateShort=%m/%d/%Y

2
htdocs/product/fiche.php
View File

@ -732,7 +732,7 @@ else
{ {
print '<tr><td>'.$langs->trans("Nature").'</td><td>'; print '<tr><td>'.$langs->trans("Nature").'</td><td>';
$statutarray=array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial")); $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 '</td></tr>'; print '</td></tr>';
} }