diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php index 6f30f5ac7ec..da726597345 100644 --- a/htdocs/accountancy/admin/accountmodel.php +++ b/htdocs/accountancy/admin/accountmodel.php @@ -456,7 +456,7 @@ if ($id) print ''; print '
'; - print ''; + print '
'; // Form to add a new line if ($tabname[$id]) diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php index f54c477ff52..faab333890b 100644 --- a/htdocs/accountancy/admin/card.php +++ b/htdocs/accountancy/admin/card.php @@ -220,7 +220,7 @@ if ($action == 'create') { dol_fiche_head(); - print '
'; + print '
'; // Chart of account print ''; @@ -291,7 +291,7 @@ elseif ($id > 0 || $ref) { print ''; print ''; - print '
' . $langs->trans("Chartofaccounts") . '
'; + print '
'; // Account number print ''; @@ -348,7 +348,7 @@ elseif ($id > 0 || $ref) { print '
'; print '
'; - print '
' . $langs->trans("AccountNumber") . '
'; + print '
'; // Label print ''; diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php index 5fdd43eb020..8313a45a504 100644 --- a/htdocs/accountancy/admin/categories.php +++ b/htdocs/accountancy/admin/categories.php @@ -104,7 +104,7 @@ print ''; dol_fiche_head(); -print '
' . $langs->trans("Label") . '
'; +print '
'; // Select the category print ''; diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php index 852349d0516..f3f3efa572c 100644 --- a/htdocs/accountancy/admin/categories_list.php +++ b/htdocs/accountancy/admin/categories_list.php @@ -449,7 +449,7 @@ if ($id) print ''; print '
'; - print '
' . $langs->trans("AccountingCategory") . '
'; + print '
'; // Form to add a new line if ($tabname[$id]) diff --git a/htdocs/accountancy/admin/closure.php b/htdocs/accountancy/admin/closure.php index a9199959905..cc69462d893 100644 --- a/htdocs/accountancy/admin/closure.php +++ b/htdocs/accountancy/admin/closure.php @@ -96,7 +96,7 @@ print '' print ''; // Define main accounts for closure -print '
'; +print '
'; foreach ($list_account_main as $key) { print ''; diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php index 6b47578761c..78d438aa4da 100644 --- a/htdocs/accountancy/admin/defaultaccounts.php +++ b/htdocs/accountancy/admin/defaultaccounts.php @@ -140,7 +140,7 @@ print ''; // Define main accounts for thirdparty -print '
'; +print '
'; foreach ($list_account_main as $key) { print ''; @@ -167,7 +167,7 @@ print '
'; // Define default accounts -print '
'; +print '
'; foreach ($list_account as $key) { print ''; diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php index e506f5bf512..8cda5284ba8 100644 --- a/htdocs/accountancy/admin/export.php +++ b/htdocs/accountancy/admin/export.php @@ -195,7 +195,7 @@ print ''; * Main Options */ -print '
'; +print '
'; print ''; print ''; print "\n"; @@ -223,7 +223,7 @@ print "
\n"; /* * Export model */ -print '
' . $langs->trans('Options') . '
'; +print '
'; print ''; print ''; @@ -254,7 +254,7 @@ print "
\n"; $num2 = count($model_option); if ($num2) { - print '
' . $langs->trans("Modelcsv") . '
'; + print '
'; print ''; print ''; print "\n"; diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php index 5b1fa9df4ec..6d321e60756 100644 --- a/htdocs/accountancy/admin/fiscalyear.php +++ b/htdocs/accountancy/admin/fiscalyear.php @@ -120,7 +120,7 @@ if ($result) // Load attribute_label print '
'; - print '
' . $langs->trans('OtherOptions') . '
'; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php index 42b9d231fe3..31000b8ec8a 100644 --- a/htdocs/accountancy/admin/fiscalyear_card.php +++ b/htdocs/accountancy/admin/fiscalyear_card.php @@ -163,7 +163,7 @@ if ($action == 'create') dol_fiche_head(); - print '
' . $langs->trans("Ref") . '' . $langs->trans("Label") . '
'; + print '
'; // Label print ''; @@ -211,7 +211,7 @@ if ($action == 'create') print ''; print ''; - print '
' . $langs->trans("Label") . '
'; + print '
'; // Ref print ""; @@ -261,7 +261,7 @@ if ($action == 'create') dol_fiche_head($head, 'card', $langs->trans("Fiscalyear"), 0, 'cron'); - print '
'; + print '
'; $linkback = '' . $langs->trans("BackToList") . ''; diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php index 0460f31af30..dcc2e608f0b 100644 --- a/htdocs/accountancy/admin/index.php +++ b/htdocs/accountancy/admin/index.php @@ -172,7 +172,7 @@ print ''; // Default mode for calculating turnover (parameter ACCOUNTING_MODE) /* -print '
'; +print '
'; print ''; print ''; @@ -202,7 +202,7 @@ print '
'; // Others params -print '
' . $langs->trans('OptionMode') . '' . $langs->trans('Description') . '
'; +print '
'; print ''; print ''; print "\n"; diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php index 44fe3e936cd..b0eaff04494 100644 --- a/htdocs/accountancy/admin/journals_list.php +++ b/htdocs/accountancy/admin/journals_list.php @@ -412,7 +412,7 @@ if ($id) print ''; print '
'; - print '
' . $langs->trans('OtherOptions') . '
'; + print '
'; // Form to add a new line if ($tabname[$id]) diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php index 091018dc909..0ed3254f484 100644 --- a/htdocs/accountancy/admin/productaccount.php +++ b/htdocs/accountancy/admin/productaccount.php @@ -325,7 +325,7 @@ if ($result) print '
'; // Select mode - print '
'; + print '
'; print ''; print ''; print "\n"; diff --git a/htdocs/accountancy/bookkeeping/balancebymonth.php b/htdocs/accountancy/bookkeeping/balancebymonth.php index bdc78911513..1d77a9a2186 100644 --- a/htdocs/accountancy/bookkeeping/balancebymonth.php +++ b/htdocs/accountancy/bookkeeping/balancebymonth.php @@ -70,7 +70,7 @@ if ($result) { $y = $year_current; -print '
' . $langs->trans('Options') . '' . $langs->trans('Description') . '
'; +print '
'; print ''; print ''; for($i = 1; $i <= 12; $i++) diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php index ca6403279e1..80c9ffb7792 100644 --- a/htdocs/accountancy/bookkeeping/card.php +++ b/htdocs/accountancy/bookkeeping/card.php @@ -354,7 +354,7 @@ if ($action == 'create') dol_fiche_head(); - print '
' . $langs->trans("Label") . '
'; + print '
'; /*print ''; print ''; diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php index 8a04e8b621a..4e96bf64602 100644 --- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php +++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php @@ -205,7 +205,7 @@ if ($resql) { print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, $letteringbutton, '', $limit); print '
'; - print '
' . $langs->trans("NumPiece") . '
'."\n"; + print '
'."\n"; /* print ''; diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php index f9cf57df344..d35eba34963 100644 --- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php +++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php @@ -203,7 +203,7 @@ if ($resql) { print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, $letteringbutton, '', $limit); print '
'; - print '
'."\n"; + print '
'."\n"; /* print ''; diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php index 0cfc0d24826..b244d8be123 100644 --- a/htdocs/accountancy/class/accountingaccount.class.php +++ b/htdocs/accountancy/class/accountingaccount.class.php @@ -154,7 +154,7 @@ class AccountingAccount extends CommonObject * @param int $rowid Id * @param string $account_number Account number * @param int|boolean $limittocurrentchart 1 or true=Load record only if it is into current active char of account - * @param string $limittoachartaccount 'ABC'=Load record only if it is into chart account with code 'ABC'. + * @param string $limittoachartaccount 'ABC'=Load record only if it is into chart account with code 'ABC' (better and faster than previous parameter if you have chart of account code). * @return int <0 if KO, 0 if not found, Id of record if OK and found */ public function fetch($rowid = null, $account_number = null, $limittocurrentchart = 0, $limittoachartaccount = '') diff --git a/htdocs/accountancy/closure/index.php b/htdocs/accountancy/closure/index.php index 599742460ae..35c556807f8 100644 --- a/htdocs/accountancy/closure/index.php +++ b/htdocs/accountancy/closure/index.php @@ -86,7 +86,7 @@ $buttonbind = '' . $langs->trans("Val print_barre_liste($langs->trans("OverviewOfMovementsNotValidated"), '', '', '', '', '', '', -1, '', '', 0, $buttonbind, '', 0, 1, 1); print '
'; -print '
'; +print '
'; for($i = 1; $i <= 12; $i ++) { $j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1; if ($j > 12) $j-=12; diff --git a/htdocs/accountancy/closure/validate.php b/htdocs/accountancy/closure/validate.php index 0498e5e2dec..0b079c57b20 100644 --- a/htdocs/accountancy/closure/validate.php +++ b/htdocs/accountancy/closure/validate.php @@ -106,7 +106,7 @@ $y = $year_current; print_barre_liste($langs->trans("SelectMonthAndValidate"), '', '', '', '', '', '', -1, '', '', 0, '', 'class="right"', 0, 1, 1); print '
'; -print '
'; +print '
'; print ''; for($i = 1; $i <= 12; $i ++) { $j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1; diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php index 62ae458d283..6b64d969518 100644 --- a/htdocs/accountancy/customer/card.php +++ b/htdocs/accountancy/customer/card.php @@ -123,7 +123,7 @@ if (! empty($id)) { dol_fiche_head(); - print '
'; + print '
'; // Ref facture print ''; diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php index b3ef45c1feb..2aa6072f2c2 100644 --- a/htdocs/accountancy/customer/index.php +++ b/htdocs/accountancy/customer/index.php @@ -225,7 +225,7 @@ print_barre_liste($langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', //print load_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, ''); print '
'; -print '
' . $langs->trans("Invoice") . '
'; +print '
'; print ''; print ''; for($i = 1; $i <= 12; $i ++) { @@ -300,7 +300,7 @@ print_barre_liste($langs->trans("OverviewOfAmountOfLinesBound"), '', '', '', '', //print load_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), '', ''); print '
'; -print '
' . $langs->trans("Account") . '' . $langs->trans("Label") . '
'; +print '
'; print ''; print ''; for($i = 1; $i <= 12; $i ++) { @@ -379,7 +379,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange. //print load_fiche_titre($langs->trans("OtherInfo"), '', ''); print '
'; - print '
' . $langs->trans("Account") . '' . $langs->trans("Label") . '
'; + print '
'; print ''; for($i = 1; $i <= 12; $i ++) { $j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1; @@ -431,7 +431,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange. if (! empty($conf->margin->enabled)) { print "
\n"; print '
'; - print '
' . $langs->trans("TotalVente") . '
'; + print '
'; print ''; for($i = 1; $i <= 12; $i ++) { $j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1; diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php index ae076a414cb..f08b4e8d42d 100644 --- a/htdocs/accountancy/customer/list.php +++ b/htdocs/accountancy/customer/list.php @@ -406,6 +406,8 @@ if ($result) { $isSellerInEEC = isInEEC($mysoc); + $accountingaccount_codetotid_cache = array(); + while ($i < min($num_lines, $limit)) { $objp = $db->fetch_object($result); @@ -474,8 +476,8 @@ if ($result) { } } - if (! empty($objp->code_sell)) { - //$objp->code_sell_p = $objp->code_sell; // Code on product + if (! empty($objp->code_sell_p)) { + // Value was defined previously } else { $code_sell_p_notset = 'color:orange'; } @@ -547,11 +549,26 @@ if ($result) { print ''; // Suggested accounting account + // $objp->code_sell_l = default (it takes the country into consideration), $objp->code_sell_p is value for product (it takes the country into consideration too) print ''; diff --git a/htdocs/accountancy/expensereport/card.php b/htdocs/accountancy/expensereport/card.php index 8ee9f9c625d..0d0e6509769 100644 --- a/htdocs/accountancy/expensereport/card.php +++ b/htdocs/accountancy/expensereport/card.php @@ -125,7 +125,7 @@ if (! empty($id)) { dol_fiche_head(); - print '
' . $langs->trans("TotalMarge") . ''; $suggestedid = $objp->aarowid_suggest; - if (empty($suggestedid) && empty($objp->code_sell_p) && ! empty($objp->code_sell_l) && ! empty($conf->global->ACCOUNTANCY_AUTOFILL_ACCOUNT_WITH_GENERIC)) + /*var_dump($suggestedid); + var_dump($objp->code_sell_p); + var_dump($objp->code_sell_l);*/ + if (empty($suggestedid) && empty($objp->code_sell_p) && ! empty($objp->code_sell_l) && empty($conf->global->ACCOUNTANCY_DO_NOT_AUTOFILL_ACCOUNT_WITH_GENERIC)) { - //$suggestedid = // id of $objp->code_sell_l + if (empty($accountingaccount_codetotid_cache[$objp->code_sell_l])) + { + $tmpaccount = new AccountingAccount($db); + $tmpaccount->fetch(0, $objp->code_sell_l, 1); + if ($tmpaccount->id > 0) { + $suggestedid = $tmpaccount->id; + } + $accountingaccount_codetotid_cache[$objp->code_sell_l] = $tmpaccount->id; + } + else { + $suggestedid = $accountingaccount_codetotid_cache[$objp->code_sell_l]; + } } print $formaccounting->select_account($suggestedid, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'codeventil maxwidth200 maxwidthonsmartphone', 'cachewithshowemptyone'); print '
'; + print '
'; // Ref print ''; diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php index 4efc8a15ba4..29fe4a7aea3 100644 --- a/htdocs/accountancy/expensereport/index.php +++ b/htdocs/accountancy/expensereport/index.php @@ -152,7 +152,7 @@ print_barre_liste($langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', //print load_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, ''); print '
'; -print '
' . $langs->trans("ExpenseReport") . '
'; +print '
'; print ''; print ''; for($i = 1; $i <= 12; $i ++) { @@ -223,7 +223,7 @@ print_barre_liste($langs->trans("OverviewOfAmountOfLinesBound"), '', '', '', '', print '
'; -print '
' . $langs->trans("Account") . '' . $langs->trans("Label") . '
'; +print '
'; print ''; print ''; for($i = 1; $i <= 12; $i ++) { @@ -297,7 +297,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange. //print load_fiche_titre($langs->trans("OtherInfo"), '', ''); print '
'; - print '
' . $langs->trans("Account") . '' . $langs->trans("Label") . '
'; + print '
'; print ''; for($i = 1; $i <= 12; $i ++) { $j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1; diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php index 63bce528ccb..e39decd7c57 100644 --- a/htdocs/accountancy/supplier/card.php +++ b/htdocs/accountancy/supplier/card.php @@ -125,7 +125,7 @@ if (! empty($id)) { dol_fiche_head(); - print '
' . $langs->trans("Total") . '
'; + print '
'; // ref invoice print ''; diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php index a1eb1ce4a45..945c5567b0b 100644 --- a/htdocs/accountancy/supplier/index.php +++ b/htdocs/accountancy/supplier/index.php @@ -223,7 +223,7 @@ print_barre_liste($langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', //print load_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, ''); print '
'; -print '
' . $langs->trans("BillsSuppliers") . '
'; +print '
'; print ''; print ''; for($i = 1; $i <= 12; $i ++) { @@ -293,7 +293,7 @@ print_barre_liste($langs->trans("OverviewOfAmountOfLinesBound"), '', '', '', '', //print load_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), '', ''); print '
'; -print '
' . $langs->trans("Account") . '' . $langs->trans("Label") . '
'; +print '
'; print ''; print ''; for($i = 1; $i <= 12; $i ++) { @@ -366,7 +366,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange. //print load_fiche_titre($langs->trans("OtherInfo"), '', ''); print '
'; - print '
' . $langs->trans("Account") . '' . $langs->trans("Label") . '
'; + print '
'; print ''; for($i = 1; $i <= 12; $i ++) { $j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1; diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php index 526b325c7ac..d7d78184e6f 100644 --- a/htdocs/adherents/admin/adherent.php +++ b/htdocs/adherents/admin/adherent.php @@ -154,7 +154,7 @@ print ''; print ''; print load_fiche_titre($langs->trans("MemberMainOptions"), '', ''); -print '
' . $langs->trans("Total") . '
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php index 97392b902bc..f0dd8ac58d7 100644 --- a/htdocs/adherents/admin/website.php +++ b/htdocs/adherents/admin/website.php @@ -163,7 +163,7 @@ if (! empty($conf->global->MEMBER_ENABLE_PUBLIC)) { print '
'; - print '
'.$langs->trans("Description").''.$langs->trans("Value").'
'; + print '
'; print ''; print ''; diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index ee89f6b9de3..417d4cd2c99 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -938,7 +938,7 @@ else dol_fiche_head(''); - print '
'.$langs->trans("Parameter").'
'; + print '
'; print ''; // Login @@ -1182,7 +1182,7 @@ else dol_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user'); - print '
'; + print '
'; // Ref print ''; diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index a0dc9b81a86..67adb031427 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -167,7 +167,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele if ($conf->use_javascript_ajax) { print '
'; - print '
'.$langs->trans("Ref").''.$object->id.'
'; + print '
'; print ''; print '
'.$langs->trans("Statistics").'
'; @@ -249,7 +249,7 @@ if ($result) } print '
'; -print ''; +print '
'; print ''; print ''; print ''; @@ -311,7 +311,7 @@ $resql=$db->query($sql); if ($resql) { print '
'; - print '
'.$langs->trans("Year").''.$langs->trans("Subscriptions").'
'; + print '
'; print ''; print ''; @@ -374,7 +374,7 @@ $resql=$db->query($sql); if ($resql) { print '
'; - print '
'.$langs->trans("LastMembersModified", $max).'
'; + print '
'; print ''; print ''; @@ -420,7 +420,7 @@ else // Summary of members by type print '
'; -print '
'.$langs->trans("LastSubscriptionsModified", $max).'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php index b2f302fea45..e75e1a61e70 100644 --- a/htdocs/adherents/stats/byproperties.php +++ b/htdocs/adherents/stats/byproperties.php @@ -117,7 +117,7 @@ else } // Print array -print '
'.$langs->trans("MembersTypes").''.$langs->trans("MembersStatusToValid").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php index 3c469e658e5..956a71112cb 100644 --- a/htdocs/adherents/stats/geo.php +++ b/htdocs/adherents/stats/geo.php @@ -294,7 +294,7 @@ if (count($arrayjs) && $mode == 'memberbycountry') if ($mode) { // Print array / Affiche le tableau - print '
'.$langs->trans("Nature").''.$langs->trans("NbOfMembers").'
'; + print '
'; print ''; print ''; if ($label2) print ''; diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php index d89a8a4a8c0..f02c012a48e 100644 --- a/htdocs/adherents/stats/index.php +++ b/htdocs/adherents/stats/index.php @@ -145,7 +145,7 @@ print '
'; // Show filter box /*print '
'; -print '
'.$label.''.$label2.'
'; +print '
'; print ''; print '
'.$langs->trans("Filter").'
'.$langs->trans("Member").''; print $form->select_company($id,'memberid','',1); @@ -211,7 +211,7 @@ print '
'; // Show graphs -print '
'; +print '
'; if ($mesg) { print $mesg; } else { print $px1->show(); diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php index 415efdc8570..f2250af5790 100644 --- a/htdocs/adherents/subscription.php +++ b/htdocs/adherents/subscription.php @@ -689,7 +689,7 @@ if ($rowid > 0) $num = $db->num_rows($result); $i = 0; - print ''."\n"; + print '
'."\n"; print ''; print_liste_field_titre('Ref', $_SERVER["PHP_SELF"], 'c.rowid', '', $param, '', $sortfield, $sortorder); diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php index 0a40f441e92..aa203ffca42 100644 --- a/htdocs/adherents/subscription/card.php +++ b/htdocs/adherents/subscription/card.php @@ -197,7 +197,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit') $linkback = ''.$langs->trans("BackToList").''; print "\n"; - print '
'; + print '
'; // Ref print ''; @@ -307,7 +307,7 @@ if ($rowid && $action != 'edit') print '
'; - print '
'.$langs->trans("Ref").'
'; + print '
'; // Member $adh->ref=$adh->getFullName($langs); diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index b6f8abe27da..68d82c5d12a 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -337,7 +337,7 @@ if ($action == 'create') dol_fiche_head(''); - print '
'; + print '
'; print ''; print ''; @@ -430,7 +430,7 @@ if ($rowid > 0) print '
'; print '
'; - print '
'.$langs->trans("Label").'
'; + print '
'; print '
'.$langs->trans("Status").''; if ( !empty($object->statut) ) { @@ -787,7 +787,7 @@ if ($rowid > 0) dol_fiche_head($head, 'card', $langs->trans("MemberType"), 0, 'group'); - print ''; + print '
'; print ''; diff --git a/htdocs/adherents/type_ldap.php b/htdocs/adherents/type_ldap.php index 35704c592f9..847c259b6b2 100644 --- a/htdocs/adherents/type_ldap.php +++ b/htdocs/adherents/type_ldap.php @@ -99,7 +99,7 @@ dol_banner_tab($object, 'rowid', $linkback); print '
'; print '
'; -print '
'.$langs->trans("Ref").''.$object->id.'
'; +print '
'; // LDAP DN print '\n"; diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php index 5a4f84868e1..673b6ef55b8 100644 --- a/htdocs/adherents/type_translation.php +++ b/htdocs/adherents/type_translation.php @@ -232,7 +232,7 @@ if ($action == 'edit') print "
".($s?$s.' ':'')." ".$langs->trans('Language_'.$key).": ".''.img_delete('', 'class="valigntextbottom"')."
"; print '
'; - print '
LDAP '.$langs->trans("LDAPMemberTypeDn").''.$conf->global->LDAP_MEMBER_TYPE_DN."
'; + print '
'; print ''; print '
'.$langs->trans('Label').'
'.$langs->trans('Description').''; $doleditor = new DolEditor("desc-$key", $object->multilangs[$key]["description"], '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%'); @@ -264,7 +264,7 @@ elseif ($action != 'add') print '
'; print '
'; - print ''; + print '
'; print ''; print ''; print '
'.$langs->trans('Label').''.$object->multilangs[$key]["label"].'
'.$langs->trans('Description').''.$object->multilangs[$key]["description"].'
'; @@ -293,7 +293,7 @@ if ($action == 'add' && $user->rights->adherent->configurer) dol_fiche_head(); - print ''; + print '
'; print ''; diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php index bfde50618cc..3f2e89f4f92 100644 --- a/htdocs/admin/accountant.php +++ b/htdocs/admin/accountant.php @@ -109,7 +109,7 @@ print '' print ''; print ''; -print '
'.$langs->trans('Language').''; print $formadmin->select_language('', 'forcelangprod', 0, $object->multilangs, 1); print '
'; +print '
'; print ''."\n"; // Name diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php index c253f6cbe91..0a87f4eda17 100644 --- a/htdocs/admin/agenda.php +++ b/htdocs/admin/agenda.php @@ -141,7 +141,7 @@ print ''.$langs->trans("AgendaAutoActionDesc")." ".$ print "
\n"; print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table -print '
'.$langs->trans("CompanyInfo").''.$langs->trans("Value").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php index 17fc773904f..970d8675873 100644 --- a/htdocs/admin/agenda_other.php +++ b/htdocs/admin/agenda_other.php @@ -221,7 +221,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { print load_fiche_titre($langs->trans("AgendaModelModule"), '', ''); - print '
'."\n"; + print '
'."\n"; print ''."\n"; print ''."\n"; print ''."\n"; diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php index f3c16941ebc..b5f3fbafdc3 100644 --- a/htdocs/admin/agenda_xcal.php +++ b/htdocs/admin/agenda_xcal.php @@ -87,7 +87,7 @@ dol_fiche_head($head, 'xcal', $langs->trans("Agenda"), -1, 'action'); print ''.$langs->trans("AgendaSetupOtherDesc")."
\n"; print "
\n"; -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ""; @@ -121,7 +121,7 @@ print '
".$langs->trans("Parameter")."
'; print '
'; -print ''; +print '
'; print ''; print '"; diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php index 70b273e2fcc..c0150ce5111 100644 --- a/htdocs/admin/bank.php +++ b/htdocs/admin/bank.php @@ -233,7 +233,7 @@ dol_fiche_head($head, 'general', $langs->trans("BankSetupModule"), -1, 'account' //Show bank account order print load_fiche_titre($langs->trans("BankOrderShow"), '', ''); -print '
'.$langs->trans("Parameter")."
'; +print '
'; print ''; print ''; print ''; @@ -431,7 +431,7 @@ print '
' . $langs->trans("Name") . '' . $langs->trans("Description") . '
'; print '

