';
print '';
// Page
$texthelp = $langs->trans("PageUrlForDefaultValues");
-if ($mode == 'createform') $texthelp .= $langs->trans("PageUrlForDefaultValuesCreate", 'societe/card.php', 'societe/card.php?abc=val1&def=val2');
-else $texthelp .= $langs->trans("PageUrlForDefaultValuesList", 'societe/list.php', 'societe/list.php?abc=val1&def=val2');
+if ($mode == 'createform') {
+ $texthelp .= $langs->trans("PageUrlForDefaultValuesCreate", 'societe/card.php', 'societe/card.php?abc=val1&def=val2');
+} else {
+ $texthelp .= $langs->trans("PageUrlForDefaultValuesList", 'societe/list.php', 'societe/list.php?abc=val1&def=val2');
+}
$texthelp .= ' \n";
@@ -299,15 +314,13 @@ print '';
print ' ';
// Value
-if ($mode != 'focus' && $mode != 'mandatory')
-{
+if ($mode != 'focus' && $mode != 'mandatory') {
print '';
print ' ';
}
// Limit to superadmin
-if (!empty($conf->multicompany->enabled) && !$user->entity)
-{
+if (!empty($conf->multicompany->enabled) && !$user->entity) {
print '';
print ' ';
@@ -318,7 +331,9 @@ if (!empty($conf->multicompany->enabled) && !$user->entity)
}
print '';
$disabled = '';
-if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES)) $disabled = ' disabled="disabled"';
+if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES)) {
+ $disabled = ' disabled="disabled"';
+}
print ' \n";
print '';
@@ -333,13 +348,11 @@ $sql .= $db->order($sortfield, $sortorder);
dol_syslog("translation::select from table", LOG_DEBUG);
$result = $db->query($sql);
-if ($result)
-{
+if ($result) {
$num = $db->num_rows($result);
$i = 0;
- while ($i < $num)
- {
+ while ($i < $num) {
$obj = $db->fetch_object($result);
print "\n";
@@ -348,27 +361,35 @@ if ($result)
// Page
print '';
- if ($action != 'edit' || GETPOST('rowid', 'int') != $obj->rowid) print $obj->page;
- else print ' '."\n";
// Field
print '';
- if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print $obj->param;
- else print ' '."\n";
// Value
- if ($mode != 'focus' && $mode != 'mandatory')
- {
+ if ($mode != 'focus' && $mode != 'mandatory') {
print '';
/*print ' ';
}
@@ -376,8 +397,7 @@ if ($result)
// Actions
print '';
- if ($action != 'edit' || GETPOST('rowid') != $obj->rowid)
- {
+ if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) {
print ''.img_edit().' ';
print ''.img_delete().' ';
} else {
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 90ea5f290b6..6c0cd230cc9 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -30,134 +30,138 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
// Load translation files required by the page
$langs->load("admin");
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+ accessforbidden();
+}
$action = GETPOST('action', 'aZ09');
-if (empty($action)) $action = 'edit';
+if (empty($action)) {
+ $action = 'edit';
+}
// Define list of managed delays
$modules = array(
- 'agenda' => array(
- array(
- 'code' => 'MAIN_DELAY_ACTIONS_TODO',
- 'img' => 'action'
- )
- ),
- 'projet' => array(
- array(
- 'code' => 'MAIN_DELAY_PROJECT_TO_CLOSE',
- 'img' => 'project'
- ),
- array(
- 'code' => 'MAIN_DELAY_TASKS_TODO',
- 'img' => 'projecttask'
- )
- ),
- 'propal' => array(
- array(
- 'code' => 'MAIN_DELAY_PROPALS_TO_CLOSE',
- 'img' => 'propal'
- ),
- array(
- 'code' => 'MAIN_DELAY_PROPALS_TO_BILL',
- 'img' => 'propal'
- )
- ),
- 'commande' => array(
- array(
- 'code' => 'MAIN_DELAY_ORDERS_TO_PROCESS',
- 'img' => 'order'
- )
- ),
- 'facture' => array(
- array(
- 'code' => 'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',
- 'img' => 'bill'
- )
- ),
- 'fournisseur' => array(
- array(
- 'code' => 'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',
- 'img' => 'order'
- ),
- array(
- 'code' => 'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',
- 'img' => 'bill'
- )
- ),
- 'service' => array(
- array(
- 'code' => 'MAIN_DELAY_NOT_ACTIVATED_SERVICES',
- 'img' => 'service'
- ),
- array(
- 'code' => 'MAIN_DELAY_RUNNING_SERVICES',
- 'img' => 'service'
- )
- ),
- 'banque' => array(
- array(
- 'code' => 'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',
- 'img' => 'account'
- ),
- array(
- 'code' => 'MAIN_DELAY_CHEQUES_TO_DEPOSIT',
- 'img' => 'account'
- )
- ),
- 'adherent' => array(
- array(
- 'code' => 'MAIN_DELAY_MEMBERS',
- 'img' => 'user'
- )
- ),
- 'expensereport' => array(
- array(
- 'code' => 'MAIN_DELAY_EXPENSEREPORTS',
- 'img' => 'trip'
- ),
- /* TODO Enable this
- array(
- 'code' => 'MAIN_DELAY_EXPENSEREPORTS_TO_PAY',
- 'img' => 'trip'
- )*/
- ),
- 'holiday' => array(
- array(
- 'code' => 'MAIN_DELAY_HOLIDAYS',
- 'img' => 'holiday'
- ),
- ),
+ 'agenda' => array(
+ array(
+ 'code' => 'MAIN_DELAY_ACTIONS_TODO',
+ 'img' => 'action'
+ )
+ ),
+ 'projet' => array(
+ array(
+ 'code' => 'MAIN_DELAY_PROJECT_TO_CLOSE',
+ 'img' => 'project'
+ ),
+ array(
+ 'code' => 'MAIN_DELAY_TASKS_TODO',
+ 'img' => 'projecttask'
+ )
+ ),
+ 'propal' => array(
+ array(
+ 'code' => 'MAIN_DELAY_PROPALS_TO_CLOSE',
+ 'img' => 'propal'
+ ),
+ array(
+ 'code' => 'MAIN_DELAY_PROPALS_TO_BILL',
+ 'img' => 'propal'
+ )
+ ),
+ 'commande' => array(
+ array(
+ 'code' => 'MAIN_DELAY_ORDERS_TO_PROCESS',
+ 'img' => 'order'
+ )
+ ),
+ 'facture' => array(
+ array(
+ 'code' => 'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',
+ 'img' => 'bill'
+ )
+ ),
+ 'fournisseur' => array(
+ array(
+ 'code' => 'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',
+ 'img' => 'order'
+ ),
+ array(
+ 'code' => 'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',
+ 'img' => 'bill'
+ )
+ ),
+ 'service' => array(
+ array(
+ 'code' => 'MAIN_DELAY_NOT_ACTIVATED_SERVICES',
+ 'img' => 'service'
+ ),
+ array(
+ 'code' => 'MAIN_DELAY_RUNNING_SERVICES',
+ 'img' => 'service'
+ )
+ ),
+ 'banque' => array(
+ array(
+ 'code' => 'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',
+ 'img' => 'account'
+ ),
+ array(
+ 'code' => 'MAIN_DELAY_CHEQUES_TO_DEPOSIT',
+ 'img' => 'account'
+ )
+ ),
+ 'adherent' => array(
+ array(
+ 'code' => 'MAIN_DELAY_MEMBERS',
+ 'img' => 'user'
+ )
+ ),
+ 'expensereport' => array(
+ array(
+ 'code' => 'MAIN_DELAY_EXPENSEREPORTS',
+ 'img' => 'trip'
+ ),
+ /* TODO Enable this
+ array(
+ 'code' => 'MAIN_DELAY_EXPENSEREPORTS_TO_PAY',
+ 'img' => 'trip'
+ )*/
+ ),
+ 'holiday' => array(
+ array(
+ 'code' => 'MAIN_DELAY_HOLIDAYS',
+ 'img' => 'holiday'
+ ),
+ ),
);
$labelmeteo = array(0=>$langs->trans("No"), 1=>$langs->trans("Yes"), 2=>$langs->trans("OnMobileOnly"));
if (!isset($conf->global->MAIN_DELAY_PROJECT_TO_CLOSE)) {
- $conf->global->MAIN_DELAY_PROJECT_TO_CLOSE = 7; // Must be same value than into conf.class.php
+ $conf->global->MAIN_DELAY_PROJECT_TO_CLOSE = 7; // Must be same value than into conf.class.php
}
if (!isset($conf->global->MAIN_DELAY_TASKS_TODO)) {
- $conf->global->MAIN_DELAY_TASKS_TODO = 7; // Must be same value than into conf.class.php
+ $conf->global->MAIN_DELAY_TASKS_TODO = 7; // Must be same value than into conf.class.php
}
if (!isset($conf->global->MAIN_DELAY_MEMBERS)) {
- $conf->global->MAIN_DELAY_MEMBERS = 0; // Must be same value than into conf.class.php
+ $conf->global->MAIN_DELAY_MEMBERS = 0; // Must be same value than into conf.class.php
}
if (!isset($conf->global->MAIN_DELAY_ACTIONS_TODO)) {
- $conf->global->MAIN_DELAY_ACTIONS_TODO = 7; // Must be same value than into conf.class.php
+ $conf->global->MAIN_DELAY_ACTIONS_TODO = 7; // Must be same value than into conf.class.php
}
if (!isset($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS)) {
- $conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2;
+ $conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2;
}
if (!isset($conf->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS)) {
- $conf->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS = 7;
+ $conf->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS = 7;
}
if (!isset($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS)) {
- $conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2;
+ $conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2;
}
if (!isset($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS)) {
- $conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2;
+ $conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2;
}
if (!isset($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS)) {
- $conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2;
+ $conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2;
}
@@ -166,32 +170,31 @@ if (!isset($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS)) {
* Actions
*/
-if ($action == 'update')
-{
- foreach ($modules as $module => $delays)
- {
- if (!empty($conf->$module->enabled))
- {
- foreach ($delays as $delay)
- {
- if (GETPOST($delay['code']) != '')
- {
- dolibarr_set_const($db, $delay['code'], GETPOST($delay['code']), 'chaine', 0, '', $conf->entity);
- }
- }
- }
- }
+if ($action == 'update') {
+ foreach ($modules as $module => $delays) {
+ if (!empty($conf->$module->enabled)) {
+ foreach ($delays as $delay) {
+ if (GETPOST($delay['code']) != '') {
+ dolibarr_set_const($db, $delay['code'], GETPOST($delay['code']), 'chaine', 0, '', $conf->entity);
+ }
+ }
+ }
+ }
- dolibarr_set_const($db, "MAIN_DISABLE_METEO", $_POST["MAIN_DISABLE_METEO"], 'chaine', 0, '', $conf->entity);
- dolibarr_set_const($db, "MAIN_USE_METEO_WITH_PERCENTAGE", GETPOST("MAIN_USE_METEO_WITH_PERCENTAGE"), 'chaine', 0, '', $conf->entity);
+ dolibarr_set_const($db, "MAIN_DISABLE_METEO", $_POST["MAIN_DISABLE_METEO"], 'chaine', 0, '', $conf->entity);
+ dolibarr_set_const($db, "MAIN_USE_METEO_WITH_PERCENTAGE", GETPOST("MAIN_USE_METEO_WITH_PERCENTAGE"), 'chaine', 0, '', $conf->entity);
- // For update value with percentage
- $plus = '';
- if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $plus = '_PERCENTAGE';
- // Update values
- for ($i = 0; $i < 4; $i++) {
- if (GETPOSTISSET('MAIN_METEO'.$plus.'_LEVEL'.$i)) dolibarr_set_const($db, 'MAIN_METEO'.$plus.'_LEVEL'.$i, GETPOST('MAIN_METEO'.$plus.'_LEVEL'.$i, 'int'), 'chaine', 0, '', $conf->entity);
- }
+ // For update value with percentage
+ $plus = '';
+ if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+ $plus = '_PERCENTAGE';
+ }
+ // Update values
+ for ($i = 0; $i < 4; $i++) {
+ if (GETPOSTISSET('MAIN_METEO'.$plus.'_LEVEL'.$i)) {
+ dolibarr_set_const($db, 'MAIN_METEO'.$plus.'_LEVEL'.$i, GETPOST('MAIN_METEO'.$plus.'_LEVEL'.$i, 'int'), 'chaine', 0, '', $conf->entity);
+ }
+ }
setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -213,158 +216,165 @@ print ''.$langs->transnoentities("DelaysOfToleranceD
print " ".$langs->trans("OnlyActiveElementsAreShown", DOL_URL_ROOT.'/admin/modules.php')." ';
- print '';
- print img_weather($text, 1, $options);
- print ' <=
';
- print img_weather($text, 2, $options);
- print ' <=
';
- print img_weather($text, 3, $options);
- print ' <=
';
- print '';
+ print '';
- print '';
+ print '';
- print 'global->MAIN_USE_METEO_WITH_PERCENTAGE) ? 'style="display:none;"' : '').'>';
+ print '
global->MAIN_USE_METEO_WITH_PERCENTAGE) ? 'style="display:none;"' : '').'>';
- print '
';
+ print '
';
- print '
';
+ print '
';
print '';
print $langs->trans($arrayoftypes[$ruleaction['type']]);
- if (in_array($ruleaction['type'], array('recordevent')))
- {
+ if (in_array($ruleaction['type'], array('recordevent'))) {
print $form->textwithpicto('', $langs->transnoentitiesnoconv('IfTrackingIDFoundEventWillBeLinked'));
} elseif (in_array($ruleaction['type'], array('loadthirdparty', 'loadandcreatethirdparty'))) {
print $form->textwithpicto('', $langs->transnoentitiesnoconv('EmailCollectorLoadThirdPartyHelp'));
}
print ' ';
print '';
- if ($action == 'editoperation' && $ruleaction['id'] == $operationid)
- {
+ if ($action == 'editoperation' && $ruleaction['id'] == $operationid) {
print ' ';
// Move up/down
print '';
- if ($i > 0)
- {
+ if ($i > 0) {
print ''.img_up('default', 0, 'imgupforline').' ';
}
if ($i < count($object->actions) - 1) {
@@ -681,10 +682,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print ''."\n";
$parameters = array();
$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
- if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+ if ($reshook < 0) {
+ setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+ }
- if (empty($reshook))
- {
+ if (empty($reshook)) {
// Edit
print '
';
@@ -703,8 +705,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print '