'.$langs->trans("CompanyName").' ';
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index 18b5dff4645..2e1afa189cc 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -444,8 +444,8 @@ print load_fiche_titre($langs->trans("BankColorizeMovement"), '', '');
print '';
print '
'."\n";
print ''."\n";
-print ''.$langs->trans("Name").' ';
-print ''.$langs->trans("Value").' '."\n";
+print ''.$langs->trans("Parameter").' ';
+print ' '."\n";
print " \n";
print '';
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index a2d261159e0..f425524f3cc 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -450,7 +450,7 @@ print '';
print '
';
print '';
print ''.$langs->trans("Parameter").' ';
-print ''.$langs->trans("Value").' ';
+print ' ';
print ' ';
print ' ';
diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php
index 1c28ed4c482..1c4f0b4377a 100644
--- a/htdocs/admin/bom.php
+++ b/htdocs/admin/bom.php
@@ -456,7 +456,7 @@ print '';
print '
';
print '';
print ''.$langs->trans("Parameter").' ';
-print ''.$langs->trans("Value").' ';
+print ' ';
print " \n";
print " \n";
diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 49cb87e885c..ba4836f815c 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -92,8 +92,8 @@ print ' ';
print '';
print '
';
print '';
-print ''.$langs->trans("Name").' ';
-print ''.$langs->trans("Value").' ';
+print ''.$langs->trans("Parameter").' ';
+print ' ';
print " \n";
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index e3d08bb29cb..68856768f08 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -899,7 +899,7 @@ if ($mysoc->country_code == 'GR') {
print '';
print '';
print ''.$langs->trans("AccountParameter").' ';
- print ''.$langs->trans("Value").' ';
+ print ' ';
print ' ';
print " \n";
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index cf91b5fb5cb..ae676a142fd 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -497,7 +497,7 @@ print '';
print '
';
print '';
print ''.$langs->trans("Parameter").' ';
-print ''.$langs->trans("Value").' ';
+print ' ';
print " \n";
$substitutionarray = pdf_getSubstitutionArray($langs, array('objectamount'), null, 2);
diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php
index 76bfbd63b8f..6099d183348 100644
--- a/htdocs/admin/dav.php
+++ b/htdocs/admin/dav.php
@@ -102,7 +102,7 @@ if ($action == 'edit') {
print ' ';
print '';
- print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Parameter").' ';
foreach ($arrayofparameters as $key => $val) {
if (isset($val['enabled']) && empty($val['enabled'])) {
@@ -138,7 +138,7 @@ if ($action == 'edit') {
print ' ';
} else {
print '';
- print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Parameter").' ';
foreach ($arrayofparameters as $key => $val) {
if (isset($val['enabled']) && empty($val['enabled'])) {
diff --git a/htdocs/admin/debugbar.php b/htdocs/admin/debugbar.php
index 9d1356362ba..6f77e1ef4e9 100644
--- a/htdocs/admin/debugbar.php
+++ b/htdocs/admin/debugbar.php
@@ -97,7 +97,7 @@ print ' ';
print '';
print '';
-print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
+print ''.$langs->trans("Parameter").' ';
print ' ';
print " \n";
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index fe17368d821..092ec5bc5fc 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -249,11 +249,11 @@ if ($action == 'edit') {
// Show if meteo is enabled
print '';
- print ''.$langs->trans("Option").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Option").' ';
print '';
print ''.$langs->trans("MAIN_DISABLE_METEO").' ';
- print $form->selectarray('MAIN_DISABLE_METEO', $labelmeteo, (!getDolGlobalString('MAIN_DISABLE_METEO') ? 0 : $conf->global->MAIN_DISABLE_METEO));
+ print $form->selectarray('MAIN_DISABLE_METEO', $labelmeteo, getDolGlobalInt('MAIN_DISABLE_METEO'));
print ' ';
print '
';
@@ -263,7 +263,7 @@ if ($action == 'edit') {
*/
print '';
- print ''.$langs->trans("DelaysOfToleranceBeforeWarning").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("DelaysOfToleranceBeforeWarning").' ';
foreach ($modules as $module => $delays) {
if (isModEnabled($module)) {
@@ -283,7 +283,7 @@ if ($action == 'edit') {
// Show if meteo is enabled
print '';
- print ''.$langs->trans("Option").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Option").' ';
print '';
print ''.$langs->trans("MAIN_DISABLE_METEO").' ';
diff --git a/htdocs/admin/delivery.php b/htdocs/admin/delivery.php
index f8d6c1730ad..fa05a39c472 100644
--- a/htdocs/admin/delivery.php
+++ b/htdocs/admin/delivery.php
@@ -490,7 +490,7 @@ if (getDolGlobalString('MAIN_SUBMODULE_DELIVERY')) {
print '';
print '';
print ''.$langs->trans("Parameter").' ';
- print ''.$langs->trans("Value").' ';
+ print ' ';
print ' ';
print " \n";
diff --git a/htdocs/admin/ecm.php b/htdocs/admin/ecm.php
index b881d6d6a1a..cfc02d93efa 100644
--- a/htdocs/admin/ecm.php
+++ b/htdocs/admin/ecm.php
@@ -96,7 +96,7 @@ print dol_get_fiche_head($head, 'ecm', '', -1, '');
print '';
print '';
print ''.$langs->trans("Description").' ';
-print ''.$langs->trans("Value").' '."\n";
+print ' '."\n";
print ' ';
// Mail required for members
diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index a92affd82cd..51eaededfb0 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -186,7 +186,7 @@ if ($action == 'edit') {
print ' ';
print '';
- print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Parameter").' ';
foreach ($arrayofparameters as $constname => $val) {
if ($val['enabled'] == 1) {
@@ -269,7 +269,7 @@ if ($action == 'edit') {
} else {
if (!empty($arrayofparameters)) {
print '';
- print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Parameter").' ';
foreach ($arrayofparameters as $constname => $val) {
if ($val['enabled'] == 1) {
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 9e04a9894da..edcd0469c1a 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -538,7 +538,7 @@ print '';
print '
';
print '';
print ''.$langs->trans("Parameter").' ';
-print ''.$langs->trans("Value").' ';
+print ' ';
print " \n";
print " \n";
diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index 64bc975d3da..20716b351cf 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -110,7 +110,7 @@ print ' ';
print '';
print '';
-print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
+print ''.$langs->trans("Parameter").' ';
print ' ';
print " \n";
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index 18b7ac33f6d..b6fc587032d 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -461,27 +461,9 @@ print '';
print '
';
print '';
print ''.$langs->trans("Parameter").' ';
-print ''.$langs->trans("Value").' ';
+print ' ';
print " \n";
-//var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY);
-//var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY);
-//var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY);
-//var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY);
-
-if (!isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY)) {
- $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY = 1;
-}
-if (!isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY)) {
- $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY = 1;
-}
-
-//var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY);
-//var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY);
-//var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY);
-//var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY);
-
-
// Set working days
print '';
print "".$langs->trans("XIsAUsualNonWorkingDay", $langs->transnoentitiesnoconv("Monday"))." ";
diff --git a/htdocs/admin/hrm.php b/htdocs/admin/hrm.php
index 6671a5b68ad..e80962f6d25 100644
--- a/htdocs/admin/hrm.php
+++ b/htdocs/admin/hrm.php
@@ -510,7 +510,7 @@ if ($action == 'edit') {
print ' ';
print '';
- print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Parameter").' ';
foreach ($arrayofparameters as $constname => $val) {
if ($val['enabled'] == 1) {
@@ -595,7 +595,7 @@ if ($action == 'edit') {
} else {
if (!empty($arrayofparameters)) {
print '';
- print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Parameter").' ';
foreach ($arrayofparameters as $constname => $val) {
if ($val['enabled'] == 1) {
diff --git a/htdocs/admin/invoice.php b/htdocs/admin/invoice.php
index 736078cd4cf..e9dc88c9b96 100644
--- a/htdocs/admin/invoice.php
+++ b/htdocs/admin/invoice.php
@@ -792,7 +792,7 @@ print '';
print '
';
print '';
print ''.$langs->trans("Parameters").' ';
-print ''.$langs->trans("Value").' ';
+print ' ';
print ' ';
print " \n";
@@ -879,7 +879,7 @@ print '';
print '
'."\n";
print ''."\n";
print ''.$langs->trans("Name").' '."\n";
-print ''.$langs->trans("Value").' '."\n";
+print ' '."\n";
print " \n";
print ''."\n";
print ''.$langs->trans("PathDirectory").' '."\n";
diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index ffd63bb379c..7c7458a6901 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -217,7 +217,7 @@ if ($action == 'edit') {
print ' ';
print '';
- print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Parameter").' ';
// @phan-suppress-next-line PhanEmptyForeach
foreach ($arrayofparameters as $constname => $val) {
@@ -285,7 +285,7 @@ if ($action == 'edit') {
} else {
if (!empty($arrayofparameters)) {
print '';
- print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Parameter").' ';
// @phan-suppress-next-line PhanEmptyForeach
foreach ($arrayofparameters as $constname => $val) {
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index c7c55268b4b..2fb95d6e572 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -198,7 +198,7 @@ print $hookmanager->resPrint;
print '';
print ''.$langs->trans("Parameter").' ';
-print ''.$langs->trans("Value").' ';
+print ' ';
print ''.$langs->trans("Example").' ';
print " \n";
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index a3e9b993621..164a0ce525c 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -173,7 +173,7 @@ if ($action == 'edit') {
clearstatcache();
print '';
- print ''.$langs->trans("Parameters").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Parameters").' ';
print '';
print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_UNIT"), $langs->trans("ParameterActiveForNextInputOnly"));
@@ -204,7 +204,7 @@ if ($action == 'edit') {
} else {
print '';
print '
';
- print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Parameter").' ';
print '';
print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_UNIT"), $langs->trans("ParameterActiveForNextInputOnly"));
diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index 36b8553156e..73a0787486b 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -144,7 +144,7 @@ print ' ';
print '';
print '';
print ''.$langs->trans("Parameter").' ';
-print ''.$langs->trans("Value").' ';
+print ' ';
print ''.$langs->trans("Example").' ';
print " \n";
diff --git a/htdocs/admin/mails_ingoing.php b/htdocs/admin/mails_ingoing.php
index 734d83f619c..a206f4bed29 100644
--- a/htdocs/admin/mails_ingoing.php
+++ b/htdocs/admin/mails_ingoing.php
@@ -118,7 +118,7 @@ print " \n";
/*
print ''; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '
';
-print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
+print ''.$langs->trans("Parameter").' ';
print ' ';
diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php
index bf7c39d8b9a..0b343459e3d 100644
--- a/htdocs/admin/mrp.php
+++ b/htdocs/admin/mrp.php
@@ -450,7 +450,7 @@ print load_fiche_titre($langs->trans("OtherOptions"), '', '');
print '';
print '';
print ''.$langs->trans("Parameter").' ';
-print ''.$langs->trans("Value").' ';
+print ' ';
print " \n";
print " \n";
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index d9a9ae5bbfc..7bf96c88081 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -202,7 +202,7 @@ print '';
print '
';
diff --git a/htdocs/admin/order.php b/htdocs/admin/order.php
index d915eda1693..38b4dd721cf 100644
--- a/htdocs/admin/order.php
+++ b/htdocs/admin/order.php
@@ -649,7 +649,7 @@ print '
';
print '
';
print '';
print ''.$langs->trans("Parameter").' ';
-print ''.$langs->trans("Value").' ';
+print ' ';
print " \n";
print " \n";
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index c37c008ad9c..f60bed8f0c9 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -265,7 +265,7 @@ print '';
print '
';
print '';
print ''.$langs->trans("Parameter").' ';
-print ''.$langs->trans("Value").' ';
+print ' ';
print ' ';
print " \n";
diff --git a/htdocs/admin/paymentbybanktransfer.php b/htdocs/admin/paymentbybanktransfer.php
index a4771a9013b..3d5fb00b6ac 100644
--- a/htdocs/admin/paymentbybanktransfer.php
+++ b/htdocs/admin/paymentbybanktransfer.php
@@ -162,7 +162,7 @@ print '';
print '';
print ''.$langs->trans("Parameter").' ';
-print ''.$langs->trans("Value").' ';
+print ' ';
print " ";
// Bank account (from Banks module)
@@ -445,7 +445,7 @@ if (isModEnabled('notification'))
print '';
print '';
print ''.$langs->trans("User").' ';
- print ''.$langs->trans("Value").' ';
+ print ' ';
print ''.$langs->trans("Action").' ';
print " \n";
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 6101cdcc7bf..02521e57b9e 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -306,7 +306,7 @@ print load_fiche_titre($langs->trans("DictionaryPaperFormat"), '', '');
print '';
print '
';
-print ''.$langs->trans("Parameters").' '.$langs->trans("Value").' ';
+print ''.$langs->trans("Parameters").' ';
$selected = getDolGlobalString('MAIN_PDF_FORMAT');
if (empty($selected)) {
@@ -515,7 +515,7 @@ print load_fiche_titre($langs->trans("Other"), '', '');
print '';
print '
';
-print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
+print ''.$langs->trans("Parameter").' ';
// Use 2 languages into PDF
diff --git a/htdocs/admin/pdf_other.php b/htdocs/admin/pdf_other.php
index 39e97b2ee70..c325cec6aed 100644
--- a/htdocs/admin/pdf_other.php
+++ b/htdocs/admin/pdf_other.php
@@ -211,7 +211,7 @@ if (isModEnabled('propal')) {
print '';
print '
';
- print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Parameter").' ';
/* This feature seems not yet used into Dolibarr. So option is kept hidden and enabled by default
print '';
@@ -253,11 +253,12 @@ if (isModEnabled('propal')) {
}
if (isModEnabled('order')) {
- print load_fiche_titre($langs->trans("Orders"), '', 'bill');
+ $langs->load("orders");
+ print load_fiche_titre($langs->trans('CustomersOrders'), '', 'order');
print '';
print '
';
- print ''.$langs->trans("Parameters").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Parameters").' ';
print '';
print $form->textwithpicto($langs->trans("MAIN_PDF_ADD_TERMSOFSALE_ORDER"), $langs->trans("PdfAddTermOfSaleHelp"));
print ' ';
@@ -268,19 +269,8 @@ if (isModEnabled('order')) {
print $form->selectarray("MAIN_PDF_ADD_TERMSOFSALE_ORDER", $arrval, $conf->global->MAIN_PDF_ADD_TERMSOFSALE_ORDER);
}
print ' ';
- print '
';
- print '
';
-}
-if (isModEnabled('order')) {
- $langs->load("orders");
- print load_fiche_titre($langs->trans('CustomersOrders'), '', 'order');
-
- print '';
- print '
';
- print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
-
- print '';
+ print ' ';
print $form->textwithpicto($langs->trans("SALES_ORDER_SHOW_SHIPPING_ADDRESS"), $langs->trans("SALES_ORDER_SHOW_SHIPPING_ADDRESSMore"));
print ' ';
if ($conf->use_javascript_ajax) {
@@ -302,7 +292,7 @@ if (isModEnabled('supplier_proposal')) {
print '';
print '
';
- print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Parameter").' ';
print '';
print $form->textwithpicto($langs->trans("MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE"), '');
@@ -337,7 +327,7 @@ if (isModEnabled('supplier_order')) {
print '';
print '
';
- print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Parameter").' ';
print '';
print $form->textwithpicto($langs->trans("MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE"), '');
@@ -370,7 +360,7 @@ if (isModEnabled('invoice')) {
print '';
print '
';
- print ''.$langs->trans("Parameters").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Parameters").' ';
print '';
print $form->textwithpicto($langs->trans("MAIN_PDF_ADD_TERMSOFSALE_INVOICE"), $langs->trans("PdfAddTermOfSaleHelp"));
@@ -476,7 +466,7 @@ if (isModEnabled('shipping')) {
print '';
print '
';
- print ''.$langs->trans("Parameters").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Parameters").' ';
print '';
print $langs->trans("BARCODE_ON_SHIPPING_PDF");
@@ -498,7 +488,7 @@ if (isModEnabled('reception')) {
print '';
print '
';
- print ''.$langs->trans("Parameters").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Parameters").' ';
print '';
print $langs->trans("RECEPTION_PDF_HIDE_ORDERED");
@@ -541,7 +531,7 @@ if (isModEnabled('stocktransfer')) {
print '';
print '
';
- print ''.$langs->trans("Parameters").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Parameters").' ';
print '';
print $langs->trans("BARCODE_ON_STOCKTRANSFER_PDF");
@@ -561,7 +551,7 @@ if (isModEnabled('stocktransfer')) {
print load_fiche_titre($langs->trans("Files"), '', 'file');
print '';
print '
';
-print ''.$langs->trans("Parameters").' '.$langs->trans("Value").' ';
+print ''.$langs->trans("Parameters").' ';
// Terms of sale
$tooltiptermsofsale = $langs->trans('AvailableFormats').' : pdf';
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index 90a150ba6bc..50a5430df3e 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -164,7 +164,7 @@ print '';
print '';
print ''.$langs->trans("Parameter").' ';
-print ''.$langs->trans("Value").' ';
+print ' ';
print " ";
@@ -460,7 +460,7 @@ if (isModEnabled('notification') )
print '';
print '';
print ''.$langs->trans("User").' ';
- print ''.$langs->trans("Value").' ';
+ print ' ';
print ''.$langs->trans("Action").' ';
print " \n";
diff --git a/htdocs/admin/resource.php b/htdocs/admin/resource.php
index aac4c03bfb4..7b16c42eb81 100644
--- a/htdocs/admin/resource.php
+++ b/htdocs/admin/resource.php
@@ -88,7 +88,7 @@ print '';
print '
';
print '';
print ''.$langs->trans("Parameters").' '."\n";
-print ''.$langs->trans("Value").' '."\n";
+print ' '."\n";
print ' ';
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index ad815dc5bc8..15bbe9a6691 100644
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -181,7 +181,7 @@ if ($action == 'edit') {
clearstatcache();
print '';
- print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Parameter").' ';
// Disable
print ''.$langs->trans("MAIN_DISABLE_ALL_SMS").' ';
@@ -217,7 +217,7 @@ if ($action == 'edit') {
print ' ';
} else {
print '';
- print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Parameter").' ';
// Disable
print ''.$langs->trans("MAIN_DISABLE_ALL_SMS").' '.yn(getDolGlobalString('MAIN_DISABLE_ALL_SMS')).' ';
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 78590db9795..952bccf2074 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -697,7 +697,7 @@ print '';
print '';
print "".$langs->trans("Parameter")." \n";
-print ''.$langs->trans("Value").' '."\n";
+print ' '."\n";
print ' '."\n";
print '';
diff --git a/htdocs/admin/stocktransfer.php b/htdocs/admin/stocktransfer.php
index e1281c1bf58..6a14e25c466 100644
--- a/htdocs/admin/stocktransfer.php
+++ b/htdocs/admin/stocktransfer.php
@@ -192,7 +192,7 @@ print ''.$langs->trans("StockTransferSetupPage").'
print ' ';
print '';
- print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Parameter").' ';
foreach ($arrayofparameters as $key => $val)
{
@@ -213,7 +213,7 @@ print ''.$langs->trans("StockTransferSetupPage").'
if (!empty($arrayofparameters))
{
print '';
- print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Parameter").' ';
foreach ($arrayofparameters as $key => $val)
{
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 325378332ce..8dab80b8157 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -472,7 +472,7 @@ print '';
print '
';
print '';
print ''.$langs->trans("Parameter").' ';
-print ''.$langs->trans("Value").' ';
+print ' ';
print ' ';
print " \n";
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 17aa2f5f78f..ba4886573f3 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -477,7 +477,7 @@ print '';
print '
';
print '';
print ''.$langs->trans("Parameter").' ';
-print ''.$langs->trans("Value").' ';
+print ' ';
print ' ';
print " \n";
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index b76fe11f1bd..3419f734977 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -454,7 +454,7 @@ print '';
print '
';
print '';
print ''.$langs->trans("Parameter").' ';
-print ''.$langs->trans("Value").' ';
+print ' ';
print ' ';
print " \n";
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index fac147f09d4..2a922fbd752 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -217,7 +217,7 @@ print ''; // You can use div-table-resp
print '
';
print '';
print ''.$langs->trans("Type").' ';
-print ''.$langs->trans("Value").' ';
+print ' ';
print ' ';
print " \n";
@@ -309,7 +309,7 @@ print ' ';
print ''; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '
';
print '';
-print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
+print ''.$langs->trans("Parameter").' ';
print ' ';
print " \n";
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index 77ff2b03096..d70217c985e 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -180,7 +180,7 @@ if (empty($mysoc->tva_assuj)) {
print ''; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '
';
- print ''.$langs->trans("Parameters").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Parameters").' ';
print ''.$langs->trans("VATIntra").' ';
print ' ';
diff --git a/htdocs/admin/webhook.php b/htdocs/admin/webhook.php
index 382971d9906..a4451fec911 100644
--- a/htdocs/admin/webhook.php
+++ b/htdocs/admin/webhook.php
@@ -182,7 +182,7 @@ if ($action == 'edit') {
print ' ';
print '';
- print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Parameter").' ';
// @phan-suppress-next-line PhanEmptyForeach
foreach ($arrayofparameters as $constname => $val) {
@@ -273,7 +273,7 @@ if ($action == 'edit') {
} else {
if (!empty($arrayofparameters)) {
print '';
- print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Parameter").' ';
foreach ($arrayofparameters as $constname => $val) {
if ($val['enabled'] == 1) {
diff --git a/htdocs/admin/website_options.php b/htdocs/admin/website_options.php
index e41ccdf90c7..4cb3f9c6120 100644
--- a/htdocs/admin/website_options.php
+++ b/htdocs/admin/website_options.php
@@ -128,7 +128,7 @@ print '';
print '';
print ''.$langs->trans("Parameter").' ';
print ' ';
-print ''.$langs->trans("Value").' '."\n";
+print ' '."\n";
print ' ';
diff --git a/htdocs/admin/workstation.php b/htdocs/admin/workstation.php
index f05467d68da..eac57dbf797 100644
--- a/htdocs/admin/workstation.php
+++ b/htdocs/admin/workstation.php
@@ -195,7 +195,7 @@ if ($action == 'edit') {
print ' ';
print '';
- print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Parameter").' ';
// @phan-suppress-next-line PhanEmptyForeach
foreach ($arrayofparameters as $key => $val) {
@@ -215,7 +215,7 @@ if ($action == 'edit') {
} else {
if (!empty($arrayofparameters)) {
print '';
- print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
+ print ''.$langs->trans("Parameter").' ';
foreach ($arrayofparameters as $key => $val) {
$setupnotempty++;
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index f6f452062c1..d0471938c67 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -20,7 +20,6 @@
* along with this program. If not, see .
*/
-
/**
* \file htdocs/core/class/conf.class.php
* \ingroup core
@@ -1038,6 +1037,14 @@ class Conf extends stdClass
$this->global->MAIN_MAX_DECIMALS_SHOWN = 8;
}
+ // Non working days
+ if (!isset($this->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY)) {
+ $this->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY = 1;
+ }
+ if (!isset($this->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY)) {
+ $this->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY = 1;
+ }
+
// Default pdf option
if (!isset($this->global->MAIN_PDF_DASH_BETWEEN_LINES)) {
$this->global->MAIN_PDF_DASH_BETWEEN_LINES = 1; // use dash between lines