'; print load_fiche_titre($langs->trans("BankColorizeMovement"), '', ''); -print ''; +print '
'; print "\n"; print ''; print ''."\n"; diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index a209a5f5590..873f14ea68e 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -200,7 +200,7 @@ if (empty($conf->use_javascript_ajax)) print ''; } -print '
' . $langs->trans("Name") . ''.$langs->trans("Value").'
'; +print '
'; print ''; print ''; print ''; @@ -309,7 +309,7 @@ print ""; print ''; print ""; -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''; print ''; @@ -366,7 +366,7 @@ if ($conf->product->enabled) { print load_fiche_titre($langs->trans("BarCodeNumberManager")." (".$langs->trans("Product").")", '', ''); - print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php index 43f3fe0584a..52a468b878d 100644 --- a/htdocs/admin/bom.php +++ b/htdocs/admin/bom.php @@ -209,7 +209,7 @@ dol_fiche_head($head, 'settings', $langs->trans("BOMs"), -1, 'bom'); print load_fiche_titre($langs->trans("BOMsNumberingModules"), '', ''); -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''; print ''; @@ -464,7 +464,7 @@ print "
"; */ print load_fiche_titre($langs->trans("OtherOptions"), '', ''); -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 1e158bc7a7f..10bfa0030a8 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -456,7 +456,7 @@ print load_fiche_titre($langs->trans("Other")); print ''; print ''; print ''; -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; +print '
'; print ''; print ''; diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php index 629018ba998..c4c6e4506d9 100644 --- a/htdocs/admin/chequereceipts.php +++ b/htdocs/admin/chequereceipts.php @@ -111,7 +111,7 @@ dol_fiche_head($head, 'checkreceipts', $langs->trans("BankSetupModule"), -1, 'ac print load_fiche_titre($langs->trans("ChequeReceiptsNumberingModule"), '', ''); -print '
'.$langs->trans("Parameter").'
'; +print '
'; print ''; print ''; print ''; @@ -240,7 +240,7 @@ print ''; print ''; print ''; -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php index 92919886512..fbf8bc63b6d 100644 --- a/htdocs/admin/clicktodial.php +++ b/htdocs/admin/clicktodial.php @@ -73,7 +73,7 @@ print ''; print ''; print ''; -print '
'.$langs->trans("Parameters").' 
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index 10955b5e8bd..764db492959 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -262,7 +262,7 @@ dol_fiche_head($head, 'general', $langs->trans("Orders"), -1, 'order'); print load_fiche_titre($langs->trans("OrdersNumberingModules"), '', ''); -print '
'.$langs->trans("Name").''.$langs->trans("Value").'
'; +print '
'; print ''; print ''; print ''; @@ -521,7 +521,7 @@ print "
"; */ print load_fiche_titre($langs->trans("OtherOptions"), '', ''); -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''; print ''; @@ -659,7 +659,7 @@ print '
'; */ print load_fiche_titre($langs->trans("Notifications"), '', ''); -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index 09a4e95c0ae..bdfb783ce12 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -403,7 +403,7 @@ print ''; print ''; -print '
'.$langs->trans("Parameter").'
'; +print '
'; print ''."\n"; // Name @@ -519,7 +519,7 @@ print '
'.$langs->trans("CompanyInfo").''.$langs->trans("Value").'
'; print '
'; // IDs of the company (country-specific) -print ''; +print '
'; print ''; $langs->load("companies"); @@ -658,7 +658,7 @@ print '
'.$langs->trans("CompanyIds").''.$langs->trans("Value").'
'; // Fiscal year start print '
'; -print ''; +print '
'; print ''; print ''; print "\n"; @@ -671,7 +671,7 @@ print "
'.$langs->trans("FiscalYearInformation").''.$langs->trans("Value").'
"; // Fiscal options print '
'; -print ''; +print '
'; print ''; print ''; print ''; @@ -704,7 +704,7 @@ if ($mysoc->useLocalTax(1)) { // Local Tax 1 print '
'; - print '
'.$langs->trans("VATManagement").''.$langs->trans("Description").' 
'; + print '
'; print ''; print ''; print ''; @@ -747,7 +747,7 @@ if ($mysoc->useLocalTax(2)) { // Local Tax 2 print '
'; - print '
'.$langs->transcountry("LocalTax1Management", $mysoc->country_code).''.$langs->trans("Description").' 
'; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php index 0955d7c6d17..25cf1df9a11 100644 --- a/htdocs/admin/compta.php +++ b/htdocs/admin/compta.php @@ -110,7 +110,7 @@ print ''; print ''; print ''; -print '
'.$langs->transcountry("LocalTax2Management", $mysoc->country_code).''.$langs->trans("Description").' 
'; +print '
'; // case of the parameter ACCOUNTING_MODE @@ -138,7 +138,7 @@ print "
\n"; print "
\n"; -print ''; +print '
'; print ''; print ''; print "\n"; diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php index 06cf38c71cc..29940f95d56 100644 --- a/htdocs/admin/confexped.php +++ b/htdocs/admin/confexped.php @@ -97,7 +97,7 @@ dol_fiche_head($head, 'general', $langs->trans("Sendings"), -1, 'sending'); // Miscellaneous parameters -print '
'.$langs->trans('OtherOptions').'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php index 795a38c867d..b3b1637e4fd 100644 --- a/htdocs/admin/const.php +++ b/htdocs/admin/const.php @@ -198,7 +198,7 @@ print ''; print ''; print '
'; -print '
'.$langs->trans("Feature").' 
'; +print '
'; print ''; print getTitleFieldOfList('Name', 0, $_SERVER['PHP_SELF'], 'name', '', $param, '', $sortfield, $sortorder, '')."\n"; print ''; diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php index 7f123c0f367..2938f97feef 100644 --- a/htdocs/admin/contract.php +++ b/htdocs/admin/contract.php @@ -199,7 +199,7 @@ dol_fiche_head($head, 'contract', $langs->trans("Contracts"), -1, 'contract'); print load_fiche_titre($langs->trans("ContractsNumberingModules"), '', ''); -print '
'.$langs->trans("Value").'
'; +print '
'; print ''; print ''; print ''; @@ -323,7 +323,7 @@ else } -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''; print ''; @@ -460,7 +460,7 @@ print ''; print ''; print load_fiche_titre($langs->trans("OtherOptions"), '', ''); -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php index 1d187c57e17..a531a9c870c 100644 --- a/htdocs/admin/dav.php +++ b/htdocs/admin/dav.php @@ -77,7 +77,7 @@ if ($action == 'edit') print ''; print ''; - print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; + print '
'; print ''; foreach($arrayofparameters as $key => $val) @@ -116,7 +116,7 @@ if ($action == 'edit') } else { - print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; + print '
'; print ''; foreach($arrayofparameters as $key => $val) diff --git a/htdocs/admin/debugbar.php b/htdocs/admin/debugbar.php index 6f2b4cea089..77969820598 100644 --- a/htdocs/admin/debugbar.php +++ b/htdocs/admin/debugbar.php @@ -93,7 +93,7 @@ print ''; print ''; print ''; -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php index 40ffed80e60..f4922a33bbb 100644 --- a/htdocs/admin/defaultvalues.php +++ b/htdocs/admin/defaultvalues.php @@ -245,7 +245,7 @@ print ''; print ''; print '
'; -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; +print '
'; print ''; // Page $texthelp=$langs->trans("PageUrlForDefaultValues"); diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php index 7e724c52280..23a9aa4b3b1 100644 --- a/htdocs/admin/delais.php +++ b/htdocs/admin/delais.php @@ -186,7 +186,7 @@ if ($action == 'edit') print ''; print ''; - print '
'; + print '
'; print ''; foreach($modules as $module => $delays) @@ -209,7 +209,7 @@ if ($action == 'edit') print '
'; // Show if meteo is enabled - print '
'.$langs->trans("DelaysOfToleranceBeforeWarning").''.$langs->trans("Value").'
'; + print '
'; print ''; print ''; @@ -225,7 +225,7 @@ else * Show parameters */ - print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; + print '
'; print ''; foreach($modules as $module => $delays) @@ -248,7 +248,7 @@ else print '
'; // Show if meteo is enabled - print '
'.$langs->trans("DelaysOfToleranceBeforeWarning").''.$langs->trans("Value").'
'; + print '
'; print ''; print ''; diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 974fba8fa1d..ea7b4ae885e 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -1060,7 +1060,7 @@ if ($id) $fieldlist=explode(',', $tabfield[$id]); print '
'; - print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; + print '
'; // Line for title print ''; @@ -1242,7 +1242,7 @@ if ($id) } print '
'; - print '
'; + print '
'; // Title line with search input fields print ''; @@ -1724,7 +1724,7 @@ else $lastlineisempty=false; print '
'; - print '
'; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/ecm.php b/htdocs/admin/ecm.php index 067ed0ea353..2fcf3fe6422 100644 --- a/htdocs/admin/ecm.php +++ b/htdocs/admin/ecm.php @@ -74,7 +74,7 @@ $linkback=''; -print '
'.$langs->trans("Dictionary").''.$langs->trans("Table").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index 7cc2e7dff44..d0c4e0dc542 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -203,7 +203,7 @@ dol_fiche_head($head, 'shipment', $langs->trans("Sendings"), -1, 'sending'); print load_fiche_titre($langs->trans("SendingsNumberingModules")); -print '
'.$langs->trans("Description").' 
'; +print '
'; print ''; print ''; print ''; @@ -332,7 +332,7 @@ else dol_print_error($db); } -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php index 8a5cef82ceb..3139de4849d 100644 --- a/htdocs/admin/expensereport.php +++ b/htdocs/admin/expensereport.php @@ -211,7 +211,7 @@ dol_fiche_head($head, 'expensereport', $langs->trans("ExpenseReports"), -1, 'tri print load_fiche_titre($langs->trans("ExpenseReportNumberingModules"), '', ''); -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''; print ''; @@ -334,7 +334,7 @@ else dol_print_error($db); } -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''; print ''; @@ -466,7 +466,7 @@ print ''; print ''; print load_fiche_titre($langs->trans("OtherOptions"), '', ''); -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/expensereport_ik.php b/htdocs/admin/expensereport_ik.php index 4d10403c692..66897261207 100644 --- a/htdocs/admin/expensereport_ik.php +++ b/htdocs/admin/expensereport_ik.php @@ -110,7 +110,7 @@ if ($action == 'edit') echo ''; -echo '
'.$langs->trans("Parameter").'
'; +echo '
'; foreach ($rangesbycateg as $fk_c_exp_tax_cat => $Tab) { diff --git a/htdocs/admin/expensereport_rules.php b/htdocs/admin/expensereport_rules.php index a785d5f2927..610bd875c4f 100644 --- a/htdocs/admin/expensereport_rules.php +++ b/htdocs/admin/expensereport_rules.php @@ -161,7 +161,7 @@ if ($action != 'edit') echo ''; echo ''; - echo '
'; + echo '
'; echo ''; echo ''; @@ -204,7 +204,7 @@ if ($action == 'edit') echo ''; } -echo '
'.$langs->trans('ExpenseReportApplyTo').'
'; +echo '
'; echo ''; echo ''; diff --git a/htdocs/admin/export.php b/htdocs/admin/export.php index b12dcf4c530..4812b056e6a 100644 --- a/htdocs/admin/export.php +++ b/htdocs/admin/export.php @@ -72,7 +72,7 @@ $h++; dol_fiche_head($head, 'setup', $langs->trans("ExportsArea"), -1, "exports"); -print '
'.$langs->trans('ExpenseReportApplyTo').'
'; +print '
'; print ''; print ''."\n"; print ''; diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php index 4bb2bf1c964..c73567a5745 100644 --- a/htdocs/admin/external_rss.php +++ b/htdocs/admin/external_rss.php @@ -200,7 +200,7 @@ print '
'; print ''; print ''; -print '
'.$langs->trans("Parameters").' 
'; +print '
'; print ''; print ''; print ''; @@ -254,7 +254,7 @@ if ($resql) print "
"; print ""; - print '
'.$langs->trans("NewRSS").''.$langs->trans("Example").'
'; + print '
'; print ''; print ""; diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index dccfcdfdda1..6f1f621b90a 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -279,7 +279,7 @@ dol_fiche_head($head, 'general', $langs->trans("Invoices"), -1, 'invoice'); print load_fiche_titre($langs->trans("BillsNumberingModule"), '', ''); -print '
'; +print '
'; print ''; print ''; print ''; @@ -468,7 +468,7 @@ else dol_print_error($db); } -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''; print ''; @@ -607,7 +607,7 @@ if(!empty($conf->global->INVOICE_USE_DEFAULT_DOCUMENT)) // Hidden conf print ''; print ''; print ''; - print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; + print '
'; print ''; print ''; print ''; @@ -648,7 +648,7 @@ print load_fiche_titre($langs->trans("SuggestedPaymentModesIfNotDefinedInInvoice print ''; print ''; -print '
'.$langs->trans("Type").''.$langs->trans("Name").'
'; +print '
'; print ''; print '
'; @@ -738,7 +738,7 @@ print ""; print "
"; print load_fiche_titre($langs->trans("OtherOptions"), '', ''); -print ''; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/facture_situation.php b/htdocs/admin/facture_situation.php index 71fc1f8eac2..0378f5cf0d4 100644 --- a/htdocs/admin/facture_situation.php +++ b/htdocs/admin/facture_situation.php @@ -85,7 +85,7 @@ print ''; _updateBtn(); -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; +print '
'; _printOnOff('INVOICE_USE_SITUATION', $langs->trans('UseSituationInvoices')); diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php index bbe8f0dd221..efe8ca1117d 100644 --- a/htdocs/admin/fckeditor.php +++ b/htdocs/admin/fckeditor.php @@ -149,7 +149,7 @@ if (empty($conf->use_javascript_ajax)) } else { - print '
'; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index 876f4b90abb..14fc247a540 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -270,7 +270,7 @@ dol_fiche_head($head, 'ficheinter', $langs->trans("Interventions"), -1, 'interve print load_fiche_titre($langs->trans("FicheinterNumberingModules"), '', ''); -print '
'.$langs->trans("ActivateFCKeditor").''.$langs->trans("Action").'
'; +print '
'; print ''; print ''; print ''; @@ -395,7 +395,7 @@ else } -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''; print ''; @@ -519,7 +519,7 @@ print "
"; */ print load_fiche_titre($langs->trans("OtherOptions"), '', ''); -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php index 7ed797b8618..0baf9a6cdc1 100644 --- a/htdocs/admin/geoipmaxmind.php +++ b/htdocs/admin/geoipmaxmind.php @@ -99,7 +99,7 @@ print ''; print ''; print ''; -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php index 2d3f986e6a1..f0b0218c0e5 100644 --- a/htdocs/admin/holiday.php +++ b/htdocs/admin/holiday.php @@ -202,7 +202,7 @@ dol_fiche_head($head, 'holiday', $langs->trans("Holidays"), -1, 'holiday'); print load_fiche_titre($langs->trans("HolidaysNumberingModules"), '', ''); print '
'; -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; +print '
'; print ''; print ''; print ''; @@ -339,7 +339,7 @@ else print '
'; -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''; print ''; @@ -479,7 +479,7 @@ print ''; print load_fiche_titre($langs->trans("OtherOptions"), '', ''); print '
'; -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index dfbb548f5e0..d2044436937 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -233,7 +233,7 @@ print ''; clearstatcache(); print '
'; -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; +print '
'; print ''; print ''; print ''; @@ -259,7 +259,7 @@ showSkins(null, 1); print '
'; // Other -print '
'.$langs->trans("Language").' 
'; +print '
'; print ''; print ''; print ''; @@ -375,7 +375,7 @@ print '
'.$langs->trans("Miscellaneous").' 
'."\n"; print '
'; // Other -print ''; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php index dba2cee41a5..00158dbb5e6 100644 --- a/htdocs/admin/ldap.php +++ b/htdocs/admin/ldap.php @@ -111,7 +111,7 @@ print ''; dol_fiche_head($head, 'ldap', $langs->trans("LDAPSetup"), -1); -print '
'.$langs->trans("LoginPage").' 
'; +print '
'; // Liste de synchro actives print ''; diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php index c466f4e6c1e..4e49bee1d44 100644 --- a/htdocs/admin/ldap_contacts.php +++ b/htdocs/admin/ldap_contacts.php @@ -116,7 +116,7 @@ print '
'; print ''; print ''; -print '
'; +print '
'; print ''; print ''; @@ -138,7 +138,7 @@ print ''; print '
'.$langs->trans("LDAPSynchronizeContacts").'
'; print '
'; -print ''; +print '
'; print ''; print ''; diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php index 17f156ca223..dc3f8638e10 100644 --- a/htdocs/admin/ldap_groups.php +++ b/htdocs/admin/ldap_groups.php @@ -109,7 +109,7 @@ print ''; $form=new Form($db); -print '
'.$langs->trans("LDAPDolibarrMapping").'
'; +print '
'; print ''; print ''; @@ -131,7 +131,7 @@ print ''; print '
'.$langs->trans("LDAPSynchronizeGroups").'
'; print '
'; -print ''; +print '
'; print ''; print ''; diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php index 618e5ac87d5..457e63d0330 100644 --- a/htdocs/admin/ldap_members.php +++ b/htdocs/admin/ldap_members.php @@ -133,7 +133,7 @@ dol_fiche_head($head, 'members', $langs->trans("LDAPSetup"), -1); print $langs->trans("LDAPDescMembers").'
'; print '
'; -print '
'.$langs->trans("LDAPDolibarrMapping").'
'; +print '
'; print ''; print ''; @@ -162,7 +162,7 @@ print ''; print '
'.$langs->trans("LDAPSynchronizeMembers").'
'; print '
'; -print ''; +print '
'; print ''; print ''; diff --git a/htdocs/admin/ldap_members_types.php b/htdocs/admin/ldap_members_types.php index 45d0d488c8a..2a2aff88507 100644 --- a/htdocs/admin/ldap_members_types.php +++ b/htdocs/admin/ldap_members_types.php @@ -107,7 +107,7 @@ print ''; $form=new Form($db); -print '
'.$langs->trans("LDAPDolibarrMapping").'
'; +print '
'; print ''; print ''; @@ -129,7 +129,7 @@ print ''; print '
'.$langs->trans("LDAPSynchronizeMembersTypes").'
'; print '
'; -print ''; +print '
'; print ''; print ''; diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php index 8d1f7d3279e..1b800612d62 100644 --- a/htdocs/admin/ldap_users.php +++ b/htdocs/admin/ldap_users.php @@ -129,7 +129,7 @@ print $langs->trans("LDAPDescUsers").'
'; print '
'; -print '
'.$langs->trans("LDAPDolibarrMapping").'
'; +print '
'; print ''; print ''; @@ -158,7 +158,7 @@ print ''; print '
'.$langs->trans("LDAPSynchronizeUsers").'
'; print '
'; -print ''; +print '
'; print ''; print ''; diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php index 27f99ecb4f1..f7b32a2c5ef 100644 --- a/htdocs/admin/limits.php +++ b/htdocs/admin/limits.php @@ -101,7 +101,7 @@ if ($action == 'edit') clearstatcache(); - print '
'.$langs->trans("LDAPDolibarrMapping").'
'; + print '
'; print ''; @@ -135,7 +135,7 @@ if ($action == 'edit') } else { - print '
'.$langs->trans("Parameters").''.$langs->trans("Value").'
'; + print '
'; print ''; diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php index 794020cfc95..ea9197a80bb 100644 --- a/htdocs/admin/livraison.php +++ b/htdocs/admin/livraison.php @@ -194,7 +194,7 @@ dol_fiche_head($head, 'receivings', $langs->trans("Receivings"), -1, 'sending'); print load_fiche_titre($langs->trans("DeliveryOrderNumberingModules"), '', ''); -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; +print '
'; print ''; print ''; print ''; @@ -322,7 +322,7 @@ else dol_print_error($db); } -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''; print ''; @@ -440,7 +440,7 @@ print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; print "
"; print load_fiche_titre($langs->trans("OtherOptions"), '', ''); -print ''; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/loan.php b/htdocs/admin/loan.php index 46d104736b0..ccc33ab3cee 100644 --- a/htdocs/admin/loan.php +++ b/htdocs/admin/loan.php @@ -89,7 +89,7 @@ print ''; /* * Params */ -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; +print '
'; print ''; print ''; print "\n"; diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php index 6ff32e1d406..715633ca77e 100644 --- a/htdocs/admin/mailing.php +++ b/htdocs/admin/mailing.php @@ -105,7 +105,7 @@ print ''; print ''; print ''; -print '
' . $langs->trans('Options') . '
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 61fb0448c8b..d459de3707b 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -257,7 +257,7 @@ if ($action == 'edit') clearstatcache(); - print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; + print '
'; print ''; // Disable @@ -520,7 +520,7 @@ else print ''.$langs->trans("EMailsDesc")."
\n"; print "
\n"; - print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; + print '
'; print ''; // Disable diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php index 94f3820c5b9..ace92914c4b 100644 --- a/htdocs/admin/mails_emailing.php +++ b/htdocs/admin/mails_emailing.php @@ -225,7 +225,7 @@ if ($action == 'edit') clearstatcache(); - print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; + print '
'; print ''; // Method @@ -398,7 +398,7 @@ else print ''.$langs->trans("EMailsDesc")."
\n"; print "
\n"; - print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; + print '
'; print ''; // Method diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php index 7ac91d51c8d..aa8a7e79719 100644 --- a/htdocs/admin/mails_templates.php +++ b/htdocs/admin/mails_templates.php @@ -451,7 +451,7 @@ print ''; print ''; print '
'; -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; +print '
'; // Line to enter new values (title) print ''; @@ -597,7 +597,7 @@ print ''; print ''; print '
'; -print '
'; +print '
'; // List of available record in database dol_syslog("htdocs/admin/dict", LOG_DEBUG); diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php index 4187c4d3eb4..fdbf34a5e13 100644 --- a/htdocs/admin/menus.php +++ b/htdocs/admin/menus.php @@ -162,7 +162,7 @@ print "
\n"; clearstatcache(); // Gestionnaires de menu -print '
'; +print '
'; print ''; print '
'.$langs->trans("Menu").''; print $form->textwithpicto($langs->trans("InternalUsers"), $langs->trans("InternalExternalDesc")); diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php index 5a54a9e5c9f..f0ebb0f7794 100644 --- a/htdocs/admin/menus/edit.php +++ b/htdocs/admin/menus/edit.php @@ -313,7 +313,7 @@ if ($action == 'create') dol_fiche_head(); - print ''; + print '
'; // Id $parent_rowid = GETPOST('menuId', 'int'); @@ -436,7 +436,7 @@ elseif ($action == 'edit') dol_fiche_head(); - print '
'; + print '
'; $menu = new Menubase($db); $result=$menu->fetch(GETPOST('menuId', 'int')); diff --git a/htdocs/admin/menus/other.php b/htdocs/admin/menus/other.php index e339b1854d8..b3df54ea265 100644 --- a/htdocs/admin/menus/other.php +++ b/htdocs/admin/menus/other.php @@ -81,7 +81,7 @@ dol_fiche_head($head, 'misc', $langs->trans("Menus"), -1); // Other Options -print '
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php index 06c59338e58..359119e9091 100644 --- a/htdocs/admin/mrp.php +++ b/htdocs/admin/mrp.php @@ -210,7 +210,7 @@ dol_fiche_head($head, 'settings', $langs->trans("MOs"), -1, 'mrp'); print load_fiche_titre($langs->trans("MOsNumberingModules"), '', ''); -print '
'.$langs->trans("Parameters").''.$langs->trans("Status").'
'; +print '
'; print ''; print ''; print ''; @@ -465,7 +465,7 @@ print "
"; */ print load_fiche_titre($langs->trans("OtherOptions"), '', ''); -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php index 63000d61c8b..515340efe89 100644 --- a/htdocs/admin/multicurrency.php +++ b/htdocs/admin/multicurrency.php @@ -186,7 +186,7 @@ $head = multicurrencyAdminPrepareHead(); dol_fiche_head($head, 'settings', $langs->trans("ModuleSetup"), -1, "multicurrency"); -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; +print '
'; print ''; print ''."\n"; print ''."\n"; @@ -270,7 +270,7 @@ if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION)) print ''; print '
'; - print '
'.$langs->trans("Parameters").''.$langs->trans("Status").'
'; + print '
'; $urlforapilayer='https://currencylayer.com'; //https://apilayer.net @@ -309,7 +309,7 @@ if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION)) } print '
'; -print '
'; +print '
'; print ''; print ''."\n"; diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php index 52de58b80b8..fb2be946169 100644 --- a/htdocs/admin/notification.php +++ b/htdocs/admin/notification.php @@ -123,7 +123,7 @@ print ''; print ''; print ''; -print '
'.$form->textwithpicto($langs->trans("CurrenciesUsed"), $langs->transnoentitiesnoconv("CurrenciesUsed_help_to_add")).'
'; +print '
'; print ''; print ''; print ''; @@ -146,7 +146,7 @@ $title=$langs->trans("ListOfNotificationsPerUser"); if (! empty($conf->societe->enabled)) $title=$langs->trans("ListOfNotificationsPerUserOrContact"); print load_fiche_titre($title, '', ''); -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; +print '
'; print ''; print ''; /*print ''; @@ -192,7 +192,7 @@ print '

'; print load_fiche_titre($langs->trans("ListOfFixedNotifications"), '', ''); -print '
'.$langs->trans("Label").''.$langs->trans("Code").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php index b0795152d05..780f22894e9 100644 --- a/htdocs/admin/oauth.php +++ b/htdocs/admin/oauth.php @@ -90,7 +90,7 @@ dol_fiche_head($head, 'services', '', -1, 'technic'); print $langs->trans("ListOfSupportedOauthProviders").'

'; -print '
'.$langs->trans("Module").''.$langs->trans("Code").'
'; +print '
'; $i=0; diff --git a/htdocs/admin/oauthlogintokens.php b/htdocs/admin/oauthlogintokens.php index bb3c83c2ee2..125ef2458b7 100644 --- a/htdocs/admin/oauthlogintokens.php +++ b/htdocs/admin/oauthlogintokens.php @@ -221,7 +221,7 @@ if ($mode == 'setup' && $user->admin) print ''; - print '
'."\n"; + print '
'."\n"; print ''; print ''; @@ -339,7 +339,7 @@ if ($mode == 'test' && $user->admin) { print $langs->trans('PrintTestDesc'.$driver)."

