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

Fix: doxygen

Browse Source 
Fix: td balance
This commit is contained in:
Laurent Destailleur 2014-09-28 02:46:20 +02:00
parent 14ab409ca9
commit 4244979f4f
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/action/peruser.php
View File

@ -702,7 +702,7 @@ $db->close();
* @param int $year Year * @param int $year Year
* @param int $monthshown Current month shown in calendar view * @param int $monthshown Current month shown in calendar view
* @param string $style Style to use for this day * @param string $style Style to use for this day
* @param array &$eventarray Array of events * @param array $eventarray Array of events
* @param int $maxprint Nb of actions to show each day on month view (0 means no limit) * @param int $maxprint Nb of actions to show each day on month view (0 means no limit)
* @param int $maxnbofchar Nb of characters to show for event line * @param int $maxnbofchar Nb of characters to show for event line
* @param string $newparam Parameters on current URL * @param string $newparam Parameters on current URL

9
htdocs/core/lib/admin.lib.php
View File

@ -853,15 +853,16 @@ function unActivateModule($value, $requiredby=1)
* *
* @param array $taborder Taborder * @param array $taborder Taborder
* @param array $tabname Tabname * @param array $tabname Tabname
* @param array $tablib Tablib * @param array $tablib Tablib
* @param array $tabsql Tabsql * @param array $tabsql Tabsql
* @param array $tabsqlsort Tabsqlsort * @param array $tabsqlsort Tabsqlsort
* @param array $tabfield Tabfield * @param array $tabfield Tabfield
* @param array $tabfieldvalue Tabfieldvalue * @param array $tabfieldvalue Tabfieldvalue
* @param array $tabfieldinsert Tabfieldinsert * @param array $tabfieldinsert Tabfieldinsert
* @param array $tabrowid Tabrowid * @param array $tabrowid Tabrowid
* @param array $tabcond Tabcond * @param array $tabcond Tabcond
* @param array $tabhelp Tabhelp * @param array $tabhelp Tabhelp
* @param array $tabfieldcheck Tabfieldcheck
* @return int 1 * @return int 1
*/ */
function complete_dictionary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsql,&$tabsqlsort,&$tabfield,&$tabfieldvalue,&$tabfieldinsert,&$tabrowid,&$tabcond,&$tabhelp,&$tabfieldcheck) function complete_dictionary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsql,&$tabsqlsort,&$tabfield,&$tabfieldvalue,&$tabfieldinsert,&$tabrowid,&$tabcond,&$tabhelp,&$tabfieldcheck)

6
htdocs/core/modules/contract/mod_contract_olive.php
View File

@ -43,7 +43,7 @@ class mod_contract_olive extends ModelNumRefContracts
var $code_auto = 0; // Numerotation automatique var $code_auto = 0; // Numerotation automatique
/** /**
* Return description of module * Return description of module
* *
* @return string Description of module * @return string Description of module
@ -51,7 +51,7 @@ class mod_contract_olive extends ModelNumRefContracts
function info() function info()
{ {
global $langs; global $langs;
$langs->load("companies"); $langs->load("companies");
return $langs->trans("LeopardNumRefModelDesc"); return $langs->trans("LeopardNumRefModelDesc");
} }
@ -74,7 +74,7 @@ class mod_contract_olive extends ModelNumRefContracts
* Check validity of code according to its rules * Check validity of code according to its rules
* *
* @param DoliDB $db Database handler * @param DoliDB $db Database handler
* @param string &$code Code to check/correct * @param string $code Code to check/correct
* @param Product $product Object product * @param Product $product Object product
* @param int $type 0 = product , 1 = service * @param int $type 0 = product , 1 = service
* @return int 0 if OK * @return int 0 if OK

9
htdocs/fichinter/card.php
View File

@ -1216,7 +1216,6 @@ else if ($id > 0 || ! empty($ref))
print '<input type="hidden" name="id" value="'.$object->id.'">'; print '<input type="hidden" name="id" value="'.$object->id.'">';
if ($action == 'edit_extras') print '<input type="hidden" name="action" value="update_extras">'; if ($action == 'edit_extras') print '<input type="hidden" name="action" value="update_extras">';
if ($action == 'contrat') print '<input type="hidden" name="action" value="setcontrat">'; if ($action == 'contrat') print '<input type="hidden" name="action" value="setcontrat">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
@ -1224,18 +1223,18 @@ else if ($id > 0 || ! empty($ref))
$linkback = '<a href="'.DOL_URL_ROOT.'/fichinter/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>'; $linkback = '<a href="'.DOL_URL_ROOT.'/fichinter/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
// Ref // Ref
print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td>'; print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref'); print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
print '</td></tr>'; print '</td></tr>';
// Third party // Third party
print "<tr><td>".$langs->trans("Company")."</td><td>".$object->client->getNomUrl(1)."</td></tr>"; print "<tr><td>".$langs->trans("Company").'</td><td colspan="3">'.$object->client->getNomUrl(1)."</td></tr>";
if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) if (empty($conf->global->FICHINTER_DISABLE_DETAILS))
{ {
// Duration // Duration
print '<tr><td>'.$langs->trans("TotalDuration").'</td>'; print '<tr><td>'.$langs->trans("TotalDuration").'</td>';
print '<td>'.convertSecondToTime($object->duree, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).'</td>'; print '<td colspan="3">'.convertSecondToTime($object->duree, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).'</td>';
print '</tr>'; print '</tr>';
} }
@ -1326,7 +1325,7 @@ else if ($id > 0 || ! empty($ref))
} }
// Statut // Statut
print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>'; print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">'.$object->getLibStatut(4).'</td></tr>';
// Other attributes (TODO Move this into an include) // Other attributes (TODO Move this into an include)
$parameters=array('colspan' => ' colspan="3"'); $parameters=array('colspan' => ' colspan="3"');