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

Merge branch 'develop' of https://github.com/grandoc/dolibarr into

Browse Source 
grandoc-develop

Conflicts:
	dev/skeletons/skeleton_list.php
This commit is contained in:
Laurent Destailleur 2017-04-11 11:06:26 +02:00
commit 3907c30ee3
11 changed files with 24 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/accountancy/admin/accountmodel.php
View File

@ -911,11 +911,9 @@ if ($id)
// Lines with values // Lines with values
while ($i < $num) while ($i < $num)
{ {
$var = ! $var;
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
//print_r($obj); //print_r($obj);
print '<tr '.$bc[$var].' id="rowid-'.$obj->rowid.'">'; print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code))) if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
{ {
print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">'; print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
@ -1198,14 +1196,13 @@ else
{ {
if ($showemptyline) if ($showemptyline)
{ {
$var=!$var; print '<tr class="oddeven"><td width="30%">&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
print '<tr '.$bc[$var].'><td width="30%">&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
$showemptyline=0; $showemptyline=0;
} }
$var=!$var; $var=!$var;
$value=$tabname[$i]; $value=$tabname[$i];
print '<tr '.$bc[$var].'><td width="50%">'; print '<tr class="oddeven"><td width="50%">';
if (! empty($tabcond[$i])) if (! empty($tabcond[$i]))
{ {
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$i.'">'.$langs->trans($tablib[$i]).'</a>'; print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$i.'">'.$langs->trans($tablib[$i]).'</a>';

3
htdocs/accountancy/admin/categories.php
View File

@ -146,8 +146,7 @@ if ($action == 'display' || $action == 'delete') {
if (is_array($accountingcategory->lines_display) && count($accountingcategory->lines_display) > 0) { if (is_array($accountingcategory->lines_display) && count($accountingcategory->lines_display) > 0) {
foreach ( $accountingcategory->lines_display as $cpt ) { foreach ( $accountingcategory->lines_display as $cpt ) {
$var = ! $var; print '<tr class="oddeven">';
print '<tr ' . $bc[$var] . '>';
print '<td>' . length_accountg($cpt->account_number) . '</td>'; print '<td>' . length_accountg($cpt->account_number) . '</td>';
print '<td>' . $cpt->label . '</td>'; print '<td>' . $cpt->label . '</td>';
print '<td align="right">'; print '<td align="right">';

4
htdocs/accountancy/admin/categories_list.php
View File

@ -847,11 +847,9 @@ if ($id)
// Lines with values // Lines with values
while ($i < $num) while ($i < $num)
{ {
$var = ! $var;
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
//print_r($obj); //print_r($obj);
print '<tr '.$bc[$var].' id="rowid-'.$obj->rowid.'">'; print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code))) if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
{ {
$tmpaction='edit'; $tmpaction='edit';

3
htdocs/accountancy/admin/defaultaccounts.php
View File

@ -135,9 +135,8 @@ print '<input type="hidden" name="action" value="update">';
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
foreach ( $list_account as $key ) { foreach ( $list_account as $key ) {
$var = ! $var;
print '<tr ' . $bc[$var] . ' class="value">'; print '<tr class="oddeven value">';
// Param // Param
$label = $langs->trans($key); $label = $langs->trans($key);
print '<td>' . $label . '</td>'; print '<td>' . $label . '</td>';

13
htdocs/accountancy/admin/export.php
View File

@ -148,9 +148,8 @@ $var = ! $var;
$num = count($main_option); $num = count($main_option);
if ($num) { if ($num) {
foreach ( $main_option as $key ) { foreach ( $main_option as $key ) {
$var = ! $var;
print '<tr ' . $bc[$var] . ' class="value">'; print '<tr class="oddeven value">';
// Param // Param
$label = $langs->trans($key); $label = $langs->trans($key);
@ -178,7 +177,7 @@ print '</tr>';
$var = ! $var; $var = ! $var;
print '<tr ' . $bc[$var] . '>'; print '<tr class="oddeven">';
print '<td width="50%">' . $langs->trans("Selectmodelcsv") . '</td>'; print '<td width="50%">' . $langs->trans("Selectmodelcsv") . '</td>';
if (! $conf->use_javascript_ajax) { if (! $conf->use_javascript_ajax) {
print '<td class="nowrap">'; print '<td class="nowrap">';
@ -212,7 +211,7 @@ if ($num2) {
print '<tr><td colspan="2" bgcolor="red"><b>' . $langs->trans('OptionsDeactivatedForThisExportModel') . '</b></td></tr>'; print '<tr><td colspan="2" bgcolor="red"><b>' . $langs->trans('OptionsDeactivatedForThisExportModel') . '</b></td></tr>';
} }
print '<tr ' . $bc[$var] . '>'; print '<tr class="oddeven">';
print '<td width="50%">' . $langs->trans("Selectformat") . '</td>'; print '<td width="50%">' . $langs->trans("Selectformat") . '</td>';
if (! $conf->use_javascript_ajax) { if (! $conf->use_javascript_ajax) {
print '<td class="nowrap">'; print '<td class="nowrap">';
@ -230,10 +229,8 @@ if ($num2) {
} }
print "</td></tr>"; print "</td></tr>";
foreach ( $model_option as $key ) { foreach ( $model_option as $key ) {
$var = ! $var; print '<tr class="oddeven value">';
print '<tr ' . $bc[$var] . ' class="value">';
// Param // Param
$label = $langs->trans($key); $label = $langs->trans($key);

4
htdocs/accountancy/admin/fiscalyear.php
View File

@ -125,7 +125,7 @@ if ($result) {
while ( $i < $num && $i < $max ) { while ( $i < $num && $i < $max ) {
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
$fiscalyearstatic->id = $obj->rowid; $fiscalyearstatic->id = $obj->rowid;
print '<tr ' . $bc[$var] . '>'; print '<tr class="oddeven">';
print '<td><a href="fiscalyear_card.php?id=' . $obj->rowid . '">' . img_object($langs->trans("ShowFiscalYear"), "technic") . ' ' . $obj->rowid . '</a></td>'; print '<td><a href="fiscalyear_card.php?id=' . $obj->rowid . '">' . img_object($langs->trans("ShowFiscalYear"), "technic") . ' ' . $obj->rowid . '</a></td>';
print '<td align="left">' . $obj->label . '</td>'; print '<td align="left">' . $obj->label . '</td>';
print '<td align="left">' . dol_print_date($db->jdate($obj->date_start), 'day') . '</td>'; print '<td align="left">' . dol_print_date($db->jdate($obj->date_start), 'day') . '</td>';
@ -136,7 +136,7 @@ if ($result) {
$i ++; $i ++;
} }
} else { } else {
print '<tr ' . $bc[$var] . '><td colspan="5" class="opacitymedium">' . $langs->trans("None") . '</td></tr>'; print '<tr class="oddeven"><td colspan="5" class="opacitymedium">' . $langs->trans("None") . '</td></tr>';
} }
print '</table>'; print '</table>';
} else { } else {

3
htdocs/accountancy/admin/importaccounts.php
View File

@ -145,8 +145,7 @@ if ($result) {
$var = true; $var = true;
while ( $i < min($num_lines, $limit) ) { while ( $i < min($num_lines, $limit) ) {
$objp = $db->fetch_object($result); $objp = $db->fetch_object($result);
$var = ! $var; print '<tr class="oddeven">';
print '<tr'. $bc[$var].'>';
print '<td align="left">'; print '<td align="left">';
print $objp->accounting; print $objp->accounting;

16
htdocs/accountancy/admin/index.php
View File

@ -214,8 +214,7 @@ print "</tr>\n";
if (! empty($user->admin)) if (! empty($user->admin))
{ {
// TO DO Mutualize code for yes/no constants // TO DO Mutualize code for yes/no constants
$var = ! $var; print '<tr class="oddeven">';
print "<tr " . $bc[$var] . ">";
print '<td>' . $langs->trans("ACCOUNTING_LIST_SORT_VENTILATION_TODO") . '</td>'; print '<td>' . $langs->trans("ACCOUNTING_LIST_SORT_VENTILATION_TODO") . '</td>';
if (! empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO)) { if (! empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO)) {
print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setlistsorttodo&value=0">'; print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setlistsorttodo&value=0">';
@ -228,8 +227,7 @@ if (! empty($user->admin))
} }
print '</tr>'; print '</tr>';
$var = ! $var; print '<tr class="oddeven">';
print "<tr " . $bc[$var] . ">";
print '<td>' . $langs->trans("ACCOUNTING_LIST_SORT_VENTILATION_DONE") . '</td>'; print '<td>' . $langs->trans("ACCOUNTING_LIST_SORT_VENTILATION_DONE") . '</td>';
if (! empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE)) { if (! empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE)) {
print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setlistsortdone&value=0">'; print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setlistsortdone&value=0">';
@ -242,8 +240,7 @@ if (! empty($user->admin))
} }
print '</tr>'; print '</tr>';
$var = ! $var; print '<tr class="oddeven">';
print "<tr " . $bc[$var] . ">";
print '<td>' . $langs->trans("BANK_DISABLE_DIRECT_INPUT") . '</td>'; print '<td>' . $langs->trans("BANK_DISABLE_DIRECT_INPUT") . '</td>';
if (! empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) { if (! empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setdisabledirectinput&value=0">'; print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setdisabledirectinput&value=0">';
@ -256,8 +253,7 @@ if (! empty($user->admin))
} }
print '</tr>'; print '</tr>';
$var = ! $var; print '<tr class="oddeven">';
print "<tr " . $bc[$var] . ">";
print '<td>' . $langs->trans("ACCOUNTING_MANAGE_ZERO") . '</td>'; print '<td>' . $langs->trans("ACCOUNTING_MANAGE_ZERO") . '</td>';
if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) { if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) {
print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setmanagezero&value=0">'; print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setmanagezero&value=0">';
@ -275,9 +271,7 @@ if (! empty($user->admin))
// Param a user $user->rights->accountancy->chartofaccount can access // Param a user $user->rights->accountancy->chartofaccount can access
foreach ($list as $key) foreach ($list as $key)
{ {
$var = ! $var; print '<tr class="oddeven value">';
print '<tr ' . $bc[$var] . ' class="value">';
if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO) && ($key == 'ACCOUNTING_LENGTH_GACCOUNT' || $key == 'ACCOUNTING_LENGTH_AACCOUNT')) continue; if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO) && ($key == 'ACCOUNTING_LENGTH_GACCOUNT' || $key == 'ACCOUNTING_LENGTH_AACCOUNT')) continue;

7
htdocs/accountancy/admin/journal.php
View File

@ -125,9 +125,8 @@ print '<td colspan="2">' . $langs->trans('Journaux') . '</td>';
print "</tr>\n"; print "</tr>\n";
foreach ( $list as $key ) { foreach ( $list as $key ) {
$var = ! $var;
print '<tr ' . $bc[$var] . ' class="value">'; print '<tr class="oddeven value">';
// Param // Param
$label = $langs->trans($key); $label = $langs->trans($key);
@ -167,8 +166,6 @@ if ($resql) {
while ( $i < $numr ) { while ( $i < $numr ) {
$objp = $db->fetch_object($resql); $objp = $db->fetch_object($resql);
$var = ! $var;
$bankaccountstatic->rowid = $objp->rowid; $bankaccountstatic->rowid = $objp->rowid;
$bankaccountstatic->id = $objp->rowid; $bankaccountstatic->id = $objp->rowid;
$bankaccountstatic->ref = $objp->ref; $bankaccountstatic->ref = $objp->ref;
@ -177,7 +174,7 @@ if ($resql) {
$bankaccountstatic->account_number = $objp->account_number; $bankaccountstatic->account_number = $objp->account_number;
$bankaccountstatic->accountancy_journal = $objp->accountancy_journal; $bankaccountstatic->accountancy_journal = $objp->accountancy_journal;
print '<tr ' . $bc[$var] . ' class="value">'; print '<tr class="oddeven value">';
// Param // Param
print '<td width="50%"><label for="' . $objp->rowid . '">' . $langs->trans("Journal"); print '<td width="50%"><label for="' . $objp->rowid . '">' . $langs->trans("Journal");

6
htdocs/accountancy/admin/journals.php
View File

@ -113,7 +113,6 @@ $sql.= $db->plimit($limit+1, $offset);
$result = $db->query($sql); $result = $db->query($sql);
if ($result) { if ($result) {
$var = false;
$num = $db->num_rows($result); $num = $db->num_rows($result);
$i = 0; $i = 0;
@ -136,16 +135,15 @@ if ($result) {
while ( $i < $num && $i < $max ) { while ( $i < $num && $i < $max ) {
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
$accountingjournalstatic->id = $obj->rowid; $accountingjournalstatic->id = $obj->rowid;
print '<tr ' . $bc[$var] . '>'; print '<tr class="oddeven">';
print '<td><a href="journals_card.php?id=' . $obj->rowid . '">' . img_object($langs->trans("ShowJournal"), "technic") . ' ' . $obj->code . '</a></td>'; print '<td><a href="journals_card.php?id=' . $obj->rowid . '">' . img_object($langs->trans("ShowJournal"), "technic") . ' ' . $obj->code . '</a></td>';
print '<td align="left">' . $obj->label . '</td>'; print '<td align="left">' . $obj->label . '</td>';
print '<td>' . $accountingjournalstatic->LibType($obj->nature, 0) . '</td>'; print '<td>' . $accountingjournalstatic->LibType($obj->nature, 0) . '</td>';
print '</tr>'; print '</tr>';
$var = ! $var;
$i ++; $i ++;
} }
} else { } else {
print '<tr ' . $bc[$var] . '><td colspan="3" class="opacitymedium">' . $langs->trans("None") . '</td></tr>'; print '<tr class="oddeven"><td colspan="3" class="opacitymedium">' . $langs->trans("None") . '</td></tr>';
} }
print '</table>'; print '</table>';
} else { } else {

5
htdocs/modulebuilder/skeletons/skeleton_list.php
View File

@ -428,17 +428,14 @@ print '</tr>'."\n";
$i=0; $i=0;
$var=true;
$totalarray=array(); $totalarray=array();
while ($i < min($num, $limit)) while ($i < min($num, $limit))
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
if ($obj) if ($obj)
{ {
$var = !$var;
// Show here line of result // Show here line of result
print '<tr '.$bc[$var].'>'; print '<tr class="oddeven">';
// LIST_OF_TD_FIELDS_LIST // LIST_OF_TD_FIELDS_LIST
/* /*
if (! empty($arrayfields['t.field1']['checked'])) if (! empty($arrayfields['t.field1']['checked']))