\n"; - print '
'.$langs->trans($key[0]).'
'; + print '
'; if (! empty($driver)) { require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php'; @@ -366,7 +366,7 @@ if ($mode == 'userconf' && $user->admin) { print $langs->trans('PrintUserConfDesc'.$driver)."

\n"; - print '
'; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/openinghours.php b/htdocs/admin/openinghours.php index c29f6816a05..f07d80a109b 100644 --- a/htdocs/admin/openinghours.php +++ b/htdocs/admin/openinghours.php @@ -89,7 +89,7 @@ if (empty($action) || $action == 'edit' || $action == 'updateedit') print ''; print ''; - print '
'.$langs->trans("User").''.$langs->trans("PrintModule").'
'; + print '
'; print ''."\n"; print '
'.$langs->trans("Day").''.$langs->trans("Value").'
'; diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php index 65b66636a10..4fcb3c84786 100644 --- a/htdocs/admin/payment.php +++ b/htdocs/admin/payment.php @@ -109,7 +109,7 @@ dol_fiche_head($head, 'payment', $langs->trans("Invoices"), -1, 'invoice'); print load_fiche_titre($langs->trans("PaymentsNumberingModule"), '', ''); -print ''; +print '
'; print ''; print ''; print ''; @@ -235,7 +235,7 @@ print ''; print ''; print ''; -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php index e9346f49a3a..da04a88ac2c 100644 --- a/htdocs/admin/pdf.php +++ b/htdocs/admin/pdf.php @@ -134,7 +134,7 @@ clearstatcache(); print load_fiche_titre($langs->trans("DictionaryPaperFormat"), '', ''); print '
'; -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; +print '
'; print ''; $selected=$conf->global->MAIN_PDF_FORMAT; @@ -169,7 +169,7 @@ print '
'; print load_fiche_titre($langs->trans("PDFAddressForging"), '', ''); print '
'; -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; +print '
'; print ''; // Hide VAT Intra on address @@ -237,7 +237,7 @@ if ($mysoc->useLocalTax(1) || $mysoc->useLocalTax(2)) print load_fiche_titre($title, '', ''); -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; +print '
'; print ''; // Hide any information on Sale tax / VAT @@ -257,7 +257,7 @@ print '
'; print load_fiche_titre($langs->trans("Other"), '', ''); print '
'; -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; +print '
'; print ''; //Desc @@ -307,7 +307,7 @@ print '
'; print load_fiche_titre($langs->trans("Library"), '', ''); print '
'; -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'."\n"; +print '
'."\n"; print ''."\n"; print ''."\n"; diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index 8e1de4d83b6..23fa06887a9 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -124,7 +124,7 @@ dol_fiche_head($head, 'default', $langs->trans("Security"), -1); print info_admin(showModulesExludedForExternal($modules)).'
'."\n"; print '
'; -print '
'.$langs->trans("Name").'
'; +print '
'; // Show permissions lines $sql = "SELECT r.id, r.libelle, r.module, r.perms, r.subperms, r.bydefault"; diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php index 7dd00938dc9..1d9b181b295 100644 --- a/htdocs/admin/prelevement.php +++ b/htdocs/admin/prelevement.php @@ -210,7 +210,7 @@ print '
'; print ''; print ''; -print '
'; +print '
'; print ''; print ''; @@ -489,7 +489,7 @@ if (! empty($conf->global->MAIN_MODULE_NOTIFICATION)) print ''; print ''; - print '
'.$langs->trans("Parameter").'
'; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php index a0f817a40c1..dc58a2c4809 100644 --- a/htdocs/admin/propal.php +++ b/htdocs/admin/propal.php @@ -258,7 +258,7 @@ dol_fiche_head($head, 'general', $langs->trans("Proposals"), -1, 'propal'); */ print load_fiche_titre($langs->trans("ProposalsNumberingModules"), '', ''); -print '
'.$langs->trans("User").''.$langs->trans("Value").'
'; +print '
'; print ''; print '\n"; print '\n"; @@ -523,7 +523,7 @@ if (empty($conf->facture->enabled)) print ''; print ''; - print '
'.$langs->trans("Name")."'.$langs->trans("Description")."
'; + print '
'; print ''; print '
'; @@ -746,7 +746,7 @@ print "
\n
"; */ print load_fiche_titre($langs->trans("Notifications"), '', ''); -print ''; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php index 9d3d125f3da..8a2b3078c7d 100644 --- a/htdocs/admin/receiptprinter.php +++ b/htdocs/admin/receiptprinter.php @@ -350,7 +350,7 @@ if ($mode == 'config' && $user->admin) { dol_fiche_head(); print $langs->trans("ReceiptPrinterTypeDesc")."

\n"; - print '
'.$langs->trans("Parameter").'
'."\n"; + print '
'."\n"; print ''; print ''; print ''; @@ -363,7 +363,7 @@ if ($mode == 'config' && $user->admin) { dol_fiche_head(); print $langs->trans("ReceiptPrinterProfileDesc")."

\n"; - print '
'.$langs->trans("CONNECTOR_DUMMY").':'.$langs->trans("CONNECTOR_DUMMY_HELP").'
'.$langs->trans("CONNECTOR_NETWORK_PRINT").':'.$langs->trans("CONNECTOR_NETWORK_PRINT_HELP").'
'.$langs->trans("CONNECTOR_FILE_PRINT").':'.$langs->trans("CONNECTOR_FILE_PRINT_HELP").'
'."\n"; + print '
'."\n"; print ''; print ''; print ''; diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php index 27564d6b4e0..eacf0deaf68 100644 --- a/htdocs/admin/reception_setup.php +++ b/htdocs/admin/reception_setup.php @@ -208,7 +208,7 @@ dol_fiche_head($head, 'reception', $langs->trans("Receptions"), -1, 'sending'); print load_fiche_titre($langs->trans("ReceptionsNumberingModules")); -print '
'.$langs->trans("PROFILE_DEFAULT").':'.$langs->trans("PROFILE_DEFAULT_HELP").'
'.$langs->trans("PROFILE_SIMPLE").':'.$langs->trans("PROFILE_SIMPLE_HELP").'
'.$langs->trans("PROFILE_EPOSTEP").':'.$langs->trans("PROFILE_EPOSTEP_HELP").'
'; +print '
'; print ''; print ''; print ''; @@ -337,7 +337,7 @@ else dol_print_error($db); } -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/resource.php b/htdocs/admin/resource.php index 44e4d1ae9de..4304007d830 100644 --- a/htdocs/admin/resource.php +++ b/htdocs/admin/resource.php @@ -76,7 +76,7 @@ print ''; print ''; print ''; -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''."\n"; print ''."\n"; diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php index 2089debcf04..9be75bf125b 100644 --- a/htdocs/admin/security.php +++ b/htdocs/admin/security.php @@ -241,7 +241,7 @@ if (is_resource($handle)) } asort($arrayhandler); -print '
'.$langs->trans("Parameters").''.$langs->trans("Value").'
'; +print '
'; print ''; print ''; print ''; @@ -291,7 +291,7 @@ print ''; if ($conf->global->USER_PASSWORD_GENERATED == "Perso"){ $tabConf = explode(";", $conf->global->USER_PASSWORD_PATTERN); print '
'; - print '
'.$langs->trans("RuleForGeneratedPasswords").''.$langs->trans("Example").'
'; + print '
'; print ''; print ''; print ''; @@ -402,7 +402,7 @@ print ""; print ''; print ""; -print '
'.$langs->trans("PasswordPatternDesc").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php index 0bd2dcdb1be..181ecad5c6b 100644 --- a/htdocs/admin/security_file.php +++ b/htdocs/admin/security_file.php @@ -107,7 +107,7 @@ dol_fiche_head($head, 'file', $langs->trans("Security"), -1); $var=false; print '
'; -print '
'.$langs->trans("Parameters").''.$langs->trans("Activated").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index c9bf1ba4357..87cd8519449 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -103,7 +103,7 @@ dol_fiche_head($head, 'misc', $langs->trans("Security"), -1); // Other Options -print '
'.$langs->trans("Parameters").''.$langs->trans("Value").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php index 1f37a36ec4f..5536424e939 100644 --- a/htdocs/admin/sms.php +++ b/htdocs/admin/sms.php @@ -166,7 +166,7 @@ if ($action == 'edit') clearstatcache(); - print '
'.$langs->trans("Parameters").''.$langs->trans("Status").'
'; + print '
'; print ''; // Disable @@ -209,7 +209,7 @@ else { if (! count($listofmethods)) print '
'.$langs->trans("NoSmsEngine", 'DoliStore').'
'; - print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; + print '
'; print ''; // Disable diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php index 51bf959bb72..b36106b3e80 100644 --- a/htdocs/admin/stock.php +++ b/htdocs/admin/stock.php @@ -100,7 +100,7 @@ print '
'; //} // Title rule for stock decrease -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; +print '
'; print ''; print "\n"; print ''."\n"; @@ -202,7 +202,7 @@ print '
".$langs->trans("RuleForStockManagementDecrease")."'.$langs->trans("Status").'
'; print '
'; // Title rule for stock increase -print ''; +print '
'; print ''; print "\n"; print ''."\n"; @@ -314,7 +314,7 @@ print '
".$langs->trans("RuleForStockManagementIncrease")."'.$langs->trans("Status").'
'; print '
'; -print ''; +print '
'; print ''; print "\n"; print ''."\n"; @@ -392,7 +392,7 @@ if ( if ($virtualdiffersfromphysical) { - print '
".$langs->trans("RuleForStockAvailability")."'.$langs->trans("Status").'
'; + print '
'; print ''; print "\n"; print ''."\n"; @@ -414,7 +414,7 @@ if ($virtualdiffersfromphysical) } -print '
".$langs->trans("RuleForStockReplenishment")." ".img_help('help', $langs->trans("VirtualDiffersFromPhysical"))."'.$langs->trans("Status").'
'; +print '
'; print ''; print "\n"; @@ -464,7 +464,7 @@ print '
".$langs->trans("Other")."
'; print '
'; if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { - print ''; + print '
'; print ''; print ''."\n"; print ''."\n"; diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php index 9cb387aedc9..f3f274e93dc 100644 --- a/htdocs/admin/supplier_invoice.php +++ b/htdocs/admin/supplier_invoice.php @@ -217,7 +217,7 @@ dol_fiche_head($head, 'invoice', $langs->trans("Suppliers"), -1, 'company'); print load_fiche_titre($langs->trans("SuppliersInvoiceNumberingModel"), '', ''); -print '
'.$langs->trans("Inventory").''.$langs->trans("Status").'
'; +print '
'; print ''; print ''; print ''; @@ -346,7 +346,7 @@ else dol_print_error($db); } -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'."\n"; +print '
'."\n"; print ''."\n"; print ''."\n"; print ''."\n"; @@ -465,7 +465,7 @@ print ''; print ''; print load_fiche_titre($langs->trans("OtherOptions"), '', ''); -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''; print ''; @@ -505,7 +505,7 @@ print ''; */ print load_fiche_titre($langs->trans("Notifications"), '', ''); -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php index c2a7a5d4077..d5a5d15eec3 100644 --- a/htdocs/admin/supplier_order.php +++ b/htdocs/admin/supplier_order.php @@ -247,7 +247,7 @@ dol_fiche_head($head, 'order', $langs->trans("Suppliers"), -1, 'company'); print load_fiche_titre($langs->trans("OrdersNumberingModules"), '', ''); -print '
'.$langs->trans("Parameter").'
'; +print '
'; print ''; print ''; print ''; @@ -374,7 +374,7 @@ else dol_print_error($db); } -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'."\n"; +print '
'."\n"; print ''."\n"; print ''."\n"; print ''."\n"; @@ -487,7 +487,7 @@ print ''; print ''; print load_fiche_titre($langs->trans("OtherOptions"), '', ''); -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''; print ''; @@ -590,7 +590,7 @@ print ''; */ print load_fiche_titre($langs->trans("Notifications"), '', ''); -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php index 8da430a9fa1..a66c849d9c7 100644 --- a/htdocs/admin/supplier_payment.php +++ b/htdocs/admin/supplier_payment.php @@ -194,7 +194,7 @@ else dol_print_error($db); } -print '
'.$langs->trans("Parameter").'
'; +print '
'; print ''; print ''; print ''; @@ -318,7 +318,7 @@ print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; print '
'; print load_fiche_titre($langs->trans("PaymentsPDFModules"), '', ''); -print ''."\n"; +print '
'."\n"; print ''."\n"; print ''."\n"; print ''."\n"; diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php index 30a85f2af3b..60cc5634c1b 100644 --- a/htdocs/admin/supplier_proposal.php +++ b/htdocs/admin/supplier_proposal.php @@ -227,7 +227,7 @@ dol_fiche_head($head, 'general', $langs->trans("CommRequests"), -1, 'supplier_pr */ print load_fiche_titre($langs->trans("SupplierProposalNumberingModules"), '', ''); -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print '\n"; print '\n"; diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index bd93d7a9fc5..96dd3d456b7 100644 --- a/htdocs/admin/syslog.php +++ b/htdocs/admin/syslog.php @@ -198,7 +198,7 @@ print load_fiche_titre($langs->trans("SyslogOutput")); print ''; print ''; print ''; -print '
'.$langs->trans("Name")."'.$langs->trans("Description")."
'; +print '
'; print ''; print ''; print ''; @@ -271,7 +271,7 @@ print load_fiche_titre($langs->trans("SyslogLevel")); print ''; print ''; print ''; -print '
'.$langs->trans("Type").''.$langs->trans("Value").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/system/browser.php b/htdocs/admin/system/browser.php index ef5ec419c8f..5035c6c4a7d 100644 --- a/htdocs/admin/system/browser.php +++ b/htdocs/admin/system/browser.php @@ -47,7 +47,7 @@ $tmp=getBrowserInfo($_SERVER["HTTP_USER_AGENT"]); // Browser print '
'; -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; +print '
'; print ''."\n"; print ''."\n"; print ''."\n"; diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index 4e203a770f7..194c871958d 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.php @@ -140,7 +140,7 @@ $configfilelib=array( 'Strict mode is on/off' ); -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.$langs->trans("UserAgent").''.$_SERVER['HTTP_USER_AGENT'].'
'.$langs->trans("BrowserName").''.$tmp['browsername'].'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php index 6ed657ba8cd..dfd05a7694e 100644 --- a/htdocs/admin/system/database.php +++ b/htdocs/admin/system/database.php @@ -43,7 +43,7 @@ print load_fiche_titre($langs->trans("InfoDatabase"), '', 'title_setup'); // Database print '
'; -print '
'.$langs->trans("Label").''.$langs->trans("Parameter").''.$langs->trans("Value").'
'; +print '
'; print ''."\n"; print ''."\n"; print ''."\n"; @@ -60,7 +60,7 @@ print ''; // Tables print '
'; print '
'; -print '
'.$langs->trans("Database").'
'.$langs->trans("Version").''.$db::LABEL.' '.$db->getVersion().'
'.$langs->trans("DatabaseServer").''.$conf->db->host.'
'; +print '
'; print ''."\n"; print ''."\n"; print '
'.$langs->trans("Tables").'
'.$langs->trans("List").'
'; @@ -80,7 +80,7 @@ else { print '
'; print '
'; - print ''; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php index 5c55c668b1a..e822371bc4f 100644 --- a/htdocs/admin/system/dolibarr.php +++ b/htdocs/admin/system/dolibarr.php @@ -68,7 +68,7 @@ print load_fiche_titre($title, '', 'title_setup'); // Version print '
'; -print '
'.$langs->trans("Parameters").''.$langs->trans("Value").'
'; +print '
'; print ''."\n"; print '
'.$langs->trans("Version").''.$langs->trans("Value").'
'.$langs->trans("CurrentVersion").' ('.$langs->trans("Programs").')'.DOL_VERSION; // If current version differs from last upgrade @@ -135,7 +135,7 @@ print '
'; // Session print '
'; -print ''; +print '
'; print ''."\n"; print ''."\n"; print ''."\n"; @@ -175,7 +175,7 @@ if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_S $shmoparray=dol_listshmop(); print '
'; - print '
'.$langs->trans("Session").''.$langs->trans("Value").'
'.$langs->trans("SessionSavePath").''.session_save_path().'
'.$langs->trans("SessionName").''.session_name().'
'; + print '
'; print ''; print ''; print ''; @@ -198,7 +198,7 @@ if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_S // Localisation print '
'; -print '
'.$langs->trans("LanguageFilesCachedIntoShmopSharedMemory").''.$langs->trans("NbOfEntries").'
'; +print '
'; print ''."\n"; print ''."\n"; print ''."\n"; @@ -337,7 +337,7 @@ $configfileparameters=array( ); print '
'; -print '
'.$langs->trans("LocalisationDolibarrParameters").''.$langs->trans("Value").'
'.$langs->trans("LanguageBrowserParameter", "HTTP_ACCEPT_LANGUAGE").''.$_SERVER["HTTP_ACCEPT_LANGUAGE"].'
'.$langs->trans("CurrentUserLanguage").''.$langs->getDefaultLang().'
'; +print '
'; print ''; print '
'.$langs->trans("Parameters").' '; print $langs->trans("ConfigurationFile").' ('.$conffiletoshowshort.')'; diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php index 3fa0905ee42..b0da228e7a8 100644 --- a/htdocs/admin/system/filecheck.php +++ b/htdocs/admin/system/filecheck.php @@ -50,7 +50,7 @@ print ''.$langs->trans("FileCheckDesc").'
// Version print '
'; -print ''; +print '
'; print ''."\n"; print ''."\n"; print ''."\n"; diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php index 928b193b1ee..cdb9e7dfcea 100644 --- a/htdocs/admin/system/index.php +++ b/htdocs/admin/system/index.php @@ -47,7 +47,7 @@ llxHeader(); print load_fiche_titre($langs->trans("SummarySystem"), '', 'title_setup'); -print '
'.$langs->trans("Version").''.$langs->trans("Value").'
'.$langs->trans("VersionLastInstall").''.$conf->global->MAIN_VERSION_LAST_INSTALL.'
'.$langs->trans("VersionLastUpgrade").''.$conf->global->MAIN_VERSION_LAST_UPGRADE.'
'; +print '
'; print "\n"; $dolversion=version_dolibarr(); print "\n"; @@ -55,7 +55,7 @@ print '
Dolibarr
".$langs->trans("Version")."".$dolversion."
'; print "
\n"; -print ''; +print '
'; print "\n"; $osversion=version_os(); print "\n"; @@ -64,7 +64,7 @@ print '
".$langs->trans("OS")."
".$langs->trans("Version")."".$osversion."
'; print "
\n"; // Serveur web -print ''; +print '
'; print "\n"; $apacheversion=version_webserver(); print "\n"; @@ -73,7 +73,7 @@ print '
".$langs->trans("WebServer")."
".$langs->trans("Version")."".$apacheversion."
'; print "
\n"; // Php -print ''; +print '
'; print "\n"; $phpversion=version_php(); print "\n"; @@ -83,7 +83,7 @@ print '
".$langs->trans("PHP")."
".$langs->trans("Version")."".$phpversion."
'; print "
\n"; // Database -print ''; +print '
'; print "\n"; $dblabel=$db::LABEL; $dbversion=$db->getVersion(); @@ -102,7 +102,7 @@ if ($db->type == 'pgsql') print '
'; // Browser -print '
".$langs->trans("Database")."
'; +print '
'; print "\n"; print "\n"; print "\n"; diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php index a3891dc1c46..7a53b95fcf2 100644 --- a/htdocs/admin/system/modules.php +++ b/htdocs/admin/system/modules.php @@ -103,7 +103,7 @@ foreach($modulesdir as $dir) } print '
'; -print '
".$langs->trans("Browser")."
".$langs->trans("UserAgent")."" .$_SERVER["HTTP_USER_AGENT"]."
".$langs->trans("Smartphone")."".(($conf->browser->layout != 'phone')?$langs->trans("No"):$langs->trans("Yes"))."
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/system/os.php b/htdocs/admin/system/os.php index 33587f3c1c6..7399a218e9c 100644 --- a/htdocs/admin/system/os.php +++ b/htdocs/admin/system/os.php @@ -37,7 +37,7 @@ llxHeader(); print load_fiche_titre($langs->trans("InfoOS"), '', 'title_setup'); -print '
'.$langs->trans("Modules").''.$langs->trans("Version").'
'; +print '
'; print ''; print "\n"; diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php index afed312cdbd..bcc3aba20d4 100644 --- a/htdocs/admin/system/phpinfo.php +++ b/htdocs/admin/system/phpinfo.php @@ -67,7 +67,7 @@ if ($maxphp > 0 && $maxphp2 > 0 && $maxphp > $maxphp2) } -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; +print '
'; print ''; print "\n"; diff --git a/htdocs/admin/system/web.php b/htdocs/admin/system/web.php index b5e8e2c3866..114a251c8f3 100644 --- a/htdocs/admin/system/web.php +++ b/htdocs/admin/system/web.php @@ -45,7 +45,7 @@ llxHeader('', $langs->trans("InfoWebServer")); print load_fiche_titre($langs->trans("InfoWebServer"), '', 'title_setup'); print '
'; -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; +print '
'; print '\n"; print '\n"; print '\n"; diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php index 99c67b038ae..8bab3b94ff5 100644 --- a/htdocs/admin/taxes.php +++ b/htdocs/admin/taxes.php @@ -137,7 +137,7 @@ else print ''; print ''; - print '
'.$langs->trans("Parameter")."".$langs->trans("Value")."
'.$langs->trans("Version")."".$_SERVER["SERVER_SOFTWARE"]."
'.$langs->trans("VirtualServerName")."" . $_SERVER["SERVER_NAME"] . "
'; + print '
'; print ''; print '
'.$langs->trans("CompanyIds").''.$langs->trans("Value").'
'; @@ -169,7 +169,7 @@ else print '
'; - print ''; + print '
'; // Cas des parametres TAX_MODE_SELL/BUY_SERVICE/PRODUCT print ''; @@ -195,7 +195,7 @@ else //print ' ('.$langs->trans("CanBeChangedWhenMakingInvoice").')'; - print '
'; + print '
'; print ''; // Products diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php index 8bb39f0056b..fa6a558e444 100644 --- a/htdocs/admin/ticket.php +++ b/htdocs/admin/ticket.php @@ -197,7 +197,7 @@ dol_fiche_end(); print load_fiche_titre($langs->trans("TicketNumberingModules")); -print '
 '.$langs->trans("Buy").''.$langs->trans("Sell").'
'; +print '
'; print ''; print ''; print ''; @@ -296,7 +296,7 @@ if (!$conf->use_javascript_ajax) { } print load_fiche_titre($langs->trans("TicketParams")); -print '
' . $langs->trans("Name") . '' . $langs->trans("Description") . '
'; +print '
'; print ''; print ''; @@ -400,7 +400,7 @@ if (!$conf->use_javascript_ajax) { // Admin var of module print load_fiche_titre($langs->trans("Notification")); -print '
' . $langs->trans("Parameter") . '
'; +print '
'; print ''; print ''; diff --git a/htdocs/admin/ticket_public.php b/htdocs/admin/ticket_public.php index c5cadac11c1..d6ab0d3830e 100644 --- a/htdocs/admin/ticket_public.php +++ b/htdocs/admin/ticket_public.php @@ -200,7 +200,7 @@ if (! empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) print ''; } - print '
'; + print '
'; print ''; print ''; @@ -288,7 +288,7 @@ if (! empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) // Admin var of module print load_fiche_titre($langs->trans("TicketParamMail")); - print '
' . $langs->trans("Parameters") . ''; print '
'; + print '
'; print ''; print ''; diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php index c0d08f4b505..f2625104fd8 100644 --- a/htdocs/admin/tools/listevents.php +++ b/htdocs/admin/tools/listevents.php @@ -238,7 +238,7 @@ if ($result) } print '
'; - print '
'; + print '
'; // Fields title search print ''; diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php index 06bed7a3f3a..d909dc8610b 100644 --- a/htdocs/admin/tools/listsessions.php +++ b/htdocs/admin/tools/listsessions.php @@ -123,7 +123,7 @@ elseif ($action == 'lock') if ($savehandler == 'files') { - print '
'; + print '
'; print ''; print_liste_field_titre("Login", $_SERVER["PHP_SELF"], "login", "", "", 'align="left"', $sortfield, $sortorder); print_liste_field_titre("SessionId", $_SERVER["PHP_SELF"], "id", "", "", 'align="left"', $sortfield, $sortorder); diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php index f991bb5752e..91a03387f9c 100644 --- a/htdocs/admin/tools/purge.php +++ b/htdocs/admin/tools/purge.php @@ -86,7 +86,7 @@ print ''; print ''; print ''; -print '
'; +print '
'; print '
'; diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php index 52ef490ceae..ffdecdecbd1 100644 --- a/htdocs/admin/translation.php +++ b/htdocs/admin/translation.php @@ -275,7 +275,7 @@ if ($mode == 'overwrite') print ''; print '
'; - print ''; + print '
'; print ''; print_liste_field_titre("Language_en_US_es_MX_etc", $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder); print_liste_field_titre("Key", $_SERVER["PHP_SELF"], 'transkey', '', $param, '', $sortfield, $sortorder); @@ -464,7 +464,7 @@ if ($mode == 'searchkey') print ''; print '
'; - print '
'; + print '
'; print ''; print_liste_field_titre("Language_en_US_es_MX_etc", $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder); print_liste_field_titre("Key", $_SERVER["PHP_SELF"], 'transkey', '', $param, '', $sortfield, $sortorder); diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php index 1b4c59505db..cfc5a65cc54 100644 --- a/htdocs/admin/user.php +++ b/htdocs/admin/user.php @@ -145,7 +145,7 @@ $head=user_admin_prepare_head(); dol_fiche_head($head, 'card', $langs->trans("MenuUsersAndGroups"), -1, 'user'); -print '
'; +print '
'; print ''; print ''; print ''; @@ -206,7 +206,7 @@ else dol_print_error($db); } -print '
'.$langs->trans("Description").' 
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php index bd8ae3d5e92..fd7348bc603 100644 --- a/htdocs/admin/usergroup.php +++ b/htdocs/admin/usergroup.php @@ -153,7 +153,7 @@ else dol_print_error($db); } -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php index 5ea6ee66dd9..c759b0a8d8c 100644 --- a/htdocs/admin/website.php +++ b/htdocs/admin/website.php @@ -447,7 +447,7 @@ if ($id) print ''; print ''; - print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; + print '
'; // Form to add a new line if ($tabname[$id]) @@ -532,7 +532,7 @@ if ($id) print ''; print ''; - print '
'; + print '
'; // Title of lines print ''; diff --git a/htdocs/admin/website_options.php b/htdocs/admin/website_options.php index 610a83f302d..b72941cd6de 100644 --- a/htdocs/admin/website_options.php +++ b/htdocs/admin/website_options.php @@ -103,7 +103,7 @@ if ($action == 'edit') print ''; print ''; - print '
'; + print '
'; print ''; foreach($arrayofparameters as $key => $val) @@ -124,7 +124,7 @@ if ($action == 'edit') } else { - print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; + print '
'; print ''; foreach($arrayofparameters as $key => $val) diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php index 3c4232cbc0a..cb9e61e9da1 100644 --- a/htdocs/admin/workflow.php +++ b/htdocs/admin/workflow.php @@ -106,7 +106,7 @@ $workflowcodes = dol_sort_array($workflowcodes, 'position'); $nbqualified=0; $oldfamily=''; -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'."\n"; +print '
'."\n"; foreach($workflowcodes as $key => $params) { @@ -117,7 +117,7 @@ foreach($workflowcodes as $key => $params) if ($family == 'separator') { print '

'; - print ''."\n"; + print '
'."\n"; continue; } diff --git a/htdocs/api/admin/index.php b/htdocs/api/admin/index.php index f8a354683e0..e85b6571c62 100644 --- a/htdocs/api/admin/index.php +++ b/htdocs/api/admin/index.php @@ -103,7 +103,7 @@ print ''; print ''; print ''; -print '
'; +print '
'; print ''; print ""; diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php index 77d16820a43..f43093d0936 100644 --- a/htdocs/asset/admin/setup.php +++ b/htdocs/asset/admin/setup.php @@ -69,7 +69,7 @@ if ($action == 'edit') print ''; print ''; - print '
".$langs->trans("Parameter")."
'; + print '
'; print ''; foreach($arrayofparameters as $key => $val) @@ -90,7 +90,7 @@ if ($action == 'edit') } else { - print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; + print '
'; print ''; foreach($arrayofparameters as $key => $val) diff --git a/htdocs/asset/type.php b/htdocs/asset/type.php index 916939b378e..db8dfb60a2b 100644 --- a/htdocs/asset/type.php +++ b/htdocs/asset/type.php @@ -343,7 +343,7 @@ if ($action == 'create') dol_fiche_head(''); - print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; + print '
'; print ''; print ''; @@ -449,7 +449,7 @@ if ($rowid > 0) print '
'; print '
'; - print '
'.$langs->trans("Label").'
'; + print '
'; print ''; print '
'; @@ -553,7 +553,7 @@ if ($rowid > 0) dol_fiche_head($head, 'card', $langs->trans("AssetsType"), -1, 'setup'); - print ''; + print '
'; print ''; @@ -614,7 +614,7 @@ if ($rowid > 0) // Extra field if (empty($reshook)) { - print '

'.$langs->trans("Ref").''.$object->id.'
'; + print '

'; foreach($extrafields->attributes[$object->element]['label'] as $key=>$label) { if (isset($_POST["options_" . $key])) { diff --git a/htdocs/blockedlog/admin/blockedlog.php b/htdocs/blockedlog/admin/blockedlog.php index a0260cc6682..e5c089061eb 100644 --- a/htdocs/blockedlog/admin/blockedlog.php +++ b/htdocs/blockedlog/admin/blockedlog.php @@ -100,7 +100,7 @@ print ''.$langs->trans("BlockedLogDesc")."
'; -print '
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php index 6ce788a5790..63e94d00a47 100644 --- a/htdocs/blockedlog/admin/blockedlog_list.php +++ b/htdocs/blockedlog/admin/blockedlog_list.php @@ -361,7 +361,7 @@ print ''; print ''; print ''; -print '
'.$langs->trans("Key").''.$langs->trans("Value").'
'; +print '
'; // Line of filters print ''; diff --git a/htdocs/bom/admin/setup.php b/htdocs/bom/admin/setup.php index 3bcdd0cbd79..b8fc1f1c1c1 100644 --- a/htdocs/bom/admin/setup.php +++ b/htdocs/bom/admin/setup.php @@ -77,7 +77,7 @@ if ($action == 'edit') print ''; print ''; - print '
'; + print '
'; print ''; foreach($arrayofparameters as $key => $val) @@ -99,7 +99,7 @@ else { if (! empty($arrayofparameters)) { - print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; + print '
'; print ''; foreach($arrayofparameters as $key => $val) diff --git a/htdocs/bookmarks/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php index 1f227d7316f..5486a4887d1 100644 --- a/htdocs/bookmarks/admin/bookmark.php +++ b/htdocs/bookmarks/admin/bookmark.php @@ -69,7 +69,7 @@ print ''; print ''; print ''; -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php index 9f76343a69e..1602c02beaa 100644 --- a/htdocs/cashdesk/admin/cashdesk.php +++ b/htdocs/cashdesk/admin/cashdesk.php @@ -97,7 +97,7 @@ print ''; if (! empty($conf->service->enabled)) { - print '
'.$langs->trans("Name").''.$langs->trans("Value").'
'; + print '
'; print ''; print ''; print "\n"; @@ -114,7 +114,7 @@ if (! empty($conf->service->enabled)) } -print '
'.$langs->trans("Parameters").''.$langs->trans("Value").'
'; +print '
'; print ''; print ''; print "\n"; diff --git a/htdocs/categories/admin/categorie.php b/htdocs/categories/admin/categorie.php index ece7ed2fa5b..7d47724ddd3 100644 --- a/htdocs/categories/admin/categorie.php +++ b/htdocs/categories/admin/categorie.php @@ -87,7 +87,7 @@ $head=categoriesadmin_prepare_head(); dol_fiche_head($head, 'setup', $langs->trans("Categories"), -1, 'category'); -print '
'.$langs->trans("Terminal").' 0'.$langs->trans("Value").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php index 39db14a9613..9729e401632 100644 --- a/htdocs/categories/edit.php +++ b/htdocs/categories/edit.php @@ -146,7 +146,7 @@ print ''; dol_fiche_head(''); -print '
'.$langs->trans("Description").' 
'; +print '
'; // Ref print '
'; diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php index 2ef44c51f4f..e0886da002c 100644 --- a/htdocs/categories/index.php +++ b/htdocs/categories/index.php @@ -87,7 +87,7 @@ print ''; print ''; -print ''; +print '
'; print ''; print ''; print ''; @@ -117,7 +117,7 @@ if ($catname || $id > 0) { $cats = $categstatic->rechercher($id, $catname, $typetext); - print '
'.$langs->trans("Search").'
'; + print '
'; print ''; foreach ($cats as $cat) diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php index 754b846576d..5dbd6e68c47 100644 --- a/htdocs/categories/photos.php +++ b/htdocs/categories/photos.php @@ -150,7 +150,7 @@ if ($object->id) print '
'; print '
'; - print '
'.$langs->trans("FoundCats").'
'; + print '
'; // Description print '
'; diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php index 1c082dfe332..c898fef8be1 100644 --- a/htdocs/categories/traduction.php +++ b/htdocs/categories/traduction.php @@ -214,7 +214,7 @@ print '
'; print '
'; print '
'; -print ''; +print '
'; // Description print '
'; @@ -273,7 +273,7 @@ if ($action == 'edit') foreach ($object->multilangs as $key => $value) { print "
".$langs->trans('Language_'.$key)." :
"; - print ''; + print '
'; // Label $libelle = (GETPOST('libelle-'.$key, 'alpha') ? GETPOST('libelle-'.$key, 'alpha') : $object->multilangs[$key]['label']); @@ -309,7 +309,7 @@ elseif ($action != 'add') foreach ($object->multilangs as $key => $value) { $s=picto_from_langcode($key); - print '
'; + print '
'; print ''; print ''; print ''; @@ -340,7 +340,7 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service print ''; print ''; - print '
'.($s?$s.' ':'')." ".$langs->trans('Language_'.$key).": ".''.img_delete('', '').'
'.$langs->trans('Label').''.$object->multilangs[$key]["label"].'
'.$langs->trans('Description').''.$object->multilangs[$key]["description"].'
'; + print '
'; print ''; diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index 45926847df4..e109970ce33 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -369,7 +369,7 @@ if ($type == Categorie::TYPE_PRODUCT) print ''; print ''; print ''; - print '
'.$langs->trans('Translation').''; print $formadmin->select_language(GETPOST('forcelangprod', 'alpha'), 'forcelangprod', 0, $object->multilangs); print '
'; + print '
'; print '
'; print $langs->trans("AddProductServiceIntoCategory").'  '; print $form->select_produits('', 'elemid', '', 0, 0, -1, 2, '', 1); @@ -455,7 +455,7 @@ if ($type == Categorie::TYPE_SUPPLIER) $param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($socs); $nbtotalofrecords = ''; $newcardbutton = ''; print_barre_liste($langs->trans("Suppliers"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit); - print ''."\n"; + print '
'."\n"; print '\n"; if (count($socs) > 0) @@ -520,7 +520,7 @@ if($type == Categorie::TYPE_CUSTOMER) $param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($socs); $nbtotalofrecords = ''; $newcardbutton = ''; print_barre_liste($langs->trans("Customers"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit); - print '
'.$langs->trans("Name")."
'."\n"; + print '
'."\n"; print ''."\n"; if (count($socs) > 0) @@ -654,7 +654,7 @@ if ($type == Categorie::TYPE_CONTACT) $param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($contacts); $nbtotalofrecords = ''; $newcardbutton = ''; print_barre_liste($langs->trans("Contact"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit); - print '
'.$langs->trans("Name").'
'."\n"; + print '
'."\n"; print ''."\n"; if (count($contacts) > 0) diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php index 6c0aea2f935..8b3f4cf4894 100644 --- a/htdocs/comm/contact.php +++ b/htdocs/comm/contact.php @@ -128,7 +128,7 @@ if ($resql) print ''; - print '
'.$langs->trans("Ref").'
'; + print '
'; print ''; print_liste_field_titre("Lastname", $_SERVER["PHP_SELF"], "p.name", $begin, $param, "", $sortfield, $sortorder); print_liste_field_titre("Firstname", $_SERVER["PHP_SELF"], "p.firstname", $begin, $param, "", $sortfield, $sortorder); diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 245d3874d92..d405d2526d3 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -165,7 +165,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire) $num = $db->num_rows($resql); print '
'; - print '
'; + print '
'; print ''; print ''; @@ -249,7 +249,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos $num = $db->num_rows($resql); print '
'; - print '
'.$langs->trans("ProposalsDraft").' '.$num.'
'; + print '
'; print ''; print ''; @@ -331,7 +331,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire) $num = $db->num_rows($resql); print '
'; - print '
'.$langs->trans("SupplierProposalsDraft").($num?' '.$num.'':'').'
'; + print '
'; print ''; print ''; @@ -420,7 +420,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande $num = $db->num_rows($resql); print '
'; - print '
'.$langs->trans("DraftOrders").($num?' '.$num.'':'').'
'; + print '
'; print ''; print ''; @@ -512,7 +512,7 @@ if (! empty($conf->societe->enabled) && $user->rights->societe->lire) $i = 0; print '
'; - print '
'.$langs->trans("DraftSuppliersOrders").($num?' '.$num.'':'').'
'; + print '
'; print ''; print '
'; if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print $langs->trans("BoxTitleLastCustomersOrProspects", $max); @@ -576,7 +576,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->societe->lire) $i = 0; print '
'; - print ''; + print '
'; print ''; print ''; print ''; @@ -657,7 +657,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) // TO if ($num > 0) { print '
'; - print '
'.$langs->trans("BoxTitleLastModifiedSuppliers", min($max, $num)).''.$langs->trans("FullList").'
'; + print '
'; print ''; $i = 0; @@ -717,7 +717,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire) if ($num > 0) { print '
'; - print '
'.$langs->trans("LastContracts", 5).'
'; + print '
'; print ''; $nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD)); @@ -821,7 +821,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire) if ($num > 0) { print '
'; - print '
'.$langs->trans("ProposalsOpened").' '.$num.'
'; + print '
'; print ''; $nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD)); diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php index d9fbd9a37b2..42c1f191a0a 100644 --- a/htdocs/comm/mailing/advtargetemailing.php +++ b/htdocs/comm/mailing/advtargetemailing.php @@ -419,7 +419,7 @@ if ($object->fetch($id) >= 0) { dol_fiche_head($head, 'advtargets', $langs->trans("Mailing"), 0, 'email'); - print '
'.$langs->trans("OrdersOpened").' '.$num.'
'; + print '
'; $linkback = '' . $langs->trans("BackToList") . ''; diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php index 714a84fe95a..f4a0e61095f 100644 --- a/htdocs/comm/mailing/card.php +++ b/htdocs/comm/mailing/card.php @@ -762,7 +762,7 @@ if ($action == 'create') print '
'; print '

