diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index f551cf3e716..e0b8c6f70c2 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -307,11 +307,11 @@ if ($resql)
print '
';
if (! empty($arrayfields['aa.account_number']['checked'])) print_liste_field_titre($arrayfields['aa.account_number']['label'], $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['aa.label']['checked'])) print_liste_field_titre($arrayfields['aa.label']['label'], $_SERVER["PHP_SELF"], "aa.label", "", $param, '', $sortfield, $sortorder);
- if (! empty($arrayfields['aa.account_parent']['checked'])) print_liste_field_titre($arrayfields['aa.account_parent']['label'], $_SERVER["PHP_SELF"], "aa.account_parent", "", $param, 'align="left"', $sortfield, $sortorder);
+ if (! empty($arrayfields['aa.account_parent']['checked'])) print_liste_field_titre($arrayfields['aa.account_parent']['label'], $_SERVER["PHP_SELF"], "aa.account_parent", "", $param, '', $sortfield, $sortorder, 'left ');
if (! empty($arrayfields['aa.pcg_type']['checked'])) print_liste_field_titre($arrayfields['aa.pcg_type']['label'], $_SERVER["PHP_SELF"], 'aa.pcg_type', '', $param, '', $sortfield, $sortorder, '', $arrayfields['aa.pcg_type']['help']);
if (! empty($arrayfields['aa.pcg_subtype']['checked'])) print_liste_field_titre($arrayfields['aa.pcg_subtype']['label'], $_SERVER["PHP_SELF"], 'aa.pcg_subtype', '', $param, '', $sortfield, $sortorder, '', $arrayfields['aa.pcg_subtype']['help']);
if (! empty($arrayfields['aa.active']['checked'])) print_liste_field_titre($arrayfields['aa.active']['label'], $_SERVER["PHP_SELF"], 'aa.active', '', $param, '', $sortfield, $sortorder);
- print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
print " \n";
$accountstatic = new AccountingAccount($db);
@@ -403,7 +403,7 @@ if ($resql)
}
// Action
- print '';
+ print ' ';
if ($user->rights->accounting->chartofaccount) {
print 'id).'">';
print img_edit();
diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index 9f31fa663ed..36ecf11a4c7 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -532,8 +532,8 @@ if ($id)
if ($fieldlist[$field]=='pcg_version' || $fieldlist[$field]=='fk_pcg_version') { $valuetoshow=$langs->trans("Pcg_version"); }
if ($valuetoshow != '') {
- print ' ';
- if (! empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) {
+ print ' ';
+ if (! empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) {
print ''.$valuetoshow.' '.img_help(1, $valuetoshow).' ';
} elseif (! empty($tabhelp[$id][$value])) {
print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
@@ -662,23 +662,29 @@ if ($id)
*/
$valuetoshow=ucfirst($fieldlist[$field]); // By defaut
$valuetoshow=$langs->trans($valuetoshow); // try to translate
- if ($fieldlist[$field]=='code') { $valuetoshow=$langs->trans("Code"); }
- if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
- {
- $valuetoshow=$langs->trans("Label");
- if ($id != 25) $valuetoshow.="*";
- }
- if ($fieldlist[$field]=='country') { $valuetoshow=$langs->trans("Country"); }
- if ($fieldlist[$field]=='country_id') { $showfield=0; }
- if ($fieldlist[$field]=='fk_pcg_version') { $valuetoshow=$langs->trans("Pcg_version"); }
+ if ($fieldlist[$field]=='code') {
+ $valuetoshow=$langs->trans("Code");
+ }
+ if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') {
+ $valuetoshow=$langs->trans("Label");
+ if ($id != 25) $valuetoshow.="*";
+ }
+ if ($fieldlist[$field]=='country') {
+ $valuetoshow=$langs->trans("Country");
+ }
+ if ($fieldlist[$field]=='country_id') {
+ $showfield=0;
+ }
+ if ($fieldlist[$field]=='fk_pcg_version') {
+ $valuetoshow=$langs->trans("Pcg_version");
+ }
// Affiche nom du champ
- if ($showfield)
- {
- print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable?$fieldlist[$field]:''), ($page?'page='.$page.'&':''), $param, "align=".$align, $sortfield, $sortorder);
+ if ($showfield) {
+ print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable?$fieldlist[$field]:''), ($page?'page='.$page.'&':''), $param, "", $sortfield, $sortorder, $class.' ');
}
}
- print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page?'page='.$page.'&':''), $param, 'align="center"', $sortfield, $sortorder);
+ print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page?'page='.$page.'&':''), $param, '', $sortfield, $sortorder, 'center ');
print getTitleFieldOfList('');
print getTitleFieldOfList('');
print '';
@@ -757,7 +763,7 @@ if ($id)
$class='tddict';
if ($fieldlist[$field] == 'tracking') $class.=' tdoverflowauto';
// Show value for field
- if ($showfield) print ' '.$valuetoshow.' ';
+ if ($showfield) print ''.$valuetoshow.' ';
}
}
@@ -769,17 +775,17 @@ if ($id)
$url.='&';
// Active
- print '';
+ print ' ';
if ($canbedisabled) print ''.$actl[$obj->active].' ';
else print $langs->trans("AlwaysActive");
print " ";
// Modify link
- if ($canbemodified) print ''.img_edit().' ';
+ if ($canbemodified) print ''.img_edit().' ';
else print ' ';
// Delete link
- if ($iserasable) print ''.img_delete().' ';
+ if ($iserasable) print ''.img_delete().' ';
else print ' ';
print "\n";
@@ -852,7 +858,7 @@ function fieldListAccountModel($fieldlist, $obj = '', $tabname = '', $context =
}
}
elseif ($fieldlist[$field] == 'type_cdr') {
- if ($fieldlist[$field] == 'type_cdr') print '';
+ if ($fieldlist[$field] == 'type_cdr') print ' ';
else print ' ';
if ($fieldlist[$field] == 'type_cdr') {
print $form->selectarray($fieldlist[$field], array(0=>$langs->trans('None'), 1=>$langs->trans('AtEndOfMonth'), 2=>$langs->trans('CurrentNext')), (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 7cb7d7d27f2..3a55e092d94 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -41,8 +41,7 @@ $rowid=GETPOST('rowid', 'alpha');
$code=GETPOST('code', 'alpha');
// Security access
-if (empty($user->rights->accounting->chartofaccount))
-{
+if (empty($user->rights->accounting->chartofaccount)) {
accessforbidden();
}
@@ -468,29 +467,46 @@ if ($id)
$valuetoshow=ucfirst($fieldlist[$field]); // Par defaut
$valuetoshow=$langs->trans($valuetoshow); // try to translate
$class="left";
- if ($fieldlist[$field]=='type') {
- if ($tabname[$id] == MAIN_DB_PREFIX."c_paiement") $valuetoshow=$form->textwithtooltip($langs->trans("Type"), $langs->trans("TypePaymentDesc"), 2, 1, img_help(1, ''));
- else $valuetoshow=$langs->trans("Type");
+ if ($fieldlist[$field]=='type') {
+ if ($tabname[$id] == MAIN_DB_PREFIX."c_paiement") {
+ $valuetoshow=$form->textwithtooltip($langs->trans("Type"), $langs->trans("TypePaymentDesc"), 2, 1, img_help(1, ''));
+ } else {
+ $valuetoshow=$langs->trans("Type");
+ }
}
- if ($fieldlist[$field]=='code') { $valuetoshow=$langs->trans("Code"); }
- if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
- {
+ if ($fieldlist[$field]=='code') {
+ $valuetoshow=$langs->trans("Code");
+ }
+ if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') {
$valuetoshow=$langs->trans("Label");
}
- if ($fieldlist[$field]=='libelle_facture') { $valuetoshow=$langs->trans("LabelOnDocuments"); }
- if ($fieldlist[$field]=='country') {
+ if ($fieldlist[$field]=='libelle_facture') {
+ $valuetoshow=$langs->trans("LabelOnDocuments");
+ }
+ if ($fieldlist[$field]=='country') {
$valuetoshow=$langs->trans("Country");
}
- if ($fieldlist[$field]=='accountancy_code'){ $valuetoshow=$langs->trans("AccountancyCode"); }
- if ($fieldlist[$field]=='accountancy_code_sell'){ $valuetoshow=$langs->trans("AccountancyCodeSell"); }
- if ($fieldlist[$field]=='accountancy_code_buy'){ $valuetoshow=$langs->trans("AccountancyCodeBuy"); }
- if ($fieldlist[$field]=='pcg_version' || $fieldlist[$field]=='fk_pcg_version') { $valuetoshow=$langs->trans("Pcg_version"); }
- if ($fieldlist[$field]=='range_account') { $valuetoshow=$langs->trans("Comment"); }
- if ($fieldlist[$field]=='category_type') { $valuetoshow=$langs->trans("Calculated"); }
+ if ($fieldlist[$field]=='accountancy_code') {
+ $valuetoshow=$langs->trans("AccountancyCode");
+ }
+ if ($fieldlist[$field]=='accountancy_code_sell') {
+ $valuetoshow=$langs->trans("AccountancyCodeSell");
+ }
+ if ($fieldlist[$field]=='accountancy_code_buy') {
+ $valuetoshow=$langs->trans("AccountancyCodeBuy");
+ }
+ if ($fieldlist[$field]=='pcg_version' || $fieldlist[$field]=='fk_pcg_version') {
+ $valuetoshow=$langs->trans("Pcg_version");
+ }
+ if ($fieldlist[$field]=='range_account') {
+ $valuetoshow=$langs->trans("Comment");
+ }
+ if ($fieldlist[$field]=='category_type') {
+ $valuetoshow=$langs->trans("Calculated");
+ }
- if ($valuetoshow != '')
- {
- print ' ';
+ if ($valuetoshow != '') {
+ print ' ';
if (! empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) print ''.$valuetoshow.' '.img_help(1, $valuetoshow).' ';
elseif (! empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
else print $valuetoshow;
@@ -591,7 +607,7 @@ if ($id)
print ' ';
print ' ';
print ' ';
- print '';
+ print ' ';
if ($filterfound)
{
$searchpicto=$form->showFilterAndCheckAddButtons(0);
@@ -613,38 +629,73 @@ if ($id)
$valuetoshow=ucfirst($fieldlist[$field]); // By defaut
$valuetoshow=$langs->trans($valuetoshow); // try to translate
- if ($fieldlist[$field]=='source') { $valuetoshow=$langs->trans("Contact"); }
- if ($fieldlist[$field]=='price') { $valuetoshow=$langs->trans("PriceUHT"); }
- if ($fieldlist[$field]=='taux') {
- if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") $valuetoshow=$langs->trans("Rate");
- else $valuetoshow=$langs->trans("Amount");
- $align='center';
+ if ($fieldlist[$field]=='source') {
+ $valuetoshow=$langs->trans("Contact");
}
- if ($fieldlist[$field]=='type') { $valuetoshow=$langs->trans("Type"); }
- if ($fieldlist[$field]=='code') { $valuetoshow=$langs->trans("Code"); }
- if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
- {
+ if ($fieldlist[$field]=='price') {
+ $valuetoshow=$langs->trans("PriceUHT");
+ }
+ if ($fieldlist[$field]=='taux') {
+ if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") {
+ $valuetoshow=$langs->trans("Rate");
+ } else {
+ $valuetoshow=$langs->trans("Amount");
+ }
+ $class='center';
+ }
+ if ($fieldlist[$field]=='type') {
+ $valuetoshow=$langs->trans("Type");
+ }
+ if ($fieldlist[$field]=='code') {
+ $valuetoshow=$langs->trans("Code");
+ }
+ if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') {
$valuetoshow=$langs->trans("Label");
}
- if ($fieldlist[$field]=='country') { $valuetoshow=$langs->trans("Country"); }
- if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') { $showfield=0; }
- if ($fieldlist[$field]=='accountancy_code'){ $valuetoshow=$langs->trans("AccountancyCode"); }
- if ($fieldlist[$field]=='accountancy_code_sell'){ $valuetoshow=$langs->trans("AccountancyCodeSell"); $sortable=0; }
- if ($fieldlist[$field]=='accountancy_code_buy'){ $valuetoshow=$langs->trans("AccountancyCodeBuy"); $sortable=0; }
- if ($fieldlist[$field]=='fk_pcg_version') { $valuetoshow=$langs->trans("Pcg_version"); }
- if ($fieldlist[$field]=='account_parent') { $valuetoshow=$langs->trans("Accountsparent"); }
- if ($fieldlist[$field]=='pcg_type') { $valuetoshow=$langs->trans("Pcg_type"); }
- if ($fieldlist[$field]=='pcg_subtype') { $valuetoshow=$langs->trans("Pcg_subtype"); }
- if ($fieldlist[$field]=='type_template') { $valuetoshow=$langs->trans("TypeOfTemplate"); }
- if ($fieldlist[$field]=='range_account') { $valuetoshow=$langs->trans("Comment"); }
- if ($fieldlist[$field]=='category_type') { $valuetoshow=$langs->trans("Calculated"); }
+ if ($fieldlist[$field]=='country') {
+ $valuetoshow=$langs->trans("Country");
+ }
+ if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') {
+ $showfield=0;
+ }
+ if ($fieldlist[$field]=='accountancy_code') {
+ $valuetoshow=$langs->trans("AccountancyCode");
+ }
+ if ($fieldlist[$field]=='accountancy_code_sell') {
+ $valuetoshow=$langs->trans("AccountancyCodeSell");
+ $sortable=0;
+ }
+ if ($fieldlist[$field]=='accountancy_code_buy') {
+ $valuetoshow=$langs->trans("AccountancyCodeBuy");
+ $sortable=0;
+ }
+ if ($fieldlist[$field]=='fk_pcg_version') {
+ $valuetoshow=$langs->trans("Pcg_version");
+ }
+ if ($fieldlist[$field]=='account_parent') {
+ $valuetoshow=$langs->trans("Accountsparent");
+ }
+ if ($fieldlist[$field]=='pcg_type') {
+ $valuetoshow=$langs->trans("Pcg_type");
+ }
+ if ($fieldlist[$field]=='pcg_subtype') {
+ $valuetoshow=$langs->trans("Pcg_subtype");
+ }
+ if ($fieldlist[$field]=='type_template') {
+ $valuetoshow=$langs->trans("TypeOfTemplate");
+ }
+ if ($fieldlist[$field]=='range_account') {
+ $valuetoshow=$langs->trans("Comment");
+ }
+ if ($fieldlist[$field]=='category_type') {
+ $valuetoshow=$langs->trans("Calculated");
+ }
// Affiche nom du champ
- if ($showfield)
- {
- print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable?$fieldlist[$field]:''), ($page?'page='.$page.'&':''), $param, "align=".$align, $sortfield, $sortorder);
+ if ($showfield) {
+ print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable?$fieldlist[$field]:''), ($page?'page='.$page.'&':''), $param, "", $sortfield, $sortorder, $class.' ');
}
}
- print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page?'page='.$page.'&':''), $param, 'align="center"', $sortfield, $sortorder);
+ print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page?'page='.$page.'&':''), $param, '', $sortfield, $sortorder, 'center ');
print getTitleFieldOfList('');
print getTitleFieldOfList('');
print getTitleFieldOfList('');
@@ -670,7 +721,7 @@ if ($id)
print ' ';
print ' ';
- print '';
+ print ' ';
print ' ';
print ' ';
print ' ';
@@ -732,7 +783,7 @@ if ($id)
$class='tddict';
// Show value for field
- if ($showfield) print ' '.$valuetoshow.' ';
+ if ($showfield) print ''.$valuetoshow.' ';
}
}
@@ -750,7 +801,7 @@ if ($id)
$url.='&';
// Active
- print '';
+ print ' ';
if ($canbedisabled) print ''.$actl[$obj->active].' ';
else
{
@@ -759,13 +810,13 @@ if ($id)
print " ";
// Modify link
- if ($canbemodified) print ''.img_edit().' ';
+ if ($canbemodified) print ''.img_edit().' ';
else print ' ';
// Delete link
if ($iserasable)
{
- print '';
+ print ' ';
if ($user->admin) print ''.img_delete().' ';
//else print ''.img_delete().' '; // Some dictionary can be edited by other profile than admin
print ' ';
diff --git a/htdocs/accountancy/admin/closure.php b/htdocs/accountancy/admin/closure.php
index 8093a2fa883..ff559332316 100644
--- a/htdocs/accountancy/admin/closure.php
+++ b/htdocs/accountancy/admin/closure.php
@@ -32,8 +32,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
$langs->loadLangs(array("compta","admin","accountancy"));
// Security check
-if (empty($user->rights->accounting->chartofaccount))
-{
+if (empty($user->rights->accounting->chartofaccount)) {
accessforbidden();
}
@@ -112,7 +111,7 @@ foreach ($list_account_main as $key) {
print $form->textwithpicto($label, $htmltext);
print '';
// Value
- print ''; // Do not force align=right, or it align also the content of the select box
+ print ' '; // Do not force class=right, or it align also the content of the select box
print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
print ' ';
print '';
diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index 5b39a38657f..4ea9ff9139a 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -156,7 +156,7 @@ foreach ($list_account_main as $key) {
print $form->textwithpicto($label, $htmltext);
print '';
// Value
- print ''; // Do not force align=right, or it align also the content of the select box
+ print ' '; // Do not force class=right, or it align also the content of the select box
print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
print ' ';
print '';
@@ -179,7 +179,7 @@ foreach ($list_account as $key) {
$label = $langs->trans($key);
print '' . $label . ' ';
// Value
- print ''; // Do not force align=right, or it align also the content of the select box
+ print ' '; // Do not force class=right, or it align also the content of the select box
print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
print ' ';
print '';
diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index 78fe73322f2..795edda5f4c 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -131,8 +131,8 @@ if ($result)
print '' . $langs->trans("Label") . ' ';
print '' . $langs->trans("DateStart") . ' ';
print '' . $langs->trans("DateEnd") . ' ';
- print '' . $langs->trans("NumberOfAccountancyEntries") . ' ';
- print '' . $langs->trans("NumberOfAccountancyMovements") . ' ';
+ print '' . $langs->trans("NumberOfAccountancyEntries") . ' ';
+ print '' . $langs->trans("NumberOfAccountancyMovements") . ' ';
print '' . $langs->trans("Statut") . ' ';
print '';
@@ -147,8 +147,8 @@ if ($result)
print '' . $obj->label . ' ';
print '' . dol_print_date($db->jdate($obj->date_start), 'day') . ' ';
print '' . dol_print_date($db->jdate($obj->date_end), 'day') . ' ';
- print '' . $object->getAccountancyEntriesByFiscalYear($obj->date_start, $obj->date_end) . ' ';
- print '' . $object->getAccountancyMovementsByFiscalYear($obj->date_start, $obj->date_end) . ' ';
+ print '' . $object->getAccountancyEntriesByFiscalYear($obj->date_start, $obj->date_end) . ' ';
+ print '' . $object->getAccountancyMovementsByFiscalYear($obj->date_start, $obj->date_end) . ' ';
print '' . $fiscalyearstatic->LibStatut($obj->statut, 5) . ' ';
print '';
$i++;
diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php
index 1efebf5c234..c8cf0aa9901 100644
--- a/htdocs/accountancy/admin/importaccounts.php
+++ b/htdocs/accountancy/admin/importaccounts.php
@@ -132,7 +132,7 @@ if ($result) {
print '' . $langs->trans("Accountparent") . ' ';
print '' . $langs->trans("Pcgtype") . ' ';
print '' . $langs->trans("Pcgsubtype") . ' ';
- print '' . $langs->trans("Import") . ' ';
+ print '' . $langs->trans("Import") . ' ';
print '';
$form = new Form($db);
@@ -166,7 +166,7 @@ if ($result) {
// Colonne choix ligne a ventiler
$checked = ('label' == 'O') ? ' checked' : '';
- print '';
+ print ' ';
print ' ';
print ' ';
@@ -174,7 +174,7 @@ if ($result) {
$i ++;
}
- print ' ';
+ print ' ';
print '';
print '';
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index 1e623c23860..996aa8500d2 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -430,16 +430,18 @@ if ($id)
$valuetoshow=ucfirst($fieldlist[$field]); // Par defaut
$valuetoshow=$langs->trans($valuetoshow); // try to translate
$class="left";
- if ($fieldlist[$field]=='code') { $valuetoshow=$langs->trans("Code"); }
- if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
- {
+ if ($fieldlist[$field]=='code') {
+ $valuetoshow=$langs->trans("Code");
+ }
+ if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') {
$valuetoshow=$langs->trans("Label");
}
- if ($fieldlist[$field]=='nature') { $valuetoshow=$langs->trans("Nature"); }
+ if ($fieldlist[$field]=='nature') {
+ $valuetoshow=$langs->trans("Nature");
+ }
- if ($valuetoshow != '')
- {
- print '';
+ if ($valuetoshow != '') {
+ print ' ';
if (! empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) print ''.$valuetoshow.' '.img_help(1, $valuetoshow).' ';
elseif (! empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
else print $valuetoshow;
@@ -549,17 +551,22 @@ if ($id)
*/
$valuetoshow=ucfirst($fieldlist[$field]); // By defaut
$valuetoshow=$langs->trans($valuetoshow); // try to translate
- if ($fieldlist[$field]=='code') { $valuetoshow=$langs->trans("Code"); }
- if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') { $valuetoshow=$langs->trans("Label"); }
- if ($fieldlist[$field]=='nature') { $valuetoshow=$langs->trans("Nature"); }
+ if ($fieldlist[$field]=='code') {
+ $valuetoshow=$langs->trans("Code");
+ }
+ if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') {
+ $valuetoshow=$langs->trans("Label");
+ }
+ if ($fieldlist[$field]=='nature') {
+ $valuetoshow=$langs->trans("Nature");
+ }
// Affiche nom du champ
- if ($showfield)
- {
- print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable?$fieldlist[$field]:''), ($page?'page='.$page.'&':''), $param, "align=".$align, $sortfield, $sortorder);
+ if ($showfield) {
+ print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable?$fieldlist[$field]:''), ($page?'page='.$page.'&':''), $param, "", $sortfield, $sortorder, $class.' ');
}
}
- print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page?'page='.$page.'&':''), $param, 'align="center"', $sortfield, $sortorder);
+ print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page?'page='.$page.'&':''), $param, '', $sortfield, $sortorder, 'center ');
print getTitleFieldOfList('');
print getTitleFieldOfList('');
print getTitleFieldOfList('');
@@ -621,7 +628,7 @@ if ($id)
$class='tddict';
// Show value for field
- if ($showfield) print ' '.$valuetoshow.' ';
+ if ($showfield) print ''.$valuetoshow.' ';
}
}
@@ -696,11 +703,11 @@ $db->close();
/**
* Show fields in insert/edit mode
*
- * @param array $fieldlist Array of fields
- * @param Object $obj If we show a particular record, obj is filled with record fields
- * @param string $tabname Name of SQL table
- * @param string $context 'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
- * @return void
+ * @param array $fieldlist Array of fields
+ * @param Object $obj If we show a particular record, obj is filled with record fields
+ * @param string $tabname Name of SQL table
+ * @param string $context 'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
+ * @return void
*/
function fieldListJournal($fieldlist, $obj = '', $tabname = '', $context = '')
{
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index a81aa472ef7..df8ce99fa10 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -307,7 +307,7 @@ if ($result)
print ''.$langs->trans('OptionModeProductBuyDesc')." \n";
print "\n";
- print '
';
+ print '
';
print " \n";
@@ -338,7 +338,7 @@ if ($result)
print ' '.$langs->trans("or").' '.$form->selectarray('search_current_account_valid', $listofvals, $search_current_account_valid, 1);
print '';
print ' ';
- print '';
+ print ' ';
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print ' ';
@@ -348,14 +348,14 @@ if ($result)
print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
if (! empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC)) print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "p.description", "", $param, '', $sortfield, $sortorder);
- if ($accounting_product_mode == 'ACCOUNTANCY_SELL') print_liste_field_titre("OnSell", $_SERVER["PHP_SELF"], "p.tosell", "", $param, 'align="center"', $sortfield, $sortorder);
- if ($accounting_product_mode == 'ACCOUNTANCY_BUY') print_liste_field_titre("OnBuy", $_SERVER["PHP_SELF"], "p.tobuy", "", $param, 'align="center"', $sortfield, $sortorder);
+ if ($accounting_product_mode == 'ACCOUNTANCY_SELL') print_liste_field_titre("OnSell", $_SERVER["PHP_SELF"], "p.tosell", "", $param, '', $sortfield, $sortorder, 'center ');
+ if ($accounting_product_mode == 'ACCOUNTANCY_BUY') print_liste_field_titre("OnBuy", $_SERVER["PHP_SELF"], "p.tobuy", "", $param, '', $sortfield, $sortorder, 'center ');
if ($accounting_product_mode == 'ACCOUNTANCY_BUY') $fieldtosortaccount="p.accountancy_code_buy";
else $fieldtosortaccount="p.accountancy_code_sell";
print_liste_field_titre("CurrentDedicatedAccountingAccount", $_SERVER["PHP_SELF"], $fieldtosortaccount, "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("AssignDedicatedAccountingAccount");
$clickpitco=$form->showCheckAddButtons('checkforselect', 1);
- print_liste_field_titre($clickpitco, '', '', '', '', 'align="center"');
+ print_liste_field_titre($clickpitco, '', '', '', '', '', '', '', 'center ');
print '';
$product_static = new Product($db);
@@ -408,10 +408,10 @@ if ($result)
}
if ($accounting_product_mode == 'ACCOUNTANCY_SELL')
- print ''.$product_static->getLibStatut(3, 0).' ';
+ print ''.$product_static->getLibStatut(3, 0).' ';
if ($accounting_product_mode == 'ACCOUNTANCY_BUY')
- print ''.$product_static->getLibStatut(3, 1).' ';
+ print ''.$product_static->getLibStatut(3, 1).' ';
// Current accounting account
print '';
@@ -450,7 +450,7 @@ if ($result)
}
// Checkbox select
- print ' ';
+ print ' ';
print ' ';
print "";
$i ++;
@@ -485,7 +485,7 @@ if ($result)
';
- print '
';
+ print '
';
print '';
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 4da7865624e..6d2c7644d85 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -248,7 +248,7 @@ if ($action != 'export_csv')
print_liste_field_titre("Debit", $_SERVER['PHP_SELF'], "t.debit", "", $param, 'class="right"', $sortfield, $sortorder);
print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $param, 'class="right"', $sortfield, $sortorder);
print_liste_field_titre("Balance", $_SERVER["PHP_SELF"], "", $param, "", 'class="right"', $sortfield, $sortorder);
- print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $param, "", 'width="60" align="center"', $sortfield, $sortorder);
+ print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $param, "", 'width="60" class="center"', $sortfield, $sortorder);
print "\n";
$total_debit = 0;
@@ -296,7 +296,7 @@ if ($action != 'export_csv')
print '' . price($line->debit) . ' ';
print '' . price($line->credit) . ' ';
print '' . price($line->credit - $line->debit) . ' ';
- print '' . $link;
+ print ' ' . $link;
print ' ';
print "\n";
diff --git a/htdocs/accountancy/bookkeeping/balancebymonth.php b/htdocs/accountancy/bookkeeping/balancebymonth.php
index 7b9bf25c589..edf7383b595 100644
--- a/htdocs/accountancy/bookkeeping/balancebymonth.php
+++ b/htdocs/accountancy/bookkeeping/balancebymonth.php
@@ -73,19 +73,19 @@ $y = $year_current;
print '';
print '';
print '' . $langs->trans("Label") . ' ';
-print '' . $langs->trans("JanuaryMin") . ' ';
-print '' . $langs->trans("FebruaryMin") . ' ';
-print '' . $langs->trans("MarchMin") . ' ';
-print '' . $langs->trans("AprilMin") . ' ';
-print '' . $langs->trans("MayMin") . ' ';
-print '' . $langs->trans("JuneMin") . ' ';
-print '' . $langs->trans("JulyMin") . ' ';
-print '' . $langs->trans("AugustMin") . ' ';
-print '' . $langs->trans("SeptemberMin") . ' ';
-print '' . $langs->trans("OctoberMin") . ' ';
-print '' . $langs->trans("NovemberMin") . ' ';
-print '' . $langs->trans("DecemberMin") . ' ';
-print 'Total ';
+print '' . $langs->trans("JanuaryMin") . ' ';
+print '' . $langs->trans("FebruaryMin") . ' ';
+print '' . $langs->trans("MarchMin") . ' ';
+print '' . $langs->trans("AprilMin") . ' ';
+print '' . $langs->trans("MayMin") . ' ';
+print '' . $langs->trans("JuneMin") . ' ';
+print '' . $langs->trans("JulyMin") . ' ';
+print '' . $langs->trans("AugustMin") . ' ';
+print '' . $langs->trans("SeptemberMin") . ' ';
+print '' . $langs->trans("OctoberMin") . ' ';
+print '' . $langs->trans("NovemberMin") . ' ';
+print '' . $langs->trans("DecemberMin") . ' ';
+print 'Total ';
print ' ';
$sql = "SELECT bk.numero_compte AS 'compte',";
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 7e3d3a6e68d..b3367ad1b8e 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -604,7 +604,7 @@ if ($action == 'create')
print_liste_field_titre("LabelOperation");
print_liste_field_titre("Debit", "", "", "", "", 'class="right"');
print_liste_field_titre("Credit", "", "", "", "", 'class="right"');
- print_liste_field_titre("Action", "", "", "", "", 'width="60" align="center"');
+ print_liste_field_titre("Action", "", "", "", "", 'width="60" class="center"');
print "\n";
@@ -644,7 +644,7 @@ if ($action == 'create')
print '' . price($line->debit) . ' ';
print '' . price($line->credit) . ' ';
- print '';
+ print ' ';
print 'id . '&piece_num=' . $line->piece_num . '&mode='.$mode.'">';
print img_edit();
print ' ';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index bc4b815100b..c1716dc18af 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -606,18 +606,18 @@ print "\n";
print ' ';
if (! empty($arrayfields['t.piece_num']['checked'])) print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, "", $sortfield, $sortorder);
-if (! empty($arrayfields['t.doc_date']['checked'])) print_liste_field_titre($arrayfields['t.doc_date']['label'], $_SERVER['PHP_SELF'], "t.doc_date", "", $param, 'align="center"', $sortfield, $sortorder);
+if (! empty($arrayfields['t.doc_date']['checked'])) print_liste_field_titre($arrayfields['t.doc_date']['label'], $_SERVER['PHP_SELF'], "t.doc_date", "", $param, '', $sortfield, $sortorder, 'center ');
if (! empty($arrayfields['t.doc_ref']['checked'])) print_liste_field_titre($arrayfields['t.doc_ref']['label'], $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
if (! empty($arrayfields['t.numero_compte']['checked'])) print_liste_field_titre($arrayfields['t.numero_compte']['label'], $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
if (! empty($arrayfields['t.subledger_account']['checked'])) print_liste_field_titre($arrayfields['t.subledger_account']['label'], $_SERVER['PHP_SELF'], "t.subledger_account", "", $param, "", $sortfield, $sortorder);
if (! empty($arrayfields['t.label_operation']['checked'])) print_liste_field_titre($arrayfields['t.label_operation']['label'], $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
-if (! empty($arrayfields['t.debit']['checked'])) print_liste_field_titre($arrayfields['t.debit']['label'], $_SERVER['PHP_SELF'], "t.debit", "", $param, 'class="right"', $sortfield, $sortorder);
-if (! empty($arrayfields['t.credit']['checked'])) print_liste_field_titre($arrayfields['t.credit']['label'], $_SERVER['PHP_SELF'], "t.credit", "", $param, 'class="right"', $sortfield, $sortorder);
-if (! empty($arrayfields['t.lettering_code']['checked'])) print_liste_field_titre($arrayfields['t.lettering_code']['label'], $_SERVER['PHP_SELF'], "t.lettering_code", "", $param, 'class="center"', $sortfield, $sortorder);
-if (! empty($arrayfields['t.code_journal']['checked'])) print_liste_field_titre($arrayfields['t.code_journal']['label'], $_SERVER['PHP_SELF'], "t.code_journal", "", $param, 'align="center"', $sortfield, $sortorder);
-if (! empty($arrayfields['t.date_creation']['checked'])) print_liste_field_titre($arrayfields['t.date_creation']['label'], $_SERVER['PHP_SELF'], "t.date_creation", "", $param, 'align="center"', $sortfield, $sortorder);
-if (! empty($arrayfields['t.tms']['checked'])) print_liste_field_titre($arrayfields['t.tms']['label'], $_SERVER['PHP_SELF'], "t.tms", "", $param, 'align="center"', $sortfield, $sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+if (! empty($arrayfields['t.debit']['checked'])) print_liste_field_titre($arrayfields['t.debit']['label'], $_SERVER['PHP_SELF'], "t.debit", "", $param, '', $sortfield, $sortorder, 'right ');
+if (! empty($arrayfields['t.credit']['checked'])) print_liste_field_titre($arrayfields['t.credit']['label'], $_SERVER['PHP_SELF'], "t.credit", "", $param, '', $sortfield, $sortorder, 'right ');
+if (! empty($arrayfields['t.lettering_code']['checked'])) print_liste_field_titre($arrayfields['t.lettering_code']['label'], $_SERVER['PHP_SELF'], "t.lettering_code", "", $param, '', $sortfield, $sortorder, 'center ');
+if (! empty($arrayfields['t.code_journal']['checked'])) print_liste_field_titre($arrayfields['t.code_journal']['label'], $_SERVER['PHP_SELF'], "t.code_journal", "", $param, '', $sortfield, $sortorder, 'center ');
+if (! empty($arrayfields['t.date_creation']['checked'])) print_liste_field_titre($arrayfields['t.date_creation']['label'], $_SERVER['PHP_SELF'], "t.date_creation", "", $param, '', $sortfield, $sortorder, 'center ');
+if (! empty($arrayfields['t.tms']['checked'])) print_liste_field_titre($arrayfields['t.tms']['label'], $_SERVER['PHP_SELF'], "t.tms", "", $param, '', $sortfield, $sortorder, 'center ');
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
print " \n";
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 33c7deb0cfd..8988491c927 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -286,7 +286,7 @@ print $formaccounting->select_account($search_accountancy_code_end, 'search_acco
print '';
print '';
print ' ';
-print '';
+print ' ';
print $langs->trans('From') . ': ';
print $form->selectDate($search_date_start, 'search_date_start', 0, 0, 1);
print ' ';
@@ -297,7 +297,7 @@ print ' ';
print ' ';
print ' ';
-print ' ';
+print ' ';
print '';
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
@@ -305,14 +305,14 @@ print ' ';
print '';
print_liste_field_titre("AccountAccountingShort", $_SERVER['PHP_SELF']);
-print_liste_field_titre("TransactionNumShort", $_SERVER['PHP_SELF'], "t.piece_num", "", $param, 'class="right"', $sortfield, $sortorder);
-print_liste_field_titre("Docdate", $_SERVER['PHP_SELF'], "t.doc_date", "", $param, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre("TransactionNumShort", $_SERVER['PHP_SELF'], "t.piece_num", "", $param, '', $sortfield, $sortorder, 'right ');
+print_liste_field_titre("Docdate", $_SERVER['PHP_SELF'], "t.doc_date", "", $param, '', $sortfield, $sortorder, 'center ');
print_liste_field_titre("Piece", $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
print_liste_field_titre("Label");
-print_liste_field_titre("Debit", $_SERVER['PHP_SELF'], "t.debit", "", $param, 'class="right"', $sortfield, $sortorder);
-print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $param, 'class="right"', $sortfield, $sortorder);
-print_liste_field_titre("Codejournal", $_SERVER['PHP_SELF'], "t.code_journal", "", $param, 'align="center"', $sortfield, $sortorder);
-print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $param, "", 'width="60" align="center"', $sortfield, $sortorder);
+print_liste_field_titre("Debit", $_SERVER['PHP_SELF'], "t.debit", "", $param, '', $sortfield, $sortorder, 'right ');
+print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $param, '', $sortfield, $sortorder, 'right ');
+print_liste_field_titre("Codejournal", $_SERVER['PHP_SELF'], "t.code_journal", "", $param, '', $sortfield, $sortorder, 'center ');
+print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $param, "", 'width="60"', $sortfield, $sortorder, 'center ');
print " \n";
print '';
@@ -364,7 +364,7 @@ while ($i < min($num, $limit))
print '';
print ' ';
print ''.$line->piece_num.' ';
- print '' . dol_print_date($line->doc_date, 'day') . ' ';
+ print '' . dol_print_date($line->doc_date, 'day') . ' ';
// TODO Add a link according to doc_type and fk_doc
print '';
@@ -384,9 +384,9 @@ while ($i < min($num, $limit))
$accountingjournal = new AccountingJournal($db);
$result = $accountingjournal->fetch('', $line->code_journal);
$journaltoshow = (($result > 0)?$accountingjournal->getNomUrl(0, 0, 0, '', 0) : $line->code_journal);
- print ' ' . $journaltoshow . ' ';
+ print '' . $journaltoshow . ' ';
- print '';
+ print ' ';
print '' . img_edit() . ' ';
print '' . img_delete() . ' ';
print ' ';
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
index 9bef7a1c4fc..1a91f2dafbb 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
@@ -238,12 +238,12 @@ if ($resql) {
print '' . price($obj->debit) . ' ';
print '' . price($obj->credit) . ' ';
print '' . price(round($solde, 2)) . ' ';
- print '' . $obj->code_journal . ' ';
+ print '' . $obj->code_journal . ' ';
if (empty($obj->lettering_code)) {
- print ' ';
+ print ' ';
} else
- print '' . $obj->lettering_code . ' ';
+ print '' . $obj->lettering_code . ' ';
print " \n";
}
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
index bf2b8d4f948..df1d4317252 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
@@ -240,12 +240,12 @@ if ($resql) {
print '' . price($obj->debit) . ' ';
print '' . price($obj->credit) . ' ';
print '' . price(round($solde, 2)) . ' ';
- print '' . $obj->code_journal . ' ';
+ print '' . $obj->code_journal . ' ';
if (empty($obj->lettering_code)) {
- print ' ';
+ print ' ';
} else
- print '' . $obj->lettering_code . ' ';
+ print '' . $obj->lettering_code . ' ';
print "\n";
}
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index dbd0f680db7..f7a53c9e210 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -309,7 +309,9 @@ if ($result) {
print ' ';
print ' ';
print '';
- if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ' ';
+ if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+ print ' ';
+ }
print ' ';
$formother->select_year($search_year, 'search_year', 1, 20, 5);
print ' ';
@@ -323,8 +325,8 @@ if ($result) {
//print ' ';
print '';
print ' ';
- print ' ';
- print '';
+ print ' ';
+ print '';
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print " \n";
@@ -332,17 +334,17 @@ if ($result) {
print '';
print_liste_field_titre("LineId", $_SERVER["PHP_SELF"], "fd.rowid", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "f.datef, f.ref, fd.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
+ print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "f.datef, f.ref, fd.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
print_liste_field_titre("ProductRef", $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
//print_liste_field_titre("ProductLabel", $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "fd.description", "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "fd.total_ht", "", $param, 'class="right"', $sortfield, $sortorder);
- print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "fd.tva_tx", "", $param, 'class="right"', $sortfield, $sortorder);
+ print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "fd.total_ht", "", $param, '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "fd.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ');
print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("VATIntra", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, 'align="center"', $sortfield, $sortorder);
+ print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder, 'center ');
$clickpicto=$form->showCheckAddButtons();
- print_liste_field_titre($clickpicto, '', '', '', '', 'align="center"');
+ print_liste_field_titre($clickpicto, '', '', '', '', '', '', '', 'center ');
print " \n";
$facture_static = new Facture($db);
@@ -368,7 +370,7 @@ if ($result) {
// Ref Invoice
print '' . $facture_static->getNomUrl(1) . ' ';
- print '' . dol_print_date($db->jdate($objp->datef), 'day') . ' ';
+ print '' . dol_print_date($db->jdate($objp->datef), 'day') . ' ';
// Ref Product
print '';
@@ -391,7 +393,7 @@ if ($result) {
print ' ' . $objp->tva_intra . ' ';
- print '';
+ print ' ';
print $codecompta . ' ';
print img_edit();
print ' ';
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 6a7d59a46ce..3d6469f6961 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -376,7 +376,9 @@ if ($result) {
print ' ';
print ' ';
print '';
- if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ' ';
+ if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+ print ' ';
+ }
print ' ';
$formother->select_year($search_year, 'search_year', 1, 20, 5);
print ' ';
@@ -392,7 +394,7 @@ if ($result) {
print ' ';
print ' ';
print ' ';
- print '';
+ print ' ';
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print ' ';
@@ -401,19 +403,19 @@ if ($result) {
print '';
print_liste_field_titre("LineId", $_SERVER["PHP_SELF"], "l.rowid", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "f.datef, f.ref, l.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
+ print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "f.datef, f.ref, l.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
print_liste_field_titre("ProductRef", $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
//print_liste_field_titre("ProductLabel", $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "l.description", "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "l.total_ht", "", $param, 'class="right"', $sortfield, $sortorder);
- print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, 'class="right"', $sortfield, $sortorder);
+ print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "l.total_ht", "", $param, '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ');
print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("VATIntra", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', 'align="center"');
- print_liste_field_titre("IntoAccount", '', '', '', '', 'align="center"');
+ print_liste_field_titre("VATIntra", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder, 'center ');
+ print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', '', '', '', 'center ');
+ print_liste_field_titre("IntoAccount", '', '', '', '', '', '', '', 'center ');
$checkpicto='';
if ($massactionbutton) $checkpicto=$form->showCheckAddButtons('checkforselect', 1);
- print_liste_field_titre($checkpicto, '', '', '', '', 'align="center"');
+ print_liste_field_titre($checkpicto, '', '', '', '', '', '', '', 'center ');
print " \n";
$facture_static = new Facture($db);
@@ -482,7 +484,7 @@ if ($result) {
// Ref Invoice
print '' . $facture_static->getNomUrl(1) . ' ';
- print '' . dol_print_date($db->jdate($objp->datef), 'day') . ' ';
+ print '' . dol_print_date($db->jdate($objp->datef), 'day') . ' ';
// Ref Product
print '';
@@ -513,7 +515,7 @@ if ($result) {
print ' ' . $objp->tva_intra . ' ';
// Current account
- print '';
+ print ' ';
print (($objp->type_l == 1)?$langs->trans("DefaultForService"):$langs->trans("DefaultForProduct")) . ' = ' . ($objp->code_sell_l > 0 ? length_accountg($objp->code_sell_l) : $langs->trans("Unknown"));
if ($objp->product_id > 0)
{
@@ -523,12 +525,12 @@ if ($result) {
print ' ';
// Suggested accounting account
- print '';
+ print ' ';
print $formaccounting->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'codeventil maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
print ' ';
// Column with checkbox
- print '';
+ print ' ';
print ' aarowid ? "checked" : "") . '/>';
print ' ';
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index 5dbacd501b9..3a322c07ef3 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -270,7 +270,7 @@ if ($result) {
print ' ';
print ' ';
print ' ';
- print ' ';
+ print ' ';
print ' ';
print ' ';
print '';
@@ -282,15 +282,15 @@ if ($result) {
print ' ';
print_liste_field_titre("LineId", $_SERVER["PHP_SELF"], "erd.rowid", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("ExpenseReport", $_SERVER["PHP_SELF"], "er.ref", "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "erd.date, erd.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
+ print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "erd.date, erd.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
print_liste_field_titre("TypeFees", $_SERVER["PHP_SELF"], "f.label", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "erd.comments", "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "erd.total_ht", "", $param, 'class="right"', $sortfield, $sortorder);
- print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "erd.tva_tx", "", $param, 'align="center"', $sortfield, $sortorder);
+ print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "erd.total_ht", "", $param, '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "erd.tva_tx", "", $param, '', $sortfield, $sortorder, 'center ');
print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre('');
$checkpicto=$form->showCheckAddButtons();
- print_liste_field_titre($checkpicto, '', '', '', '', 'align="center"');
+ print_liste_field_titre($checkpicto, '', '', '', '', '', '', '', 'center ');
print " \n";
$expensereport_static = new ExpenseReport($db);
@@ -309,7 +309,7 @@ if ($result) {
// Ref Invoice
print '' . $expensereport_static->getNomUrl(1) . ' ';
- print '' . dol_print_date($db->jdate($objp->date), 'day') . ' ';
+ print '' . dol_print_date($db->jdate($objp->date), 'day') . ' ';
print '' . ($langs->trans($objp->type_fees_code) == $objp->type_fees_code ? $objp->type_fees_label : $langs->trans(($objp->type_fees_code))) . ' ';
@@ -321,7 +321,7 @@ if ($result) {
print '' . price($objp->total_ht) . ' ';
- print '' . vatrate($objp->tva_tx.($objp->vat_src_code?' ('.$objp->vat_src_code.')':'')) . ' ';
+ print '' . vatrate($objp->tva_tx.($objp->vat_src_code?' ('.$objp->vat_src_code.')':'')) . ' ';
print '' . $codeCompta . ' ';
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 9d28206a91e..a6bec0246a0 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -319,7 +319,7 @@ if ($result) {
print ' ';
print ' ';
print ' ';
- print '';
+ print ' ';
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print ' ';
@@ -328,16 +328,16 @@ if ($result) {
print '';
print_liste_field_titre("LineId", $_SERVER["PHP_SELF"], "erd.rowid", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("ExpenseReport", $_SERVER["PHP_SELF"], "er.ref", "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "erd.date, erd.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
+ print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "erd.date, erd.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
print_liste_field_titre("TypeFees", $_SERVER["PHP_SELF"], "f.label", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "erd.comments", "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "erd.total_ht", "", $param, 'class="right"', $sortfield, $sortorder);
- print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "erd.tva_tx", "", $param, 'class="right"', $sortfield, $sortorder);
- print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', 'align="center"', $sortfield, $sortorder);
- print_liste_field_titre("IntoAccount", '', '', '', '', 'align="center"', $sortfield, $sortorder);
+ print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "erd.total_ht", "", $param, '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "erd.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', '', $sortfield, $sortorder, 'center ');
+ print_liste_field_titre("IntoAccount", '', '', '', '', '', $sortfield, $sortorder, 'center ');
$checkpicto='';
if ($massactionbutton) $checkpicto=$form->showCheckAddButtons('checkforselect', 1);
- print_liste_field_titre($checkpicto, '', '', '', '', 'align="center"');
+ print_liste_field_titre($checkpicto, '', '', '', '', '', '', '', 'center ');
print " \n";
@@ -362,7 +362,7 @@ if ($result) {
print '' . $expensereport_static->getNomUrl(1) . ' ';
// Date
- print '' . dol_print_date($db->jdate($objp->date), 'day') . ' ';
+ print '' . dol_print_date($db->jdate($objp->date), 'day') . ' ';
// Fees label
print '';
@@ -386,16 +386,16 @@ if ($result) {
print ' ';
// Current account
- print '';
+ print ' ';
print length_accountg(html_entity_decode($objp->code_buy));
print ' ';
// Suggested accounting account
- print '';
+ print ' ';
print $formaccounting->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'codeventil maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
print ' ';
- print '';
+ print ' ';
print ' aarowid ? "checked" : "") . '/>';
print ' ';
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 0c5ba39bd94..275af10701d 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -994,8 +994,8 @@ if (empty($action) || $action == 'view') {
print "" . $langs->trans("SubledgerAccount") . " ";
print "" . $langs->trans("LabelOperation") . " ";
print "" . $langs->trans("PaymentMode") . " ";
- print "" . $langs->trans("Debit") . " ";
- print "" . $langs->trans("Credit") . " ";
+ print "" . $langs->trans("Debit") . " ";
+ print "" . $langs->trans("Credit") . " ";
print "\n";
$r = '';
@@ -1044,8 +1044,8 @@ if (empty($action) || $action == 'view') {
print $reflabel;
print "";
print "" . $val["type_payment"] . " ";
- print "" . ($mt >= 0 ? price($mt) : '') . " ";
- print "" . ($mt < 0 ? price(- $mt) : '') . " ";
+ print "" . ($mt >= 0 ? price($mt) : '') . " ";
+ print "" . ($mt < 0 ? price(- $mt) : '') . " ";
print "";
}
}
@@ -1126,8 +1126,8 @@ if (empty($action) || $action == 'view') {
print "";
print "" . $reflabel . " ";
print "" . $val["type_payment"] . " ";
- print "" . ($mt < 0 ? price(- $mt) : '') . " ";
- print "" . ($mt >= 0 ? price($mt) : '') . " ";
+ print "" . ($mt < 0 ? price(- $mt) : '') . " ";
+ print "" . ($mt >= 0 ? price($mt) : '') . " ";
print "";
}
}
@@ -1163,8 +1163,8 @@ if (empty($action) || $action == 'view') {
print "";
print "" . $reflabel . " ";
print "" . $val["type_payment"] . " ";
- print "" . ($mt < 0 ? price(- $mt) : '') . " ";
- print "" . ($mt >= 0 ? price($mt) : '') . " ";
+ print "" . ($mt < 0 ? price(- $mt) : '') . " ";
+ print "" . ($mt >= 0 ? price($mt) : '') . " ";
print "";
}
}
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 1c687fb98cc..4af51060b4b 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -328,8 +328,8 @@ if ($result) {
// print ' ';
print '';
print ' ';
- print ' ';
- print '';
+ print ' ';
+ print '';
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print ' ';
@@ -339,17 +339,17 @@ if ($result) {
print_liste_field_titre("LineId", $_SERVER["PHP_SELF"], "l.rowid", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("InvoiceLabel", $_SERVER["PHP_SELF"], "f.libelle", "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "f.datef, f.ref, l.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
+ print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "f.datef, f.ref, l.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
print_liste_field_titre("ProductRef", $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
//print_liste_field_titre("ProductLabel", $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "l.description", "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "l.total_ht", "", $param, 'class="right"', $sortfield, $sortorder);
- print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, 'class="right"', $sortfield, $sortorder);
+ print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "l.total_ht", "", $param, '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ');
print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("VATIntra", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, 'align="center"', $sortfield, $sortorder);
+ print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder, 'center ');
$checkpicto=$form->showCheckAddButtons();
- print_liste_field_titre($checkpicto, '', '', '', '', 'align="center"');
+ print_liste_field_titre($checkpicto, '', '', '', '', '', '', '', 'center ');
print "\n";
$facturefournisseur_static = new FactureFournisseur($db);
@@ -380,7 +380,7 @@ if ($result) {
print $objp->invoice_label;
print '';
- print '' . dol_print_date($db->jdate($objp->datef), 'day') . ' ';
+ print '' . dol_print_date($db->jdate($objp->datef), 'day') . ' ';
// Ref product
print '';
@@ -404,7 +404,7 @@ if ($result) {
print ' ' . $objp->tva_intra . ' ';
- print '';
+ print ' ';
print $codecompta . ' ';
print img_edit();
print ' ';
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index f864824c740..156f98fc6a2 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -392,7 +392,7 @@ if ($result) {
print ' ';
print ' ';
print ' ';
- print '';
+ print ' ';
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print ' ';
@@ -402,19 +402,19 @@ if ($result) {
print_liste_field_titre("LineId", $_SERVER["PHP_SELF"], "l.rowid", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("InvoiceLabel", $_SERVER["PHP_SELF"], "f.libelle", "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "f.datef, f.ref, l.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
+ print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "f.datef, f.ref, l.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
print_liste_field_titre("ProductRef", $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
//print_liste_field_titre("ProductLabel", $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "l.description", "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "l.total_ht", "", $param, 'class="right"', $sortfield, $sortorder);
- print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, 'class="right"', $sortfield, $sortorder);
+ print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "l.total_ht", "", $param, '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ');
print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("VATIntra", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', 'align="center"');
- print_liste_field_titre("IntoAccount", '', '', '', '', 'align="center"');
+ print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', '', '', '', 'center ');
+ print_liste_field_titre("IntoAccount", '', '', '', '', '', '', '', 'center ');
$checkpicto='';
if ($massactionbutton) $checkpicto=$form->showCheckAddButtons('checkforselect', 1);
- print_liste_field_titre($checkpicto, '', '', '', '', 'align="center"');
+ print_liste_field_titre($checkpicto, '', '', '', '', '', '', '', 'center ');
print "\n";
$facturefourn_static = new FactureFournisseur($db);
@@ -475,7 +475,7 @@ if ($result) {
print $objp->invoice_label;
print '';
- print '' . dol_print_date($db->jdate($objp->datef), 'day') . ' ';
+ print '' . dol_print_date($db->jdate($objp->datef), 'day') . ' ';
// Ref product
print '';
@@ -506,7 +506,7 @@ if ($result) {
print ' ' . $objp->tva_intra . ' ';
// Current account
- print '';
+ print ' ';
print (($objp->type_l == 1)?$langs->trans("DefaultForService"):$langs->trans("DefaultForProduct")) . ' = ' . ($objp->code_buy_l > 0 ? length_accountg($objp->code_buy_l) : $langs->trans("Unknown"));
if ($objp->product_id > 0)
{
@@ -516,12 +516,12 @@ if ($result) {
print ' ';
// Suggested accounting account
- print '';
+ print ' ';
print $formaccounting->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'codeventil maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
print ' ';
// Column with checkbox
- print '';
+ print ' ';
print ' aarowid ? "checked" : "") . '/>';
print ' ';