'; - print ''; + print '
'; print ''; print '
'.$langs->trans("MailTopic").'
'.$langs->trans("BackgroundColorByDefault").''; print $htmlother->selectColor($_POST['bgcolor'], 'bgcolor', '', 0); @@ -1189,7 +1189,7 @@ else print '
'; print '
'; - print ''; + print '
'; /* print ''; diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 819e0acf562..f6e27fffaa3 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -297,7 +297,7 @@ if ($object->fetch($id) >= 0) { print load_fiche_titre($langs->trans("ToAddRecipientsChooseHere"), ($user->admin?info_admin($langs->trans("YouCanAddYourOwnPredefindedListHere"), 1):''), 'generic'); - //print '
'.$langs->trans("Ref").'
'; + //print '
'; print '
'; //print '
'; diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index 701dd2d4716..1a15ac2ca64 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -61,7 +61,7 @@ print '
'; print ''; print ''; print '
'; - print '
'; + print '
'; print ''; print ''; @@ -74,7 +74,7 @@ print '
'; // Affiche stats de tous les modules de destinataires mailings -print '
'.$langs->trans("SearchAMailing").'
'; print $langs->trans("Ref").':
'; +print '
'; print ''; $dir=DOL_DOCUMENT_ROOT."/core/modules/mailings"; @@ -162,7 +162,7 @@ $sql.= " LIMIT ".$limit; $result=$db->query($sql); if ($result) { print '
'; - print '
'.$langs->trans("TargetsStatistics").'
'; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php index c99048a8955..82bf49261a1 100644 --- a/htdocs/comm/multiprix.php +++ b/htdocs/comm/multiprix.php @@ -136,7 +136,7 @@ if ($_socid > 0) $resql=$db->query($sql); if ($resql) { - print '
'.$langs->trans("LastMailings", $limit).''.$langs->trans("DateCreation").'
'; + print '
'; $tag = !$tag; print ''; print ''; diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index 85a3b059164..11d57eabbfc 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -1551,7 +1551,7 @@ if ($action == 'create') dol_fiche_head(); - print '
'.$langs->trans("Date").'
'; + print '
'; // Reference print ''; @@ -1853,7 +1853,7 @@ if ($action == 'create') $title = $langs->trans('ProductsAndServices'); print load_fiche_titre($title); - print '
' . $langs->trans('Ref') . '' . $langs->trans("Draft") . '
'; + print '
'; $objectsrc->printOriginLinesList(); diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index d802548ac6b..ed981d9488b 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -69,7 +69,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele { print ''; print ''; - print '
'; + print '
'; print ''; print ''; @@ -118,7 +118,7 @@ if ($resql) } $db->free($resql); - print '
'.$langs->trans("Search").'
'; print $langs->trans("Proposal").':
'; + print '
'; print ''."\n"; $listofstatus=array(0,1,2,3,4); foreach ($listofstatus as $status) @@ -181,7 +181,7 @@ if (! empty($conf->propal->enabled)) if ($num) { print '
'; - print '
'.$langs->trans("Statistics").' - '.$langs->trans("Proposals").'
'; + print '
'; print ''; $langs->load("propal"); print ''; @@ -248,7 +248,7 @@ $resql=$db->query($sql); if ($resql) { print '
'; - print '
'.$langs->trans("DraftPropals").' '.$num.'
'; + print '
'; print ''; print ''; @@ -332,7 +332,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire) if ($num > 0) { print '
'; - print '
'.$langs->trans("LastModifiedProposals", $max).'
'; + print '
'; print ''; $nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD)); @@ -419,7 +419,7 @@ if (! empty($conf->propal->enabled)) $num = $db->num_rows($resql); print '
'; - print '
'.$langs->trans("ProposalsOpened").' '.$num.'
'; + print '
'; print ''; print ''; @@ -492,7 +492,7 @@ if (! empty($conf->propal->enabled)) $num = $db->num_rows($resql); print '
'; - print '
'.$langs->trans("ProposalsToProcess").' '.$num.'
'; + print '
'; print ''; print ''; diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php index a37006d60fb..4c7b393c8db 100644 --- a/htdocs/comm/propal/stats/index.php +++ b/htdocs/comm/propal/stats/index.php @@ -243,7 +243,7 @@ print '
'; // Show filter box print ''; print ''; - print '
'.$langs->trans("OnProcessOrders").' '.$num.'
'; + print '
'; print ''; // Company print '
'.$langs->trans("Filter").'
'.$langs->trans("ThirdParty").''; @@ -272,7 +272,7 @@ print '
'; //} print '
'; -print ''; +print '
'; print ''; print ''; print ''; @@ -320,7 +320,7 @@ print '
'; // Show graphs -print '
'.$langs->trans("Year").''.$langs->trans("NbOfProposals").'
'; +print '
'; if ($mesg) { print $mesg; } else { print $px1->show(); diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php index 485771939c4..b2cc1d8bbda 100644 --- a/htdocs/comm/prospect/index.php +++ b/htdocs/comm/prospect/index.php @@ -57,7 +57,7 @@ if (! empty($conf->propal->enabled)) $var=false; print ''; print ''; - print ''; + print '
'; print ''; print ''; @@ -89,7 +89,7 @@ if ($resql) $i = 0; if ($num > 0 ) { - print '
'.$langs->trans("SearchAProposal").'
'; print $langs->trans("Ref").':
'; + print '
'; print ''; print ''; while ($i < $num) @@ -193,7 +193,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire) $i = 0; if ($num > 0) { - print '
'.$langs->trans("ProspectsByStatus").'
'; + print '
'; print ''; while ($i < $num) @@ -250,7 +250,7 @@ if ($resql) $i = 0; if ($num > 0 ) { - print '
'.$langs->trans("ProposalsOpened").'
'; + print '
'; print ''; while ($i < $num) diff --git a/htdocs/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php index 07741635bcc..f1e15a51ecc 100644 --- a/htdocs/comm/prospect/recap-prospect.php +++ b/htdocs/comm/prospect/recap-prospect.php @@ -62,7 +62,7 @@ if ($socid > 0) print "
'.$langs->trans("ProspectToContact").'
\n"; print '
'; - print ''; + print '
'; // Name print ''; diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php index 9605281d6ca..81e7446cff1 100644 --- a/htdocs/comm/recap-client.php +++ b/htdocs/comm/recap-client.php @@ -62,7 +62,7 @@ if ($socid > 0) print "
'.$langs->trans("Thirdpary").''.$societe->getNomUrl(1).'
\n"; print '
'; - print ''; + print '
'; // Name print ''; diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index 32c6869d576..229fca58d18 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -229,7 +229,7 @@ if ($socid > 0) $resql=$db->query($sql); if ($resql) { - print '
'.$langs->trans("ThirdParty").''.$societe->getNomUrl(1).'
'; + print '
'; $tag = !$tag; print ''; print ''; @@ -288,7 +288,7 @@ if ($socid > 0) $resql=$db->query($sql); if ($resql) { - print '
'.$langs->trans("Date").'
'; + print '
'; $tag = !$tag; print ''; print ''; diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index 523c6ebc7b1..b3d3140db09 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -356,7 +356,7 @@ if ($socid > 0) print ''; } - print '
'.$langs->trans("Date").'
'; + print '
'; if($isCustomer && $isSupplier) { print ''; print '
'.$langs->trans('DiscountType').' '; @@ -776,7 +776,7 @@ if ($socid > 0) if ($resql2) { print '
'; - print ''; + print '
'; print ''; print ''; // Need 120+ for format with AM/PM print ''; @@ -946,7 +946,7 @@ if ($socid > 0) if ($resql2) { print '
'; - print '
'.$langs->trans("Date").''.$langs->trans("ReasonDiscount").'
'; + print '
'; print ''; print ''; // Need 120+ for format with AM/PM print ''; diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 57dbbabcf1d..0daf73db702 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -1605,7 +1605,7 @@ if ($action == 'create' && $usercancreate) dol_fiche_head(''); - print '
'.$langs->trans("Date").''.$langs->trans("ReasonDiscount").'
'; + print '
'; // Reference print ''; @@ -1890,7 +1890,7 @@ if ($action == 'create' && $usercancreate) $title = $langs->trans('ProductsAndServices'); print load_fiche_titre($title); - print '
' . $langs->trans('Ref') . '' . $langs->trans("Draft") . '
'; + print '
'; $objectsrc->printOriginLinesList('', $selectedLines); diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php index bcb445c546c..f6594b5694a 100644 --- a/htdocs/commande/customer.php +++ b/htdocs/commande/customer.php @@ -123,7 +123,7 @@ if ($resql) print ''; - print '
'; + print '
'; print ''; print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", "", "", 'valign="center"', $sortfield, $sortorder); diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index da1a4fc55df..6c5fb4701dd 100644 --- a/htdocs/commande/index.php +++ b/htdocs/commande/index.php @@ -74,7 +74,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele $var=false; print ''; print ''; - print '
'; + print '
'; print ''; print ''; @@ -123,7 +123,7 @@ if ($resql) $i++; } $db->free($resql); - print '
'.$langs->trans("Search").'
'; print $langs->trans("CustomerOrder").':
'; + print '
'; print ''."\n"; $listofstatus=array(0,1,2,3,-1); foreach ($listofstatus as $status) @@ -190,7 +190,7 @@ if (! empty($conf->commande->enabled)) $resql=$db->query($sql); if ($resql) { - print '
'.$langs->trans("Statistics").' - '.$langs->trans("CustomersOrders").'
'; + print '
'; print ''; print ''; $langs->load("orders"); @@ -259,7 +259,7 @@ $sql.= $db->plimit($max, 0); $resql=$db->query($sql); if ($resql) { - print '
'.$langs->trans("DraftOrders").'
'; + print '
'; print ''; print ''; @@ -340,7 +340,7 @@ if (! empty($conf->commande->enabled)) { $num = $db->num_rows($resql); - print '
'.$langs->trans("LastModifiedOrders", $max).'
'; + print '
'; print ''; print ''; @@ -421,7 +421,7 @@ if (! empty($conf->commande->enabled)) { $num = $db->num_rows($resql); - print '
'.$langs->trans("OrdersToProcess").' '.$num.'
'; + print '
'; print ''; print ''; diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php index 35756a56487..4cc5ce532e4 100644 --- a/htdocs/commande/orderstoinvoice.php +++ b/htdocs/commande/orderstoinvoice.php @@ -415,7 +415,7 @@ if ($action == 'create' && !$error) dol_fiche_head(); - print '
'.$langs->trans("OnProcessOrders").' '.$num.'
'; + print '
'; // Ref print ''; @@ -606,7 +606,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error) } print '
'; - print '
'.$langs->trans('Ref').''.$langs->trans('Draft').'
'; + print '
'; print ''; print_liste_field_titre('Ref', $_SERVER["PHP_SELF"], 'c.ref', '', '&socid='.$socid, '', $sortfield, $sortorder); print_liste_field_titre('RefCustomerOrder', $_SERVER["PHP_SELF"], 'c.ref_client', '', '&socid='.$socid, '', $sortfield, $sortorder); diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php index bdf277bc375..e3413f5b927 100644 --- a/htdocs/commande/stats/index.php +++ b/htdocs/commande/stats/index.php @@ -256,7 +256,7 @@ print '
'; // Show filter box print ''; print ''; -print '
'; +print '
'; print ''; // Company print '
'.$langs->trans("Filter").'
'.$langs->trans("ThirdParty").''; @@ -299,7 +299,7 @@ print '

'; print '
'; -print ''; +print '
'; print ''; print ''; print ''; @@ -350,7 +350,7 @@ print '
'; // Show graphs -print '
'.$langs->trans("Year").''.$langs->trans("NbOfOrders").'
'; +print '
'; if ($mesg) { print $mesg; } else { print $px1->show(); diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php index f9d7e44794c..eec09bb94cc 100644 --- a/htdocs/compta/accounting-files.php +++ b/htdocs/compta/accounting-files.php @@ -423,7 +423,7 @@ if (!empty($date_start) && !empty($date_stop)) print '
'; print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table - print ''; + print '
'; print ''; print_liste_field_titre($arrayfields['type']['label'], $_SERVER["PHP_SELF"], "type", "", $param, '', $sortfield, $sortorder, 'nowrap '); print_liste_field_titre($arrayfields['date']['label'], $_SERVER["PHP_SELF"], "date", "", $param, '', $sortfield, $sortorder, 'center nowrap '); diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php index b5839db2200..d10374e4c8d 100644 --- a/htdocs/compta/bank/annuel.php +++ b/htdocs/compta/bank/annuel.php @@ -183,7 +183,7 @@ dol_fiche_end(); print load_fiche_titre('', $link, ''); print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table -print '
'; +print '
'; print ''; for ($annee = $year_start ; $annee <= $year_end ; $annee++) @@ -262,7 +262,7 @@ else { dol_print_error($db); } -print '
'.$langs->trans("Month").'
'; +print '
'; print '"; print ''; diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index d23f5126375..0912dfaba0a 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -690,7 +690,7 @@ if ($resql) { print load_fiche_titre($langs->trans("AddBankRecordLong"), '', ''); - print '
'.$langs->trans("CurrentBalance")."'.price($balance).'
'; + print '
'; print ''; print ''; diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php index c9c5a0f77fe..967227f9e89 100644 --- a/htdocs/compta/bank/budget.php +++ b/htdocs/compta/bank/budget.php @@ -46,7 +46,7 @@ llxHeader(); // List movements bu category for bank transactions print load_fiche_titre($langs->trans("BankTransactionByCategories"), '', 'title_bank.png'); -print '
'.$langs->trans("Description").'
'; +print '
'; print ""; print ''; print ''; diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php index 702d3bbc113..4e58684b876 100644 --- a/htdocs/compta/bank/card.php +++ b/htdocs/compta/bank/card.php @@ -346,7 +346,7 @@ if ($action == 'create') dol_fiche_head(''); - print '
'.$langs->trans("Rubrique").''.$langs->trans("Nb").'
'; + print '
'; // Ref print ''; @@ -450,7 +450,7 @@ if ($action == 'create') print '
'; - print '
'.$langs->trans("Ref").'
'; + print '
'; // Sold print ''; @@ -472,7 +472,7 @@ if ($action == 'create') if ($_POST["type"] == Account::TYPE_SAVINGS || $_POST["type"] == Account::TYPE_CURRENT) { - print '
'.$langs->trans("InitialBankBalance").'
'; + print '
'; // If bank account print ''; @@ -532,7 +532,7 @@ if ($action == 'create') print '
'; } - print '
'.$langs->trans("BankName").'
'; + print '
'; // Accountancy code $fieldrequired=''; if (! empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED)) $fieldrequired='fieldrequired '; @@ -833,7 +833,7 @@ else //print '
'; - print '
'; + print '
'; // Ref print ''; @@ -951,7 +951,7 @@ else //print '
'; - print '
'.$langs->trans("Ref").'
'; + print '
'; // Accountancy code $tdextra = ' class="titlefieldcreate"'; @@ -986,7 +986,7 @@ else //print '
'; - print '
'; + print '
'; // If bank account print ''; diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php index 683f04bc84c..377feaa0cae 100644 --- a/htdocs/compta/bank/categ.php +++ b/htdocs/compta/bank/categ.php @@ -93,7 +93,7 @@ print ''; */ print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table -print '
'.$langs->trans("BankName").'
'; +print '
'; print ''; print ''; print "\n"; diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php index 7e96ddf31be..cdab5006ef9 100644 --- a/htdocs/compta/bank/line.php +++ b/htdocs/compta/bank/line.php @@ -314,7 +314,7 @@ if ($result) print '
'; print '
'; - print '
'.$langs->trans("Ref").''.$langs->trans("Label").'
'; + print '
'; $i++; @@ -639,7 +639,7 @@ if ($result) print '
'; - print '
'; + print '
'; print '"; if ($user->rights->banque->consolidate) diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index cb029902372..27daba4ec5a 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -270,7 +270,7 @@ if (empty($numref)) print ''; print ''; - print '
'.$langs->trans("Conciliation")."
'; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php index ad21fe07df4..7ce6763b8e0 100644 --- a/htdocs/compta/bank/transfer.php +++ b/htdocs/compta/bank/transfer.php @@ -238,7 +238,7 @@ print ''; print ''; -print '
'.$langs->trans("Ref").''.$langs->trans("InitialBankBalance").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php index 30472729d92..9066d0ef581 100644 --- a/htdocs/compta/bank/various_payment/card.php +++ b/htdocs/compta/bank/various_payment/card.php @@ -267,7 +267,7 @@ if ($action == 'create') dol_fiche_head('', ''); - print '
'.$langs->trans("TransferFrom").''.$langs->trans("TransferTo").''.$langs->trans("Date").''.$langs->trans("Description").''.$langs->trans("Amount").'
'; + print '
'; // Date payment print '
'; @@ -459,7 +459,7 @@ if ($id) print '
'; print '
'; - print ''; + print '
'; // Label print ''; diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php index 706f24d00d4..602cd9142cf 100644 --- a/htdocs/compta/cashcontrol/cashcontrol_card.php +++ b/htdocs/compta/cashcontrol/cashcontrol_card.php @@ -327,7 +327,7 @@ if ($action=="create" || $action=="start") { print ''; } - print '
'.$langs->trans("Label").''.$object->label.'
'; + print '
'; print ''; print ''; print ''; @@ -407,7 +407,7 @@ if ($action=="create" || $action=="start") print '
'; - print '
'.$langs->trans("Module").''.$langs->trans("CashDesk").' ID
'; + print '
'; print ''; print ''; diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index 5fe9853ec54..bd333110e51 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -125,7 +125,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) print load_fiche_titre($langs->trans("SocialContributionsPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', ''); } - print '
'; + print '
'; print ''; print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "cs.date_ech", "", $param, 'width="140px"', $sortfield, $sortorder); print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "c.libelle", "", $param, '', $sortfield, $sortorder); @@ -281,7 +281,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) $num = $db->num_rows($result); $i = 0; $total = 0 ; - print '
'; + print '
'; print ''; print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'width="140px"', $sortfield, $sortorder); print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "pv.label", "", $param, '', $sortfield, $sortorder); @@ -414,7 +414,7 @@ while($j<$numlt) $num = $db->num_rows($result); $i = 0; $total = 0 ; - print '
'; + print '
'; print ''; print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'width="120"', $sortfield, $sortorder); print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "pv.label", "", $param, '', $sortfield, $sortorder); @@ -495,7 +495,7 @@ if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read)) $num = $db->num_rows($result); $i = 0; $total = 0 ; - print '
'; + print '
'; print ''; print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "s.dateep", "", $param, 'width="140px"', $sortfield, $sortorder); print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "s.label", "", $param, '', $sortfield, $sortorder); diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php index 15f3504268b..8cfeeda613e 100644 --- a/htdocs/compta/clients.php +++ b/htdocs/compta/clients.php @@ -141,7 +141,7 @@ if ($resql) print ''; - print '
'; + print '
'; print ''; print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", "", "", 'valign="center"', $sortfield, $sortorder); diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php index dd56e611545..488a5a86cf7 100644 --- a/htdocs/compta/deplacement/card.php +++ b/htdocs/compta/deplacement/card.php @@ -250,7 +250,7 @@ if ($action == 'create') print ''; print ''; - print '
'; + print '
'; print ""; print '
'.$langs->trans("Type").''; @@ -339,7 +339,7 @@ elseif ($id) print ''; print ''; - print ''; + print '
'; // Ref print ""; @@ -426,7 +426,7 @@ elseif ($id) $soc = new Societe($db); if ($object->socid) $soc->fetch($object->socid); - print '
'; + print '
'; $linkback = ''.$langs->trans("BackToList").''; diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php index 659744a2ba0..fde600aff8f 100644 --- a/htdocs/compta/deplacement/index.php +++ b/htdocs/compta/deplacement/index.php @@ -97,7 +97,7 @@ print '
'; // Statistics -print '
'; +print '
'; print ''; print ''; print "\n"; @@ -160,7 +160,7 @@ if ($result) $i = 0; - print '
'.$langs->trans("Statistics").'
'; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php index 6d5d952d104..3f92e9127da 100644 --- a/htdocs/compta/deplacement/list.php +++ b/htdocs/compta/deplacement/list.php @@ -120,7 +120,7 @@ if ($resql) $i = 0; print ''."\n"; - print '
'.$langs->trans("BoxTitleLastModifiedExpenses", min($max, $num)).''.$langs->trans("FeesKilometersOrAmout").'
'; + print '
'; print ""; print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "d.rowid", "", "&socid=$socid", '', $sortfield, $sortorder); print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "d.type", "", "&socid=$socid", '', $sortfield, $sortorder); diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php index ccb2ecb60fe..d313224cf53 100644 --- a/htdocs/compta/deplacement/stats/index.php +++ b/htdocs/compta/deplacement/stats/index.php @@ -228,7 +228,7 @@ print '
'; // Show filter box print ''; print ''; -print '
'; +print '
'; print ''; // Company print '
'.$langs->trans("Filter").'
'.$langs->trans("ThirdParty").''; @@ -253,7 +253,7 @@ print ''; print '

'; print '
'; -print ''; +print '
'; print ''; print ''; print ''; @@ -291,7 +291,7 @@ print '
'; // Show graphs -print '
'.$langs->trans("Year").''.$langs->trans("Number").'
'; +print '
'; if ($mesg) { print $mesg; } else { print $px1->show(); diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php index bde69045bb7..e13693e7411 100644 --- a/htdocs/compta/facture/card-rec.php +++ b/htdocs/compta/facture/card-rec.php @@ -999,7 +999,7 @@ if ($action == 'create') if (! empty($conf->projet->enabled)) $rowspan++; if ($object->fk_account > 0) $rowspan++; - print ''; + print '
'; $object->fetch_thirdparty(); @@ -1111,7 +1111,7 @@ if ($action == 'create') dol_fiche_head(null, '', '', 0); - print '
'; + print '
'; // Frequency + unit print '
'.$form->textwithpicto($langs->trans("Frequency"), $langs->transnoentitiesnoconv('toolTipFrequency')).""; @@ -1285,7 +1285,7 @@ else print '
'; print '
'; - print ''; + print '
'; print '"; @@ -1514,7 +1514,7 @@ else $title = $langs->trans("Recurrence"); //print load_fiche_titre($title, '', 'calendar'); - print '
'.$langs->trans("Author").''.$author->getFullName($langs)."
'; + print '
'; print ''; diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index d462d3cc444..10f54e538a2 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -2748,7 +2748,7 @@ if ($action == 'create') dol_fiche_head(''); - print '
'.$title.'
'; + print '
'; // Ref print ''; @@ -3454,7 +3454,7 @@ if ($action == 'create') $title = $langs->trans('ProductsAndServices'); print load_fiche_titre($title); - print '
' . $langs->trans('Ref') . '' . $langs->trans('Draft') . '
'; + print '
'; $objectsrc->printOriginLinesList(); diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index 485401d340e..e0569878b57 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -226,7 +226,7 @@ if ($object->id > 0) print '
'; print '
'; - print '
'; + print '
'; // Type print '
'.$langs->trans('Type').''; @@ -583,7 +583,7 @@ if ($object->id > 0) */ print '
'; - print ''; + print '
'; print ''; print ''; diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php index 5f81d34a092..0939da3598b 100644 --- a/htdocs/compta/facture/stats/index.php +++ b/htdocs/compta/facture/stats/index.php @@ -236,7 +236,7 @@ print '
'; // Show filter box print '
'; print ''; -print '
'.$langs->trans("DateRequest").'
'; +print '
'; print ''; // Company print '
'.$langs->trans("Filter").'
'.$langs->trans("ThirdParty").''; @@ -274,7 +274,7 @@ print ''; print '

'; print '
'; -print ''; +print '
'; print ''; print ''; print ''; @@ -323,7 +323,7 @@ print '
'; // Show graphs -print '
'.$langs->trans("Year").''.$langs->trans("NumberOfBills").'
'; +print '
'; if ($mesg) { print $mesg; } else { print $px1->show(); diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 8531249afdb..5199903b9ff 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -168,7 +168,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) $num = $db->num_rows($resql); print '
'; - print ''; + print '
'; print ''; print ''; if ($num) @@ -255,7 +255,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- $num = $db->num_rows($resql); print '
'; - print '
'.$langs->trans("CustomersDraftInvoices").($num?' '.$num.'':'').'
'; + print '
'; print ''; print ''; if ($num) @@ -358,7 +358,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) $i = 0; print '
'; - print '
'.$langs->trans("SuppliersDraftInvoices").($num?' '.$num.'':'').'
'; + print '
'; print ''; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''; print ''; @@ -480,7 +480,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- $num = $db->num_rows($resql); print '
'; - print '
'.$langs->trans("BoxTitleLastCustomerBills", $max).''.$langs->trans("AmountHT").''.$langs->trans("AmountTTC").'
'; + print '
'; print ''; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''; print ''; @@ -570,7 +570,7 @@ if (! empty($conf->don->enabled) && $user->rights->societe->lire) $i = 0; print '
'; - print '
'.$langs->trans("BoxTitleLastSupplierBills", $max).''.$langs->trans("AmountHT").''.$langs->trans("AmountTTC").'
'; + print '
'; print ''; print ''; print ''; @@ -644,7 +644,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) $num = $db->num_rows($resql); print '
'; - print '
'.$langs->trans("BoxTitleLastModifiedDonations", $max).'
'; + print '
'; print ''; print ''; print ''; @@ -739,7 +739,7 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us $i = 0; print '
'; - print '
'.$langs->trans("ContributionsToPay").($num?' '.$num.'':'').''.$langs->trans("DateDue").'
'; + print '
'; print ""; print ''; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''; @@ -855,7 +855,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) $i = 0; print '
'; - print '
'.$langs->trans("OrdersDeliveredToBill").' '.$num.''.$langs->trans("AmountHT").'
'; + print '
'; print ''; print ''; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''; @@ -989,7 +989,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- $num = $db->num_rows($resql); print '
'; - print '
'.$langs->trans("BillsCustomersUnpaid", $num).' '.$num.''.$langs->trans("DateDue").''.$langs->trans("AmountHT").'
'; + print '
'; print ''; print ''; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''; @@ -1067,7 +1067,7 @@ $resql = 0; if ($resql) { print '
'; - print '
'.$langs->trans("BillsSuppliersUnpaid", $num).' '.$num.''.$langs->trans("DateDue").''.$langs->trans("AmountHT").'
'; + print '
'; print ''.$langs->trans("TasksToDo").''; print "\n"; $i = 0; diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php index f6cc0ec03b6..859f1372b1d 100644 --- a/htdocs/compta/journal/sellsjournal.php +++ b/htdocs/compta/journal/sellsjournal.php @@ -206,7 +206,7 @@ else { */ -print '
'; +print '
'; print ''; //print ""; print ''; diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php index 4acb3f108a3..a58d7a7c6ea 100644 --- a/htdocs/compta/localtax/card.php +++ b/htdocs/compta/localtax/card.php @@ -166,7 +166,7 @@ if ($action == 'create') dol_fiche_head(); - print '
".$langs->trans("JournalNum")."'.$langs->trans('Date').''.$langs->trans('Piece').' ('.$langs->trans('InvoiceRef').')
'; + print '
'; print ""; print '
'.$langs->trans("DatePayment").''; @@ -236,7 +236,7 @@ if ($id) print '
'; print '
'; - print ''; + print '
'; print ""; print '
'.$langs->trans("Ref").''; diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php index c31a02b5b33..fbc09ea4e12 100644 --- a/htdocs/compta/localtax/clients.php +++ b/htdocs/compta/localtax/clients.php @@ -164,7 +164,7 @@ $vatsup=$langs->transcountry($local==1?"LT1":"LT2", $mysoc->country_code); // IRPF that the customer has retained me if($calc ==0 || $calc == 2) { - print ''; + print '
'; print ''; print ''; print ''; @@ -244,7 +244,7 @@ if($calc ==0 || $calc == 2) // IRPF I retained my supplier if($calc ==0 || $calc == 1){ - print '
'.$langs->trans("Num").''.$langs->trans("Customer").'
'; + print '
'; print ''; print '"; print '"; @@ -320,7 +320,7 @@ if($calc ==0 || $calc == 1){ if($calc ==0){ // Total to pay print '

'; - print '
'.$langs->trans("Num")."'.$langs->trans("Supplier")."
'; + print '
'; $diff = $x_coll_sum - $x_paye_sum ; print ''; print ''; diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php index 6fa963ad25e..bf447b2fdd9 100644 --- a/htdocs/compta/localtax/index.php +++ b/htdocs/compta/localtax/index.php @@ -97,7 +97,7 @@ function pt($db, $sql, $date) $num = $db->num_rows($result); $i = 0; $total = 0; - print '
'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'
'; + print '
'; print ''; print ''; @@ -262,7 +262,7 @@ print '
'; print load_fiche_titre($langs->transcountry($LTSummary, $mysoc->country_code), '', ''); -print '
'.$date.'
'; +print '
'; print ''; print '"; if($CalcLT==0) { diff --git a/htdocs/compta/localtax/list.php b/htdocs/compta/localtax/list.php index cfa1d492a60..46aa0cfe57f 100644 --- a/htdocs/compta/localtax/list.php +++ b/htdocs/compta/localtax/list.php @@ -62,7 +62,7 @@ if ($result) $i = 0; $total = 0 ; - print '
'.$langs->trans("Year")." ".$y."
'; + print '
'; print ''; print ''; print ""; diff --git a/htdocs/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php index 0c49f23dc3d..cfc59dfaa91 100644 --- a/htdocs/compta/localtax/quadri_detail.php +++ b/htdocs/compta/localtax/quadri_detail.php @@ -204,7 +204,7 @@ if($local==1){ } // VAT Received and paid -echo '
'.$langs->trans("Ref").'".$langs->trans("Label")."
'; +echo '
'; $y = $year_current; $total = 0; @@ -480,7 +480,7 @@ else print '
'; $diff=$x_coll_sum; - echo ''; + echo '
'; //print table headers for this quadri - expenses now print ''; print ''; @@ -635,7 +635,7 @@ else // Total to pay print '

'; - print '
'.$elementsup.'
'; + print '
'; $diff = $x_coll_sum - $x_paye_sum; print ''; print ''; diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 5590a45f97f..3f1e4aef717 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -470,7 +470,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie dol_fiche_head(); - print '
'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'
'; + print '
'; // Third party print '\n"; @@ -580,7 +580,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie $i = 0; //print '
'.$langs->trans('Company').''.$facture->thirdparty->getNomUrl(4)."
'; print '
'; - print ''; + print '
'; print ''; print ''; @@ -880,7 +880,7 @@ if (! GETPOST('action', 'aZ09')) $i = 0; print_barre_liste($langs->trans('Payments'), $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', $num); - print '
'.$arraytitle.'
'; + print '
'; print ''; print_liste_field_titre('Invoice', $_SERVER["PHP_SELF"], 'ref', '', '', '', $sortfield, $sortorder); print_liste_field_titre('Date', $_SERVER["PHP_SELF"], 'dp', '', '', '', $sortfield, $sortorder); diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php index 1fd4f735a50..7b14146edf8 100644 --- a/htdocs/compta/paiement/card.php +++ b/htdocs/compta/paiement/card.php @@ -337,7 +337,7 @@ if ($resql) print '
'; print '
'; - print '
'; + print '
'; print ''; print ''; diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php index f91ac35f678..a31086ece30 100644 --- a/htdocs/compta/paiement/cheque/card.php +++ b/htdocs/compta/paiement/cheque/card.php @@ -381,7 +381,7 @@ if ($action == 'new') dol_fiche_head(); - print '
'.$langs->trans('Bill').'
'; + print '
'; //print ''; // Filter print '
'.$langs->trans('Date').''.dol_print_date($now,'day').'
'.$langs->trans("DateChequeReceived").''; @@ -568,7 +568,7 @@ else print '
'; - print ''; + print '
'; print '
'; @@ -663,7 +663,7 @@ else $num = $db->num_rows($resql); print '
'; - print ''; + print '
'; $param="&id=".$object->id; diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php index bbec9e1fba7..8d2104303fe 100644 --- a/htdocs/compta/paiement/cheque/index.php +++ b/htdocs/compta/paiement/cheque/index.php @@ -61,7 +61,7 @@ $sql.= " AND b.amount > 0"; $resql = $db->query($sql); -print '
'; +print '
'; print ''; print '\n"; print "\n"; @@ -101,7 +101,7 @@ $sql.= $db->plimit($max); $resql = $db->query($sql); if ($resql) { - print '
'.$langs->trans("BankChecks")."
'; + print '
'; print ''; print ''; print '"; diff --git a/htdocs/compta/paiement/tovalidate.php b/htdocs/compta/paiement/tovalidate.php index e3c23041ec8..cf5a5cc7bd0 100644 --- a/htdocs/compta/paiement/tovalidate.php +++ b/htdocs/compta/paiement/tovalidate.php @@ -103,7 +103,7 @@ if ($resql) print_barre_liste($langs->trans("ReceivedCustomersPaymentsToValid"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num); - print '
'.$langs->trans("LastCheckReceiptShort", $max).''.$langs->trans("Date")."
'; + print '
'; print ''; print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.rowid", "", "", 'width="60"', $sortfield, $sortorder); print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "dp", "", "", 'width="80" align="center"', $sortfield, $sortorder); diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php index 238ac01fd1a..bb57e796ef6 100644 --- a/htdocs/compta/paiement_charge.php +++ b/htdocs/compta/paiement_charge.php @@ -199,7 +199,7 @@ if ($action == 'create') dol_fiche_head('', ''); - print '
'; + print '
'; print ''; print '\n"; @@ -260,7 +260,7 @@ if ($action == 'create') $num = 1; $i = 0; - print '
'.$langs->trans("Ref").''.$chid.'
'.$langs->trans("Type")."".$charge->type_label."
'; + print '
'; print ''; //print ''; print ''; diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php index ecc3a23430a..5dfd029747b 100644 --- a/htdocs/compta/payment_sc/card.php +++ b/htdocs/compta/payment_sc/card.php @@ -169,7 +169,7 @@ dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'id', ''); print '
'; print '
'; -print '
'.$langs->trans("SocialContribution").''.$langs->trans("DateDue").'
'; +print '
'; // Ref /*print ''; @@ -235,7 +235,7 @@ if ($resql) $i = 0; $total = 0; - print '
'.$langs->trans('Ref').'
'; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php index 6c60cdaa059..0008a948c16 100644 --- a/htdocs/compta/prelevement/card.php +++ b/htdocs/compta/prelevement/card.php @@ -177,7 +177,7 @@ if ($id > 0 || $ref) print '
'; print '
'; - print '
'.$langs->trans('SocialContribution').''.$langs->trans('Type').'
'; + print '
'; //print ''; print ''; @@ -214,7 +214,7 @@ if ($id > 0 || $ref) print '
'; print '
'; - print '
'.$langs->trans("Ref").''.$object->getNomUrl(1).'
'.$langs->trans("Date").''.dol_print_date($object->datec, 'day').'
'; + print '
'; $acc = new Account($db); $result=$acc->fetch($conf->global->PRELEVEMENT_ID_BANKACCOUNT); @@ -262,7 +262,7 @@ if ($id > 0 || $ref) print ''; print ''; print ''; - print '
'; + print '
'; print ''; print ''; print '
'.$langs->trans("NotifyTransmision").'
'.$langs->trans("TransData").''; @@ -286,7 +286,7 @@ if ($id > 0 || $ref) print ''; print ''; print ''; - print ''; + print '
'; print ''; print ''; print '
'.$langs->trans("NotifyCredit").'
'.$langs->trans('CreditDate').''; diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index c4cad05d1f6..625fc0ce04f 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -337,7 +337,7 @@ if ($result) $i = 0; print"\n\n"; - print ''; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php index 52b312e6b4c..67d4fcbc078 100644 --- a/htdocs/compta/prelevement/demandes.php +++ b/htdocs/compta/prelevement/demandes.php @@ -153,7 +153,7 @@ print ''; print ''; -print '
'.$langs->trans("Ref").''.$langs->trans("Date").''.$langs->trans("Amount").'
'; +print '
'; print ''; print_liste_field_titre("Bill", $_SERVER["PHP_SELF"]); diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 334e36c5a68..aa47b3184ce 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -79,7 +79,7 @@ if ($prev_id > 0 || $ref) print '
'; print '
'; - print '
'; + print '
'; //print ''; print ''; @@ -111,7 +111,7 @@ if ($prev_id > 0 || $ref) print '
'; print '
'; - print '
'.$langs->trans("Ref").''.$object->getNomUrl(1).'
'.$langs->trans("Date").''.dol_print_date($object->datec, 'day').'
'; + print '
'; $acc = new Account($db); $result=$acc->fetch($conf->global->PRELEVEMENT_ID_BANKACCOUNT); @@ -201,7 +201,7 @@ if ($result) print"\n\n"; print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table - print '
'; + print '
'; print ''; print_liste_field_titre("Bill", $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder); print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", '', $param, '', $sortfield, $sortorder); diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index 17e8dcebe98..ca5cb77432b 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -112,7 +112,7 @@ if ($prev_id > 0 || $ref) print '
'; print '
'; - print '
'; + print '
'; $acc = new Account($db); $result=$acc->fetch($conf->global->PRELEVEMENT_ID_BANKACCOUNT); diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php index 01fde1b2450..1b351371958 100644 --- a/htdocs/compta/prelevement/fiche-stat.php +++ b/htdocs/compta/prelevement/fiche-stat.php @@ -109,7 +109,7 @@ if ($prev_id > 0 || $ref) print '
'; print '
'; - print '
'; + print '
'; $acc = new Account($db); $result=$acc->fetch($conf->global->PRELEVEMENT_ID_BANKACCOUNT); diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php index 3af40c84dcb..936fbebcf6e 100644 --- a/htdocs/compta/prelevement/index.php +++ b/htdocs/compta/prelevement/index.php @@ -72,7 +72,7 @@ $invoicestatic=new Facture($db); $bprev = new BonPrelevement($db); print '
'; -print '
'; +print '
'; print ''; print ''; @@ -117,7 +117,7 @@ if ($resql) $i = 0; print '
'; - print '
'.$langs->trans("Statistics").'
'.$langs->trans("NbOfInvoiceToWithdraw").'
'; + print '
'; print ''; print ''; if ($num) @@ -191,7 +191,7 @@ if ($result) print"\n\n"; print '
'; - print '
'.$langs->trans("InvoiceWaitingWithdraw").' ('.$num.')
'; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php index 454861dea73..fdea395e3e5 100644 --- a/htdocs/compta/prelevement/line.php +++ b/htdocs/compta/prelevement/line.php @@ -128,7 +128,7 @@ if ($id) dol_fiche_head($head, $hselected, $langs->trans("StandingOrder")); - print '
'.$langs->trans("LastWithdrawalReceipt", $limit).''.$langs->trans("Date").''.$langs->trans("Amount").'
'; + print '
'; print ''; @@ -182,7 +182,7 @@ if ($id) print ''; print ''; print ''; - print '
'.$langs->trans("WithdrawalsReceipts").''; print $bon->getNomUrl(1).'
'; + print '
'; print ''; print ''; diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php index 1b9396a411a..87257db6a9d 100644 --- a/htdocs/compta/prelevement/stats.php +++ b/htdocs/compta/prelevement/stats.php @@ -89,7 +89,7 @@ if ($resql) $i = 0; print"\n\n"; - print '
'.$langs->trans("WithdrawalRefused").'
'; + print '
'; print ''; print ''; print ''; @@ -182,7 +182,7 @@ if ($resql) $i = 0; print"\n\n"; - print '
'.$langs->trans("Status").''.$langs->trans("Number").'%'.$langs->trans("Amount").'%
'; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php index 88a72344f52..3956874e11c 100644 --- a/htdocs/compta/recap-compta.php +++ b/htdocs/compta/recap-compta.php @@ -104,7 +104,7 @@ if ($id > 0) // Invoice list print load_fiche_titre($langs->trans("CustomerPreview")); - print '
'.$langs->trans("Status").''.$langs->trans("Number").'%'.$langs->trans("Amount").'%
'; + print '
'; print ''; if (! empty($arrayfields['f.datef']['checked'])) print_liste_field_titre($arrayfields['f.datef']['label'], $_SERVER["PHP_SELF"], "f.datef", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder); print ''; diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index c85894c60d6..e051be0773d 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -201,7 +201,7 @@ if ($date_endday) $param.='&date_endday='.$date_endday; if ($date_endmonth) $param.='&date_endmonth='.$date_endmonth; if ($date_endyear) $param.='&date_endyear='.$date_startyear; -print '
'.$langs->trans("Element").'
'; +print '
'; print ''; print_liste_field_titre("PredefinedGroups", $_SERVER["PHP_SELF"], 'f.thirdparty_code,f.rowid', '', $param, '', $sortfield, $sortorder, 'width200 '); print_liste_field_titre(''); diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php index 397de3d8ad9..9ecc68316c5 100644 --- a/htdocs/compta/sociales/card.php +++ b/htdocs/compta/sociales/card.php @@ -317,7 +317,7 @@ if ($action == 'create') dol_fiche_head(); - print '
'; + print '
'; // Label print ""; @@ -512,7 +512,7 @@ if ($id > 0) print '
'; print '
'; - print '
'; + print '
'; // Type print '"; diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php index d22bd80722a..6ccb76e95e5 100644 --- a/htdocs/compta/sociales/payments.php +++ b/htdocs/compta/sociales/payments.php @@ -114,7 +114,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) print load_fiche_titre($langs->trans("SocialContributionsPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', ''); } - print '
'.$langs->trans("Type")."".$object->type_label."
'; + print '
'; print ''; print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pc.rowid", "", $param, '', $sortfield, $sortorder); print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pc.datep", "", $param, 'align="center"', $sortfield, $sortorder); @@ -244,7 +244,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) $num = $db->num_rows($result); $i = 0; $total = 0 ; - print '
'; + print '
'; print ''; print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'width="140px"', $sortfield, $sortorder); print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "pv.label", "", $param, '', $sortfield, $sortorder); @@ -345,7 +345,7 @@ while($j<$numlt) $num = $db->num_rows($result); $i = 0; $total = 0 ; - print '
'; + print '
'; print ''; print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'width="120"', $sortfield, $sortorder); print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "pv.label", "", $param, '', $sortfield, $sortorder); @@ -426,7 +426,7 @@ if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read)) $num = $db->num_rows($result); $i = 0; $total = 0 ; - print '
'; + print '
'; print ''; print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "s.dateep", "", $param, 'width="140px"', $sortfield, $sortorder); print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "s.label", "", $param, '', $sortfield, $sortorder); diff --git a/htdocs/compta/stats/byratecountry.php b/htdocs/compta/stats/byratecountry.php index 08ddd9a576e..b43ccbacb38 100644 --- a/htdocs/compta/stats/byratecountry.php +++ b/htdocs/compta/stats/byratecountry.php @@ -242,7 +242,7 @@ if (! empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING') if ($modecompta == 'CREANCES-DETTES') { - print '
'; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php index dbbaa8d56fc..e084dd4fab6 100644 --- a/htdocs/compta/tva/card.php +++ b/htdocs/compta/tva/card.php @@ -252,7 +252,7 @@ if ($action == 'create') dol_fiche_head(); - print '
' . $langs->trans("TurnoverbyVatrate") . '' . $langs->trans("ProductOrService") . '' . $langs->trans("Country") . '
'; + print '
'; print ""; print '
'.$langs->trans("DatePayment").''; @@ -331,7 +331,7 @@ if ($id) print '
'; print '
'; - print ''; + print '
'; // Label //print ''; diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index e97e4554b41..650e6e203e4 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -735,7 +735,7 @@ if (! is_array($x_coll) || ! is_array($x_paye)) // Total to pay print '

'; - print '
'.$langs->trans("Label").''.$object->label.'
'; + print '
'; $diff = $x_coll_sum - $x_paye_sum; print ''; print ''; diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index 1ed3658b37a..77c904512aa 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -97,7 +97,7 @@ function pt($db, $sql, $date) $num = $db->num_rows($result); $i = 0; $total = 0; - print '
'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'
'; + print '
'; print ''; print ''; @@ -243,7 +243,7 @@ print '
'; print load_fiche_titre($langs->trans("VATSummary"), '', ''); -print '
'.$date.'
'; +print '
'; print ''; print ''; print ''; @@ -576,7 +576,7 @@ if (! empty($conf->global->MAIN_FEATURES_LEVEL)) $result = $db->query($sql1); if ($result) { $obj = $db->fetch_object($result); - print '
'.$langs->trans("Year")." ".$y.''.$langs->trans("VATToPay").'
'; + print '
'; print ""; print ''; diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index 791c360ff67..14636fb1e2f 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -198,7 +198,7 @@ $vatexpensereport=$langs->trans("VATPaid"); // VAT Received and paid -print '
' . $langs->trans("VATDue") . '
'; +print '
'; $y = $year_current; $total = 0; @@ -715,7 +715,7 @@ if (! is_array($x_coll) || ! is_array($x_paye)) // Total to pay print '

'; - print '
'; + print '
'; $diff = $x_coll_sum - $x_paye_sum; print ''; print ''; diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index 9642cdfa84c..e4cf66b472a 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -610,7 +610,7 @@ else dol_fiche_head($head, 'card', '', 0, ''); - print '
'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'
'; + print '
'; // Name print ''; @@ -831,7 +831,7 @@ else // Add personnal information print load_fiche_titre('
'.$langs->trans("PersonalInformations").'
', '', ''); - print '
'; + print '
'; // Date To Birth print '
'; @@ -931,7 +931,7 @@ else dol_fiche_head($head, 'card', $title, 0, 'contact'); - print ''; + print '
'; // Ref/ID if (! empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php index 4b08d3cb95a..09e83c313c0 100644 --- a/htdocs/contact/consumption.php +++ b/htdocs/contact/consumption.php @@ -126,7 +126,7 @@ dol_banner_tab($object, 'id', $linkback, ($user->socid?0:1), 'rowid', 'nom', $mo print '
'; print '
'; -print '
'; +print '
'; // Civility print '
'.$langs->trans("UserTitle").''; @@ -356,7 +356,7 @@ if ($sql_select) print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, '', 0, '', '', $limit); print '
'; - print ''."\n"; + print '
'."\n"; // Filters print ''; @@ -605,7 +605,7 @@ if ($sql_select) } elseif (empty($type_element) || $type_element == -1) { print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', ''); - print '
'."\n"; + print '
'."\n"; // Titles with sort buttons print ''; print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left '); @@ -621,7 +621,7 @@ if ($sql_select) } else { print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', ''); - print '
'."\n"; + print '
'."\n"; print ''; diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index 093245025cd..f3a93ebac33 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -149,7 +149,7 @@ if ($action == 'edit') dol_fiche_head($head, 'perso', $title, 0, 'contact'); - print '
'.$langs->trans("FeatureNotYetAvailable").'
'; + print '
'; // Ref print '
'.$langs->trans("Ref").''; diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 9c30ff802a5..d1239087cfe 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -1171,7 +1171,7 @@ if ($action == 'create') dol_fiche_head(); - print ''; + print '
'; // Ref print '
'.$langs->trans('Ref').''; diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 7049ce77076..b85262586b9 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -1894,6 +1894,7 @@ class Contrat extends CommonObject public function LibStatut($status, $mode) { // phpcs:enable + global $langs; if (empty($this->labelStatus) || empty($this->labelStatusShort)) { diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index 9d96ca7be5e..7432ca1cd47 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -85,12 +85,14 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele { print ''; print ''; - print ''; + + print '
'; + print '
'; print ''; print ''; print ''; print ''; - print "
'.$langs->trans("Search").'
'.$langs->trans("Contract").':
\n"; + print "
\n"; print "
"; } } @@ -183,8 +185,8 @@ else dol_print_error($db); } - -print ''; +print '
'; +print '
'; print ''."\n"; $listofstatus=array(0,4,4,5); $bool=false; foreach($listofstatus as $status) @@ -232,7 +234,7 @@ foreach($listofstatus as $status) //if ($totalinprocess != $total) //print ''; print ''; -print "
'.$langs->trans("Statistics").' - '.$langs->trans("Services").'
'.$langs->trans("Total").' ('.$langs->trans("ServicesRunning").')'.$totalinprocess.'
'.$langs->trans("Total").''.$total.'

"; +print "

"; // Draft contracts @@ -255,7 +257,8 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire) { $num = $db->num_rows($resql); - print ''; + print '
'; + print '
'; print ''; print ''; if ($num) @@ -290,7 +293,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire) { print ''; } - print "
'.$langs->trans("DraftContracts").($num?' '.$num.'':'').'
'.$langs->trans("NoContracts").'

"; + print "

"; $db->free($resql); } else @@ -333,7 +336,8 @@ if ($result) $num = $db->num_rows($result); $i = 0; - print ''; + print '
'; + print '
'; print ''; print ''; @@ -368,7 +372,7 @@ if ($result) } $db->free($result); - print "
'.$langs->trans("LastContracts", 5).''.$langs->trans("DateModification").'
"; + print "
"; } else { @@ -400,7 +404,8 @@ if ($resql) $num = $db->num_rows($resql); $i = 0; - print ''; + print '
'; + print '
'; print ''; print "\n"; @@ -446,7 +451,7 @@ if ($resql) } $db->free(); - print "
'.$langs->trans("LastModifiedServices", $max).'
"; + print "
"; } else { @@ -479,7 +484,8 @@ if ($resql) $num = $db->num_rows($resql); $i = 0; - print ''; + print '
'; + print '
'; print ''; print "\n"; @@ -524,7 +530,7 @@ if ($resql) } $db->free(); - print "
'.$langs->trans("NotActivatedServices").' '.$num.'
"; + print "
"; } else { @@ -558,7 +564,8 @@ if ($resql) $num = $db->num_rows($resql); $i = 0; - print ''; + print '
'; + print '
'; print ''; print "\n"; @@ -603,7 +610,7 @@ if ($resql) } $db->free(); - print "
'.$langs->trans("ListOfExpiredServices").' '.$num.'
"; + print "
"; } else { diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index 5f8c630e46a..05cbcb0ca14 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -1125,10 +1125,10 @@ class CMailFile $strContentAltText = ''; if ($this->msgishtml) { - // Similar code to forge a text from html is also in CMailFile.class.php + // Similar code to forge a text from html is also in smtps.class.php $strContentAltText = preg_replace("/]*>/", " ", $strContent); $strContentAltText = html_entity_decode(strip_tags($strContentAltText)); - $strContentAltText = rtrim(wordwrap($strContentAltText, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)?"\r\n":"\n")); + $strContentAltText = trim(wordwrap($strContentAltText, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)?"\r\n":"\n")); // Check if html header already in message, if not complete the message $strContent = $this->checkIfHTML($strContent); diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 0aca6a94213..48fe598c198 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -5962,7 +5962,7 @@ class Form * @param int $forcecombo Force to load all values and output a standard combobox (with no beautification) * @param int $outputmode 0=HTML select string, 1=Array * @param int $disabled 1=Html component is disabled - * @return string Return HTML string + * @return string|array Return HTML string * @see selectForForms() */ public function selectForFormsList($objecttmp, $htmlname, $preselectedvalue, $showempty = '', $searchkey = '', $placeholder = '', $morecss = '', $moreparams = '', $forcecombo = 0, $outputmode = 0, $disabled = 0) @@ -5975,8 +5975,7 @@ class Form if ($prefixforautocompletemode == 'societe') $prefixforautocompletemode='company'; $confkeyforautocompletemode=strtoupper($prefixforautocompletemode).'_USE_SEARCH_TO_SELECT'; // For example COMPANY_USE_SEARCH_TO_SELECT - $fieldstoshow='t.ref'; - if (! empty($objecttmp->fields)) // For object that declare it, it is better to use declared fields ( like societe, contact, ...) + if (! empty($objecttmp->fields)) // For object that declare it, it is better to use declared fields (like societe, contact, ...) { $tmpfieldstoshow=''; foreach($objecttmp->fields as $key => $val) @@ -5985,6 +5984,18 @@ class Form } if ($tmpfieldstoshow) $fieldstoshow = $tmpfieldstoshow; } + if (empty($fieldstoshow)) + { + if (isset($objecttmp->fields['ref'])) { + $fieldstoshow='t.ref'; + } + else + { + $langs->load("errors"); + $this->error = $langs->trans("ErrorNoFieldWithAttributeShowoncombobox"); + return $langs->trans('ErrorNoFieldWithAttributeShowoncombobox'); + } + } $out=''; $outarray=array(); @@ -7432,7 +7443,7 @@ class Form $ret.=''; //$defaultimg=urlencode(dol_buildpath($nophoto,3)); $defaultimg='mm'; - $ret.='Gravatar avatar'; // gravatar need md5 hash + $ret.='Gravatar avatar'; // gravatar need md5 hash } else { diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php index 02a0a29b428..7292fe8c235 100644 --- a/htdocs/core/class/html.formaccounting.class.php +++ b/htdocs/core/class/html.formaccounting.class.php @@ -257,7 +257,7 @@ class FormAccounting extends Form /** * Return list of accounts with label by chart of accounts * - * @param string $selectid Preselected id or code of accounting accounts (depends on $select_in) + * @param string $selectid Preselected id of accounting accounts (depends on $select_in) * @param string $htmlname Name of HTML field id. If name start with '.', it is name of HTML css class, so several component with same name in different forms can be used. * @param int $showempty 1=Add an empty field, 2=Add an empty field+'None' field * @param array $event Event options diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php index d950f92b3c2..5c5975b9284 100644 --- a/htdocs/core/class/smtps.class.php +++ b/htdocs/core/class/smtps.class.php @@ -1385,7 +1385,7 @@ class SMTPs // Similar code to forge a text from html is also in CMailFile.class.php $strContentAltText = preg_replace("/]*>/", " ", $strContent); $strContentAltText = html_entity_decode(strip_tags($strContentAltText)); - $strContentAltText = rtrim(wordwrap($strContentAltText, 75, "\r\n")); + $strContentAltText = trim(wordwrap($strContentAltText, 75, "\r\n")); } // Make RFC2045 Compliant diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php index 1d3f7eb65c3..a38a9c4289c 100644 --- a/htdocs/core/lib/admin.lib.php +++ b/htdocs/core/lib/admin.lib.php @@ -1427,7 +1427,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '') print ''; } - print ''; + print '
'; print ''; print ''; print '
'.$langs->trans("Description").''; diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php index ad17cd259bd..ed228294bf5 100644 --- a/htdocs/core/lib/agenda.lib.php +++ b/htdocs/core/lib/agenda.lib.php @@ -238,7 +238,7 @@ function show_array_actions_to_do($max = 5) $num = $db->num_rows($resql); print '
'; - print ''; + print '
'; print ''; print ''; print ''; @@ -336,7 +336,7 @@ function show_array_last_actions_done($max = 5) $num = $db->num_rows($resql); print '
'; - print '
'.$langs->trans("LastActionsToDo", $max).''.$langs->trans("FullList").'
'; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index d87f59eefa2..2af03656a64 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -1561,7 +1561,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin $out.="\n"; $out.='
'; - $out.='
'.$langs->trans("LastDoneTasks", $max).''.$langs->trans("FullList").'
'; + $out.='
'; $out.=''; if ($donetodo) @@ -1800,7 +1800,7 @@ function show_subsidiaries($conf, $langs, $db, $object) $socstatic = new Societe($db); print load_fiche_titre($langs->trans("Subsidiaries"), '', ''); - print "\n".'
'."\n"; + print "\n".'
'."\n"; print ''; print ''; diff --git a/htdocs/core/lib/doleditor.lib.php b/htdocs/core/lib/doleditor.lib.php index 34e8ad083f0..2cffa7a2b9d 100644 --- a/htdocs/core/lib/doleditor.lib.php +++ b/htdocs/core/lib/doleditor.lib.php @@ -58,7 +58,7 @@ function show_skin($fuser, $edit = 0) $colspan=2; $thumbsbyrow=6; - print '
'.$langs->trans("Company").''.$langs->trans("Address").''.$langs->trans("Zip").'
'; + print '
'; $var=false; diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index 8ceca03b0b2..21df0301d49 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -1773,7 +1773,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks $arrayidtypeofcontact=array(); print '
'; - print '
'; + print '
'; $sql= " FROM ".MAIN_DB_PREFIX."projet as p"; if ($mytasks) diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php index 2c0501500f9..79446183685 100644 --- a/htdocs/core/lib/sendings.lib.php +++ b/htdocs/core/lib/sendings.lib.php @@ -215,7 +215,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '') if ($filter) print load_fiche_titre($langs->trans("OtherSendingsForSameOrder")); else print load_fiche_titre($langs->trans("SendingsAndReceivingForSameOrder")); - print '
'; + print '
'; print ''; //print ''; print ''; diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php index a9dca00d645..5e842612b24 100644 --- a/htdocs/core/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -330,7 +330,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false) if ($foruserprofile) $colspan=4; $thumbsbyrow=6; - print '
'.$langs->trans("QtyOrdered").''.$langs->trans("SendingSheet").'
'; + print '
'; // Title if ($foruserprofile) diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php index ba2505cc15a..6d8a14fc5ea 100644 --- a/htdocs/core/lib/website2.lib.php +++ b/htdocs/core/lib/website2.lib.php @@ -369,7 +369,7 @@ function showWebsiteTemplates(Website $website) $colspan=2; $thumbsbyrow=6; - print '
'; + print '
'; // Title print ''; diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php index b103ee9676c..7f3c4d7c8e5 100644 --- a/htdocs/core/tpl/admin_extrafields_view.tpl.php +++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php @@ -46,7 +46,7 @@ print '
'; $extrafields->fetch_name_optionals_label($elementtype); print '
'; -print '
'; +print '
'; print ''; print '
'.$langs->trans("Position"); diff --git a/htdocs/core/tpl/advtarget.tpl.php b/htdocs/core/tpl/advtarget.tpl.php index 976b571081e..edb45a8e86a 100644 --- a/htdocs/core/tpl/advtarget.tpl.php +++ b/htdocs/core/tpl/advtarget.tpl.php @@ -529,7 +529,7 @@ print '' . "\n"; print '
'; print ''; print load_fiche_titre($langs->trans("ToClearAllRecipientsClickHere")); -print ''; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/core/tpl/bloc_comment.tpl.php b/htdocs/core/tpl/bloc_comment.tpl.php index d7b5e5d7532..1a1b9023a98 100644 --- a/htdocs/core/tpl/bloc_comment.tpl.php +++ b/htdocs/core/tpl/bloc_comment.tpl.php @@ -27,7 +27,7 @@ print ''; print ''; print ''; -print '
'; +print '
'; print ''; print ''; diff --git a/htdocs/cron/admin/cron.php b/htdocs/cron/admin/cron.php index 4de7296c96d..9dc8b43379f 100644 --- a/htdocs/cron/admin/cron.php +++ b/htdocs/cron/admin/cron.php @@ -78,7 +78,7 @@ dol_fiche_head($head, 'setup', $langs->trans("Module2300Name"), -1, 'cron'); print "
\n"; -print '
'.$langs->trans("Comments").'
'; +print '
'; print ''; print ""; diff --git a/htdocs/datapolicy/admin/setup.php b/htdocs/datapolicy/admin/setup.php index a4b0a826bd9..2223404f646 100644 --- a/htdocs/datapolicy/admin/setup.php +++ b/htdocs/datapolicy/admin/setup.php @@ -138,7 +138,7 @@ if ($action == 'edit') print ''; print ''; - print '
".$langs->trans("Parameter")."
'; + print '
'; print ''; foreach($arrayofparameters as $title => $tab) @@ -169,7 +169,7 @@ if ($action == 'edit') print ''; print '
'; } else { - print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; + print '
'; print ''; foreach($arrayofparameters as $title => $tab) diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php index 2779363004e..9b1c08704b6 100644 --- a/htdocs/don/admin/donation.php +++ b/htdocs/don/admin/donation.php @@ -228,7 +228,7 @@ else dol_print_error($db); } -print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; +print '
'; print ''; print ''; print ''; @@ -337,7 +337,7 @@ print '
'.$langs->trans("Name").''.$langs->trans("Description").'

'; */ print load_fiche_titre($langs->trans("Options"), '', ''); -print ''; +print '
'; print ''; print ''; print '\n"; @@ -402,7 +402,7 @@ if (preg_match('/fr/i', $conf->global->MAIN_INFO_SOCIETE_COUNTRY)) print '
'; print load_fiche_titre($langs->trans("FrenchOptions"), '', ''); - print '
'.$langs->trans("Parameters").''.$langs->trans("Value")."
'; + print '
'; print ''; print ''."\n"; print ''."\n"; diff --git a/htdocs/don/card.php b/htdocs/don/card.php index 2ebdc2c18c2..bc590174166 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -326,7 +326,7 @@ if ($action == 'create') dol_fiche_head(''); - print '
'.$langs->trans("Parameters").''.$langs->trans("Status").'
'; + print '
'; print ''; // Ref @@ -502,7 +502,7 @@ if (! empty($id) && $action == 'edit') dol_fiche_head($head, $hselected, $langs->trans("Donation"), 0, 'generic'); - print '
'; + print '
'; // Ref print '
'.$langs->trans("Ref").''; diff --git a/htdocs/don/index.php b/htdocs/don/index.php index 0dd57a1101a..20e82aeb897 100644 --- a/htdocs/don/index.php +++ b/htdocs/don/index.php @@ -119,7 +119,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele } -print ''; +print '
'; print ''; print ''; print "\n"; @@ -196,7 +196,7 @@ $sql.= $db->plimit($max, 0); $resql=$db->query($sql); if ($resql) { - print '
'.$langs->trans("Statistics").'
'; + print '
'; print ''; print ''; diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php index 36b9b78cf10..c5517a72696 100644 --- a/htdocs/don/payment/card.php +++ b/htdocs/don/payment/card.php @@ -151,7 +151,7 @@ dol_banner_tab($object, 'id', '', 1, 'rowid', 'id'); print '
'; print '
'; -print '
'.$langs->trans("LastModifiedDonations", $max).'
'; +print '
'; // Ref /*print '
'; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php index 6a7871ba31b..6ca66ad18a5 100644 --- a/htdocs/don/payment/payment.php +++ b/htdocs/don/payment/payment.php @@ -229,7 +229,7 @@ if ($action == 'create') $num = 1; $i = 0; - print '
'.$langs->trans('Donation').''.$langs->trans('ExpectedToPay').'
'; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php index 1604ceb3870..381d1ba7011 100644 --- a/htdocs/don/stats/index.php +++ b/htdocs/don/stats/index.php @@ -219,7 +219,7 @@ print '
'; print '
'; print ''; - print '
'.$langs->trans("Donation").''.$langs->trans("Amount").'
'; + print '
'; print ''; // Company print '
'.$langs->trans("Filter").'
'.$langs->trans("ThirdParty").''; @@ -243,7 +243,7 @@ print '
'; //} print '
'; -print ''; +print '
'; print ''; print ''; print ''; @@ -284,7 +284,7 @@ print '
'; // Show graphs -print '
'.$langs->trans("Year").''.$langs->trans("NbOfSendings").'
'; +print '
'; if ($mesg) { print $mesg; } else { print $px1->show(); @@ -305,7 +305,7 @@ dol_fiche_end(); // TODO USe code similar to commande/stats/index.php instead of this one. /* -print ''; +print '
'; print ''; print ''; diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php index 56120d206b4..c47a4a389b7 100644 --- a/htdocs/ecm/dir_add_card.php +++ b/htdocs/ecm/dir_add_card.php @@ -237,7 +237,7 @@ if ($action == 'create') dol_fiche_head(); - print '
'.$langs->trans("Year").''.$langs->trans("NbOfSendings").'
'; + print '
'; // Label print ''."\n"; diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php index fcfa5b71205..0216c529a57 100644 --- a/htdocs/ecm/file_card.php +++ b/htdocs/ecm/file_card.php @@ -274,7 +274,7 @@ dol_banner_tab($object, '', $morehtml, 0, '', '', $s); print '
'; print '
'; -print '
'.$langs->trans("Label").'
'; +print '
'; print ''; diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php index a801b6fca3b..2b4fb1e8c0b 100644 --- a/htdocs/ecm/search.php +++ b/htdocs/ecm/search.php @@ -125,7 +125,7 @@ $head = ecm_prepare_head_fm($ecmdir, $module, $section); //dol_fiche_head($head, 'search_form', '', 1); -print '
'.$langs->trans("ECMCreationDate").''; print dol_print_date(dol_filemtime($fullpath), 'dayhour'); print '
'; +print '
'; // Left area diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 21aaae1b755..6c2753429f8 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -1090,7 +1090,7 @@ if ($action == 'create') print '
'; - print ''; + print '
'; // Load shipments already done for same order $object->loadExpeditions(); diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php index 918266eab90..a1d3c2a579c 100644 --- a/htdocs/expedition/index.php +++ b/htdocs/expedition/index.php @@ -58,7 +58,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele print ''; print ''; print '
'; - print '
'; + print '
'; print ''; print ''; @@ -94,7 +94,7 @@ if ($resql) if ($num) { print '
'; - print '
'.$langs->trans("Search").'
'; print $langs->trans("Shipment").':
'; + print '
'; print ''; print ''; $i = 0; @@ -146,7 +146,7 @@ if ($resql) $i = 0; print '
'; - print '
'.$langs->trans("SendingsToValidate").'
'; + print '
'; print ''; print ''; while ($i < $num) @@ -207,7 +207,7 @@ if ( $resql ) { $i = 0; print '
'; - print '
'.$langs->trans("OrdersToProcess").'
'; + print '
'; print ''; print ''; while ($i < $num) @@ -267,7 +267,7 @@ if ($resql) { $i = 0; print '
'; - print '
'.$langs->trans("OrdersInProcess").'
'; + print '
'; print ''; print ''; while ($i < $num) diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php index 2bc1e9a23ef..2bd6e67b595 100644 --- a/htdocs/expedition/shipment.php +++ b/htdocs/expedition/shipment.php @@ -901,7 +901,7 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; print ''; - //print '
'.$langs->trans("LastSendings", $num).'
'; + //print '
'; $langs->load("stocks"); diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php index b2aea807b5f..ebede918552 100644 --- a/htdocs/expedition/stats/index.php +++ b/htdocs/expedition/stats/index.php @@ -218,7 +218,7 @@ print '
'; print ''; print ''; - print '
'; + print '
'; print ''; // Company print '
'.$langs->trans("Filter").'
'.$langs->trans("ThirdParty").''; @@ -243,7 +243,7 @@ print '
'; print '
'; -print ''; +print '
'; print ''; print ''; print ''; @@ -289,7 +289,7 @@ print '
'; // Show graphs -print '
'.$langs->trans("Year").''.$langs->trans("NbOfSendings").'
'; +print '
'; if ($mesg) { print $mesg; } else { print $px1->show(); @@ -310,7 +310,7 @@ dol_fiche_end(); // TODO USe code similar to commande/stats/index.php instead of this one. /* -print ''; +print '
'; print ''; print ''; diff --git a/htdocs/expedition/stats/month.php b/htdocs/expedition/stats/month.php index 97e11b7f38c..c0f3b1b3030 100644 --- a/htdocs/expedition/stats/month.php +++ b/htdocs/expedition/stats/month.php @@ -64,7 +64,7 @@ if (! $mesg) { $px->draw($filename, $fileurl); } -print '
'.$langs->trans("Year").''.$langs->trans("NbOfSendings").'
'; +print '
'; print ''; print '
'.$langs->trans("NbOfSendingsByMonth").''; print $px->show(); diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index 28470bccc6c..258f87d2d9f 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -1450,7 +1450,7 @@ if ($action == 'create') dol_fiche_head(''); - print ''; + print '
'; print ''; // Date start @@ -2108,7 +2108,7 @@ else print ''; print '
'; - print '
'; + print '
'; if (!empty($object->lines)) { diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php index c849a5c62f9..39bcab7f4ec 100644 --- a/htdocs/expensereport/index.php +++ b/htdocs/expensereport/index.php @@ -116,7 +116,7 @@ print load_fiche_titre($langs->trans("ExpensesArea")); print '
'; print '
'; -print '
'; +print '
'; print ''; print ''; print "\n"; @@ -191,7 +191,7 @@ if ($result) $i = 0; print '
'; - print '
'.$langs->trans("Statistics").'
'; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php index 72b7296ac6b..830349dbdcd 100644 --- a/htdocs/expensereport/payment/card.php +++ b/htdocs/expensereport/payment/card.php @@ -225,7 +225,7 @@ if ($resql) print '
'; print '
'; - print '
'.$langs->trans("BoxTitleLastModifiedExpenses", min($max, $num)).''.$langs->trans("AmountHT").'
'; + print '
'; print ''; print ''; diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php index 7fb79573ab2..b7a0d4f4c78 100644 --- a/htdocs/expensereport/payment/payment.php +++ b/htdocs/expensereport/payment/payment.php @@ -289,7 +289,7 @@ if ($action == 'create' || empty($action)) $num = 1; $i = 0; - print '
'.$langs->trans('ExpenseReport').'
'; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php index 5d6301353db..de2c6ba3132 100644 --- a/htdocs/expensereport/stats/index.php +++ b/htdocs/expensereport/stats/index.php @@ -212,7 +212,7 @@ print '
'; // Show filter box print ''; print ''; -print '
'.$langs->trans("ExpenseReport").''.$langs->trans("Amount").'
'; +print '
'; print ''; // Company /* @@ -243,7 +243,7 @@ print ''; print '

'; print '
'; -print '
'.$langs->trans("Filter").'
'; +print '
'; print ''; print ''; print ''; @@ -284,7 +284,7 @@ print '
'; // Show graphs -print '
'.$langs->trans("Year").''.$langs->trans("Number").'
'; +print '
'; if ($mesg) { print $mesg; } else { print $px1->show(); diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index ed6966eb083..a0ca5dbfe1a 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -446,7 +446,7 @@ if ($step == 1 || ! $datatoexport) // Affiche les modules d'exports print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table - print ''; + print '
'; print ''; print ''; print ''; @@ -552,7 +552,7 @@ if ($step == 2 && $datatoexport) print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table - print '
'.$langs->trans("Module").''.$langs->trans("ExportableDatas").'
'; + print '
'; print ''; print ''; print ''; @@ -751,7 +751,7 @@ if ($step == 3 && $datatoexport) print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table - print '
'.$langs->trans("Entities").''.$langs->trans("ExportableFields").'
'; + print '
'; print ''; print ''; //print ''; @@ -955,7 +955,7 @@ if ($step == 4 && $datatoexport) print '
'.$langs->trans("ChooseFieldsOrdersAndTitle").'
'; print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table - print '
'.$langs->trans("Entities").''.$langs->trans("ExportableFields").'
'; + print '
'; print ''; print ''; print ''; @@ -1057,7 +1057,7 @@ if ($step == 4 && $datatoexport) print ''; print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table - print '
'.$langs->trans("Entities").''.$langs->trans("ExportedFields").'
'; + print '
'; print ''; print ''; print ''; @@ -1212,7 +1212,7 @@ if ($step == 5 && $datatoexport) print '
'; // List of available export formats - $htmltabloflibs = '
'.$langs->trans("ExportModelName").' 
'; + $htmltabloflibs = '
'; $htmltabloflibs.= ''; $htmltabloflibs.= ''; $htmltabloflibs.= ''; diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php index 7236a3f45dc..c7e58916be1 100644 --- a/htdocs/exports/index.php +++ b/htdocs/exports/index.php @@ -60,7 +60,7 @@ print '
'; // List of available export formats print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table -print '
'.$langs->trans("AvailableFormats").''.$langs->trans("LibraryUsed").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php index aaf2aec0490..c836f4d73be 100644 --- a/htdocs/fichinter/card-rec.php +++ b/htdocs/fichinter/card-rec.php @@ -262,7 +262,7 @@ if ($action == 'create') { if (! empty($conf->projet->enabled) && $object->fk_project > 0) $rowspan++; if (! empty($conf->contrat->enabled) && $object->fk_contrat > 0) $rowspan++; - print '
'.$langs->trans("AvailableFormats").''.$langs->trans("LibraryShort").'
'; + print '
'; $object->fetch_thirdparty(); @@ -327,7 +327,7 @@ if ($action == 'create') { $title = $langs->trans("Recurrence"); print load_fiche_titre($title, '', 'calendar'); - print '
'; + print '
'; // Frequency print '
'; @@ -381,7 +381,7 @@ if ($action == 'create') { $i = 0; $total = 0; - echo ''; + echo '
'; if ($num) { print ''; print ''; @@ -433,7 +433,7 @@ if ($action == 'create') { dol_fiche_head(''); print ''; - print '
'.$langs->trans("Description").'
'; + print '
'; print ''; @@ -512,7 +512,7 @@ if ($action == 'create') { print '
'; print '
'; - print '
'.$langs->trans("ThirdParty").''; print $form->select_company('', 'socid', '', 1, 1); print '
'; + print '
'; print ""; @@ -569,7 +569,7 @@ if ($action == 'create') { $title = $langs->trans("Recurrence"); print load_fiche_titre($title, '', 'calendar'); - print '
".$langs->trans("Author").''.$author->getFullName($langs)."
'; + print '
'; // if "frequency" is empty or = 0, the reccurence is disabled print '
'; @@ -681,7 +681,7 @@ if ($action == 'create') { print load_fiche_titre($title); - print ''; + print '
'; print ''; print ''; print ''; @@ -780,7 +780,7 @@ if ($action == 'create') { print $langs->trans("ToCreateAPredefinedInterventional").'

'; $i = 0; - print '
'.$langs->trans("Description").''.$langs->trans("Duration").'
'; + print '
'; print ''; print_liste_field_titre("Ref", $_SERVER['PHP_SELF'], "f.titre", "", "", 'width="200px"', $sortfield, $sortorder, 'left '); print_liste_field_titre("Company", $_SERVER['PHP_SELF'], "s.nom", "", "", 'width="200px"', $sortfield, $sortorder, 'left '); diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 684d67346ab..9447b7e15ea 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -909,7 +909,7 @@ if ($action == 'create') dol_fiche_head(''); - print '
'; + print '
'; print ''; print ''; @@ -1055,7 +1055,7 @@ if ($action == 'create') $title = $langs->trans('Services'); print load_fiche_titre($title); - print '
'.$langs->trans("ThirdParty").''.$soc->getNomUrl(1).'
'; + print '
'; $objectsrc->printOriginLinesList(empty($conf->global->FICHINTER_PRINT_PRODUCTS)?'services':''); // Show only service, except if option FICHINTER_PRINT_PRODUCTS is on @@ -1074,7 +1074,7 @@ if ($action == 'create') } elseif ($origin == 'project' && !empty($projectid)) { print ''; } - print '
'; + print '
'; print ''; @@ -1384,7 +1384,7 @@ elseif ($id > 0 || ! empty($ref)) if ($num) { print '
'; - print '
'.$langs->trans("ThirdParty").''; print $form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, null, 0, 'minwidth300'); print '
'; + print '
'; print ''; print ''; @@ -1519,7 +1519,7 @@ elseif ($id > 0 || ! empty($ref)) { if (! $num) { - print '
'.$langs->trans('Description').'
'; + print '
'; print ''; print '
'; diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php index 147d3f13570..8c1540a61fd 100644 --- a/htdocs/fichinter/index.php +++ b/htdocs/fichinter/index.php @@ -72,7 +72,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele print ''; print ''; print '
'; - print ''; + print '
'; print ''; print ''; @@ -123,7 +123,7 @@ if ($resql) } $db->free($resql); print '
'; - print '
'.$langs->trans("Search").'
'; print $langs->trans("Intervention").':
'; + print '
'; print ''."\n"; $listofstatus=array(0,1,2); $bool=false; @@ -196,7 +196,7 @@ if (! empty($conf->ficheinter->enabled)) if ($resql) { print '
'; - print '
'.$langs->trans("Statistics").' - '.$langs->trans("Interventions").'
'; + print '
'; print ''; print ''; $langs->load("fichinter"); @@ -245,7 +245,7 @@ $resql=$db->query($sql); if ($resql) { print '
'; - print '
'.$langs->trans("DraftFichinter").'
'; + print '
'; print ''; print ''; @@ -316,7 +316,7 @@ if (! empty($conf->ficheinter->enabled)) $num = $db->num_rows($resql); print '
'; - print '
'.$langs->trans("LastModifiedInterventions", $max).'
'; + print '
'; print ''; print ''; diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php index 02bec47ed86..78f3289d638 100644 --- a/htdocs/fichinter/stats/index.php +++ b/htdocs/fichinter/stats/index.php @@ -226,7 +226,7 @@ print '
'; // Show filter box print ''; print ''; - print '
'.$langs->trans("FichinterToProcess").' '.$num.'
'; + print '
'; print ''; // Company print '
'.$langs->trans("Filter").'
'.$langs->trans("ThirdParty").''; @@ -257,7 +257,7 @@ print '
'; //} print '
'; -print ''; +print '
'; print ''; print ''; print ''; @@ -310,7 +310,7 @@ print '
'; // Show graphs -print '
'.$langs->trans("Year").''.$langs->trans("NbOfinterventions").'
'; +print '
'; if ($mesg) { print $mesg; } else { print $px1->show(); diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index 47f44aff059..f52f5b089fd 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -435,7 +435,7 @@ if ($object->id > 0) // Lien recap /* - print ''; + print '
'; print ''; print ''; diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php index 0d9782b3683..f7ade86eb64 100644 --- a/htdocs/fourn/commande/dispatch.php +++ b/htdocs/fourn/commande/dispatch.php @@ -496,7 +496,7 @@ if ($id > 0 || ! empty($ref)) { else print ''; print '
'; - print '
'; print '
'.$langs->trans("Summary").''.$langs->trans("ShowSupplierPreview").'
'; + print '
'; // Set $products_dispatched with qty dispatched for each product id $products_dispatched = array(); @@ -922,7 +922,7 @@ if ($id > 0 || ! empty($ref)) { print load_fiche_titre($langs->trans("ReceivingForSameOrder")); print '
'; - print '
'; + print '
'; print ''; if($conf->reception->enabled)print ''; diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php index 487be054e7e..dfd37e1579a 100644 --- a/htdocs/fourn/commande/index.php +++ b/htdocs/fourn/commande/index.php @@ -64,7 +64,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele print ''; print ''; print '
'; - print '
' . $langs->trans("Reception") . '
'; + print '
'; print ''; print ''; @@ -115,7 +115,7 @@ if ($resql) } $db->free($resql); - print '
'; + print '
'; print '
'.$langs->trans("Search").'
'; print $langs->trans("SupplierOrder").':
'; print ''; print "\n"; @@ -180,8 +180,8 @@ if ($resql) $num = $db->num_rows($resql); $i = 0; - print '
'; - print '
'.$langs->trans("Statistics").' - '.$langs->trans("SuppliersOrders").'
'; + print '
'; + print '
'; print ''; print ''; @@ -226,8 +226,8 @@ if (! empty($conf->fournisseur->enabled)) $resql=$db->query($sql); if ($resql) { - print '
'; - print '
'.$langs->trans("Status").''.$langs->trans("Nb").'
'; + print '
'; + print '
'; print ''; print ''; $langs->load("orders"); @@ -272,8 +272,8 @@ if ($resql) $num = $db->num_rows($resql); $i = 0; - print '
'; - print '
'.$langs->trans("DraftOrders").'
'; + print '
'; + print '
'; print ''; print "\n"; @@ -324,8 +324,8 @@ $sql.= $db->plimit($max, 0); $resql=$db->query($sql); if ($resql) { - print '
'; - print '
'.$langs->trans("UserWithApproveOrderGrant").'
'; + print '
'; + print '
'; print ''; print ''; @@ -394,7 +394,7 @@ if ($resql) $num = $db->num_rows($resql); print '
'; -print '
'.$langs->trans("LastModifiedOrders", $max).'
'; +print '
'; print ''; print ''; diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php index 7005d3029f4..c5df8e7d743 100644 --- a/htdocs/fourn/commande/orderstoinvoice.php +++ b/htdocs/fourn/commande/orderstoinvoice.php @@ -333,7 +333,7 @@ if ($action == 'create' && !$error) { print ''; print ''; - print '
'.$langs->trans("OrdersToProcess").' ('.$num.')
'; + print '
'; // Ref print ''; @@ -517,7 +517,7 @@ if (($action != 'create' && $action != 'add') && !$error) { print ''; - print '
' . $langs->trans('Ref') . '' . $langs->trans('Draft') . '
'; + print '
'; print ''; print_liste_field_titre('Ref', 'orderstoinvoice.php', 'c.ref', '', '&socid=' . $socid, '', $sortfield, $sortorder); print_liste_field_titre('RefSupplier', 'orderstoinvoice.php', 'c.ref_supplier', '', '&socid=' . $socid, '', $sortfield, $sortorder); diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php index 649c24408a1..1b2005cf690 100644 --- a/htdocs/fourn/contact.php +++ b/htdocs/fourn/contact.php @@ -96,7 +96,7 @@ if ($result) $title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses")); print_barre_liste($title." (".$langs->trans("Suppliers").")", $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num); - print '
'; + print '
'; print ''; print_liste_field_titre("Lastname", $_SERVER["PHP_SELF"], "p.name", $begin, "", "", $sortfield, $sortorder); print_liste_field_titre("Firstname", $_SERVER["PHP_SELF"], "p.firstname", $begin, "", "", $sortfield, $sortorder); diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index 6935e978c67..3dc6e0383b0 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -1726,7 +1726,7 @@ if ($action == 'create') dol_fiche_head(); - print '
'; + print '
'; // Ref print ''; @@ -2151,7 +2151,7 @@ if ($action == 'create') $title=$langs->trans('ProductsAndServices'); print load_fiche_titre($title); - print '
'.$langs->trans('Ref').''.$langs->trans('Draft').'
'; + print '
'; $objectsrc->printOriginLinesList(); diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php index 18f64d15734..33263e79cb6 100644 --- a/htdocs/fourn/facture/contact.php +++ b/htdocs/fourn/facture/contact.php @@ -193,7 +193,7 @@ if ($id > 0 || ! empty($ref)) print '
'; print '
'; - print '
'; + print '
'; // Type print '
'.$langs->trans('Type').''; diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php index 0a10d58764a..4d6e85006c3 100644 --- a/htdocs/fourn/facture/impayees.php +++ b/htdocs/fourn/facture/impayees.php @@ -185,7 +185,7 @@ if ($user->rights->fournisseur->facture->lire) $i = 0; print ''; - print ''; + print '
'; print ''; print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "f.rowid", "", $param, "", $sortfield, $sortorder); print_liste_field_titre("RefSupplier", $_SERVER["PHP_SELF"], "f.ref_supplier", "", $param, "", $sortfield, $sortorder); diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php index a7200495e96..a55dd9ba7d7 100644 --- a/htdocs/fourn/facture/note.php +++ b/htdocs/fourn/facture/note.php @@ -138,7 +138,7 @@ if ($object->id > 0) print '
'; print '
'; - print '
'; + print '
'; // Type print '
'.$langs->trans('Type').''; diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index eb7c8af3ef0..a39c4621a80 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -467,7 +467,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie dol_fiche_head(null); - print ''; + print '
'; print '
'.$langs->trans('Company').''; $supplierstatic->id=$obj->socid; diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php index b10ee9ff909..aeb945bc220 100644 --- a/htdocs/fourn/index.php +++ b/htdocs/fourn/index.php @@ -70,7 +70,7 @@ if ($resql) $num = $db->num_rows($resql); $i = 0; - print ''; + print '
'; print ''; print "\n"; @@ -119,7 +119,7 @@ if (! empty($conf->fournisseur->enabled)) $num = $db->num_rows($resql); if ($num) { - print '
'.$langs->trans("Orders").''.$langs->trans("Nb").' 
'; + print '
'; print ''; print ''; @@ -174,7 +174,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- $num = $db->num_rows($resql); if ($num) { - print '
'.$langs->trans("DraftOrders").''.$num.'
'; + print '
'; print ''; print ''; $i = 0; @@ -246,7 +246,7 @@ if ($resql) $num = $db->num_rows($resql); $i = 0; - print '
'.$langs->trans("DraftBills").''.$num.'
'; + print '
'; print ''; print '\n"; print '\n"; @@ -281,7 +281,7 @@ if (count($companystatic->SupplierCategories)) { print '
'; - print '
'.$langs->trans("BoxTitleLastSuppliers", min($max, $num))."'.$langs->trans("DateModification")."
'; + print '
'; print '\n"; diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php index 2b6404e7ff8..d20f4e5d6ed 100644 --- a/htdocs/fourn/paiement/card.php +++ b/htdocs/fourn/paiement/card.php @@ -184,7 +184,7 @@ if ($result > 0) print '
'; print '
'; - print '
'; print $langs->trans("Category"); print "
'; + print '
'; /*print ''; print '
'.$langs->trans('Ref').''; @@ -275,7 +275,7 @@ if ($result > 0) $i = 0; $total = 0; print ''.$langs->trans("Invoices").'
'; - print ''; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php index 860cbde73ba..133fa4fd3d6 100644 --- a/htdocs/fourn/product/list.php +++ b/htdocs/fourn/product/list.php @@ -238,7 +238,7 @@ if ($resql) $trackid='prod'.$object->id; include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php'; - print '
'.$langs->trans('Ref').''.$langs->trans('RefSupplier').'
'; + print '
'; // Fields title search print ''; diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php index 7f9a7fb11ab..7a586c7ee2d 100644 --- a/htdocs/fourn/recap-fourn.php +++ b/htdocs/fourn/recap-fourn.php @@ -70,7 +70,7 @@ if ($socid > 0) // Invoice list print load_fiche_titre($langs->trans("SupplierPreview")); - print '
'; + print '
'; $sql = "SELECT s.nom, s.rowid as socid, f.ref_supplier, f.amount, f.datef as df,"; $sql.= " f.paye as paye, f.fk_statut as statut, f.rowid as facid,"; diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php index 9915bb0b740..1b79f55d51d 100644 --- a/htdocs/ftp/admin/ftpclient.php +++ b/htdocs/ftp/admin/ftpclient.php @@ -155,7 +155,7 @@ else print ''; print ''; - print '
'; + print '
'; print ''; print ''; print ''; @@ -236,7 +236,7 @@ else print ''; print ''; - print '
'.$langs->trans("NewFTPClient").''.$langs->trans("Example").'
'."\n"; + print '
'."\n"; print ''; print '"; diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php index 0b8ef393670..113f4b4f655 100644 --- a/htdocs/holiday/card.php +++ b/htdocs/holiday/card.php @@ -1007,7 +1007,7 @@ if ((empty($id) && empty($ref)) || $action == 'add' || $action == 'request' || $ //print ''.$langs->trans('DelayToRequestCP',$object->getConfCP('delayForRequest')).'

'; - print '
'.$langs->trans("FTP")." ".($idrss)."
'; + print '
'; print ''; // User for leave request diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php index c09771e47a3..f0171bfa4a6 100644 --- a/htdocs/holiday/month_report.php +++ b/htdocs/holiday/month_report.php @@ -102,7 +102,7 @@ print ''; print '
'; print '
'; -print '
'; +print '
'; print ''; print ''; diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php index 38cff03e28a..64683ac9d55 100644 --- a/htdocs/hrm/admin/admin_establishment.php +++ b/htdocs/hrm/admin/admin_establishment.php @@ -89,7 +89,7 @@ if ($result) $i = 0; // Load attribute_label - print '
' . $langs->trans('Ref') . '
'; + print '
'; print ''; print_liste_field_titre("Name", $_SERVER["PHP_SELF"], "e.name", "", "", "", $sortfield, $sortorder); print_liste_field_titre("Address", $_SERVER["PHP_SELF"], "e.address", "", "", "", $sortfield, $sortorder); diff --git a/htdocs/hrm/admin/admin_hrm.php b/htdocs/hrm/admin/admin_hrm.php index 343e6fa54e9..b9ef15152de 100644 --- a/htdocs/hrm/admin/admin_hrm.php +++ b/htdocs/hrm/admin/admin_hrm.php @@ -80,7 +80,7 @@ print ''; dol_fiche_head($head, 'parameters', $langs->trans("HRM"), -1, "user"); -print '
'; +print '
'; print ''; print ''; print "\n"; diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php index 4033757fc30..b64563e38f2 100644 --- a/htdocs/hrm/establishment/card.php +++ b/htdocs/hrm/establishment/card.php @@ -181,7 +181,7 @@ if ($action == 'create') dol_fiche_head(); - print '
' . $langs->trans('Journaux') . '
'; + print '
'; // Name print ''; @@ -278,7 +278,7 @@ if (($id || $ref) && $action == 'edit') print ''; print ''; - print '
'; + print '
'; // Ref print ""; diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php index 5f390ab1d45..281a573353b 100644 --- a/htdocs/hrm/index.php +++ b/htdocs/hrm/index.php @@ -141,7 +141,7 @@ if (! empty($conf->holiday->enabled)) $user_id = $user->id; print '
'; - print '
'; + print '
'; print ''; print ''; print '
'.$langs->trans("Holidays").'
'; diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 6a00679fd84..66baa76d4a0 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -346,7 +346,7 @@ if ($step == 1 || ! $datatoimport) // Affiche les modules d'imports print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table - print ''; + print '
'; print ''; print ''; print ''; @@ -874,7 +874,7 @@ if ($step == 4 && $datatoimport) // Title of array with fields print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table - print '
'.$langs->trans("Module").''.$langs->trans("ImportableDatas").'
'; + print '
'; print ''; print ''; print ''; @@ -1151,7 +1151,7 @@ if ($step == 4 && $datatoimport) print ''; print ''; - print '
'.$langs->trans("FieldsInSourceFile").''.$langs->trans("FieldsInTargetDatabase").'
'; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php index 7f9c113b10f..c91dc0fe83b 100644 --- a/htdocs/imports/index.php +++ b/htdocs/imports/index.php @@ -55,7 +55,7 @@ print '
'; // List of import set /* print '
'; -print '
'.$langs->trans("ImportModelName").' 
'; +print '
'; print ''; print ''; print ''; @@ -110,7 +110,7 @@ print '
'; // List of available import format print '
'; -print '
'.$langs->trans("Module").''.$langs->trans("ImportableDatas").'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/install/doctemplates/contracts/index.html b/htdocs/install/doctemplates/contracts/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/install/doctemplates/invoices/index.html b/htdocs/install/doctemplates/invoices/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/install/doctemplates/orders/index.html b/htdocs/install/doctemplates/orders/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/install/doctemplates/products/index.html b/htdocs/install/doctemplates/products/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/install/doctemplates/projects/index.html b/htdocs/install/doctemplates/projects/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/install/doctemplates/proposals/index.html b/htdocs/install/doctemplates/proposals/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/install/doctemplates/shipments/index.html b/htdocs/install/doctemplates/shipments/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/install/doctemplates/supplier_proposals/index.html b/htdocs/install/doctemplates/supplier_proposals/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/install/doctemplates/tasks/index.html b/htdocs/install/doctemplates/tasks/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/install/doctemplates/thirdparties/index.html b/htdocs/install/doctemplates/thirdparties/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/install/doctemplates/usergroups/index.html b/htdocs/install/doctemplates/usergroups/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/install/doctemplates/users/index.html b/htdocs/install/doctemplates/users/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/install/mysql/data/llx_c_socialnetworks.sql b/htdocs/install/mysql/data/llx_c_socialnetworks.sql index e45179cfe89..829cbbf0294 100644 --- a/htdocs/install/mysql/data/llx_c_socialnetworks.sql +++ b/htdocs/install/mysql/data/llx_c_socialnetworks.sql @@ -30,24 +30,24 @@ INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'googleplus', 'GooglePlus', 'https://www.googleplus.com/{socialid}', 'fa-google-plus-g', 0); INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'youtube', 'Youtube', 'https://www.youtube.com/{socialid}', 'fa-youtube', 1); INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'whatsapp', 'Whatsapp', '{socialid}', 'fa-whatsapp', 1); -INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'tumblr', 'Tumblr', 'https://www.tumblr.com/{socialid}', '', 0); +INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'tumblr', 'Tumblr', 'https://www.tumblr.com/{socialid}', 'fa-tumblr', 0); INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'vero', 'Vero', 'https://vero.co/{socialid}', '', 0); -INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'viadeo', 'Viadeo', 'https://fr.viadeo.com/fr/{socialid}', '', 0); -INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'slack', 'Slack', '{socialid}', '', 0); -INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'xing', 'Xing', '{socialid}', '', 0); -INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'meetup', 'Meetup', '{socialid}', '', 0); -INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'pinterest', 'Pinterest', '{socialid}', '', 0); -INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'flickr', 'Flickr', '{socialid}', '', 0); -INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, '500px', '500px', '{socialid}', '', 0); +INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'viadeo', 'Viadeo', 'https://fr.viadeo.com/fr/{socialid}', 'fa-viadeo', 0); +INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'slack', 'Slack', '{socialid}', 'fa-slack', 0); +INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'xing', 'Xing', '{socialid}', 'fa-xing', 0); +INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'meetup', 'Meetup', '{socialid}', 'fa-meetup', 0); +INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'pinterest', 'Pinterest', '{socialid}', 'fa-pinterest', 0); +INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'flickr', 'Flickr', '{socialid}', 'fa-flickr', 0); +INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, '500px', '500px', '{socialid}', 'fa-500px', 0); INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'giphy', 'Giphy', '{socialid}', '', 0); INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'gifycat', 'Gificat', '{socialid}', '', 0); INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'dailymotion', 'Dailymotion', '{socialid}', '', 0); INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'vimeo', 'Vimeo', '{socialid}', '', 0); INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'periscope', 'Periscope', '{socialid}', '', 0); INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'twitch', 'Twitch', '{socialid}', '', 0); -INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'discord', 'Discord', '{socialid}', '', 0); +INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'discord', 'Discord', '{socialid}', 'fa-discord', 0); INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'wikipedia', 'Wikipedia', '{socialid}', '', 0); -INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'reddit', 'Reddit', '{socialid}', '', 0); +INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'reddit', 'Reddit', '{socialid}', 'fa-reddit', 0); INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'quora', 'Quora', '{socialid}', '', 0); INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'tripadvisor', 'Tripadvisor', '{socialid}', '', 0); INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'mastodon', 'Mastodon', '{socialid}', '', 0); diff --git a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql index fcd7ede9bcc..ee55852906f 100644 --- a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql +++ b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql @@ -273,24 +273,24 @@ INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'googleplus', 'GooglePlus', 'https://www.googleplus.com/{socialid}', 'fa-google-plus-g', 1); INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'youtube', 'Youtube', 'https://www.youtube.com/{socialid}', 'fa-youtube', 1); INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'whatsapp', 'Whatsapp', '{socialid}', 'fa-whatsapp', 1); -INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'tumblr', 'Tumblr', 'https://www.tumblr.com/{socialid}', '', 0); +INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'tumblr', 'Tumblr', 'https://www.tumblr.com/{socialid}', 'fa-tumblr', 0); INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'vero', 'Vero', 'https://vero.co/{socialid}', '', 0); -INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'viadeo', 'Viadeo', 'https://fr.viadeo.com/fr/{socialid}', '', 0); -INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'slack', 'Slack', '{socialid}', '', 0); -INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'xing', 'Xing', '{socialid}', '', 0); -INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'meetup', 'Meetup', '{socialid}', '', 0); -INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'pinterest', 'Pinterest', '{socialid}', '', 0); -INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'flickr', 'Flickr', '{socialid}', '', 0); -INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, '500px', '500px', '{socialid}', '', 0); +INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'viadeo', 'Viadeo', 'https://fr.viadeo.com/fr/{socialid}', 'fa-viadeo', 0); +INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'slack', 'Slack', '{socialid}', 'fa-slack', 0); +INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'xing', 'Xing', '{socialid}', 'fa-xing', 0); +INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'meetup', 'Meetup', '{socialid}', 'fa-meetup', 0); +INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'pinterest', 'Pinterest', '{socialid}', 'fa-pinterest', 0); +INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'flickr', 'Flickr', '{socialid}', 'fa-flickr', 0); +INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, '500px', '500px', '{socialid}', 'fa-500px', 0); INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'giphy', 'Giphy', '{socialid}', '', 0); INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'gifycat', 'Gificat', '{socialid}', '', 0); INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'dailymotion', 'Dailymotion', '{socialid}', '', 0); INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'vimeo', 'Vimeo', '{socialid}', '', 0); INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'periscope', 'Periscope', '{socialid}', '', 0); INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'twitch', 'Twitch', '{socialid}', '', 0); -INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'discord', 'Discord', '{socialid}', '', 0); +INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'discord', 'Discord', '{socialid}', 'fa-discord', 0); INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'wikipedia', 'Wikipedia', '{socialid}', '', 0); -INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'reddit', 'Reddit', '{socialid}', '', 0); +INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'reddit', 'Reddit', '{socialid}', 'fa-reddit', 0); INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'quora', 'Quora', '{socialid}', '', 0); INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'tripadvisor', 'Tripadvisor', '{socialid}', '', 0); INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'mastodon', 'Mastodon', '{socialid}', '', 0); diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index 96eedb296a3..2b23fc6d19e 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -222,6 +222,7 @@ ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked ErrorSearchCriteriaTooSmall=Search criteria too small. ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to be disabled ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled +ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist. # Warnings WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup. WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user. diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php index 8ac7494b8ab..3ef71743318 100644 --- a/htdocs/livraison/card.php +++ b/htdocs/livraison/card.php @@ -586,7 +586,7 @@ else $num_prod = count($object->lines); $i = 0; $total = 0; - print '
'.$langs->trans("AvailableFormats").''.$langs->trans("LibraryShort").'
'; + print '
'; if ($num_prod) { diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php index 7cf592a354c..e741ce869fc 100644 --- a/htdocs/loan/card.php +++ b/htdocs/loan/card.php @@ -263,7 +263,7 @@ if ($action == 'create') dol_fiche_head(); - print '
'; + print '
'; // Label print ''; @@ -487,7 +487,7 @@ if ($id > 0) print '
'; print '
'; - print '
'.$langs->trans("Label").'
'; + print '
'; // Capital if ($action == 'edit') diff --git a/htdocs/loan/createschedule.php b/htdocs/loan/createschedule.php index e1b7652ef63..88942b4cae7 100644 --- a/htdocs/loan/createschedule.php +++ b/htdocs/loan/createschedule.php @@ -140,7 +140,7 @@ if(count($echeance->lines)>0) }else{ print ''; } -print '
'; +print '
'; print ''; $colspan = 6; if (count($echeance->lines)>0) $colspan++; diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php index 1f937e6fe77..f2a3aa3a877 100644 --- a/htdocs/loan/payment/card.php +++ b/htdocs/loan/payment/card.php @@ -146,7 +146,7 @@ if ($action == 'valide') } -print '
'; +print '
'; // Ref print ''; @@ -210,7 +210,7 @@ if ($resql) $i = 0; $total = 0; - print '
'.$langs->trans('Ref').'
'; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php index 742cf5ea5cf..b3b08c365f7 100644 --- a/htdocs/loan/payment/payment.php +++ b/htdocs/loan/payment/payment.php @@ -276,7 +276,7 @@ if ($action == 'create') dol_fiche_end(); - print '
'.$langs->trans('Loan').''.$langs->trans('Label').'
'; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/loan/schedule.php b/htdocs/loan/schedule.php index d743c11273b..106d7d1f71d 100644 --- a/htdocs/loan/schedule.php +++ b/htdocs/loan/schedule.php @@ -146,7 +146,7 @@ if(count($echeance->lines)>0) }else{ print ''; } -print '
'.$langs->trans("DateDue").''.$langs->trans("LoanCapital").'
'; +print '
'; print ''; $colspan = 6; if (count($echeance->lines)>0) $colspan++; diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php index 2c417d245b5..3def4a011ed 100644 --- a/htdocs/margin/admin/margin.php +++ b/htdocs/margin/admin/margin.php @@ -119,7 +119,7 @@ $head = marges_admin_prepare_head(); dol_fiche_head($head, 'parameters', $langs->trans("Margins"), -1, 'margin'); print load_fiche_titre($langs->trans("MemberMainOptions"), '', ''); -print '
'; +print '
'; print ''; print ''; print ''."\n"; diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php index e04a5e6ecc0..a47acb63eec 100644 --- a/htdocs/margin/agentMargins.php +++ b/htdocs/margin/agentMargins.php @@ -107,7 +107,7 @@ print ''; dol_fiche_head($head, 'agentMargins', $titre, 0, $picto); -print '
'.$langs->trans("Description").''.$langs->trans("Value").'
'; +print '
'; print ''; print '
'.$langs->trans('ContactOfInvoice').''; diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php index 776bec4171c..dd1abc79eaa 100644 --- a/htdocs/margin/checkMargins.php +++ b/htdocs/margin/checkMargins.php @@ -161,7 +161,7 @@ print ''; dol_fiche_head($head, $langs->trans('checkMargins'), $title, 0, $picto); -print ''; +print '
'; print ''; print '
' . $langs->trans('DateStart') . ' (' . $langs->trans("DateValidation") . ')'; diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php index a25528f58fb..4b9bc5ce0c6 100644 --- a/htdocs/margin/customerMargins.php +++ b/htdocs/margin/customerMargins.php @@ -87,7 +87,7 @@ print ''; dol_fiche_head($head, 'customerMargins', $titre, 0, $picto); -print ''; +print '
'; $client = false; if ($socid > 0) { @@ -170,7 +170,7 @@ print "
"; print '
'; -print ''; +print '
'; // Total Margin print '
'.$langs->trans("TotalMargin").''; @@ -219,6 +219,7 @@ if ($socid > 0) $sql.= ' AND s.rowid = '.$socid; if (!$user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; $sql.= " AND f.fk_statut NOT IN (" . implode(', ', $invoice_status_except_list) . ")"; $sql.= ' AND s.entity IN ('.getEntity('societe').')'; +$sql.= ' AND f.entity IN ('.getEntity('invoice').')'; $sql.= " AND d.fk_facture = f.rowid"; $sql.= " AND (d.product_type = 0 OR d.product_type = 1)"; if(! empty($TSelectedProducts)) { diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php index cbc134c0b66..66077dc8708 100644 --- a/htdocs/margin/productMargins.php +++ b/htdocs/margin/productMargins.php @@ -100,7 +100,7 @@ print ''; dol_fiche_head($head, 'productMargins', $titre, 0, $picto); -print ''; +print '
'; if ($id > 0) { print ''; @@ -146,7 +146,7 @@ print "
'.$langs->trans('ChooseProduct/Service').'
"; print '
'; -print ''; +print '
'; // Total Margin print '
'.$langs->trans("TotalMargin").''; diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php index d9677ffa4da..0056c869fa1 100644 --- a/htdocs/margin/tabs/productMargins.php +++ b/htdocs/margin/tabs/productMargins.php @@ -166,7 +166,7 @@ if ($id > 0 || ! empty($ref)) $i = 0; print '
'; - print ''; + print '
'; print ''; print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", "&id=".$object->id, '', $sortfield, $sortorder); diff --git a/htdocs/modulebuilder/admin/setup.php b/htdocs/modulebuilder/admin/setup.php index 673783bc06a..e696be779d0 100644 --- a/htdocs/modulebuilder/admin/setup.php +++ b/htdocs/modulebuilder/admin/setup.php @@ -105,7 +105,7 @@ print '' . $langs->trans("ModuleBuilderDesc") . "'; -print '
'; +print '
'; print ''; print ''; diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php index 8534e6e5cbd..6c5f44fc732 100644 --- a/htdocs/modulebuilder/template/admin/setup.php +++ b/htdocs/modulebuilder/template/admin/setup.php @@ -97,7 +97,7 @@ if ($action == 'edit') print ''; print ''; - print '
' . $langs->trans("Key") . '
'; + print '
'; print ''; foreach($arrayofparameters as $key => $val) diff --git a/htdocs/modulebuilder/template/mymoduleindex.php b/htdocs/modulebuilder/template/mymoduleindex.php index af7272d5954..99ed522e273 100644 --- a/htdocs/modulebuilder/template/mymoduleindex.php +++ b/htdocs/modulebuilder/template/mymoduleindex.php @@ -104,7 +104,7 @@ if (! empty($conf->mymodule->enabled) && $user->rights->mymodule->read) $total = 0; $num = $db->num_rows($resql); - print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; + print '
'; print ''; print ''; @@ -188,7 +188,7 @@ if (! empty($conf->mymodule->enabled) && $user->rights->mymodule->read) $num = $db->num_rows($resql); $i = 0; - print '
'.$langs->trans("DraftOrders").($num?''.$num.'':'').'
'; + print '
'; print ''; print '
'; if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print $langs->trans("BoxTitleLastCustomersOrProspects",$max); diff --git a/htdocs/mrp/index.php b/htdocs/mrp/index.php index 36847b71035..23729f8e0de 100644 --- a/htdocs/mrp/index.php +++ b/htdocs/mrp/index.php @@ -92,7 +92,7 @@ if ($conf->use_javascript_ajax) $db->free($resql); print '
'; - print ''; + print '
'; print ''."\n"; if ($conf->use_javascript_ajax) { @@ -143,7 +143,7 @@ $resql=$db->query($sql); if ($resql) { print '
'; - print '
'.$langs->trans("Statistics").'
'; + print '
'; print ''; print ''; @@ -196,7 +196,7 @@ $resql=$db->query($sql); if ($resql) { print '
'; - print '
'.$langs->trans("LatestBOMModified", $max).'
'; + print '
'; print ''; print ''; diff --git a/htdocs/opensurvey/index.php b/htdocs/opensurvey/index.php index ad7f78938c6..d411c084f8f 100644 --- a/htdocs/opensurvey/index.php +++ b/htdocs/opensurvey/index.php @@ -63,7 +63,7 @@ print load_fiche_titre($title, '', 'wrench'); print '
'; -print '
'.$langs->trans("LatestMOModified", $max).'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php index 56bca6bc1be..f8161cb2917 100644 --- a/htdocs/opensurvey/wizard/create_survey.php +++ b/htdocs/opensurvey/wizard/create_survey.php @@ -140,7 +140,7 @@ print ''."\n"; dol_fiche_head(); // Affichage des différents champs textes a remplir -print '
'.$langs->trans("OpenSurveyArea").'
'.$langs->trans("NbOfSurveys").''.$nbsondages.'
'."\n"; +print '
'."\n"; print ''."\n"; if (! $_SESSION["titre"] && (GETPOST('creation_sondage_date') || GETPOST('creation_sondage_autre'))) diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php index 1d1b82bde62..8ac92f60f18 100644 --- a/htdocs/paybox/admin/paybox.php +++ b/htdocs/paybox/admin/paybox.php @@ -121,7 +121,7 @@ dol_fiche_head($head, 'payboxaccount', '', -1); print $langs->trans("PayBoxDesc")."
\n"; print '
'; -print '
'. $langs->trans("PollTitle") .'
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php index 608492ba455..7136b505f8a 100644 --- a/htdocs/paypal/admin/paypal.php +++ b/htdocs/paypal/admin/paypal.php @@ -136,7 +136,7 @@ if (! function_exists('curl_version')) print '
'; -print '
'.$langs->trans("AccountParameter").''.$langs->trans("Value").'
'; +print '
'; // Account Parameters print ''; diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php index 8c71ff0fcb7..2b3604ae13f 100644 --- a/htdocs/printing/admin/printing.php +++ b/htdocs/printing/admin/printing.php @@ -126,7 +126,7 @@ if ($mode == 'setup' && $user->admin) print $langs->trans("PrintingDriverDesc".$driver)."

\n"; - print '
'."\n"; + print '
'."\n"; print ''; print ''; print ''; @@ -243,7 +243,7 @@ if ($mode == 'config' && $user->admin) print $langs->trans("PrintingDesc")."

\n"; - print '
'.$langs->trans("Parameters").''.$langs->trans("Value").'
'."\n"; + print '
'."\n"; print ''; print ''; @@ -295,7 +295,7 @@ if ($mode == 'test' && $user->admin) print $langs->trans('PrintTestDesc'.$driver)."

\n"; - print '
'.$langs->trans("Description").'
'; + print '
'; if (! empty($driver)) { require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php'; @@ -327,7 +327,7 @@ if ($mode == 'userconf' && $user->admin) print $langs->trans('PrintUserConfDesc'.$driver)."

\n"; - print '
'; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php index 14bd92ca4ee..98bfc5a304c 100644 --- a/htdocs/product/admin/dynamic_prices.php +++ b/htdocs/product/admin/dynamic_prices.php @@ -161,7 +161,7 @@ if ($action != 'create_updater' && $action != 'edit_updater') { print load_fiche_titre($langs->trans("GlobalVariables"), '', ''); - print '
'.$langs->trans("User").''.$langs->trans("PrintModule").'
'; + print '
'; print ''; print ''; print ''; @@ -242,7 +242,7 @@ if ($action != 'create_variable' && $action != 'edit_variable') { print load_fiche_titre($langs->trans("GlobalVariableUpdaters"), '', ''); - print '
'.$langs->trans("Variable").''.$langs->trans("Description").'
'; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php index d6f636bf4c9..deafff12cfe 100644 --- a/htdocs/product/admin/product.php +++ b/htdocs/product/admin/product.php @@ -300,7 +300,7 @@ $dirmodels=array_merge(array('/'), (array) $conf->modules_parts['models']); print load_fiche_titre($langs->trans("ProductCodeChecker"), '', ''); -print '
'.$langs->trans("VariableToUpdate").''.$langs->trans("Description").'
'."\n"; +print '
'."\n"; print ''."\n"; print ' '; print ' '; @@ -401,7 +401,7 @@ print '
'; print load_fiche_titre($langs->trans("ProductDocumentTemplates"), '', ''); -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''; print ''; @@ -537,7 +537,7 @@ print ''; print ''; print ''; -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''."\n"; print ''."\n"; diff --git a/htdocs/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php index 4210a3a560a..ccdd666bc30 100644 --- a/htdocs/product/admin/product_tools.php +++ b/htdocs/product/admin/product_tools.php @@ -296,7 +296,7 @@ else print ''; print ''; - print '
'.$langs->trans("Parameters").''.$langs->trans("Value").'
'; + print '
'; print ''; print ''."\n"; print ''."\n"; diff --git a/htdocs/product/card.php b/htdocs/product/card.php index cc8d4e6bc89..3a646528a28 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -1182,7 +1182,7 @@ else { // We do no show price array on create when multiprices enabled. // We must set them on prices tab. - print '
'.$langs->trans("Parameters").''.$langs->trans("Value").'
'; + print '
'; // VAT print '
' . $langs->trans("VATRate") . ''; $defaultva = get_default_tva($mysoc, $mysoc); @@ -1193,7 +1193,7 @@ else } else { - print ''; + print '
'; // Price print ''; @@ -1218,7 +1218,7 @@ else } // Accountancy codes - print '
'.$langs->trans("SellingPrice").'
'; + print '
'; if (! empty($conf->accounting->enabled)) { @@ -1566,7 +1566,7 @@ else print '
'; - print '
'; + print '
'; if (! empty($conf->accounting->enabled)) { diff --git a/htdocs/product/dynamic_price/editor.php b/htdocs/product/dynamic_price/editor.php index 026c036bc97..9b16db0eef9 100644 --- a/htdocs/product/dynamic_price/editor.php +++ b/htdocs/product/dynamic_price/editor.php @@ -177,7 +177,7 @@ print ''; +print '
'; // Price expression selector print '
'.$langs->trans("PriceExpressionSelected").''; diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index e1940864dd0..31819043202 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -456,7 +456,7 @@ if ($id > 0 || $ref) dol_fiche_head(); - print ''; + print '
'; // Supplier print '
'.$langs->trans("Supplier").''; @@ -842,7 +842,7 @@ SCRIPT; // Suppliers list title print '
'; - print ''; + print '
'; $param="&id=".$object->id; diff --git a/htdocs/product/index.php b/htdocs/product/index.php index 87e5eb6d2fb..651b2f5aea4 100644 --- a/htdocs/product/index.php +++ b/htdocs/product/index.php @@ -145,7 +145,7 @@ while ($objp = $db->fetch_object($result)) if ($conf->use_javascript_ajax) { print '
'; - print '
'; + print '
'; print ''; print '
'.$langs->trans("Statistics").'
'; @@ -196,7 +196,7 @@ if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHS require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; print '
'; print '
'; - print ''; + print '
'; print ''; print '
'.$langs->trans("Categories").'
'; $sql = "SELECT c.label, count(*) as nb"; @@ -299,7 +299,7 @@ if ($result) if (isset($_GET["type"]) && $_GET["type"] == 1) $transRecordedType = $langs->trans("LastRecordedServices", $max); print '
'; - print ''; + print '
'; $colnb=2; if (empty($conf->global->PRODUIT_MULTIPRICES)) $colnb++; diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php index c50ca3538aa..95bf2b965a2 100644 --- a/htdocs/product/popuprop.php +++ b/htdocs/product/popuprop.php @@ -157,7 +157,7 @@ else print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num, $totalnboflines, ''); -print '
'; +print '
'; print ""; print_liste_field_titre('Ref', $_SERVER["PHP_SELF"], 'p.ref', '', $param, '', $sortfield, $sortorder); diff --git a/htdocs/product/price.php b/htdocs/product/price.php index f6820bc37bc..471c1775552 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -1157,7 +1157,7 @@ if ($action == 'edit_vat' && ($user->rights->produit->creer || $user->rights->se dol_fiche_head(''); - print '
'; + print '
'; // VAT print '
' . $langs->trans("DefaultTaxRate") . ''; @@ -1191,7 +1191,7 @@ if ($action == 'edit_price' && $object->getRights()->creer) dol_fiche_head(''); - print ''; + print '
'; // VAT print '
' . $langs->trans("DefaultTaxRate") . ''; @@ -1463,7 +1463,7 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action=='showlog_default_ //else print_barre_liste($langs->trans("PriceByCustomerLog"),'','','','','','', 0, 0, 'title_accountancy.png'); print '
'; - print ''; + print '
'; print ''; print ''; @@ -1659,7 +1659,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) dol_fiche_head(); - print '
' . $langs->trans("AppliedPricesFrom") . '
'; + print '
'; print ''; print ''; print '
' . $langs->trans('ThirdParty') . ''; @@ -1746,7 +1746,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) dol_fiche_head(); - print ''; + print '
'; print ''; print ''; $staticsoc = new Societe($db); @@ -1856,7 +1856,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print ''; print ''; - print '
' . $langs->trans('ThirdParty') . '
'; + print '
'; print ''; print ''; @@ -1976,7 +1976,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print ''; print ''; - print '
' . $langs->trans("ThirdParty") . '
'; + print '
'; if (count($prodcustprice->lines) > 0 || $search_soc) { diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php index e5830ef7fc1..d87b6f7604f 100644 --- a/htdocs/product/stats/card.php +++ b/htdocs/product/stats/card.php @@ -173,7 +173,7 @@ if ($result || empty($id)) print ''; print ''; - print '
'; + print '
'; print ''; if (empty($id)) @@ -401,7 +401,7 @@ if ($result || empty($id)) $linktoregenerate='id).((string) $type != ''?'&type='.$type:'').'&action=recalcul&mode='.$mode.'&search_year='.$search_year.'&search_categ='.$search_categ.'">'.img_picto($langs->trans("ReCalculate").' ('.$dategenerated.')', 'refresh').''; // Show graph - print '
'.$langs->trans("Filter").'
'; + print '
'; // Label print '
'; print $graphfiles[$key]['label']; diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php index 6ccc5d891a1..41e91b04d0c 100644 --- a/htdocs/product/stock/card.php +++ b/htdocs/product/stock/card.php @@ -255,7 +255,7 @@ if ($action == 'create') dol_fiche_head(); - print ''; + print '
'; // Ref print ''; @@ -386,7 +386,7 @@ else print '
'; print '
'; - print '
'.$langs->trans("Ref").'
'; + print '
'; // Parent entrepot $e = new Entrepot($db); @@ -504,7 +504,7 @@ else /* ************************************************************************** */ print '
'; - print '
'; + print '
'; print ""; print_liste_field_titre("Product", "", "p.ref", "&id=".$id, "", "", $sortfield, $sortorder); print_liste_field_titre("Label", "", "p.label", "&id=".$id, "", "", $sortfield, $sortorder); @@ -665,7 +665,7 @@ else dol_fiche_head($head, 'card', $langs->trans("Warehouse"), 0, 'stock'); - print '
'; + print '
'; // Ref print ''; diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php index dbd0354cea3..f5604cbacdb 100644 --- a/htdocs/product/stock/class/productlot.class.php +++ b/htdocs/product/stock/class/productlot.class.php @@ -65,7 +65,7 @@ class Productlot extends CommonObject 'entity' =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>20), 'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>500), 'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501), - 'fk_user_author'=>array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>510, 'foreignkey'=>'llx_user.rowid'), + 'fk_user_creat'=>array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>510, 'foreignkey'=>'llx_user.rowid'), 'fk_user_modif' =>array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511) ); diff --git a/htdocs/product/stock/fiche-valo.php b/htdocs/product/stock/fiche-valo.php index c6eed274793..838c01b7b6f 100644 --- a/htdocs/product/stock/fiche-valo.php +++ b/htdocs/product/stock/fiche-valo.php @@ -60,7 +60,7 @@ if ($_GET["id"]) dol_fiche_head($head, 'value', $langs->trans("Warehouse"), 0, 'stock'); - print '
'.$langs->trans("Ref").'
'; + print '
'; // Ref print '
'.$langs->trans("Ref").''; diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php index 496d4b4f109..ea39a0caf42 100644 --- a/htdocs/product/stock/index.php +++ b/htdocs/product/stock/index.php @@ -62,7 +62,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele print ''; print ''; print '
'; - print ''; + print '
'; print ""; print ''; print "
'.$langs->trans("Search").'
"; @@ -87,7 +87,7 @@ if ($result) $i = 0; print '
'; - print ''; + print '
'; print ''; if ($num) @@ -141,7 +141,7 @@ if ($resql) $num = $db->num_rows($resql); print '
'; - print '
'.$langs->trans("Warehouses").'
'; + print '
'; print ""; print ''; print ''; diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php index 0f4e5476fd2..81fbd774111 100644 --- a/htdocs/product/stock/massstockmove.php +++ b/htdocs/product/stock/massstockmove.php @@ -339,7 +339,7 @@ print ''; print '
'; -print '
'.$langs->trans("LastMovements", min($num, $max)).''.$langs->trans("Product").'
'; +print '
'; //print '
'; $param=''; @@ -439,7 +439,7 @@ print ''; $codemove=(isset($_POST["codemove"])?GETPOST("codemove", 'alpha'):dol_print_date(dol_now(), '%Y%m%d%H%M%S')); $labelmovement=GETPOST("label")?GETPOST('label'):$langs->trans("StockTransfer").' '.dol_print_date($now, '%Y-%m-%d %H:%M'); -print '
'; +print '
'; print ''; print ''; print '
'.$langs->trans("InventoryCode").''; diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php index e640c346eec..cef869d6a21 100644 --- a/htdocs/product/stock/movement_card.php +++ b/htdocs/product/stock/movement_card.php @@ -576,7 +576,7 @@ if ($resql) print '
'; print '
'; - print ''; + print '
'; print ''; diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php index 85f40a9d214..60c98d81a60 100644 --- a/htdocs/product/stock/movement_list.php +++ b/htdocs/product/stock/movement_list.php @@ -558,7 +558,7 @@ if ($resql) print '
'; print '
'; - print '
'; + print '
'; print ''; diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index 3428b75f395..2932ba43d5b 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -893,7 +893,7 @@ if (! $variants) { print "\n" . ''; print '
'; print ''; - print ''; + print '
'; print ''; print '
'; print $form->selectDate($pdluo->eatby, 'eatby', '', '', 1, '', 1, 0); @@ -963,7 +963,7 @@ if (! $variants) { print ''; print ''; } - print ''; + print '
'; if (!empty($user->rights->produit->creer)) { print ''; print ''; diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index 168ed5e54f9..dbab10c0bf4 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -523,7 +523,7 @@ if ($sref || $snom || $sall || $salert || $draftorder || GETPOST('search', 'alph } print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table -print '
' . $formproduct->selectWarehouses('', 'fk_entrepot') . '
'; +print '
'; $param = (isset($type)? '&type=' . $type : ''); $param .= '&fourn_id=' . $fourn_id . '&snom='. $snom . '&salert=' . $salert . '&draftorder='.$draftorder; diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php index 27834923a0e..13f7cca301f 100644 --- a/htdocs/product/stock/replenishorders.php +++ b/htdocs/product/stock/replenishorders.php @@ -170,7 +170,7 @@ if ($resql) print ''; - print '
'; + print '
'; print ''; print '
'. diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php index 63b80636d67..9f0c4dd376e 100644 --- a/htdocs/product/stock/tpl/stockcorrection.tpl.php +++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php @@ -62,7 +62,7 @@ if (empty($conf) || ! is_object($conf)) { print ''; print ''; print ''; - print ''; + print '
'; // Warehouse or product print ''; diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php index dc814e54790..f796827587e 100644 --- a/htdocs/product/stock/tpl/stocktransfer.tpl.php +++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php @@ -66,7 +66,7 @@ if ($pdluoid) { print ''; } - print '
'; + print '
'; // Source warehouse or product print ''; diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php index 341e2e3ec45..32ffebdba76 100644 --- a/htdocs/product/stock/valo.php +++ b/htdocs/product/stock/valo.php @@ -83,7 +83,7 @@ if ($result) print_barre_liste($langs->trans("EnhancedValueOfWarehouses"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num); - print '
'; + print '
'; print ""; print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "e.ref", "", "", "", $sortfield, $sortorder); print_liste_field_titre("LocationSummary", $_SERVER["PHP_SELF"], "e.lieu", "", "", "", $sortfield, $sortorder); diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php index 19a23e1e9d2..efdaebab889 100644 --- a/htdocs/product/traduction.php +++ b/htdocs/product/traduction.php @@ -250,7 +250,7 @@ if ($action == 'edit') print "
".($s?$s.' ':'')." ".$langs->trans('Language_'.$key).": ".''.img_delete('', 'class="valigntextbottom"')."
"; print '
'; - print '
'; + print '
'; print ''; print '
'.$langs->trans('Label').'
'.$langs->trans('Description').''; $doleditor = new DolEditor("desc-$key", $object->multilangs[$key]["description"], '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%'); @@ -288,7 +288,7 @@ elseif ($action != 'add') print '
'; print '
'; - print ''; + print '
'; print ''; print ''; if (! empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) @@ -321,7 +321,7 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service dol_fiche_head(); - print '
'.$langs->trans('Label').''.$object->multilangs[$key]["label"].'
'.$langs->trans('Description').''.$object->multilangs[$key]["description"].'
'; + print '
'; print ''; diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php index cf1249aa9eb..cea14170602 100644 --- a/htdocs/projet/activity/index.php +++ b/htdocs/projet/activity/index.php @@ -133,7 +133,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele /* Affichage de la liste des projets d'aujourd'hui */ print '
'; -print '
'.$langs->trans('Language').''; print $formadmin->select_language('', 'forcelangprod', 0, $object->multilangs, 1); print '
'; +print '
'; print ''; print ''; print ''; @@ -190,7 +190,7 @@ print '
'; /* Affichage de la liste des projets d'hier */ print '
'; -print '
'.$langs->trans('ActivityOnProjectToday').''.$langs->trans("Time").'
'; +print '
'; print ''; print ''; print ''; @@ -250,7 +250,7 @@ if ($db->type != 'pgsql') // Affichage de la liste des projets de la semaine print '
'; - print '
'.$langs->trans('ActivityOnProjectYesterday').''.$langs->trans("Time").'
'; + print '
'; print ''; print ''; print ''; @@ -307,7 +307,7 @@ if ($db->type != 'pgsql') if (! empty($conf->global->PROJECT_TASK_TIME_MONTH)) { print '
'; - print '
'.$langs->trans("ActivityOnProjectThisWeek").''.$langs->trans("Time").'
'; + print '
'; print ''; print ''; print ''; @@ -358,7 +358,7 @@ if (! empty($conf->global->PROJECT_TASK_TIME_MONTH)) if (! empty($conf->global->PROJECT_TASK_TIME_YEAR)) { print '
'; - print '
'.$langs->trans("ActivityOnProjectThisMonth").': '.dol_print_date($now, "%B %Y").''.$langs->trans("Time").'
'; + print '
'; print ''; print ''; print ''; @@ -479,7 +479,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_S //print load_fiche_titre($langs->trans("TasksOnOpenedProject"),'','').'
'; print '
'; - print '
'.$langs->trans("ActivityOnProjectThisYear").': '.strftime("%Y", $now).''.$langs->trans("Time").'
'; + print '
'; print ''; //print ''; print ''; diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php index 56998cdfc99..bd6c5eacc47 100644 --- a/htdocs/projet/admin/project.php +++ b/htdocs/projet/admin/project.php @@ -306,7 +306,7 @@ print ''; print ''; print ''; -print '
'.$langs->trans('TaskRessourceLinks').''.$langs->trans('OpenedProjects').'
'; +print '
'; print ''; print "\n"; print ''."\n"; @@ -349,7 +349,7 @@ print '
'; print load_fiche_titre($langs->trans("ProjectsNumberingModules"), '', ''); -print '
".$langs->trans("Parameters")."'.$langs->trans("Value").'
'; +print '
'; print ''; print ''; print ''; @@ -450,7 +450,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) // Task numbering module print load_fiche_titre($langs->trans("TasksNumberingModules"), '', ''); - print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; + print '
'; print ''; print ''; print ''; @@ -867,7 +867,7 @@ print ''; print ''; print ''; -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print "\n"; print ''."\n"; diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index 5b3d69777b7..51af2f2b14d 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -786,7 +786,7 @@ elseif ($object->id > 0) { dol_fiche_head($head, 'project', $langs->trans("Project"), 0, ($object->public?'projectpub':'project')); - print '
".$langs->trans("Parameters")."'.$langs->trans("Value").'
'; + print '
'; // Ref $suggestedref=$object->ref; diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index dcc4c18c497..c10e9915c3b 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -1849,6 +1849,8 @@ class Task extends CommonObject public function LibStatut($status, $mode = 0) { // phpcs:enable + global $langs; + // list of Statut of the task $this->statuts[0]='Draft'; $this->statuts[1]='ToDo'; @@ -1861,8 +1863,6 @@ class Task extends CommonObject $this->statuts_short[3]='Completed'; $this->statuts_short[4]='Transfered'; - global $langs; - if ($mode == 0) { return $langs->trans($this->statuts[$status]); diff --git a/htdocs/projet/comment.php b/htdocs/projet/comment.php index 064f4a12729..a7478163f47 100644 --- a/htdocs/projet/comment.php +++ b/htdocs/projet/comment.php @@ -118,7 +118,7 @@ print '
'; print '
'; print '
'; -print '
'; +print '
'; // Visibility print '
' . $langs->trans("Visibility") . ''; @@ -150,7 +150,7 @@ print '
'; print '
'; print '
'; -print ''; +print '
'; // Description print '
' . $langs->trans("Description") . ''; diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 14dccfedb8d..56d01faa342 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -588,7 +588,7 @@ if (!empty($conf->stock->enabled)) $langs->load('stocks'); print load_fiche_titre($langs->trans("Profit"), '', 'title_accountancy'); -print ''; +print '
'; print ''; print ''; print ''; @@ -815,7 +815,7 @@ foreach ($listofreferent as $key => $value) print load_fiche_titre($langs->trans($title), $addform, ''); print "\n".''."\n"; - print '
'.$langs->trans("Element").''.$langs->trans("Number").'
'; + print '
'; print ''; // Remove link column diff --git a/htdocs/projet/graph_opportunities.inc.php b/htdocs/projet/graph_opportunities.inc.php index 0987a47e507..8c92cabf363 100644 --- a/htdocs/projet/graph_opportunities.inc.php +++ b/htdocs/projet/graph_opportunities.inc.php @@ -50,7 +50,7 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) $ponderated_opp_amount = $ponderated_opp_amount / 100; print '
'; - print '
'; + print '
'; print ''."\n"; $listofstatus=array_keys($listofoppstatus); foreach ($listofstatus as $status) diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index a2526171b9b..15c98b4d1fc 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -186,7 +186,7 @@ $resql=$db->query($sql); if ($resql) { print '
'; - print '
'.$langs->trans("Statistics").' - '.$langs->trans("OpportunitiesStatusForOpenedProjects").'
'; + print '
'; print ''; print ''; @@ -258,7 +258,7 @@ $companystatic=new Societe($db); // We need a clean new object for next loop // Open project per thirdparty print '
'; -print '
'.$langs->trans("LatestModifiedProjects", $max).'
'; +print '
'; print ''; print_liste_field_titre("OpenedProjectsByThirdparties", $_SERVER["PHP_SELF"], "s.nom", "", "", '', $sortfield, $sortorder); print_liste_field_titre("NbOfProjects", "", "", "", "", '', $sortfield, $sortorder, 'right '); diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php index a7e6bf510b3..84f4a7c14a3 100644 --- a/htdocs/projet/stats/index.php +++ b/htdocs/projet/stats/index.php @@ -273,7 +273,7 @@ print '
'; print ''; -print '
'; +print '
'; print ''; // Company print '
'.$langs->trans("Filter").'
'.$langs->trans("ThirdParty").''; @@ -296,7 +296,7 @@ print ''; print '

'; print '
'; -print ''; +print '
'; print ''; print ''; print ''; @@ -346,7 +346,7 @@ print ''; print '
'; -$stringtoshow.= '
'.$langs->trans("Year").''.$langs->trans("NbOfProjects").'
'; +$stringtoshow.= '
'; if ($mesg) { print $mesg; } else { $stringtoshow.= $px1->show(); diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php index 31211e59dbf..565a459bf9e 100644 --- a/htdocs/projet/tasks/comment.php +++ b/htdocs/projet/tasks/comment.php @@ -148,7 +148,7 @@ if ($id > 0 || ! empty($ref)) print '
'; print '
'; - print ''; + print '
'; // Usage print '
'; @@ -234,7 +234,7 @@ if ($id > 0 || ! empty($ref)) print '
'; print '
'; - print ''; + print '
'; // Description print '
'.$langs->trans("Description").''; @@ -306,7 +306,7 @@ if ($id > 0 || ! empty($ref)) print '
'; print '
'; - print ''; + print '
'; // Nb comments print '
'.$langs->trans("NbComments").''; diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index aa94d413fc9..c60f1baef99 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -369,7 +369,7 @@ if ($id > 0 || ! empty($ref)) /* * Add a new contact line */ - print ''; + print '
'; if ($action != 'editline' && $user->rights->projet->creer) { diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php index c9e8bc335e7..18091baabe9 100644 --- a/htdocs/projet/tasks/stats/index.php +++ b/htdocs/projet/tasks/stats/index.php @@ -140,7 +140,7 @@ print '
'; print '
'; -print '
'; +print '
'; print ''; // Company /*print '
'.$langs->trans("Filter").'
'.$langs->trans("ThirdParty").''; @@ -165,7 +165,7 @@ print '

'; print '
'; -print ''; +print '
'; print ''; print ''; print ''; @@ -197,7 +197,7 @@ print ''; print '
'; -$stringtoshow.= '
'.$langs->trans("Year").''.$langs->trans("NbOfTasks").'
'; +$stringtoshow.= '
'; if ($mesg) { print $mesg; } else { $stringtoshow.= $px1->show(); diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 0bc07537ccf..50b4ddd168a 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -321,7 +321,7 @@ if ($id > 0 || ! empty($ref)) print '
'; print '
'; - print ''; + print '
'; // Description print '
'.$langs->trans("Description").''; @@ -388,7 +388,7 @@ if ($id > 0 || ! empty($ref)) dol_fiche_head($head, 'task_task', $langs->trans("Task"), 0, 'projecttask', 0, '', ''); - print ''; + print '
'; // Ref print ''; @@ -509,7 +509,7 @@ if ($id > 0 || ! empty($ref)) print '
'; print '
'; - print '
'.$langs->trans("Ref").'
'; + print '
'; // Task parent print '
'.$langs->trans("ChildOfTask").''; @@ -550,7 +550,7 @@ if ($id > 0 || ! empty($ref)) print '
'; print '
'; - print ''; + print '
'; // Progress declared print '
'.$langs->trans("ProgressDeclared").''; diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 12dff700288..fa7efdfa2a5 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -974,7 +974,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) if (! empty($id)) print ''; print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table - print ''; + print '
'; print ''; print ''; diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php index 5dce7eed5c6..14f19ef94b5 100644 --- a/htdocs/public/members/public_list.php +++ b/htdocs/public/members/public_list.php @@ -125,7 +125,7 @@ if ($result) $param="&statut=$statut&sortorder=$sortorder&sortfield=$sortfield"; print_barre_liste($langs->trans("ListOfValidatedPublicMembers"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, 0, ''); - print '
'.$langs->trans("Date").'
'; + print '
'; print ''; print ''; diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php index 2e9dbe5f57b..c641007ecf1 100644 --- a/htdocs/reception/card.php +++ b/htdocs/reception/card.php @@ -969,7 +969,7 @@ if ($action == 'create') print '
'; - print '
'.dolGetFirstLastname($langs->trans("Firstname"), $langs->trans("Lastname")).'
'; + print '
'; // Load receptions already done for same order $object->loadReceptions(); @@ -1366,7 +1366,7 @@ elseif ($id || $ref) print '
'; print '
'; - print '
'; + print '
'; // Linked documents if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled)) @@ -1620,7 +1620,7 @@ elseif ($id || $ref) print '
'; print '
'; - print '
'; + print '
'; print ''; // # if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) diff --git a/htdocs/reception/index.php b/htdocs/reception/index.php index 5844365b56f..fb4967436e2 100644 --- a/htdocs/reception/index.php +++ b/htdocs/reception/index.php @@ -59,7 +59,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele print ''; print ''; print '
'; - print '
'; + print '
'; print ''; print ''; @@ -95,7 +95,7 @@ if ($resql) if ($num) { print '
'; - print '
'.$langs->trans("Search").'
'; print $langs->trans("Reception").':
'; + print '
'; print ''; print ''; $i = 0; @@ -146,7 +146,7 @@ if ($resql) $i = 0; print '
'; - print '
'.$langs->trans("ReceptionsToValidate").'
'; + print '
'; print ''; print ''; while ($i < $num) @@ -207,7 +207,7 @@ if ( $resql ) { $i = 0; print '
'; - print '
'.$langs->trans("SuppliersOrdersToProcess").'
'; + print '
'; print ''; print ''; while ($i < $num) @@ -268,7 +268,7 @@ if ($resql) { $i = 0; print '
'; - print '
'.$langs->trans("SuppliersOrdersInProcess").'
'; + print '
'; print ''; print ''; while ($i < $num) diff --git a/htdocs/reception/stats/index.php b/htdocs/reception/stats/index.php index 06304a2afb8..8c79daf76ea 100644 --- a/htdocs/reception/stats/index.php +++ b/htdocs/reception/stats/index.php @@ -221,7 +221,7 @@ print '
'; print ''; print ''; - print '
'.$langs->trans("LastReceptions", $num).'
'; + print '
'; print ''; // Company print '
'.$langs->trans("Filter").'
'.$langs->trans("ThirdParty").''; @@ -244,7 +244,7 @@ print '
'; print '

'; //} -print ''; +print '
'; print ''; print ''; print ''; @@ -289,7 +289,7 @@ print '
'; // Show graphs -print '
'.$langs->trans("Year").''.$langs->trans("NbOfReceptions").'
'; +print '
'; if ($mesg) { print $mesg; } else { print $px1->show(); @@ -310,7 +310,7 @@ dol_fiche_end(); // TODO USe code similar to commande/stats/index.php instead of this one. /* -print ''; +print '
'; print ''; print ''; diff --git a/htdocs/reception/stats/month.php b/htdocs/reception/stats/month.php index 958d1fbd314..3dd2dd39300 100644 --- a/htdocs/reception/stats/month.php +++ b/htdocs/reception/stats/month.php @@ -63,7 +63,7 @@ if (! $mesg) $px->draw($filename, $fileurl); } -print '
'.$langs->trans("Year").''.$langs->trans("NbOfReceptions").'
'; +print '
'; print ''; print '
Nombre d reception par mois'; print $px->show(); diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php index f52da4934b0..1ad5c03ef98 100644 --- a/htdocs/resource/card.php +++ b/htdocs/resource/card.php @@ -244,7 +244,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0) print ''; print ''; - print ''; + print '
'; // Ref print ''; diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php index 2ab64799f1d..62fc5ca9a9c 100644 --- a/htdocs/resource/element_resource.php +++ b/htdocs/resource/element_resource.php @@ -458,7 +458,7 @@ else print '
'; print '
'; - print '
'.$langs->trans("ResourceFormLabel_ref").'
'; + print '
'; // Alias name (commercial, trademark or alias name) print '
' . $langs->trans('AliasNames') . ''; diff --git a/htdocs/salaries/admin/salaries.php b/htdocs/salaries/admin/salaries.php index abccb11b4f1..db97de6a21a 100644 --- a/htdocs/salaries/admin/salaries.php +++ b/htdocs/salaries/admin/salaries.php @@ -95,7 +95,7 @@ print ''; /* * Params */ -print ''; +print '
'; print ''; print ''; print '\n"; diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php index 4e9b9dac118..bf26e5426b9 100644 --- a/htdocs/salaries/card.php +++ b/htdocs/salaries/card.php @@ -258,7 +258,7 @@ if ($action == 'create') dol_fiche_head('', ''); - print '
'.$langs->trans("Parameters").''.$langs->trans("Value")."
'; + print '
'; // Date payment print '
'; @@ -423,7 +423,7 @@ if ($id) print '
'; print '
'; - print ''; + print '
'; // Label print ''; diff --git a/htdocs/salaries/stats/index.php b/htdocs/salaries/stats/index.php index 38a568d5fc0..1cc61ebc0b6 100644 --- a/htdocs/salaries/stats/index.php +++ b/htdocs/salaries/stats/index.php @@ -193,7 +193,7 @@ print '
'; // Show filter box print ''; -print '
'.$langs->trans("Label").''.$object->label.'
'; +print '
'; print ''; // User print '
'.$langs->trans("Filter").'
'.$langs->trans("User").''; @@ -211,7 +211,7 @@ print ''; print '

'; print '
'; -print ''; +print '
'; print ''; print ''; print ''; @@ -253,7 +253,7 @@ print '
'; // Show graphs -print '
'.$langs->trans("Year").''.$langs->trans("Number").'
'; +print '
'; if ($mesg) { print $mesg; } else { print $px1->show(); diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index e7184764e7b..93893060f75 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -351,7 +351,7 @@ foreach ($conf->modules_parts['models'] as $mo) $dirsociete[]=$mo.'core/modules print load_fiche_titre($langs->trans("CompanyCodeChecker"), '', ''); print '
'; -print ''."\n"; +print '
'."\n"; print ''."\n"; print ' '; print ' '; @@ -440,7 +440,7 @@ print "
"; print load_fiche_titre($langs->trans("AccountCodeManager"), '', ''); print '
'; -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''; print ''; @@ -544,7 +544,7 @@ else } print '
'; -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''; print ''; @@ -667,7 +667,7 @@ print '
'; print load_fiche_titre($langs->trans("CompanyIdProfChecker"), '', ''); print '
'; -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print ''; print ''; @@ -768,7 +768,7 @@ print ''; print ''; print '
'; -print '
'.$langs->trans("Name").''.$langs->trans("Description").'
'; +print '
'; print ''; print "\n"; print ''."\n"; diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php index b0503c7c163..6b375679052 100644 --- a/htdocs/societe/card.php +++ b/htdocs/societe/card.php @@ -1172,7 +1172,7 @@ else dol_fiche_head(null, 'card', '', 0, ''); - print '
".$langs->trans("Parameters")."'.$langs->trans("Value").'
'; + print '
'; // Name, firstname print '
'; @@ -1801,7 +1801,7 @@ else dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company'); print '
'; - print ''; + print '
'; // Ref/ID if (! empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 21213272a26..e73a060af40 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -785,17 +785,7 @@ class Societe extends CommonObject { if ($this->isACompany()) { - // Check for unicity - if ($vallabel && $this->id_prof_verifiable($i)) - { - if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0))) - { - $langs->load("errors"); - $error++; $this->errors[] = $langs->transcountry('ProfId'.$i, $this->country_code)." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')'; - } - } - - // Check for mandatory prof id (but only if country is other than ours) + // Check for mandatory prof id (but only if country is same than ours) if ($mysoc->country_id > 0 && $this->country_id == $mysoc->country_id) { $idprof_mandatory ='SOCIETE_'.$key.'_MANDATORY'; @@ -807,6 +797,17 @@ class Societe extends CommonObject } } } + + // Check for unicity + if (! $error && $vallabel && $this->id_prof_verifiable($i)) + { + if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0))) + { + $langs->load("errors"); + $error++; + $this->errors[] = $langs->transcountry('ProfId'.$i, $this->country_code)." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')'; + } + } } else { @@ -814,16 +815,6 @@ class Societe extends CommonObject //var_dump($conf->global->SOCIETE_EMAIL_MANDATORY); if ($key == 'EMAIL') { - // Check for unicity - if ($vallabel && ! empty($conf->global->SOCIETE_EMAIL_UNIQUE)) - { - if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0))) - { - $langs->load("errors"); - $error++; $this->errors[] = $langs->trans('Email')." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')'; - } - } - // Check for mandatory if (! empty($conf->global->SOCIETE_EMAIL_MANDATORY) && ! isValidEMail($this->email)) { @@ -831,6 +822,16 @@ class Societe extends CommonObject $error++; $this->errors[] = $langs->trans("ErrorBadEMail", $this->email).' ('.$langs->trans("ForbiddenBySetupRules").')'; } + + // Check for unicity + if (! $error && $vallabel && ! empty($conf->global->SOCIETE_EMAIL_UNIQUE)) + { + if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0))) + { + $langs->load("errors"); + $error++; $this->errors[] = $langs->trans('Email')." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')'; + } + } } } } @@ -3284,12 +3285,17 @@ class Societe extends CommonObject // Define if third party is treated as company (or not) when nature is unknown $isacompany=empty($conf->global->MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES)?0:1; // 0 by default - if (! empty($this->tva_intra)) $isacompany=1; + if (! empty($this->tva_intra)) { + $isacompany = 1; + } + elseif (! empty($this->idprof1) || ! empty($this->idprof2) || ! empty($this->idprof3) || ! empty($this->idprof4) || ! empty($this->idprof5) || ! empty($this->idprof6)) { + $isacompany = 1; + } elseif (! empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN') { // TODO Add a field is_a_company into dictionary - if (preg_match('/^TE_PRIVATE/', $this->typent_code)) $isacompany=0; - else $isacompany=1; + if (preg_match('/^TE_PRIVATE/', $this->typent_code)) $isacompany = 0; + else $isacompany = 1; } return $isacompany; diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php index 0039504e950..b55c6a3242e 100644 --- a/htdocs/societe/consumption.php +++ b/htdocs/societe/consumption.php @@ -364,7 +364,7 @@ if ($sql_select) print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, '', 0, '', '', $limit); print '
'; - print '
'."\n"; + print '
'."\n"; // Filters print ''; @@ -612,7 +612,7 @@ elseif (empty($type_element) || $type_element == -1) { print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', ''); - print '
'."\n"; + print '
'."\n"; // Titles with sort buttons print ''; print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left '); @@ -629,7 +629,7 @@ elseif (empty($type_element) || $type_element == -1) else { print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', ''); - print '
'."\n"; + print '
'."\n"; print ''; diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php index 5aadc5d3606..a56762ce447 100644 --- a/htdocs/societe/index.php +++ b/htdocs/societe/index.php @@ -99,7 +99,7 @@ if ($result) else dol_print_error($db); print '
'; -print '
'.$langs->trans("FeatureNotYetAvailable").'
'."\n"; +print '
'."\n"; print ''; if (!empty($conf->use_javascript_ajax) && ((round($third['prospect']) ? 1 : 0) + (round($third['customer']) ? 1 : 0) + (round($third['supplier']) ? 1 : 0) + (round($third['other']) ? 1 : 0) >= 2)) { @@ -157,7 +157,7 @@ if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTA print '
'; print '
'; - print '
'.$langs->trans("Statistics").'
'; + print '
'; print ''; print '
'.$langs->trans("Categories").'
'; $sql = "SELECT c.label, count(*) as nb"; @@ -263,7 +263,7 @@ if ($result) print "\n\n"; print '
'; - print ''; + print '
'; print ''; print ''; diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php index 1f333a7cdfd..5636f09b3a4 100644 --- a/htdocs/societe/paymentmodes.php +++ b/htdocs/societe/paymentmodes.php @@ -992,7 +992,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard' print ''."\n"; print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table - print '
'.$transRecordedType.' 
'."\n"; + print '
'."\n"; print ''; if (! empty($conf->global->STRIPE_ALLOW_LOCAL_CARD)) { @@ -1302,7 +1302,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard' { print load_fiche_titre($langs->trans('StripeBalance').($stripesupplieracc?' (Stripe connection with StripeConnect account '.$stripesupplieracc.')':' (Stripe connection with keys from Stripe module setup)'), $morehtmlright, ''); $balance = \Stripe\Balance::retrieve(array("stripe_account" => $stripesupplieracc)); - print '
'."\n"; + print '
'."\n"; print ''; print ''; print ''; @@ -1360,7 +1360,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard' if (is_array($rib_list)) { print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table - print '
'.$langs->trans('Currency').''.$langs->trans('Available').'
'; + print '
'; print ''; print_liste_field_titre("LabelRIB"); @@ -1684,7 +1684,7 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer) { print '
'; - print '
'; + print '
'; if (empty($companybankaccount->rum)) $companybankaccount->rum = $prelevement->buildRumNumber($object->code_client, $companybankaccount->datec, $companybankaccount->id); @@ -1832,7 +1832,7 @@ if ($socid && $action == 'create' && $user->rights->societe->creer) { print '
'; - print '
'; + print '
'; // RUM print ''; diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php index d3c4c75fca5..47e85a0bf6b 100644 --- a/htdocs/societe/price.php +++ b/htdocs/societe/price.php @@ -259,7 +259,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { print ''; print ''; print ''; - print '
'.$langs->trans("RUM").'
'; + print '
'; print ''; print ''; print '
' . $langs->trans('Product') . ''; @@ -337,7 +337,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { print ''; print ''; print ''; - print ''; + print '
'; print ''; print ''; $staticprod = new Product($db); @@ -428,7 +428,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { print ''; print ''; - print '
' . $langs->trans('Product') . '
'; + print '
'; print ''; print ''; @@ -516,7 +516,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { print ''; print ''; - print '
' . $langs->trans("Product") . '
'; + print '
'; print ''; print ''; diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php index e101a40ffbf..72de4e55877 100644 --- a/htdocs/stripe/admin/stripe.php +++ b/htdocs/stripe/admin/stripe.php @@ -167,7 +167,7 @@ print $langs->trans("StripeDesc")."
\n"; print '
'; -print '
' . $langs->trans("Product") . '
'; +print '
'; print ''; print ''; print ''; @@ -333,7 +333,7 @@ print '
'.$langs->trans("AccountParameter").''.$langs->trans("Value").'
'; print '
'; -print ''; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/stripe/payment.php b/htdocs/stripe/payment.php index e0ed986bfd6..0fe4c450fad 100644 --- a/htdocs/stripe/payment.php +++ b/htdocs/stripe/payment.php @@ -565,7 +565,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie dol_fiche_head(); - print '
'.$langs->trans("UsageParameter").''.$langs->trans("Value").'
'; + print '
'; // Invoice /*if ($facture->id > 0) @@ -620,7 +620,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie print '
'; print_barre_liste($langs->trans('StripeSourceList').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', ''); - print '
'."\n"; + print '
'."\n"; // Titles with sort buttons print ''; print ''; @@ -820,7 +820,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie print_barre_liste($langs->trans('StripeInvoiceList').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', ''); - print '
'; + print '
'; print ''; print ''; print ''; @@ -1107,7 +1107,7 @@ if (! GETPOST('action')) $i = 0; print_barre_liste($langs->trans('Payments'), $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', $num); - print '
'.$arraytitle.''.$langs->trans('Date').'
'; + print '
'; print ''; print_liste_field_titre('Invoice', $_SERVER["PHP_SELF"], 'ref', '', '', '', $sortfield, $sortorder); print_liste_field_titre('Date', $_SERVER["PHP_SELF"], 'dp', '', '', '', $sortfield, $sortorder); diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php index 67bf6d02a0d..81999dc86f8 100644 --- a/htdocs/supplier_proposal/card.php +++ b/htdocs/supplier_proposal/card.php @@ -1131,7 +1131,7 @@ if ($action == 'create') dol_fiche_head(); - print '
'; + print '
'; // Reference print ''; @@ -1362,7 +1362,7 @@ if ($action == 'create') $title = $langs->trans('ProductsAndServices'); print load_fiche_titre($title); - print '
' . $langs->trans('Ref') . '' . $langs->trans("Draft") . '
'; + print '
'; $objectsrc->printOriginLinesList(); @@ -1806,7 +1806,7 @@ if ($action == 'create') $form_close = ''; if (! empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL)) $form_close .= '

'.$langs->trans('SupplierProposalRefFournNotice').'

'; // TODO Suggest a permanent checkbox instead of option $form_close .= ''; - $form_close .= '
'; + $form_close .= '
'; $form_close .= '
' . $langs->trans("CloseAs") . ''; $form_close .= ''; $form_close .= ''; print '
'; - print ''; + print '
'; print ''; print ''; @@ -123,7 +123,7 @@ if ($resql) $db->free($resql); print '
'; - print '
'.$langs->trans("Search").'
'; print $langs->trans("SupplierProposal").':
'; + print '
'; print ''."\n"; $listofstatus=array(0,1,2,3,4); foreach ($listofstatus as $status) @@ -182,7 +182,7 @@ if (! empty($conf->supplier_proposal->enabled)) if ($resql) { print '
'; - print '
'.$langs->trans("Statistics").' - '.$langs->trans("CommRequests").'
'; + print '
'; print ''; print ''; $langs->load("supplier_proposal"); @@ -239,7 +239,7 @@ $resql=$db->query($sql); if ($resql) { print '
'; - print '
'.$langs->trans("DraftRequests").'
'; + print '
'; print ''; print ''; @@ -321,7 +321,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos if ($num > 0) { print '
'; - print '
'.$langs->trans("LastModifiedRequests", $max).'
'; + print '
'; print ''; $nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD)); diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php index ffa4bd6d13b..ee936015352 100644 --- a/htdocs/takepos/admin/receipt.php +++ b/htdocs/takepos/admin/receipt.php @@ -85,7 +85,7 @@ print ''; print ''; -print '
'.$langs->trans("RequestsOpened").' '.$num.'
'; +print '
'; print ''; print ''; print "\n"; diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php index 2c9cc3cb495..132b9db3cf5 100644 --- a/htdocs/takepos/admin/setup.php +++ b/htdocs/takepos/admin/setup.php @@ -125,7 +125,7 @@ print ''; print ''; print ''; -print '
'.$langs->trans("Parameters").''.$langs->trans("Value").'
'; +print '
'; print ''; print ''; diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php index 24418654457..4696426aaf8 100644 --- a/htdocs/takepos/admin/terminal.php +++ b/htdocs/takepos/admin/terminal.php @@ -123,7 +123,7 @@ print ''; print ''; -print '
'.$langs->trans("Parameters").''.$langs->trans("Value").'
'; +print '
'; print ''; print ''; print "\n"; diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php index feac750aa3b..779a3667c9e 100644 --- a/htdocs/ticket/card.php +++ b/htdocs/ticket/card.php @@ -689,7 +689,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd /* * Projet synthese pour rappel */ - print '
'.$langs->trans("Parameters").''.$langs->trans("Value").'
'; + print '
'; $linkback = '' . $langs->trans("BackToList") . ''; diff --git a/htdocs/ticket/index.php b/htdocs/ticket/index.php index dd95bd1bdf0..88e895435a7 100644 --- a/htdocs/ticket/index.php +++ b/htdocs/ticket/index.php @@ -211,7 +211,7 @@ $stringtoshow .= ''; $stringtoshow .= ''; print '
'; -print '
'; +print '
'; print ''; print '
' . $langs->trans("Statistics") . ' ' . img_picto('', 'filter.png', 'id="idsubimgDOLUSERCOOKIE_ticket_by_status" class="linkobject"') . '
'; @@ -309,7 +309,7 @@ if ($result) { $transRecordedType = $langs->trans("LatestNewTickets", $max); print '
'; - print ''; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/ticket/stats/index.php b/htdocs/ticket/stats/index.php index a6baeef7c06..588b645710a 100644 --- a/htdocs/ticket/stats/index.php +++ b/htdocs/ticket/stats/index.php @@ -230,7 +230,7 @@ print ''; print ''; -print '
' . $transRecordedType . ''.$langs->trans("FullList").'
'; +print '
'; print ''; // Company print '
'.$langs->trans("Filter").'
'.$langs->trans("ThirdParty").''; diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php index b24b6db9381..fd7de709fe4 100644 --- a/htdocs/user/bank.php +++ b/htdocs/user/bank.php @@ -305,7 +305,7 @@ if ($action != 'edit' && $action != 'create') // If not bank account yet, $acco { $num = $db->num_rows($resql); - print ''; + print '
'; print ''; print '
'; diff --git a/htdocs/user/card.php b/htdocs/user/card.php index f689cdc71d4..7c4c3bc0ef1 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -2012,7 +2012,7 @@ else print ''; } - print '
'.$langs->trans("LastSalaries", ($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllSalaries").''.$num.'
'."\n"; + print '
'."\n"; // Other form for add user to group $parameters=array('caneditgroup' => $caneditgroup, 'groupslist' => $groupslist, 'exclude' => $exclude); diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php index 573b7038dde..17ce50ca8bb 100644 --- a/htdocs/user/group/card.php +++ b/htdocs/user/group/card.php @@ -443,7 +443,7 @@ else print ''."\n"; print ''; print ''; - print '
'."\n"; + print '
'."\n"; print ''."\n"; print '
'.$langs->trans("NonAffectedUsers").''; print $form->select_dolusers('', 'user', 1, $exclude, 0, '', '', $object->entity, 0, 0, '', 0, '', 'maxwidth300'); diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index 736db8767ec..c9ddaaed4aa 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -261,7 +261,7 @@ if ($action == 'edit') clearstatcache(); - print ''; + print '
'; print ''; // Landing page @@ -333,7 +333,7 @@ else dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin); - print '
'.$langs->trans("Parameter").''.$langs->trans("DefaultValue").' '.$langs->trans("PersonalValue").'
'; + print '
'; print ''; // Landing page diff --git a/htdocs/webservices/admin/index.php b/htdocs/webservices/admin/index.php index dbe3082b5de..b782c5dc5ed 100644 --- a/htdocs/webservices/admin/index.php +++ b/htdocs/webservices/admin/index.php @@ -70,7 +70,7 @@ print "
\n"; print ''; print ''; -print '
'.$langs->trans("Parameter").''.$langs->trans("DefaultValue").' '.$langs->trans("PersonalValue").'
'; +print '
'; print ''; print ""; diff --git a/htdocs/website/index.php b/htdocs/website/index.php index e0e3378bf26..947336ab88c 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -2619,7 +2619,7 @@ if ($action == 'editcss') dol_fiche_head(); print ''."\n"; - print '
".$langs->trans("Parameter")."
'; + print '
'; // Website print '
'; @@ -2752,7 +2752,7 @@ if ($action == 'createsite') print ''."\n"; //print '
'; - print ''; + print '
'; if (GETPOST('WEBSITE_REF')) $siteref=GETPOST('WEBSITE_REF', 'alpha'); if (GETPOST('WEBSITE_DESCRIPTION')) $sitedesc=GETPOST('WEBSITE_DESCRIPTION', 'alpha'); @@ -3280,7 +3280,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm') print ''."\n"; print '
'; - if ($action == 'replacesiteconfirm') + if ($action == 'replacesiteconfirm' && $conf->global->MAIN_FEATURES_LEVEL >= 2) { print '
'; print '
'; diff --git a/htdocs/zapier/admin/setup.php b/htdocs/zapier/admin/setup.php index b8b203b8ab1..0754f75bb3c 100644 --- a/htdocs/zapier/admin/setup.php +++ b/htdocs/zapier/admin/setup.php @@ -78,7 +78,7 @@ if ($action == 'edit') { print ''; print ''; - print '
'; + print '
'; print ''; foreach($arrayofparameters as $key => $val) { @@ -96,7 +96,7 @@ if ($action == 'edit') { print '
'; } else { if (! empty($arrayofparameters)) { - print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; + print '
'; print ''; foreach($arrayofparameters as $key => $val) { diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php index 5c79d68aefe..fdc7aba2bc9 100644 --- a/htdocs/zapier/class/hook.class.php +++ b/htdocs/zapier/class/hook.class.php @@ -633,39 +633,22 @@ class Hook extends CommonObject public function LibStatut($status, $mode = 0) { // phpcs:enable - if (empty($this->labelStatus)) { - global $langs; - //$langs->load("zapier@zapier"); - $this->labelStatus[1] = $langs->trans('Enabled'); - $this->labelStatus[0] = $langs->trans('Disabled'); - } + global $langs; - if ($mode == 0) { - return $this->labelStatus[$status]; - } elseif ($mode == 1) { - return $this->labelStatus[$status]; - } elseif ($mode == 2) { - if ($status == 1) { - return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status]; - } elseif ($status == 0) { - return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status]; - } - } elseif ($mode == 3) { - if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle'); - elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle'); - } elseif ($mode == 4) { - if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status]; - elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status]; - } elseif ($mode == 5) { - if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle'); - elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle'); - } elseif ($mode == 6) { - if ($status == 1) { - return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle'); - } elseif ($status == 0) { - return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle'); - } - } + if (empty($this->labelStatus) || empty($this->labelStatusShort)) + { + global $langs; + //$langs->load("mymodule"); + $this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Disabled'); + $this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled'); + $this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Disabled'); + $this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled'); + } + + $statusType = 'status5'; + if ($status == self::STATUS_VALIDATED) $statusType = 'status4'; + + return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode); } /** diff --git a/htdocs/zapier/zapierindex.php b/htdocs/zapier/zapierindex.php index f70f9e8c95d..f9931a29d41 100644 --- a/htdocs/zapier/zapierindex.php +++ b/htdocs/zapier/zapierindex.php @@ -104,7 +104,7 @@ if (! empty($conf->zapierfordolibarr->enabled) && $user->rights->zapierfordoliba $total = 0; $num = $db->num_rows($resql); - print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; + print '
'; print ''; print ''; @@ -188,7 +188,7 @@ if (! empty($conf->zapierfordolibarr->enabled) && $user->rights->zapierfordoliba $num = $db->num_rows($resql); $i = 0; - print '
'.$langs->trans("DraftOrders").($num?''.$num.'':'').'
'; + print '
'; print ''; print ''; print '
'; if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print $langs->trans("BoxTitleLastCustomersOrProspects",$max); diff --git a/scripts/accountancy/export-thirdpartyaccount.php b/scripts/accountancy/export-thirdpartyaccount.php index 4a55aa81376..29b8fb14d95 100755 --- a/scripts/accountancy/export-thirdpartyaccount.php +++ b/scripts/accountancy/export-thirdpartyaccount.php @@ -182,11 +182,11 @@ if ($resql) { print '

'; - print ''; + print '
'; print "
\n"; print '
'; - print ''; + print '
'; print ''; print ''; print '';
' . $langs->trans("ThirdParties") . '' . $langs->trans("AccountNumber") . '' . $langs->trans("RaisonSociale") . '