Merge remote-tracking branch 'upstream/develop' into customerordertooltip
This commit is contained in:
Frédéric FRANCE
commit
7c6624e27d
@ -113,15 +113,15 @@ class DolibarrApiAccess implements iAuthenticate
|
|||||||
$sql = "SELECT u.login, u.datec, u.api_key, ";
|
$sql = "SELECT u.login, u.datec, u.api_key, ";
|
||||||
$sql .= " u.tms as date_modification, u.entity";
|
$sql .= " u.tms as date_modification, u.entity";
|
||||||
$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
|
$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
|
||||||
$sql .= " WHERE u.api_key = '".$this->db->escape($api_key)."'";
|
$sql .= " WHERE u.api_key = '".$this->db->escape($api_key)."' OR u.api_key = '".$this->db->escape(dolEncrypt($api_key, '', '', 'dolibarr'))."'";
|
||||||
// TODO Check if 2 users has same API key.
|
|
||||||
|
|
||||||
$result = $this->db->query($sql);
|
$result = $this->db->query($sql);
|
||||||
if ($result) {
|
if ($result) {
|
||||||
if ($this->db->num_rows($result)) {
|
$nbrows = $this->db->num_rows($result);
|
||||||
|
if ($nbrows == 1) {
|
||||||
$obj = $this->db->fetch_object($result);
|
$obj = $this->db->fetch_object($result);
|
||||||
$login = $obj->login;
|
$login = $obj->login;
|
||||||
$stored_key = $obj->api_key;
|
$stored_key = dolDecrypt($obj->api_key);
|
||||||
$userentity = $obj->entity;
|
$userentity = $obj->entity;
|
||||||
|
|
||||||
if (!defined("DOLENTITY") && $conf->entity != ($obj->entity ? $obj->entity : 1)) { // If API was not forced with HTTP_DOLENTITY, and user is on another entity, so we reset entity to entity of user
|
if (!defined("DOLENTITY") && $conf->entity != ($obj->entity ? $obj->entity : 1)) { // If API was not forced with HTTP_DOLENTITY, and user is on another entity, so we reset entity to entity of user
|
||||||
@ -130,6 +130,8 @@ class DolibarrApiAccess implements iAuthenticate
|
|||||||
dol_syslog("Entity was not set on http header with HTTP_DOLAPIENTITY (recommanded for performance purpose), so we switch now on entity of user (".$conf->entity.") and we have to reload configuration.", LOG_WARNING);
|
dol_syslog("Entity was not set on http header with HTTP_DOLAPIENTITY (recommanded for performance purpose), so we switch now on entity of user (".$conf->entity.") and we have to reload configuration.", LOG_WARNING);
|
||||||
$conf->setValues($this->db);
|
$conf->setValues($this->db);
|
||||||
}
|
}
|
||||||
|
} elseif ($nbrows > 1) {
|
||||||
|
throw new RestException(503, 'Error when fetching user api_key : More than 1 user with this apikey');
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
throw new RestException(503, 'Error when fetching user api_key :'.$this->db->error_msg);
|
throw new RestException(503, 'Error when fetching user api_key :'.$this->db->error_msg);
|
||||||
|
|||||||
@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
use Luracast\Restler\RestException;
|
use Luracast\Restler\RestException;
|
||||||
|
|
||||||
|
require_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
|
||||||
require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
|
require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -152,7 +153,7 @@ class Login
|
|||||||
|
|
||||||
// We store API token into database
|
// We store API token into database
|
||||||
$sql = "UPDATE ".MAIN_DB_PREFIX."user";
|
$sql = "UPDATE ".MAIN_DB_PREFIX."user";
|
||||||
$sql .= " SET api_key = '".$this->db->escape($token)."'";
|
$sql .= " SET api_key = '".$this->db->escape(dolEncrypt($token, '', '', 'dolibarr'))."'";
|
||||||
$sql .= " WHERE login = '".$this->db->escape($login)."'";
|
$sql .= " WHERE login = '".$this->db->escape($login)."'";
|
||||||
|
|
||||||
dol_syslog(get_class($this)."::login", LOG_DEBUG); // No log
|
dol_syslog(get_class($this)."::login", LOG_DEBUG); // No log
|
||||||
|
|||||||
@ -155,9 +155,6 @@ if (!empty($conf->global->AGENDA_REMINDER_EMAIL)) {
|
|||||||
$TDurationTypes = array('y'=>$langs->trans('Years'), 'm'=>$langs->trans('Month'), 'w'=>$langs->trans('Weeks'), 'd'=>$langs->trans('Days'), 'h'=>$langs->trans('Hours'), 'i'=>$langs->trans('Minutes'));
|
$TDurationTypes = array('y'=>$langs->trans('Years'), 'm'=>$langs->trans('Month'), 'w'=>$langs->trans('Weeks'), 'd'=>$langs->trans('Days'), 'h'=>$langs->trans('Hours'), 'i'=>$langs->trans('Minutes'));
|
||||||
|
|
||||||
$result = restrictedArea($user, 'agenda', $object->id, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id');
|
$result = restrictedArea($user, 'agenda', $object->id, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id');
|
||||||
if ($user->socid && $socid) {
|
|
||||||
$result = restrictedArea($user, 'societe', $socid);
|
|
||||||
}
|
|
||||||
|
|
||||||
$usercancreate = $user->hasRight('agenda', 'allactions', 'create') || (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create);
|
$usercancreate = $user->hasRight('agenda', 'allactions', 'create') || (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create);
|
||||||
|
|
||||||
|
|||||||
@ -223,6 +223,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
|
|||||||
$object->fields = dol_sort_array($object->fields, 'position');
|
$object->fields = dol_sort_array($object->fields, 'position');
|
||||||
$arrayfields = dol_sort_array($arrayfields, 'position');
|
$arrayfields = dol_sort_array($arrayfields, 'position');
|
||||||
|
|
||||||
|
$error = 0;
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -1284,24 +1285,24 @@ if ($resql) {
|
|||||||
if ($permissiontovalidate) {
|
if ($permissiontovalidate) {
|
||||||
$arrayofmassactions['prevalidate'] = img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate");
|
$arrayofmassactions['prevalidate'] = img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate");
|
||||||
}
|
}
|
||||||
if ($permissiontosendbymail) {
|
|
||||||
$arrayofmassactions['presend'] = img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail");
|
|
||||||
}
|
|
||||||
if ($permissiontoclose) {
|
if ($permissiontoclose) {
|
||||||
$arrayofmassactions['preshipped'] = img_picto('', 'dollyrevert', 'class="pictofixedwidth"').$langs->trans("ClassifyShipped");
|
$arrayofmassactions['preshipped'] = img_picto('', 'dollyrevert', 'class="pictofixedwidth"').$langs->trans("ClassifyShipped");
|
||||||
}
|
}
|
||||||
if ($permissiontocancel) {
|
|
||||||
$arrayofmassactions['cancelorders'] = img_picto('', 'close_title', 'class="pictofixedwidth"').$langs->trans("Cancel");
|
|
||||||
}
|
|
||||||
if (isModEnabled('facture') && $user->hasRight("facture", "creer")) {
|
|
||||||
$arrayofmassactions['createbills'] = img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("CreateInvoiceForThisCustomer");
|
|
||||||
}
|
|
||||||
if ($permissiontoclose) {
|
if ($permissiontoclose) {
|
||||||
$arrayofmassactions['setbilled'] = img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("ClassifyBilled");
|
$arrayofmassactions['setbilled'] = img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("ClassifyBilled");
|
||||||
}
|
}
|
||||||
|
if ($permissiontocancel) {
|
||||||
|
$arrayofmassactions['cancelorders'] = img_picto('', 'close_title', 'class="pictofixedwidth"').$langs->trans("Cancel");
|
||||||
|
}
|
||||||
if ($permissiontodelete) {
|
if ($permissiontodelete) {
|
||||||
$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
|
$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
|
||||||
}
|
}
|
||||||
|
if (isModEnabled('facture') && $user->hasRight("facture", "creer")) {
|
||||||
|
$arrayofmassactions['createbills'] = img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("CreateInvoiceForThisCustomer");
|
||||||
|
}
|
||||||
|
if ($permissiontosendbymail) {
|
||||||
|
$arrayofmassactions['presend'] = img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail");
|
||||||
|
}
|
||||||
if (in_array($massaction, array('presend', 'predelete', 'createbills'))) {
|
if (in_array($massaction, array('presend', 'predelete', 'createbills'))) {
|
||||||
$arrayofmassactions = array();
|
$arrayofmassactions = array();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -32,6 +32,7 @@
|
|||||||
|
|
||||||
use OAuth\Common\Storage\DoliStorage;
|
use OAuth\Common\Storage\DoliStorage;
|
||||||
use OAuth\Common\Consumer\Credentials;
|
use OAuth\Common\Consumer\Credentials;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class to send emails (with attachments or not)
|
* Class to send emails (with attachments or not)
|
||||||
* Usage: $mailfile = new CMailFile($subject,$sendto,$replyto,$message,$filepath,$mimetype,$filename,$cc,$ccc,$deliveryreceipt,$msgishtml,$errors_to,$css,$trackid,$moreinheader,$sendcontext,$replyto);
|
* Usage: $mailfile = new CMailFile($subject,$sendto,$replyto,$message,$filepath,$mimetype,$filename,$cc,$ccc,$deliveryreceipt,$msgishtml,$errors_to,$css,$trackid,$moreinheader,$sendcontext,$replyto);
|
||||||
@ -171,6 +172,10 @@ class CMailFile
|
|||||||
{
|
{
|
||||||
global $conf, $dolibarr_main_data_root, $user;
|
global $conf, $dolibarr_main_data_root, $user;
|
||||||
|
|
||||||
|
dol_syslog("CMailFile::CMailfile: charset=".$conf->file->character_set_client." from=$from, to=$to, addr_cc=$addr_cc, addr_bcc=$addr_bcc, errors_to=$errors_to, replyto=$replyto trackid=$trackid sendcontext=$sendcontext", LOG_DEBUG);
|
||||||
|
dol_syslog("CMailFile::CMailfile: subject=".$subject.", deliveryreceipt=".$deliveryreceipt.", msgishtml=".$msgishtml, LOG_DEBUG);
|
||||||
|
|
||||||
|
|
||||||
// Clean values of $mimefilename_list
|
// Clean values of $mimefilename_list
|
||||||
if (is_array($mimefilename_list)) {
|
if (is_array($mimefilename_list)) {
|
||||||
foreach ($mimefilename_list as $key => $val) {
|
foreach ($mimefilename_list as $key => $val) {
|
||||||
@ -214,9 +219,6 @@ class CMailFile
|
|||||||
// On defini alternative_boundary
|
// On defini alternative_boundary
|
||||||
$this->alternative_boundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3); // Force md5 hash (does not contains special chars)
|
$this->alternative_boundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3); // Force md5 hash (does not contains special chars)
|
||||||
|
|
||||||
dol_syslog("CMailFile::CMailfile: sendmode=".$this->sendmode." charset=".$conf->file->character_set_client." from=$from, to=$to, addr_cc=$addr_cc, addr_bcc=$addr_bcc, errors_to=$errors_to, replyto=$replyto trackid=$trackid sendcontext=$sendcontext upload_dir_tmp=$upload_dir_tmp", LOG_DEBUG);
|
|
||||||
dol_syslog("CMailFile::CMailfile: subject=".$subject.", deliveryreceipt=".$deliveryreceipt.", msgishtml=".$msgishtml, LOG_DEBUG);
|
|
||||||
|
|
||||||
if (empty($subject)) {
|
if (empty($subject)) {
|
||||||
dol_syslog("CMailFile::CMailfile: Try to send an email with empty subject");
|
dol_syslog("CMailFile::CMailfile: Try to send an email with empty subject");
|
||||||
$this->error = 'ErrorSubjectIsRequired';
|
$this->error = 'ErrorSubjectIsRequired';
|
||||||
@ -367,6 +369,8 @@ class CMailFile
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dol_syslog("CMailFile::CMailfile: sendmode=".$this->sendmode." addr_bcc=$addr_bcc, replyto=$replyto", LOG_DEBUG);
|
||||||
|
|
||||||
// We set all data according to choosed sending method.
|
// We set all data according to choosed sending method.
|
||||||
// We also set a value for ->msgid
|
// We also set a value for ->msgid
|
||||||
if ($this->sendmode == 'mail') {
|
if ($this->sendmode == 'mail') {
|
||||||
|
|||||||
@ -11685,7 +11685,10 @@ function dolForgeCriteriaCallback($matches)
|
|||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
$operator = strtoupper(preg_replace('/[^a-z<>=]/i', '', trim($tmp[1])));
|
$operand = preg_replace('/[^a-z0-9\._]/i', '', trim($tmp[0]));
|
||||||
|
|
||||||
|
$operator = strtoupper(preg_replace('/[^a-z<>!=]/i', '', trim($tmp[1])));
|
||||||
|
|
||||||
if ($operator == 'NOTLIKE') {
|
if ($operator == 'NOTLIKE') {
|
||||||
$operator = 'NOT LIKE';
|
$operator = 'NOT LIKE';
|
||||||
}
|
}
|
||||||
@ -11723,7 +11726,7 @@ function dolForgeCriteriaCallback($matches)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $db->escape($tmp[0]).' '.strtoupper($operator).' '.$tmpescaped;
|
return $db->escape($operand).' '.strtoupper($operator).' '.$tmpescaped;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -146,7 +146,7 @@ function payment_supplier_prepare_head(Paiement $object)
|
|||||||
*/
|
*/
|
||||||
function getValidOnlinePaymentMethods($paymentmethod = '')
|
function getValidOnlinePaymentMethods($paymentmethod = '')
|
||||||
{
|
{
|
||||||
global $conf, $langs, $hookmanager, $action;
|
global $langs, $hookmanager, $action;
|
||||||
|
|
||||||
$validpaymentmethod = array();
|
$validpaymentmethod = array();
|
||||||
|
|
||||||
@ -434,6 +434,8 @@ function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0,
|
|||||||
{
|
{
|
||||||
global $conf;
|
global $conf;
|
||||||
|
|
||||||
|
$reg = array();
|
||||||
|
|
||||||
// Juridical status
|
// Juridical status
|
||||||
$line1 = "";
|
$line1 = "";
|
||||||
if ($fromcompany->forme_juridique_code) {
|
if ($fromcompany->forme_juridique_code) {
|
||||||
@ -485,9 +487,8 @@ function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0,
|
|||||||
|
|
||||||
print '<!-- htmlPrintOnlinePaymentFooter -->'."\n";
|
print '<!-- htmlPrintOnlinePaymentFooter -->'."\n";
|
||||||
|
|
||||||
|
print '<footer class="center paddingleft paddingright centpercent">'."\n";
|
||||||
print '<br>';
|
print '<br>';
|
||||||
|
|
||||||
print '<div class="center paddingleft paddingright centpercent">'."\n";
|
|
||||||
if ($addformmessage) {
|
if ($addformmessage) {
|
||||||
print '<!-- object = '.(empty($object) ? 'undefined' : $object->element).' -->';
|
print '<!-- object = '.(empty($object) ? 'undefined' : $object->element).' -->';
|
||||||
print '<br>';
|
print '<br>';
|
||||||
@ -519,5 +520,6 @@ function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0,
|
|||||||
print ' - ';
|
print ' - ';
|
||||||
}
|
}
|
||||||
print $line2;
|
print $line2;
|
||||||
print '</span></div>'."\n";
|
print '</span>';
|
||||||
|
print '</footer>'."\n";
|
||||||
}
|
}
|
||||||
|
|||||||
@ -113,10 +113,11 @@ function dolGetRandomBytes($length)
|
|||||||
* @param string $chain string to encode
|
* @param string $chain string to encode
|
||||||
* @param string $key If '', we use $dolibarr_main_instance_unique_id
|
* @param string $key If '', we use $dolibarr_main_instance_unique_id
|
||||||
* @param string $ciphering Default ciphering algorithm
|
* @param string $ciphering Default ciphering algorithm
|
||||||
|
* @param string $forceseed To force the seed
|
||||||
* @return string encoded string
|
* @return string encoded string
|
||||||
* @see dolDecrypt(), dol_hash()
|
* @see dolDecrypt(), dol_hash()
|
||||||
*/
|
*/
|
||||||
function dolEncrypt($chain, $key = '', $ciphering = "AES-256-CTR")
|
function dolEncrypt($chain, $key = '', $ciphering = 'AES-256-CTR', $forceseed = '')
|
||||||
{
|
{
|
||||||
global $dolibarr_main_instance_unique_id;
|
global $dolibarr_main_instance_unique_id;
|
||||||
global $dolibarr_disable_dolcrypt_for_debug;
|
global $dolibarr_disable_dolcrypt_for_debug;
|
||||||
@ -134,6 +135,9 @@ function dolEncrypt($chain, $key = '', $ciphering = "AES-256-CTR")
|
|||||||
if (empty($key)) {
|
if (empty($key)) {
|
||||||
$key = $dolibarr_main_instance_unique_id;
|
$key = $dolibarr_main_instance_unique_id;
|
||||||
}
|
}
|
||||||
|
if (empty($ciphering)) {
|
||||||
|
$ciphering = 'AES-256-CTR';
|
||||||
|
}
|
||||||
|
|
||||||
$newchain = $chain;
|
$newchain = $chain;
|
||||||
|
|
||||||
@ -145,7 +149,11 @@ function dolEncrypt($chain, $key = '', $ciphering = "AES-256-CTR")
|
|||||||
if ($ivlen === false || $ivlen < 1 || $ivlen > 32) {
|
if ($ivlen === false || $ivlen < 1 || $ivlen > 32) {
|
||||||
$ivlen = 16;
|
$ivlen = 16;
|
||||||
}
|
}
|
||||||
|
if (empty($forceseed)) {
|
||||||
$ivseed = dolGetRandomBytes($ivlen);
|
$ivseed = dolGetRandomBytes($ivlen);
|
||||||
|
} else {
|
||||||
|
$ivseed = dol_trunc(md5($forceseed), $ivlen, 'right', 'UTF-8', 1);
|
||||||
|
}
|
||||||
|
|
||||||
$newchain = openssl_encrypt($chain, $ciphering, $key, 0, $ivseed);
|
$newchain = openssl_encrypt($chain, $ciphering, $key, 0, $ivseed);
|
||||||
return 'dolcrypt:'.$ciphering.':'.$ivseed.':'.$newchain;
|
return 'dolcrypt:'.$ciphering.':'.$ivseed.':'.$newchain;
|
||||||
|
|||||||
@ -1497,9 +1497,11 @@ class Holiday extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
$out .= '</select>'."\n";
|
$out .= '</select>'."\n";
|
||||||
$out .= ajax_combobox($htmlname);
|
|
||||||
|
|
||||||
print $out;
|
$showempty= 0;
|
||||||
|
$out .= ajax_combobox($htmlname, array(), 0, 0, 'resolve', ($showempty < 0 ? (string) $showempty : '-1'), $morecss);
|
||||||
|
|
||||||
|
return $out;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -2488,7 +2490,7 @@ class Holiday extends CommonObject
|
|||||||
$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
|
$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
|
||||||
if (property_exists($this, 'fk_type')) {
|
if (property_exists($this, 'fk_type')) {
|
||||||
$return .= '<br><span class="opacitymedium">'.$langs->trans("Type").'</span> : ';
|
$return .= '<br><span class="opacitymedium">'.$langs->trans("Type").'</span> : ';
|
||||||
$return .= '<span class="info_box-label maxwidth100">'.arraydata['labeltype'].'</span>';
|
$return .= '<span class="info_box-label maxwidth100">'.$arraydata['labeltype'].'</span>';
|
||||||
}
|
}
|
||||||
if (property_exists($this, 'date_debut') && property_exists($this, 'date_fin')) {
|
if (property_exists($this, 'date_debut') && property_exists($this, 'date_fin')) {
|
||||||
$return .= '<br><span class="info-box-label">'.dol_print_date($this->date_debut, 'day').'</span>';
|
$return .= '<br><span class="info-box-label">'.dol_print_date($this->date_debut, 'day').'</span>';
|
||||||
|
|||||||
@ -143,7 +143,13 @@ if ($user->socid > 0) { // Protection if external user
|
|||||||
accessforbidden();
|
accessforbidden();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (empty($conf->holiday->enabled)) accessforbidden('Module not enabled');
|
$permissiontoread = $user->hasRight('holiday', 'read');
|
||||||
|
$permissiontodelete = $user->hasRight('holiday', 'delete');
|
||||||
|
$permissiontoapprove = $user->hasRight('holiday', 'approve');
|
||||||
|
|
||||||
|
if (!ismodEnabled('holiday')) {
|
||||||
|
accessforbidden('Module holiday not enabled');
|
||||||
|
}
|
||||||
|
|
||||||
$result = restrictedArea($user, 'holiday', '', '');
|
$result = restrictedArea($user, 'holiday', '', '');
|
||||||
// If we are on the view of a specific user
|
// If we are on the view of a specific user
|
||||||
@ -152,10 +158,10 @@ if ($id > 0) {
|
|||||||
if ($id == $user->id) {
|
if ($id == $user->id) {
|
||||||
$canread = 1;
|
$canread = 1;
|
||||||
}
|
}
|
||||||
if (!empty($user->rights->holiday->readall)) {
|
if ($user->hasRight('holiday', 'readall')) {
|
||||||
$canread = 1;
|
$canread = 1;
|
||||||
}
|
}
|
||||||
if (!empty($user->rights->holiday->read) && in_array($id, $childids)) {
|
if ($user->hasRight('holiday', 'read') && in_array($id, $childids)) {
|
||||||
$canread = 1;
|
$canread = 1;
|
||||||
}
|
}
|
||||||
if (!$canread) {
|
if (!$canread) {
|
||||||
@ -165,13 +171,13 @@ if ($id > 0) {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Actions
|
* Actions
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (GETPOST('cancel', 'alpha')) {
|
if (GETPOST('cancel', 'alpha')) {
|
||||||
$action = 'list'; $massaction = '';
|
$action = 'list';
|
||||||
|
$massaction = '';
|
||||||
}
|
}
|
||||||
if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
|
if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
|
||||||
$massaction = '';
|
$massaction = '';
|
||||||
@ -211,9 +217,6 @@ if (empty($reshook)) {
|
|||||||
// Mass actions
|
// Mass actions
|
||||||
$objectclass = 'Holiday';
|
$objectclass = 'Holiday';
|
||||||
$objectlabel = 'Holiday';
|
$objectlabel = 'Holiday';
|
||||||
$permissiontoread = $user->hasRight('holiday', 'read');
|
|
||||||
$permissiontodelete = $user->hasRight('holiday', 'delete');
|
|
||||||
$permissiontoapprove = $user->hasRight('holiday', 'approve');
|
|
||||||
$uploaddir = $conf->holiday->dir_output;
|
$uploaddir = $conf->holiday->dir_output;
|
||||||
include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
|
include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
|
||||||
}
|
}
|
||||||
@ -236,6 +239,8 @@ $holidaystatic = new Holiday($db);
|
|||||||
$result = $object->updateBalance();
|
$result = $object->updateBalance();
|
||||||
|
|
||||||
$title = $langs->trans('CPTitreMenu');
|
$title = $langs->trans('CPTitreMenu');
|
||||||
|
$help_url = '';
|
||||||
|
|
||||||
llxHeader('', $title);
|
llxHeader('', $title);
|
||||||
|
|
||||||
$max_year = 5;
|
$max_year = 5;
|
||||||
@ -304,7 +309,8 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
|
|||||||
// Add fields from hooks
|
// Add fields from hooks
|
||||||
$parameters = array();
|
$parameters = array();
|
||||||
$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
|
$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
|
||||||
$sql .= $hookmanager->resPrint;
|
$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
|
||||||
|
$sql = preg_replace('/,\s*$/', '', $sql);
|
||||||
|
|
||||||
$sqlfields = $sql; // $sql fields to remove for count total
|
$sqlfields = $sql; // $sql fields to remove for count total
|
||||||
|
|
||||||
@ -357,7 +363,7 @@ if ($id > 0) {
|
|||||||
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
|
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
|
||||||
// Add where from hooks
|
// Add where from hooks
|
||||||
$parameters = array();
|
$parameters = array();
|
||||||
$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
|
$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
|
||||||
$sql .= $hookmanager->resPrint;
|
$sql .= $hookmanager->resPrint;
|
||||||
|
|
||||||
// Count total nb of records
|
// Count total nb of records
|
||||||
@ -374,7 +380,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
|
|||||||
dol_print_error($db);
|
dol_print_error($db);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller then paging size (filtering), goto and load page 0
|
if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller than the paging size (filtering), goto and load page 0
|
||||||
$page = 0;
|
$page = 0;
|
||||||
$offset = 0;
|
$offset = 0;
|
||||||
}
|
}
|
||||||
@ -389,104 +395,109 @@ if ($limit) {
|
|||||||
|
|
||||||
//print $sql;
|
//print $sql;
|
||||||
$resql = $db->query($sql);
|
$resql = $db->query($sql);
|
||||||
if ($resql) {
|
if (!$resql) {
|
||||||
$num = $db->num_rows($resql);
|
dol_print_error($db);
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
$arrayofselected = is_array($toselect) ? $toselect : array();
|
$num = $db->num_rows($resql);
|
||||||
|
|
||||||
$param = '';
|
$arrayofselected = is_array($toselect) ? $toselect : array();
|
||||||
if (!empty($mode)) {
|
|
||||||
|
$param = '';
|
||||||
|
if (!empty($mode)) {
|
||||||
$param .= '&mode='.urlencode($mode);
|
$param .= '&mode='.urlencode($mode);
|
||||||
}
|
}
|
||||||
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
|
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
|
||||||
$param .= '&contextpage='.urlencode($contextpage);
|
$param .= '&contextpage='.urlencode($contextpage);
|
||||||
}
|
}
|
||||||
if ($limit > 0 && $limit != $conf->liste_limit) {
|
if ($limit > 0 && $limit != $conf->liste_limit) {
|
||||||
$param .= '&limit='.urlencode($limit);
|
$param .= '&limit='.((int) $limit);
|
||||||
}
|
}
|
||||||
if ($optioncss != '') {
|
if ($optioncss != '') {
|
||||||
$param .= '&optioncss='.urlencode($optioncss);
|
$param .= '&optioncss='.urlencode($optioncss);
|
||||||
}
|
}
|
||||||
if ($search_ref) {
|
if ($search_ref) {
|
||||||
$param .= '&search_ref='.urlencode($search_ref);
|
$param .= '&search_ref='.urlencode($search_ref);
|
||||||
}
|
}
|
||||||
if ($search_day_create) {
|
if ($search_day_create) {
|
||||||
$param .= '&search_day_create='.urlencode($search_day_create);
|
$param .= '&search_day_create='.urlencode($search_day_create);
|
||||||
}
|
}
|
||||||
if ($search_month_create) {
|
if ($search_month_create) {
|
||||||
$param .= '&search_month_create='.urlencode($search_month_create);
|
$param .= '&search_month_create='.urlencode($search_month_create);
|
||||||
}
|
}
|
||||||
if ($search_year_create) {
|
if ($search_year_create) {
|
||||||
$param .= '&search_year_create='.urlencode($search_year_create);
|
$param .= '&search_year_create='.urlencode($search_year_create);
|
||||||
}
|
}
|
||||||
if ($search_day_start) {
|
if ($search_day_start) {
|
||||||
$param .= '&search_day_start='.urlencode($search_day_start);
|
$param .= '&search_day_start='.urlencode($search_day_start);
|
||||||
}
|
}
|
||||||
if ($search_month_start) {
|
if ($search_month_start) {
|
||||||
$param .= '&search_month_start='.urlencode($search_month_start);
|
$param .= '&search_month_start='.urlencode($search_month_start);
|
||||||
}
|
}
|
||||||
if ($search_year_start) {
|
if ($search_year_start) {
|
||||||
$param .= '&search_year_start='.urlencode($search_year_start);
|
$param .= '&search_year_start='.urlencode($search_year_start);
|
||||||
}
|
}
|
||||||
if ($search_day_end) {
|
if ($search_day_end) {
|
||||||
$param .= '&search_day_end='.urlencode($search_day_end);
|
$param .= '&search_day_end='.urlencode($search_day_end);
|
||||||
}
|
}
|
||||||
if ($search_month_end) {
|
if ($search_month_end) {
|
||||||
$param .= '&search_month_end='.urlencode($search_month_end);
|
$param .= '&search_month_end='.urlencode($search_month_end);
|
||||||
}
|
}
|
||||||
if ($search_year_end) {
|
if ($search_year_end) {
|
||||||
$param .= '&search_year_end='.urlencode($search_year_end);
|
$param .= '&search_year_end='.urlencode($search_year_end);
|
||||||
}
|
}
|
||||||
if ($search_employee > 0) {
|
if ($search_employee > 0) {
|
||||||
$param .= '&search_employee='.urlencode($search_employee);
|
$param .= '&search_employee='.urlencode($search_employee);
|
||||||
}
|
}
|
||||||
if ($search_valideur > 0) {
|
if ($search_valideur > 0) {
|
||||||
$param .= '&search_valideur='.urlencode($search_valideur);
|
$param .= '&search_valideur='.urlencode($search_valideur);
|
||||||
}
|
}
|
||||||
if ($search_type > 0) {
|
if ($search_type > 0) {
|
||||||
$param .= '&search_type='.urlencode($search_type);
|
$param .= '&search_type='.urlencode($search_type);
|
||||||
}
|
}
|
||||||
if ($search_status > 0) {
|
if ($search_status > 0) {
|
||||||
$param .= '&search_status='.urlencode($search_status);
|
$param .= '&search_status='.urlencode($search_status);
|
||||||
}
|
}
|
||||||
// Add $param from extra fields
|
// Add $param from extra fields
|
||||||
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
|
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
|
||||||
|
|
||||||
// List of mass actions available
|
// List of mass actions available
|
||||||
$arrayofmassactions = array(
|
$arrayofmassactions = array(
|
||||||
//'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
|
//'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
|
||||||
//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
|
//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
|
||||||
//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
|
//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
|
||||||
);
|
);
|
||||||
if (!empty($user->rights->holiday->delete)) {
|
if (!empty($permissiontodelete)) {
|
||||||
$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
|
$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
|
||||||
}
|
}
|
||||||
if (!empty($user->rights->holiday->approve)) {
|
if (!empty($permissiontoapprove)) {
|
||||||
$arrayofmassactions['preapproveleave'] = img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Approve");
|
$arrayofmassactions['preapproveleave'] = img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Approve");
|
||||||
}
|
}
|
||||||
if (in_array($massaction, array('presend', 'predelete'))) {
|
if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
|
||||||
$arrayofmassactions = array();
|
$arrayofmassactions = array();
|
||||||
}
|
}
|
||||||
$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
|
$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
|
||||||
|
|
||||||
// Lines of title fields
|
print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
|
||||||
print '<form id="searchFormList" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
|
if ($optioncss != '') {
|
||||||
if ($optioncss != '') {
|
|
||||||
print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
|
print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
|
||||||
}
|
}
|
||||||
print '<input type="hidden" name="token" value="'.newToken().'">';
|
print '<input type="hidden" name="token" value="'.newToken().'">';
|
||||||
print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
|
print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
|
||||||
print '<input type="hidden" name="action" value="'.($action == 'edit' ? 'update' : 'list').'">';
|
print '<input type="hidden" name="action" value="'.($action == 'edit' ? 'update' : 'list').'">';
|
||||||
print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
|
print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
|
||||||
print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
|
print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
|
||||||
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
|
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
|
||||||
print '<input type="hidden" name="mode" value="'.$mode.'">';
|
print '<input type="hidden" name="page" value="'.$page.'">';
|
||||||
|
print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
|
||||||
if ($id > 0) {
|
print '<input type="hidden" name="page_y" value="">';
|
||||||
|
print '<input type="hidden" name="mode" value="'.$mode.'">';
|
||||||
|
if ($id > 0) {
|
||||||
print '<input type="hidden" name="id" value="'.$id.'">';
|
print '<input type="hidden" name="id" value="'.$id.'">';
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($id > 0) { // For user tab
|
if ($id > 0) { // For user tab
|
||||||
$title = $langs->trans("User");
|
$title = $langs->trans("User");
|
||||||
$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
|
$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
|
||||||
$head = user_prepare_head($fuser);
|
$head = user_prepare_head($fuser);
|
||||||
@ -522,77 +533,83 @@ if ($resql) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
print '</div>';
|
print '</div>';
|
||||||
} else {
|
} else {
|
||||||
$title = $langs->trans("ListeCP");
|
$title = $langs->trans("ListeCP");
|
||||||
|
|
||||||
|
|
||||||
$newcardbutton = '';
|
$newcardbutton = '';
|
||||||
$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
|
$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
|
||||||
$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
|
$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
|
||||||
|
$newcardbutton .= dolGetButtonTitleSeparator();
|
||||||
$newcardbutton .= dolGetButtonTitle($langs->trans('MenuAddCP'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/holiday/card.php?action=create', '', $user->rights->holiday->write);
|
$newcardbutton .= dolGetButtonTitle($langs->trans('MenuAddCP'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/holiday/card.php?action=create', '', $user->rights->holiday->write);
|
||||||
|
|
||||||
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_hrm', 0, $newcardbutton, '', $limit, 0, 0, 1);
|
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_hrm', 0, $newcardbutton, '', $limit, 0, 0, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
$topicmail = "Information";
|
$topicmail = "Information";
|
||||||
$modelmail = "leaverequest";
|
$modelmail = "leaverequest";
|
||||||
$objecttmp = new Holiday($db);
|
$objecttmp = new Holiday($db);
|
||||||
$trackid = 'leav'.$object->id;
|
$trackid = 'leav'.$object->id;
|
||||||
include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
|
include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
|
||||||
|
|
||||||
if ($sall) {
|
if ($sall) {
|
||||||
|
$setupstring = '';
|
||||||
foreach ($fieldstosearchall as $key => $val) {
|
foreach ($fieldstosearchall as $key => $val) {
|
||||||
$fieldstosearchall[$key] = $langs->trans($val);
|
$fieldstosearchall[$key] = $langs->trans($val);
|
||||||
|
$setupstring .= $key."=".$val.";";
|
||||||
}
|
}
|
||||||
|
print '<!-- Search done like if HOLIDAY_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
|
||||||
print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
|
print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
$moreforfilter = '';
|
$moreforfilter = '';
|
||||||
|
|
||||||
$parameters = array();
|
$parameters = array();
|
||||||
$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
|
$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
|
||||||
if (empty($reshook)) {
|
if (empty($reshook)) {
|
||||||
$moreforfilter .= $hookmanager->resPrint;
|
$moreforfilter .= $hookmanager->resPrint;
|
||||||
} else {
|
} else {
|
||||||
$moreforfilter = $hookmanager->resPrint;
|
$moreforfilter = $hookmanager->resPrint;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($moreforfilter)) {
|
if (!empty($moreforfilter)) {
|
||||||
print '<div class="liste_titre liste_titre_bydiv centpercent">';
|
print '<div class="liste_titre liste_titre_bydiv centpercent">';
|
||||||
print $moreforfilter;
|
print $moreforfilter;
|
||||||
|
$parameters = array('type'=>$type);
|
||||||
|
$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
|
||||||
|
print $hookmanager->resPrint;
|
||||||
print '</div>';
|
print '</div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
|
$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
|
||||||
$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
|
$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
|
||||||
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
|
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
|
||||||
|
|
||||||
|
$include = '';
|
||||||
$include = '';
|
if (empty($user->rights->holiday->readall)) {
|
||||||
if (empty($user->rights->holiday->readall)) {
|
|
||||||
$include = 'hierarchyme'; // Can see only its hierarchyl
|
$include = 'hierarchyme'; // Can see only its hierarchyl
|
||||||
}
|
}
|
||||||
|
|
||||||
print '<div class="div-table-responsive">';
|
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
||||||
print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
|
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
|
||||||
|
|
||||||
|
// Fields title search
|
||||||
// Filters
|
// --------------------------------------------------------------------
|
||||||
print '<tr class="liste_titre_filter">';
|
print '<tr class="liste_titre_filter">';
|
||||||
// Action column
|
// Action column
|
||||||
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
||||||
print '<td class="liste_titre maxwidthsearch">';
|
print '<td class="liste_titre center maxwidthsearch">';
|
||||||
$searchpicto = $form->showFilterButtons('left');
|
$searchpicto = $form->showFilterButtons('left');
|
||||||
print $searchpicto;
|
print $searchpicto;
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
if (!empty($arrayfields['cp.ref']['checked'])) {
|
if (!empty($arrayfields['cp.ref']['checked'])) {
|
||||||
print '<td class="liste_titre">';
|
print '<td class="liste_titre">';
|
||||||
print '<input class="flat maxwidth50" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
|
print '<input class="flat maxwidth50" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($arrayfields['cp.fk_user']['checked'])) {
|
if (!empty($arrayfields['cp.fk_user']['checked'])) {
|
||||||
$morefilter = '';
|
$morefilter = '';
|
||||||
if (!empty($conf->global->HOLIDAY_HIDE_FOR_NON_SALARIES)) {
|
if (!empty($conf->global->HOLIDAY_HIDE_FOR_NON_SALARIES)) {
|
||||||
$morefilter = 'AND employee = 1';
|
$morefilter = 'AND employee = 1';
|
||||||
@ -609,10 +626,10 @@ if ($resql) {
|
|||||||
print '<td class="liste_titre maxwidthonsmartphone left">';
|
print '<td class="liste_titre maxwidthonsmartphone left">';
|
||||||
print $form->select_dolusers($search_employee, "search_employee", 1, "", $disabled, $include, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth125');
|
print $form->select_dolusers($search_employee, "search_employee", 1, "", $disabled, $include, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth125');
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Approver
|
// Approver
|
||||||
if (!empty($arrayfields['cp.fk_validator']['checked'])) {
|
if (!empty($arrayfields['cp.fk_validator']['checked'])) {
|
||||||
if ($user->hasRight('holiday', 'readall')) {
|
if ($user->hasRight('holiday', 'readall')) {
|
||||||
print '<td class="liste_titre maxwidthonsmartphone left">';
|
print '<td class="liste_titre maxwidthonsmartphone left">';
|
||||||
$validator = new UserGroup($db);
|
$validator = new UserGroup($db);
|
||||||
@ -627,10 +644,10 @@ if ($resql) {
|
|||||||
} else {
|
} else {
|
||||||
print '<td class="liste_titre"> </td>';
|
print '<td class="liste_titre"> </td>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Type
|
// Type
|
||||||
if (!empty($arrayfields['cp.fk_type']['checked'])) {
|
if (!empty($arrayfields['cp.fk_type']['checked'])) {
|
||||||
print '<td class="liste_titre">';
|
print '<td class="liste_titre">';
|
||||||
if (empty($mysoc->country_id)) {
|
if (empty($mysoc->country_id)) {
|
||||||
setEventMessages(null, array($langs->trans("ErrorSetACountryFirst"), $langs->trans("CompanyFoundation")), 'errors');
|
setEventMessages(null, array($langs->trans("ErrorSetACountryFirst"), $langs->trans("CompanyFoundation")), 'errors');
|
||||||
@ -645,141 +662,165 @@ if ($resql) {
|
|||||||
print $form->selectarray('search_type', $arraytypeleaves, $search_type, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100', 1);
|
print $form->selectarray('search_type', $arraytypeleaves, $search_type, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100', 1);
|
||||||
}
|
}
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Duration
|
// Duration
|
||||||
if (!empty($arrayfields['duration']['checked'])) {
|
if (!empty($arrayfields['duration']['checked'])) {
|
||||||
print '<td class="liste_titre"> </td>';
|
print '<td class="liste_titre"> </td>';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Start date
|
// Start date
|
||||||
if (!empty($arrayfields['cp.date_debut']['checked'])) {
|
if (!empty($arrayfields['cp.date_debut']['checked'])) {
|
||||||
print '<td class="liste_titre center nowraponall">';
|
print '<td class="liste_titre center nowraponall">';
|
||||||
print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month_start" value="'.dol_escape_htmltag($search_month_start).'">';
|
print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month_start" value="'.dol_escape_htmltag($search_month_start).'">';
|
||||||
print $formother->selectyear($search_year_start, 'search_year_start', 1, $min_year, $max_year);
|
print $formother->selectyear($search_year_start, 'search_year_start', 1, $min_year, $max_year);
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
|
|
||||||
// End date
|
// End date
|
||||||
if (!empty($arrayfields['cp.date_fin']['checked'])) {
|
if (!empty($arrayfields['cp.date_fin']['checked'])) {
|
||||||
print '<td class="liste_titre center nowraponall">';
|
print '<td class="liste_titre center nowraponall">';
|
||||||
print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month_end" value="'.dol_escape_htmltag($search_month_end).'">';
|
print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month_end" value="'.dol_escape_htmltag($search_month_end).'">';
|
||||||
print $formother->selectyear($search_year_end, 'search_year_end', 1, $min_year, $max_year);
|
print $formother->selectyear($search_year_end, 'search_year_end', 1, $min_year, $max_year);
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Date validation
|
// Date validation
|
||||||
if (!empty($arrayfields['cp.date_valid']['checked'])) {
|
if (!empty($arrayfields['cp.date_valid']['checked'])) {
|
||||||
print '<td class="liste_titre center nowraponall">';
|
print '<td class="liste_titre center nowraponall">';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Date appoval
|
// Date appoval
|
||||||
if (!empty($arrayfields['cp.date_approval']['checked'])) {
|
if (!empty($arrayfields['cp.date_approval']['checked'])) {
|
||||||
print '<td class="liste_titre center nowraponall">';
|
print '<td class="liste_titre center nowraponall">';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Extra fields
|
// Extra fields
|
||||||
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
|
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
|
||||||
// Fields from hook
|
|
||||||
$parameters = array('arrayfields'=>$arrayfields);
|
|
||||||
$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
|
|
||||||
print $hookmanager->resPrint;
|
|
||||||
|
|
||||||
// Create date
|
// Fields from hook
|
||||||
if (!empty($arrayfields['cp.date_create']['checked'])) {
|
$parameters = array('arrayfields'=>$arrayfields);
|
||||||
|
$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
|
||||||
|
print $hookmanager->resPrint;
|
||||||
|
|
||||||
|
// Create date
|
||||||
|
if (!empty($arrayfields['cp.date_create']['checked'])) {
|
||||||
print '<td class="liste_titre center width200">';
|
print '<td class="liste_titre center width200">';
|
||||||
print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month_create" value="'.dol_escape_htmltag($search_month_create).'">';
|
print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month_create" value="'.dol_escape_htmltag($search_month_create).'">';
|
||||||
print $formother->selectyear($search_year_create, 'search_year_create', 1, $min_year, 0);
|
print $formother->selectyear($search_year_create, 'search_year_create', 1, $min_year, 0);
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create date
|
// Create date
|
||||||
if (!empty($arrayfields['cp.tms']['checked'])) {
|
if (!empty($arrayfields['cp.tms']['checked'])) {
|
||||||
print '<td class="liste_titre center width200">';
|
print '<td class="liste_titre center width200">';
|
||||||
print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month_update" value="'.dol_escape_htmltag($search_month_update).'">';
|
print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month_update" value="'.dol_escape_htmltag($search_month_update).'">';
|
||||||
print $formother->selectyear($search_year_update, 'search_year_update', 1, $min_year, 0);
|
print $formother->selectyear($search_year_update, 'search_year_update', 1, $min_year, 0);
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Status
|
// Status
|
||||||
if (!empty($arrayfields['cp.statut']['checked'])) {
|
if (!empty($arrayfields['cp.statut']['checked'])) {
|
||||||
print '<td class="liste_titre right">';
|
print '<td class="liste_titre right parentonrightofpage">';
|
||||||
$object->selectStatutCP($search_status, 'search_status', 'minwidth125');
|
print $object->selectStatutCP($search_status, 'search_status', 'search_status width100 onrightofpage');
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Action column
|
// Action column
|
||||||
if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
||||||
print '<td class="liste_titre maxwidthsearch">';
|
print '<td class="liste_titre center maxwidthsearch">';
|
||||||
$searchpicto = $form->showFilterButtons();
|
$searchpicto = $form->showFilterButtons();
|
||||||
print $searchpicto;
|
print $searchpicto;
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
|
|
||||||
print "</tr>\n";
|
print '</tr>'."\n";
|
||||||
|
|
||||||
print '<tr class="liste_titre">';
|
$totalarray = array();
|
||||||
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
$totalarray['nbfield'] = 0;
|
||||||
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ');
|
|
||||||
}
|
// Fields title label
|
||||||
if (!empty($arrayfields['cp.ref']['checked'])) {
|
// --------------------------------------------------------------------
|
||||||
|
print '<tr class="liste_titre">';
|
||||||
|
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
||||||
|
print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
|
||||||
|
$totalarray['nbfield']++;
|
||||||
|
}
|
||||||
|
if (!empty($arrayfields['cp.ref']['checked'])) {
|
||||||
print_liste_field_titre($arrayfields['cp.ref']['label'], $_SERVER["PHP_SELF"], "cp.ref", "", $param, '', $sortfield, $sortorder);
|
print_liste_field_titre($arrayfields['cp.ref']['label'], $_SERVER["PHP_SELF"], "cp.ref", "", $param, '', $sortfield, $sortorder);
|
||||||
}
|
$totalarray['nbfield']++;
|
||||||
if (!empty($arrayfields['cp.fk_user']['checked'])) {
|
}
|
||||||
|
if (!empty($arrayfields['cp.fk_user']['checked'])) {
|
||||||
print_liste_field_titre($arrayfields['cp.fk_user']['label'], $_SERVER["PHP_SELF"], "cp.fk_user", "", $param, '', $sortfield, $sortorder);
|
print_liste_field_titre($arrayfields['cp.fk_user']['label'], $_SERVER["PHP_SELF"], "cp.fk_user", "", $param, '', $sortfield, $sortorder);
|
||||||
}
|
$totalarray['nbfield']++;
|
||||||
if (!empty($arrayfields['cp.fk_validator']['checked'])) {
|
}
|
||||||
|
if (!empty($arrayfields['cp.fk_validator']['checked'])) {
|
||||||
print_liste_field_titre($arrayfields['cp.fk_validator']['label'], $_SERVER["PHP_SELF"], "cp.fk_validator", "", $param, '', $sortfield, $sortorder);
|
print_liste_field_titre($arrayfields['cp.fk_validator']['label'], $_SERVER["PHP_SELF"], "cp.fk_validator", "", $param, '', $sortfield, $sortorder);
|
||||||
}
|
$totalarray['nbfield']++;
|
||||||
if (!empty($arrayfields['cp.fk_type']['checked'])) {
|
}
|
||||||
|
if (!empty($arrayfields['cp.fk_type']['checked'])) {
|
||||||
print_liste_field_titre($arrayfields['cp.fk_type']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
|
print_liste_field_titre($arrayfields['cp.fk_type']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
|
||||||
}
|
$totalarray['nbfield']++;
|
||||||
if (!empty($arrayfields['duration']['checked'])) {
|
}
|
||||||
|
if (!empty($arrayfields['duration']['checked'])) {
|
||||||
print_liste_field_titre($arrayfields['duration']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right maxwidth100');
|
print_liste_field_titre($arrayfields['duration']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right maxwidth100');
|
||||||
}
|
$totalarray['nbfield']++;
|
||||||
if (!empty($arrayfields['cp.date_debut']['checked'])) {
|
}
|
||||||
|
if (!empty($arrayfields['cp.date_debut']['checked'])) {
|
||||||
print_liste_field_titre($arrayfields['cp.date_debut']['label'], $_SERVER["PHP_SELF"], "cp.date_debut", "", $param, '', $sortfield, $sortorder, 'center ');
|
print_liste_field_titre($arrayfields['cp.date_debut']['label'], $_SERVER["PHP_SELF"], "cp.date_debut", "", $param, '', $sortfield, $sortorder, 'center ');
|
||||||
}
|
$totalarray['nbfield']++;
|
||||||
if (!empty($arrayfields['cp.date_fin']['checked'])) {
|
}
|
||||||
|
if (!empty($arrayfields['cp.date_fin']['checked'])) {
|
||||||
print_liste_field_titre($arrayfields['cp.date_fin']['label'], $_SERVER["PHP_SELF"], "cp.date_fin", "", $param, '', $sortfield, $sortorder, 'center ');
|
print_liste_field_titre($arrayfields['cp.date_fin']['label'], $_SERVER["PHP_SELF"], "cp.date_fin", "", $param, '', $sortfield, $sortorder, 'center ');
|
||||||
}
|
$totalarray['nbfield']++;
|
||||||
if (!empty($arrayfields['cp.date_valid']['checked'])) {
|
}
|
||||||
|
if (!empty($arrayfields['cp.date_valid']['checked'])) {
|
||||||
print_liste_field_titre($arrayfields['cp.date_valid']['label'], $_SERVER["PHP_SELF"], "cp.date_valid", "", $param, '', $sortfield, $sortorder, 'center ');
|
print_liste_field_titre($arrayfields['cp.date_valid']['label'], $_SERVER["PHP_SELF"], "cp.date_valid", "", $param, '', $sortfield, $sortorder, 'center ');
|
||||||
}
|
$totalarray['nbfield']++;
|
||||||
if (!empty($arrayfields['cp.date_approval']['checked'])) {
|
}
|
||||||
|
if (!empty($arrayfields['cp.date_approval']['checked'])) {
|
||||||
print_liste_field_titre($arrayfields['cp.date_approval']['label'], $_SERVER["PHP_SELF"], "cp.date_approval", "", $param, '', $sortfield, $sortorder, 'center ');
|
print_liste_field_titre($arrayfields['cp.date_approval']['label'], $_SERVER["PHP_SELF"], "cp.date_approval", "", $param, '', $sortfield, $sortorder, 'center ');
|
||||||
}
|
$totalarray['nbfield']++;
|
||||||
// Extra fields
|
}
|
||||||
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
|
// Extra fields
|
||||||
// Hook fields
|
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
|
||||||
$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
|
// Hook fields
|
||||||
$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
|
$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
|
||||||
print $hookmanager->resPrint;
|
$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
|
||||||
if (!empty($arrayfields['cp.date_create']['checked'])) {
|
print $hookmanager->resPrint;
|
||||||
|
if (!empty($arrayfields['cp.date_create']['checked'])) {
|
||||||
print_liste_field_titre($arrayfields['cp.date_create']['label'], $_SERVER["PHP_SELF"], "cp.date_create", "", $param, '', $sortfield, $sortorder, 'center ');
|
print_liste_field_titre($arrayfields['cp.date_create']['label'], $_SERVER["PHP_SELF"], "cp.date_create", "", $param, '', $sortfield, $sortorder, 'center ');
|
||||||
}
|
$totalarray['nbfield']++;
|
||||||
if (!empty($arrayfields['cp.tms']['checked'])) {
|
}
|
||||||
|
if (!empty($arrayfields['cp.tms']['checked'])) {
|
||||||
print_liste_field_titre($arrayfields['cp.tms']['label'], $_SERVER["PHP_SELF"], "cp.tms", "", $param, '', $sortfield, $sortorder, 'center ');
|
print_liste_field_titre($arrayfields['cp.tms']['label'], $_SERVER["PHP_SELF"], "cp.tms", "", $param, '', $sortfield, $sortorder, 'center ');
|
||||||
}
|
$totalarray['nbfield']++;
|
||||||
if (!empty($arrayfields['cp.statut']['checked'])) {
|
}
|
||||||
|
if (!empty($arrayfields['cp.statut']['checked'])) {
|
||||||
print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "cp.statut", "", $param, '', $sortfield, $sortorder, 'right ');
|
print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "cp.statut", "", $param, '', $sortfield, $sortorder, 'right ');
|
||||||
}
|
$totalarray['nbfield']++;
|
||||||
if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
}
|
||||||
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ');
|
// Action column
|
||||||
}
|
if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
||||||
print "</tr>\n";
|
print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
|
||||||
|
$totalarray['nbfield']++;
|
||||||
|
}
|
||||||
|
print '</tr>'."\n";
|
||||||
|
|
||||||
$listhalfday = array('morning'=>$langs->trans("Morning"), "afternoon"=>$langs->trans("Afternoon"));
|
$listhalfday = array('morning'=>$langs->trans("Morning"), "afternoon"=>$langs->trans("Afternoon"));
|
||||||
|
|
||||||
|
|
||||||
// If we ask a dedicated card and not allow to see it, we force on user.
|
// Loop on record
|
||||||
if ($id && empty($user->rights->holiday->readall) && !in_array($id, $childids)) {
|
// --------------------------------------------------------------------
|
||||||
|
|
||||||
|
// If we ask a dedicated card and not allow to see it, we force on user.
|
||||||
|
if ($id && empty($user->rights->holiday->readall) && !in_array($id, $childids)) {
|
||||||
$langs->load("errors");
|
$langs->load("errors");
|
||||||
print '<tr class="oddeven opacitymediuem"><td colspan="10">'.$langs->trans("NotEnoughPermissions").'</td></tr>';
|
print '<tr class="oddeven opacitymediuem"><td colspan="10">'.$langs->trans("NotEnoughPermissions").'</td></tr>';
|
||||||
$result = 0;
|
$result = 0;
|
||||||
} elseif ($num > 0 && !empty($mysoc->country_id)) {
|
} elseif ($num > 0 && !empty($mysoc->country_id)) {
|
||||||
// Lines
|
// Lines
|
||||||
$userstatic = new User($db);
|
$userstatic = new User($db);
|
||||||
$approbatorstatic = new User($db);
|
$approbatorstatic = new User($db);
|
||||||
@ -787,12 +828,16 @@ if ($resql) {
|
|||||||
$typeleaves = $object->getTypes(1, -1);
|
$typeleaves = $object->getTypes(1, -1);
|
||||||
|
|
||||||
$i = 0;
|
$i = 0;
|
||||||
|
$savnbfield = $totalarray['nbfield'];
|
||||||
$totalarray = array();
|
$totalarray = array();
|
||||||
$totalarray['nbfield'] = 0;
|
$totalarray['nbfield'] = 0;
|
||||||
$totalduration = 0;
|
$totalduration = 0;
|
||||||
$imaxinloop = ($limit ? min($num, $limit) : $num);
|
$imaxinloop = ($limit ? min($num, $limit) : $num);
|
||||||
while ($i < $imaxinloop) {
|
while ($i < $imaxinloop) {
|
||||||
$obj = $db->fetch_object($resql);
|
$obj = $db->fetch_object($resql);
|
||||||
|
if (empty($obj)) {
|
||||||
|
break; // Should not happen
|
||||||
|
}
|
||||||
|
|
||||||
// Leave request
|
// Leave request
|
||||||
$holidaystatic->id = $obj->rowid;
|
$holidaystatic->id = $obj->rowid;
|
||||||
@ -832,11 +877,11 @@ if ($resql) {
|
|||||||
|
|
||||||
if ($mode == 'kanban') {
|
if ($mode == 'kanban') {
|
||||||
if ($i == 0) {
|
if ($i == 0) {
|
||||||
print '<tr><td colspan="12">';
|
print '<tr><td colspan="'.$savnbfield.'">';
|
||||||
print '<div class="box-flex-container kanban">';
|
print '<div class="box-flex-container kanban">';
|
||||||
}
|
}
|
||||||
|
|
||||||
$holidaystatic->fk_type = $typeleaves[$obj->fk_type]['rowid'];
|
$holidaystatic->fk_type = empty($typeleaves[$obj->fk_type]['rowid']) ? 0 : $typeleaves[$obj->fk_type]['rowid'];
|
||||||
|
|
||||||
// Output Kanban
|
// Output Kanban
|
||||||
if ($massactionbutton || $massaction) {
|
if ($massactionbutton || $massaction) {
|
||||||
@ -851,14 +896,16 @@ if ($resql) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$arraydata = array('user'=>$userstatic, 'labeltype'=>$labeltypeleavetoshow);
|
$arraydata = array('user'=>$userstatic, 'labeltype'=>$labeltypeleavetoshow);
|
||||||
print $holidaystatic->getKanbanView('', $arraydata);
|
|
||||||
}
|
}
|
||||||
|
print $holidaystatic->getKanbanView('', $arraydata);
|
||||||
if ($i == ($imaxinloop - 1)) {
|
if ($i == ($imaxinloop - 1)) {
|
||||||
print '</div>';
|
print '</div>';
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
print '<tr class="oddeven">';
|
// Show here line of result
|
||||||
|
$j = 0;
|
||||||
|
print '<tr data-rowid="'.$object->id.'" class="oddeven">';
|
||||||
// Action column
|
// Action column
|
||||||
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
||||||
print '<td class="nowrap center">';
|
print '<td class="nowrap center">';
|
||||||
@ -870,6 +917,9 @@ if ($resql) {
|
|||||||
print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
|
print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
|
||||||
}
|
}
|
||||||
print '</td>';
|
print '</td>';
|
||||||
|
if (!$i) {
|
||||||
|
$totalarray['nbfield']++;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (!empty($arrayfields['cp.ref']['checked'])) {
|
if (!empty($arrayfields['cp.ref']['checked'])) {
|
||||||
print '<td class="nowraponall">';
|
print '<td class="nowraponall">';
|
||||||
@ -952,8 +1002,8 @@ if ($resql) {
|
|||||||
// Extra fields
|
// Extra fields
|
||||||
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
|
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
|
||||||
// Fields from hook
|
// Fields from hook
|
||||||
$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
|
$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
|
||||||
$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
|
$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
|
||||||
print $hookmanager->resPrint;
|
print $hookmanager->resPrint;
|
||||||
|
|
||||||
// Date creation
|
// Date creation
|
||||||
@ -987,10 +1037,10 @@ if ($resql) {
|
|||||||
print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
|
print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
|
||||||
}
|
}
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
|
||||||
if (!$i) {
|
if (!$i) {
|
||||||
$totalarray['nbfield']++;
|
$totalarray['nbfield']++;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
print '</tr>'."\n";
|
print '</tr>'."\n";
|
||||||
}
|
}
|
||||||
@ -998,7 +1048,7 @@ if ($resql) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Add a line for total if there is a total to show
|
// Add a line for total if there is a total to show
|
||||||
if (!empty($arrayfields['duration']['checked'])) {
|
if ($mode != 'kanban' && !empty($arrayfields['duration']['checked'])) {
|
||||||
print '<tr class="total">';
|
print '<tr class="total">';
|
||||||
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
||||||
print '<td></td>';
|
print '<td></td>';
|
||||||
@ -1018,27 +1068,30 @@ if ($resql) {
|
|||||||
}
|
}
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Si il n'y a pas d'enregistrement suite à une recherche
|
// If no record found
|
||||||
if ($num == 0) {
|
if ($num == 0) {
|
||||||
$colspan = 1;
|
$colspan = 1;
|
||||||
foreach ($arrayfields as $key => $val) {
|
foreach ($arrayfields as $key => $val) {
|
||||||
if (!empty($val['checked'])) {
|
if (!empty($val['checked'])) {
|
||||||
$colspan++;
|
$colspan++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
|
print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
|
||||||
}
|
|
||||||
|
|
||||||
print '</table>';
|
|
||||||
print '</div>';
|
|
||||||
|
|
||||||
print '</form>';
|
|
||||||
} else {
|
|
||||||
dol_print_error($db);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$db->free($resql);
|
||||||
|
|
||||||
|
$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
|
||||||
|
$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
|
||||||
|
print $hookmanager->resPrint;
|
||||||
|
|
||||||
|
print '</table>'."\n";
|
||||||
|
print '</div>'."\n";
|
||||||
|
|
||||||
|
print '</form>'."\n";
|
||||||
|
|
||||||
// End of page
|
// End of page
|
||||||
llxFooter();
|
llxFooter();
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|||||||
@ -279,255 +279,255 @@ INSERT INTO llx_c_country (rowid, code, code_iso, label, active, favorite) VALUE
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
UPDATE llx_c_country SET numeric_code = '004' WHERE code_iso = "AFG";
|
UPDATE llx_c_country SET numeric_code = '004' WHERE code_iso = 'AFG';
|
||||||
UPDATE llx_c_country SET numeric_code = '248' WHERE code_iso = "ALA";
|
UPDATE llx_c_country SET numeric_code = '248' WHERE code_iso = 'ALA';
|
||||||
UPDATE llx_c_country SET numeric_code = '008' WHERE code_iso = "ALB";
|
UPDATE llx_c_country SET numeric_code = '008' WHERE code_iso = 'ALB';
|
||||||
UPDATE llx_c_country SET numeric_code = '276' WHERE code_iso = "DEU";
|
UPDATE llx_c_country SET numeric_code = '276' WHERE code_iso = 'DEU';
|
||||||
UPDATE llx_c_country SET numeric_code = '020' WHERE code_iso = "AND";
|
UPDATE llx_c_country SET numeric_code = '020' WHERE code_iso = 'AND';
|
||||||
UPDATE llx_c_country SET numeric_code = '024' WHERE code_iso = "AGO";
|
UPDATE llx_c_country SET numeric_code = '024' WHERE code_iso = 'AGO';
|
||||||
UPDATE llx_c_country SET numeric_code = '660' WHERE code_iso = "AIA";
|
UPDATE llx_c_country SET numeric_code = '660' WHERE code_iso = 'AIA';
|
||||||
UPDATE llx_c_country SET numeric_code = '010' WHERE code_iso = "ATA";
|
UPDATE llx_c_country SET numeric_code = '010' WHERE code_iso = 'ATA';
|
||||||
UPDATE llx_c_country SET numeric_code = '028' WHERE code_iso = "ATG";
|
UPDATE llx_c_country SET numeric_code = '028' WHERE code_iso = 'ATG';
|
||||||
UPDATE llx_c_country SET numeric_code = '682' WHERE code_iso = "SAU";
|
UPDATE llx_c_country SET numeric_code = '682' WHERE code_iso = 'SAU';
|
||||||
UPDATE llx_c_country SET numeric_code = '012' WHERE code_iso = "DZA";
|
UPDATE llx_c_country SET numeric_code = '012' WHERE code_iso = 'DZA';
|
||||||
UPDATE llx_c_country SET numeric_code = '032' WHERE code_iso = "ARG";
|
UPDATE llx_c_country SET numeric_code = '032' WHERE code_iso = 'ARG';
|
||||||
UPDATE llx_c_country SET numeric_code = '051' WHERE code_iso = "ARM";
|
UPDATE llx_c_country SET numeric_code = '051' WHERE code_iso = 'ARM';
|
||||||
UPDATE llx_c_country SET numeric_code = '533' WHERE code_iso = "ABW";
|
UPDATE llx_c_country SET numeric_code = '533' WHERE code_iso = 'ABW';
|
||||||
UPDATE llx_c_country SET numeric_code = '036' WHERE code_iso = "AUS";
|
UPDATE llx_c_country SET numeric_code = '036' WHERE code_iso = 'AUS';
|
||||||
UPDATE llx_c_country SET numeric_code = '040' WHERE code_iso = "AUT";
|
UPDATE llx_c_country SET numeric_code = '040' WHERE code_iso = 'AUT';
|
||||||
UPDATE llx_c_country SET numeric_code = '031' WHERE code_iso = "AZE";
|
UPDATE llx_c_country SET numeric_code = '031' WHERE code_iso = 'AZE';
|
||||||
UPDATE llx_c_country SET numeric_code = '044' WHERE code_iso = "BHS";
|
UPDATE llx_c_country SET numeric_code = '044' WHERE code_iso = 'BHS';
|
||||||
UPDATE llx_c_country SET numeric_code = '050' WHERE code_iso = "BGD";
|
UPDATE llx_c_country SET numeric_code = '050' WHERE code_iso = 'BGD';
|
||||||
UPDATE llx_c_country SET numeric_code = '052' WHERE code_iso = "BRB";
|
UPDATE llx_c_country SET numeric_code = '052' WHERE code_iso = 'BRB';
|
||||||
UPDATE llx_c_country SET numeric_code = '048' WHERE code_iso = "BHR";
|
UPDATE llx_c_country SET numeric_code = '048' WHERE code_iso = 'BHR';
|
||||||
UPDATE llx_c_country SET numeric_code = '056' WHERE code_iso = "BEL";
|
UPDATE llx_c_country SET numeric_code = '056' WHERE code_iso = 'BEL';
|
||||||
UPDATE llx_c_country SET numeric_code = '084' WHERE code_iso = "BLZ";
|
UPDATE llx_c_country SET numeric_code = '084' WHERE code_iso = 'BLZ';
|
||||||
UPDATE llx_c_country SET numeric_code = '204' WHERE code_iso = "BEN";
|
UPDATE llx_c_country SET numeric_code = '204' WHERE code_iso = 'BEN';
|
||||||
UPDATE llx_c_country SET numeric_code = '060' WHERE code_iso = "BMU";
|
UPDATE llx_c_country SET numeric_code = '060' WHERE code_iso = 'BMU';
|
||||||
UPDATE llx_c_country SET numeric_code = '112' WHERE code_iso = "BLR";
|
UPDATE llx_c_country SET numeric_code = '112' WHERE code_iso = 'BLR';
|
||||||
UPDATE llx_c_country SET numeric_code = '068' WHERE code_iso = "BOL";
|
UPDATE llx_c_country SET numeric_code = '068' WHERE code_iso = 'BOL';
|
||||||
UPDATE llx_c_country SET numeric_code = '535' WHERE code_iso = "BES";
|
UPDATE llx_c_country SET numeric_code = '535' WHERE code_iso = 'BES';
|
||||||
UPDATE llx_c_country SET numeric_code = '070' WHERE code_iso = "BIH";
|
UPDATE llx_c_country SET numeric_code = '070' WHERE code_iso = 'BIH';
|
||||||
UPDATE llx_c_country SET numeric_code = '072' WHERE code_iso = "BWA";
|
UPDATE llx_c_country SET numeric_code = '072' WHERE code_iso = 'BWA';
|
||||||
UPDATE llx_c_country SET numeric_code = '076' WHERE code_iso = "BRA";
|
UPDATE llx_c_country SET numeric_code = '076' WHERE code_iso = 'BRA';
|
||||||
UPDATE llx_c_country SET numeric_code = '096' WHERE code_iso = "BRN";
|
UPDATE llx_c_country SET numeric_code = '096' WHERE code_iso = 'BRN';
|
||||||
UPDATE llx_c_country SET numeric_code = '100' WHERE code_iso = "BGR";
|
UPDATE llx_c_country SET numeric_code = '100' WHERE code_iso = 'BGR';
|
||||||
UPDATE llx_c_country SET numeric_code = '854' WHERE code_iso = "BFA";
|
UPDATE llx_c_country SET numeric_code = '854' WHERE code_iso = 'BFA';
|
||||||
UPDATE llx_c_country SET numeric_code = '108' WHERE code_iso = "BDI";
|
UPDATE llx_c_country SET numeric_code = '108' WHERE code_iso = 'BDI';
|
||||||
UPDATE llx_c_country SET numeric_code = '064' WHERE code_iso = "BTN";
|
UPDATE llx_c_country SET numeric_code = '064' WHERE code_iso = 'BTN';
|
||||||
UPDATE llx_c_country SET numeric_code = '132' WHERE code_iso = "CPV";
|
UPDATE llx_c_country SET numeric_code = '132' WHERE code_iso = 'CPV';
|
||||||
UPDATE llx_c_country SET numeric_code = '116' WHERE code_iso = "KHM";
|
UPDATE llx_c_country SET numeric_code = '116' WHERE code_iso = 'KHM';
|
||||||
UPDATE llx_c_country SET numeric_code = '120' WHERE code_iso = "CMR";
|
UPDATE llx_c_country SET numeric_code = '120' WHERE code_iso = 'CMR';
|
||||||
UPDATE llx_c_country SET numeric_code = '124' WHERE code_iso = "CAN";
|
UPDATE llx_c_country SET numeric_code = '124' WHERE code_iso = 'CAN';
|
||||||
UPDATE llx_c_country SET numeric_code = '634' WHERE code_iso = "QAT";
|
UPDATE llx_c_country SET numeric_code = '634' WHERE code_iso = 'QAT';
|
||||||
UPDATE llx_c_country SET numeric_code = '148' WHERE code_iso = "TCD";
|
UPDATE llx_c_country SET numeric_code = '148' WHERE code_iso = 'TCD';
|
||||||
UPDATE llx_c_country SET numeric_code = '152' WHERE code_iso = "CHL";
|
UPDATE llx_c_country SET numeric_code = '152' WHERE code_iso = 'CHL';
|
||||||
UPDATE llx_c_country SET numeric_code = '156' WHERE code_iso = "CHN";
|
UPDATE llx_c_country SET numeric_code = '156' WHERE code_iso = 'CHN';
|
||||||
UPDATE llx_c_country SET numeric_code = '196' WHERE code_iso = "CYP";
|
UPDATE llx_c_country SET numeric_code = '196' WHERE code_iso = 'CYP';
|
||||||
UPDATE llx_c_country SET numeric_code = '170' WHERE code_iso = "COL";
|
UPDATE llx_c_country SET numeric_code = '170' WHERE code_iso = 'COL';
|
||||||
UPDATE llx_c_country SET numeric_code = '174' WHERE code_iso = "COM";
|
UPDATE llx_c_country SET numeric_code = '174' WHERE code_iso = 'COM';
|
||||||
UPDATE llx_c_country SET numeric_code = '408' WHERE code_iso = "PRK";
|
UPDATE llx_c_country SET numeric_code = '408' WHERE code_iso = 'PRK';
|
||||||
UPDATE llx_c_country SET numeric_code = '410' WHERE code_iso = "KOR";
|
UPDATE llx_c_country SET numeric_code = '410' WHERE code_iso = 'KOR';
|
||||||
UPDATE llx_c_country SET numeric_code = '384' WHERE code_iso = "CIV";
|
UPDATE llx_c_country SET numeric_code = '384' WHERE code_iso = 'CIV';
|
||||||
UPDATE llx_c_country SET numeric_code = '188' WHERE code_iso = "CRI";
|
UPDATE llx_c_country SET numeric_code = '188' WHERE code_iso = 'CRI';
|
||||||
UPDATE llx_c_country SET numeric_code = '191' WHERE code_iso = "HRV";
|
UPDATE llx_c_country SET numeric_code = '191' WHERE code_iso = 'HRV';
|
||||||
UPDATE llx_c_country SET numeric_code = '192' WHERE code_iso = "CUB";
|
UPDATE llx_c_country SET numeric_code = '192' WHERE code_iso = 'CUB';
|
||||||
UPDATE llx_c_country SET numeric_code = '531' WHERE code_iso = "CUW";
|
UPDATE llx_c_country SET numeric_code = '531' WHERE code_iso = 'CUW';
|
||||||
UPDATE llx_c_country SET numeric_code = '208' WHERE code_iso = "DNK";
|
UPDATE llx_c_country SET numeric_code = '208' WHERE code_iso = 'DNK';
|
||||||
UPDATE llx_c_country SET numeric_code = '212' WHERE code_iso = "DMA";
|
UPDATE llx_c_country SET numeric_code = '212' WHERE code_iso = 'DMA';
|
||||||
UPDATE llx_c_country SET numeric_code = '218' WHERE code_iso = "ECU";
|
UPDATE llx_c_country SET numeric_code = '218' WHERE code_iso = 'ECU';
|
||||||
UPDATE llx_c_country SET numeric_code = '818' WHERE code_iso = "EGY";
|
UPDATE llx_c_country SET numeric_code = '818' WHERE code_iso = 'EGY';
|
||||||
UPDATE llx_c_country SET numeric_code = '222' WHERE code_iso = "SLV";
|
UPDATE llx_c_country SET numeric_code = '222' WHERE code_iso = 'SLV';
|
||||||
UPDATE llx_c_country SET numeric_code = '784' WHERE code_iso = "ARE";
|
UPDATE llx_c_country SET numeric_code = '784' WHERE code_iso = 'ARE';
|
||||||
UPDATE llx_c_country SET numeric_code = '232' WHERE code_iso = "ERI";
|
UPDATE llx_c_country SET numeric_code = '232' WHERE code_iso = 'ERI';
|
||||||
UPDATE llx_c_country SET numeric_code = '703' WHERE code_iso = "SVK";
|
UPDATE llx_c_country SET numeric_code = '703' WHERE code_iso = 'SVK';
|
||||||
UPDATE llx_c_country SET numeric_code = '705' WHERE code_iso = "SVN";
|
UPDATE llx_c_country SET numeric_code = '705' WHERE code_iso = 'SVN';
|
||||||
UPDATE llx_c_country SET numeric_code = '724' WHERE code_iso = "ESP";
|
UPDATE llx_c_country SET numeric_code = '724' WHERE code_iso = 'ESP';
|
||||||
UPDATE llx_c_country SET numeric_code = '840' WHERE code_iso = "USA";
|
UPDATE llx_c_country SET numeric_code = '840' WHERE code_iso = 'USA';
|
||||||
UPDATE llx_c_country SET numeric_code = '233' WHERE code_iso = "EST";
|
UPDATE llx_c_country SET numeric_code = '233' WHERE code_iso = 'EST';
|
||||||
UPDATE llx_c_country SET numeric_code = '231' WHERE code_iso = "ETH";
|
UPDATE llx_c_country SET numeric_code = '231' WHERE code_iso = 'ETH';
|
||||||
UPDATE llx_c_country SET numeric_code = '608' WHERE code_iso = "PHL";
|
UPDATE llx_c_country SET numeric_code = '608' WHERE code_iso = 'PHL';
|
||||||
UPDATE llx_c_country SET numeric_code = '246' WHERE code_iso = "FIN";
|
UPDATE llx_c_country SET numeric_code = '246' WHERE code_iso = 'FIN';
|
||||||
UPDATE llx_c_country SET numeric_code = '242' WHERE code_iso = "FJI";
|
UPDATE llx_c_country SET numeric_code = '242' WHERE code_iso = 'FJI';
|
||||||
UPDATE llx_c_country SET numeric_code = '250' WHERE code_iso = "FRA";
|
UPDATE llx_c_country SET numeric_code = '250' WHERE code_iso = 'FRA';
|
||||||
UPDATE llx_c_country SET numeric_code = '266' WHERE code_iso = "GAB";
|
UPDATE llx_c_country SET numeric_code = '266' WHERE code_iso = 'GAB';
|
||||||
UPDATE llx_c_country SET numeric_code = '270' WHERE code_iso = "GMB";
|
UPDATE llx_c_country SET numeric_code = '270' WHERE code_iso = 'GMB';
|
||||||
UPDATE llx_c_country SET numeric_code = '268' WHERE code_iso = "GEO";
|
UPDATE llx_c_country SET numeric_code = '268' WHERE code_iso = 'GEO';
|
||||||
UPDATE llx_c_country SET numeric_code = '288' WHERE code_iso = "GHA";
|
UPDATE llx_c_country SET numeric_code = '288' WHERE code_iso = 'GHA';
|
||||||
UPDATE llx_c_country SET numeric_code = '292' WHERE code_iso = "GIB";
|
UPDATE llx_c_country SET numeric_code = '292' WHERE code_iso = 'GIB';
|
||||||
UPDATE llx_c_country SET numeric_code = '308' WHERE code_iso = "GRD";
|
UPDATE llx_c_country SET numeric_code = '308' WHERE code_iso = 'GRD';
|
||||||
UPDATE llx_c_country SET numeric_code = '300' WHERE code_iso = "GRC";
|
UPDATE llx_c_country SET numeric_code = '300' WHERE code_iso = 'GRC';
|
||||||
UPDATE llx_c_country SET numeric_code = '304' WHERE code_iso = "GRL";
|
UPDATE llx_c_country SET numeric_code = '304' WHERE code_iso = 'GRL';
|
||||||
UPDATE llx_c_country SET numeric_code = '312' WHERE code_iso = "GLP";
|
UPDATE llx_c_country SET numeric_code = '312' WHERE code_iso = 'GLP';
|
||||||
UPDATE llx_c_country SET numeric_code = '316' WHERE code_iso = "GUM";
|
UPDATE llx_c_country SET numeric_code = '316' WHERE code_iso = 'GUM';
|
||||||
UPDATE llx_c_country SET numeric_code = '320' WHERE code_iso = "GTM";
|
UPDATE llx_c_country SET numeric_code = '320' WHERE code_iso = 'GTM';
|
||||||
UPDATE llx_c_country SET numeric_code = '254' WHERE code_iso = "GUF";
|
UPDATE llx_c_country SET numeric_code = '254' WHERE code_iso = 'GUF';
|
||||||
UPDATE llx_c_country SET numeric_code = '831' WHERE code_iso = "GGY";
|
UPDATE llx_c_country SET numeric_code = '831' WHERE code_iso = 'GGY';
|
||||||
UPDATE llx_c_country SET numeric_code = '324' WHERE code_iso = "GIN";
|
UPDATE llx_c_country SET numeric_code = '324' WHERE code_iso = 'GIN';
|
||||||
UPDATE llx_c_country SET numeric_code = '624' WHERE code_iso = "GNB";
|
UPDATE llx_c_country SET numeric_code = '624' WHERE code_iso = 'GNB';
|
||||||
UPDATE llx_c_country SET numeric_code = '226' WHERE code_iso = "GNQ";
|
UPDATE llx_c_country SET numeric_code = '226' WHERE code_iso = 'GNQ';
|
||||||
UPDATE llx_c_country SET numeric_code = '328' WHERE code_iso = "GUY";
|
UPDATE llx_c_country SET numeric_code = '328' WHERE code_iso = 'GUY';
|
||||||
UPDATE llx_c_country SET numeric_code = '332' WHERE code_iso = "HTI";
|
UPDATE llx_c_country SET numeric_code = '332' WHERE code_iso = 'HTI';
|
||||||
UPDATE llx_c_country SET numeric_code = '340' WHERE code_iso = "HND";
|
UPDATE llx_c_country SET numeric_code = '340' WHERE code_iso = 'HND';
|
||||||
UPDATE llx_c_country SET numeric_code = '344' WHERE code_iso = "HKG";
|
UPDATE llx_c_country SET numeric_code = '344' WHERE code_iso = 'HKG';
|
||||||
UPDATE llx_c_country SET numeric_code = '348' WHERE code_iso = "HUN";
|
UPDATE llx_c_country SET numeric_code = '348' WHERE code_iso = 'HUN';
|
||||||
UPDATE llx_c_country SET numeric_code = '356' WHERE code_iso = "IND";
|
UPDATE llx_c_country SET numeric_code = '356' WHERE code_iso = 'IND';
|
||||||
UPDATE llx_c_country SET numeric_code = '360' WHERE code_iso = "IDN";
|
UPDATE llx_c_country SET numeric_code = '360' WHERE code_iso = 'IDN';
|
||||||
UPDATE llx_c_country SET numeric_code = '368' WHERE code_iso = "IRQ";
|
UPDATE llx_c_country SET numeric_code = '368' WHERE code_iso = 'IRQ';
|
||||||
UPDATE llx_c_country SET numeric_code = '364' WHERE code_iso = "IRN";
|
UPDATE llx_c_country SET numeric_code = '364' WHERE code_iso = 'IRN';
|
||||||
UPDATE llx_c_country SET numeric_code = '372' WHERE code_iso = "IRL";
|
UPDATE llx_c_country SET numeric_code = '372' WHERE code_iso = 'IRL';
|
||||||
UPDATE llx_c_country SET numeric_code = '074' WHERE code_iso = "BVT";
|
UPDATE llx_c_country SET numeric_code = '074' WHERE code_iso = 'BVT';
|
||||||
UPDATE llx_c_country SET numeric_code = '833' WHERE code_iso = "IMN";
|
UPDATE llx_c_country SET numeric_code = '833' WHERE code_iso = 'IMN';
|
||||||
UPDATE llx_c_country SET numeric_code = '162' WHERE code_iso = "CXR";
|
UPDATE llx_c_country SET numeric_code = '162' WHERE code_iso = 'CXR';
|
||||||
UPDATE llx_c_country SET numeric_code = '352' WHERE code_iso = "ISL";
|
UPDATE llx_c_country SET numeric_code = '352' WHERE code_iso = 'ISL';
|
||||||
UPDATE llx_c_country SET numeric_code = '136' WHERE code_iso = "CYM";
|
UPDATE llx_c_country SET numeric_code = '136' WHERE code_iso = 'CYM';
|
||||||
UPDATE llx_c_country SET numeric_code = '166' WHERE code_iso = "CCK";
|
UPDATE llx_c_country SET numeric_code = '166' WHERE code_iso = 'CCK';
|
||||||
UPDATE llx_c_country SET numeric_code = '184' WHERE code_iso = "COK";
|
UPDATE llx_c_country SET numeric_code = '184' WHERE code_iso = 'COK';
|
||||||
UPDATE llx_c_country SET numeric_code = '234' WHERE code_iso = "FRO";
|
UPDATE llx_c_country SET numeric_code = '234' WHERE code_iso = 'FRO';
|
||||||
UPDATE llx_c_country SET numeric_code = '239' WHERE code_iso = "SGS";
|
UPDATE llx_c_country SET numeric_code = '239' WHERE code_iso = 'SGS';
|
||||||
UPDATE llx_c_country SET numeric_code = '334' WHERE code_iso = "HMD";
|
UPDATE llx_c_country SET numeric_code = '334' WHERE code_iso = 'HMD';
|
||||||
UPDATE llx_c_country SET numeric_code = '238' WHERE code_iso = "FLK";
|
UPDATE llx_c_country SET numeric_code = '238' WHERE code_iso = 'FLK';
|
||||||
UPDATE llx_c_country SET numeric_code = '580' WHERE code_iso = "MNP";
|
UPDATE llx_c_country SET numeric_code = '580' WHERE code_iso = 'MNP';
|
||||||
UPDATE llx_c_country SET numeric_code = '584' WHERE code_iso = "MHL";
|
UPDATE llx_c_country SET numeric_code = '584' WHERE code_iso = 'MHL';
|
||||||
UPDATE llx_c_country SET numeric_code = '612' WHERE code_iso = "PCN";
|
UPDATE llx_c_country SET numeric_code = '612' WHERE code_iso = 'PCN';
|
||||||
UPDATE llx_c_country SET numeric_code = '090' WHERE code_iso = "SLB";
|
UPDATE llx_c_country SET numeric_code = '090' WHERE code_iso = 'SLB';
|
||||||
UPDATE llx_c_country SET numeric_code = '796' WHERE code_iso = "TCA";
|
UPDATE llx_c_country SET numeric_code = '796' WHERE code_iso = 'TCA';
|
||||||
UPDATE llx_c_country SET numeric_code = '581' WHERE code_iso = "UMI";
|
UPDATE llx_c_country SET numeric_code = '581' WHERE code_iso = 'UMI';
|
||||||
UPDATE llx_c_country SET numeric_code = '092' WHERE code_iso = "VGB";
|
UPDATE llx_c_country SET numeric_code = '092' WHERE code_iso = 'VGB';
|
||||||
UPDATE llx_c_country SET numeric_code = '850' WHERE code_iso = "VIR";
|
UPDATE llx_c_country SET numeric_code = '850' WHERE code_iso = 'VIR';
|
||||||
UPDATE llx_c_country SET numeric_code = '376' WHERE code_iso = "ISR";
|
UPDATE llx_c_country SET numeric_code = '376' WHERE code_iso = 'ISR';
|
||||||
UPDATE llx_c_country SET numeric_code = '380' WHERE code_iso = "ITA";
|
UPDATE llx_c_country SET numeric_code = '380' WHERE code_iso = 'ITA';
|
||||||
UPDATE llx_c_country SET numeric_code = '388' WHERE code_iso = "JAM";
|
UPDATE llx_c_country SET numeric_code = '388' WHERE code_iso = 'JAM';
|
||||||
UPDATE llx_c_country SET numeric_code = '392' WHERE code_iso = "JPN";
|
UPDATE llx_c_country SET numeric_code = '392' WHERE code_iso = 'JPN';
|
||||||
UPDATE llx_c_country SET numeric_code = '832' WHERE code_iso = "JEY";
|
UPDATE llx_c_country SET numeric_code = '832' WHERE code_iso = 'JEY';
|
||||||
UPDATE llx_c_country SET numeric_code = '400' WHERE code_iso = "JOR";
|
UPDATE llx_c_country SET numeric_code = '400' WHERE code_iso = 'JOR';
|
||||||
UPDATE llx_c_country SET numeric_code = '398' WHERE code_iso = "KAZ";
|
UPDATE llx_c_country SET numeric_code = '398' WHERE code_iso = 'KAZ';
|
||||||
UPDATE llx_c_country SET numeric_code = '404' WHERE code_iso = "KEN";
|
UPDATE llx_c_country SET numeric_code = '404' WHERE code_iso = 'KEN';
|
||||||
UPDATE llx_c_country SET numeric_code = '417' WHERE code_iso = "KGZ";
|
UPDATE llx_c_country SET numeric_code = '417' WHERE code_iso = 'KGZ';
|
||||||
UPDATE llx_c_country SET numeric_code = '296' WHERE code_iso = "KIR";
|
UPDATE llx_c_country SET numeric_code = '296' WHERE code_iso = 'KIR';
|
||||||
UPDATE llx_c_country SET numeric_code = '414' WHERE code_iso = "KWT";
|
UPDATE llx_c_country SET numeric_code = '414' WHERE code_iso = 'KWT';
|
||||||
UPDATE llx_c_country SET numeric_code = '418' WHERE code_iso = "LAO";
|
UPDATE llx_c_country SET numeric_code = '418' WHERE code_iso = 'LAO';
|
||||||
UPDATE llx_c_country SET numeric_code = '426' WHERE code_iso = "LSO";
|
UPDATE llx_c_country SET numeric_code = '426' WHERE code_iso = 'LSO';
|
||||||
UPDATE llx_c_country SET numeric_code = '428' WHERE code_iso = "LVA";
|
UPDATE llx_c_country SET numeric_code = '428' WHERE code_iso = 'LVA';
|
||||||
UPDATE llx_c_country SET numeric_code = '422' WHERE code_iso = "LBN";
|
UPDATE llx_c_country SET numeric_code = '422' WHERE code_iso = 'LBN';
|
||||||
UPDATE llx_c_country SET numeric_code = '430' WHERE code_iso = "LBR";
|
UPDATE llx_c_country SET numeric_code = '430' WHERE code_iso = 'LBR';
|
||||||
UPDATE llx_c_country SET numeric_code = '434' WHERE code_iso = "LBY";
|
UPDATE llx_c_country SET numeric_code = '434' WHERE code_iso = 'LBY';
|
||||||
UPDATE llx_c_country SET numeric_code = '438' WHERE code_iso = "LIE";
|
UPDATE llx_c_country SET numeric_code = '438' WHERE code_iso = 'LIE';
|
||||||
UPDATE llx_c_country SET numeric_code = '440' WHERE code_iso = "LTU";
|
UPDATE llx_c_country SET numeric_code = '440' WHERE code_iso = 'LTU';
|
||||||
UPDATE llx_c_country SET numeric_code = '442' WHERE code_iso = "LUX";
|
UPDATE llx_c_country SET numeric_code = '442' WHERE code_iso = 'LUX';
|
||||||
UPDATE llx_c_country SET numeric_code = '446' WHERE code_iso = "MAC";
|
UPDATE llx_c_country SET numeric_code = '446' WHERE code_iso = 'MAC';
|
||||||
UPDATE llx_c_country SET numeric_code = '807' WHERE code_iso = "MKD";
|
UPDATE llx_c_country SET numeric_code = '807' WHERE code_iso = 'MKD';
|
||||||
UPDATE llx_c_country SET numeric_code = '450' WHERE code_iso = "MDG";
|
UPDATE llx_c_country SET numeric_code = '450' WHERE code_iso = 'MDG';
|
||||||
UPDATE llx_c_country SET numeric_code = '458' WHERE code_iso = "MYS";
|
UPDATE llx_c_country SET numeric_code = '458' WHERE code_iso = 'MYS';
|
||||||
UPDATE llx_c_country SET numeric_code = '454' WHERE code_iso = "MWI";
|
UPDATE llx_c_country SET numeric_code = '454' WHERE code_iso = 'MWI';
|
||||||
UPDATE llx_c_country SET numeric_code = '462' WHERE code_iso = "MDV";
|
UPDATE llx_c_country SET numeric_code = '462' WHERE code_iso = 'MDV';
|
||||||
UPDATE llx_c_country SET numeric_code = '466' WHERE code_iso = "MLI";
|
UPDATE llx_c_country SET numeric_code = '466' WHERE code_iso = 'MLI';
|
||||||
UPDATE llx_c_country SET numeric_code = '470' WHERE code_iso = "MLT";
|
UPDATE llx_c_country SET numeric_code = '470' WHERE code_iso = 'MLT';
|
||||||
UPDATE llx_c_country SET numeric_code = '504' WHERE code_iso = "MAR";
|
UPDATE llx_c_country SET numeric_code = '504' WHERE code_iso = 'MAR';
|
||||||
UPDATE llx_c_country SET numeric_code = '474' WHERE code_iso = "MTQ";
|
UPDATE llx_c_country SET numeric_code = '474' WHERE code_iso = 'MTQ';
|
||||||
UPDATE llx_c_country SET numeric_code = '480' WHERE code_iso = "MUS";
|
UPDATE llx_c_country SET numeric_code = '480' WHERE code_iso = 'MUS';
|
||||||
UPDATE llx_c_country SET numeric_code = '478' WHERE code_iso = "MRT";
|
UPDATE llx_c_country SET numeric_code = '478' WHERE code_iso = 'MRT';
|
||||||
UPDATE llx_c_country SET numeric_code = '175' WHERE code_iso = "MYT";
|
UPDATE llx_c_country SET numeric_code = '175' WHERE code_iso = 'MYT';
|
||||||
UPDATE llx_c_country SET numeric_code = '484' WHERE code_iso = "MEX";
|
UPDATE llx_c_country SET numeric_code = '484' WHERE code_iso = 'MEX';
|
||||||
UPDATE llx_c_country SET numeric_code = '583' WHERE code_iso = "FSM";
|
UPDATE llx_c_country SET numeric_code = '583' WHERE code_iso = 'FSM';
|
||||||
UPDATE llx_c_country SET numeric_code = '498' WHERE code_iso = "MDA";
|
UPDATE llx_c_country SET numeric_code = '498' WHERE code_iso = 'MDA';
|
||||||
UPDATE llx_c_country SET numeric_code = '492' WHERE code_iso = "MCO";
|
UPDATE llx_c_country SET numeric_code = '492' WHERE code_iso = 'MCO';
|
||||||
UPDATE llx_c_country SET numeric_code = '496' WHERE code_iso = "MNG";
|
UPDATE llx_c_country SET numeric_code = '496' WHERE code_iso = 'MNG';
|
||||||
UPDATE llx_c_country SET numeric_code = '499' WHERE code_iso = "MNE";
|
UPDATE llx_c_country SET numeric_code = '499' WHERE code_iso = 'MNE';
|
||||||
UPDATE llx_c_country SET numeric_code = '500' WHERE code_iso = "MSR";
|
UPDATE llx_c_country SET numeric_code = '500' WHERE code_iso = 'MSR';
|
||||||
UPDATE llx_c_country SET numeric_code = '508' WHERE code_iso = "MOZ";
|
UPDATE llx_c_country SET numeric_code = '508' WHERE code_iso = 'MOZ';
|
||||||
UPDATE llx_c_country SET numeric_code = '104' WHERE code_iso = "MMR";
|
UPDATE llx_c_country SET numeric_code = '104' WHERE code_iso = 'MMR';
|
||||||
UPDATE llx_c_country SET numeric_code = '516' WHERE code_iso = "NAM";
|
UPDATE llx_c_country SET numeric_code = '516' WHERE code_iso = 'NAM';
|
||||||
UPDATE llx_c_country SET numeric_code = '520' WHERE code_iso = "NRU";
|
UPDATE llx_c_country SET numeric_code = '520' WHERE code_iso = 'NRU';
|
||||||
UPDATE llx_c_country SET numeric_code = '524' WHERE code_iso = "NPL";
|
UPDATE llx_c_country SET numeric_code = '524' WHERE code_iso = 'NPL';
|
||||||
UPDATE llx_c_country SET numeric_code = '558' WHERE code_iso = "NIC";
|
UPDATE llx_c_country SET numeric_code = '558' WHERE code_iso = 'NIC';
|
||||||
UPDATE llx_c_country SET numeric_code = '562' WHERE code_iso = "NER";
|
UPDATE llx_c_country SET numeric_code = '562' WHERE code_iso = 'NER';
|
||||||
UPDATE llx_c_country SET numeric_code = '566' WHERE code_iso = "NGA";
|
UPDATE llx_c_country SET numeric_code = '566' WHERE code_iso = 'NGA';
|
||||||
UPDATE llx_c_country SET numeric_code = '570' WHERE code_iso = "NIU";
|
UPDATE llx_c_country SET numeric_code = '570' WHERE code_iso = 'NIU';
|
||||||
UPDATE llx_c_country SET numeric_code = '574' WHERE code_iso = "NFK";
|
UPDATE llx_c_country SET numeric_code = '574' WHERE code_iso = 'NFK';
|
||||||
UPDATE llx_c_country SET numeric_code = '578' WHERE code_iso = "NOR";
|
UPDATE llx_c_country SET numeric_code = '578' WHERE code_iso = 'NOR';
|
||||||
UPDATE llx_c_country SET numeric_code = '540' WHERE code_iso = "NCL";
|
UPDATE llx_c_country SET numeric_code = '540' WHERE code_iso = 'NCL';
|
||||||
UPDATE llx_c_country SET numeric_code = '554' WHERE code_iso = "NZL";
|
UPDATE llx_c_country SET numeric_code = '554' WHERE code_iso = 'NZL';
|
||||||
UPDATE llx_c_country SET numeric_code = '512' WHERE code_iso = "OMN";
|
UPDATE llx_c_country SET numeric_code = '512' WHERE code_iso = 'OMN';
|
||||||
UPDATE llx_c_country SET numeric_code = '528' WHERE code_iso = "NLD";
|
UPDATE llx_c_country SET numeric_code = '528' WHERE code_iso = 'NLD';
|
||||||
UPDATE llx_c_country SET numeric_code = '586' WHERE code_iso = "PAK";
|
UPDATE llx_c_country SET numeric_code = '586' WHERE code_iso = 'PAK';
|
||||||
UPDATE llx_c_country SET numeric_code = '585' WHERE code_iso = "PLW";
|
UPDATE llx_c_country SET numeric_code = '585' WHERE code_iso = 'PLW';
|
||||||
UPDATE llx_c_country SET numeric_code = '275' WHERE code_iso = "PSE";
|
UPDATE llx_c_country SET numeric_code = '275' WHERE code_iso = 'PSE';
|
||||||
UPDATE llx_c_country SET numeric_code = '591' WHERE code_iso = "PAN";
|
UPDATE llx_c_country SET numeric_code = '591' WHERE code_iso = 'PAN';
|
||||||
UPDATE llx_c_country SET numeric_code = '598' WHERE code_iso = "PNG";
|
UPDATE llx_c_country SET numeric_code = '598' WHERE code_iso = 'PNG';
|
||||||
UPDATE llx_c_country SET numeric_code = '600' WHERE code_iso = "PRY";
|
UPDATE llx_c_country SET numeric_code = '600' WHERE code_iso = 'PRY';
|
||||||
UPDATE llx_c_country SET numeric_code = '604' WHERE code_iso = "PER";
|
UPDATE llx_c_country SET numeric_code = '604' WHERE code_iso = 'PER';
|
||||||
UPDATE llx_c_country SET numeric_code = '258' WHERE code_iso = "PYF";
|
UPDATE llx_c_country SET numeric_code = '258' WHERE code_iso = 'PYF';
|
||||||
UPDATE llx_c_country SET numeric_code = '616' WHERE code_iso = "POL";
|
UPDATE llx_c_country SET numeric_code = '616' WHERE code_iso = 'POL';
|
||||||
UPDATE llx_c_country SET numeric_code = '620' WHERE code_iso = "PRT";
|
UPDATE llx_c_country SET numeric_code = '620' WHERE code_iso = 'PRT';
|
||||||
UPDATE llx_c_country SET numeric_code = '630' WHERE code_iso = "PRI";
|
UPDATE llx_c_country SET numeric_code = '630' WHERE code_iso = 'PRI';
|
||||||
UPDATE llx_c_country SET numeric_code = '826' WHERE code_iso = "GBR";
|
UPDATE llx_c_country SET numeric_code = '826' WHERE code_iso = 'GBR';
|
||||||
UPDATE llx_c_country SET numeric_code = '732' WHERE code_iso = "ESH";
|
UPDATE llx_c_country SET numeric_code = '732' WHERE code_iso = 'ESH';
|
||||||
UPDATE llx_c_country SET numeric_code = '140' WHERE code_iso = "CAF";
|
UPDATE llx_c_country SET numeric_code = '140' WHERE code_iso = 'CAF';
|
||||||
UPDATE llx_c_country SET numeric_code = '203' WHERE code_iso = "CZE";
|
UPDATE llx_c_country SET numeric_code = '203' WHERE code_iso = 'CZE';
|
||||||
UPDATE llx_c_country SET numeric_code = '178' WHERE code_iso = "COG";
|
UPDATE llx_c_country SET numeric_code = '178' WHERE code_iso = 'COG';
|
||||||
UPDATE llx_c_country SET numeric_code = '180' WHERE code_iso = "COD";
|
UPDATE llx_c_country SET numeric_code = '180' WHERE code_iso = 'COD';
|
||||||
UPDATE llx_c_country SET numeric_code = '214' WHERE code_iso = "DOM";
|
UPDATE llx_c_country SET numeric_code = '214' WHERE code_iso = 'DOM';
|
||||||
UPDATE llx_c_country SET numeric_code = '638' WHERE code_iso = "REU";
|
UPDATE llx_c_country SET numeric_code = '638' WHERE code_iso = 'REU';
|
||||||
UPDATE llx_c_country SET numeric_code = '646' WHERE code_iso = "RWA";
|
UPDATE llx_c_country SET numeric_code = '646' WHERE code_iso = 'RWA';
|
||||||
UPDATE llx_c_country SET numeric_code = '642' WHERE code_iso = "ROU";
|
UPDATE llx_c_country SET numeric_code = '642' WHERE code_iso = 'ROU';
|
||||||
UPDATE llx_c_country SET numeric_code = '643' WHERE code_iso = "RUS";
|
UPDATE llx_c_country SET numeric_code = '643' WHERE code_iso = 'RUS';
|
||||||
UPDATE llx_c_country SET numeric_code = '882' WHERE code_iso = "WSM";
|
UPDATE llx_c_country SET numeric_code = '882' WHERE code_iso = 'WSM';
|
||||||
UPDATE llx_c_country SET numeric_code = '016' WHERE code_iso = "ASM";
|
UPDATE llx_c_country SET numeric_code = '016' WHERE code_iso = 'ASM';
|
||||||
UPDATE llx_c_country SET numeric_code = '652' WHERE code_iso = "BLM";
|
UPDATE llx_c_country SET numeric_code = '652' WHERE code_iso = 'BLM';
|
||||||
UPDATE llx_c_country SET numeric_code = '659' WHERE code_iso = "KNA";
|
UPDATE llx_c_country SET numeric_code = '659' WHERE code_iso = 'KNA';
|
||||||
UPDATE llx_c_country SET numeric_code = '674' WHERE code_iso = "SMR";
|
UPDATE llx_c_country SET numeric_code = '674' WHERE code_iso = 'SMR';
|
||||||
UPDATE llx_c_country SET numeric_code = '663' WHERE code_iso = "MAF";
|
UPDATE llx_c_country SET numeric_code = '663' WHERE code_iso = 'MAF';
|
||||||
UPDATE llx_c_country SET numeric_code = '666' WHERE code_iso = "SPM";
|
UPDATE llx_c_country SET numeric_code = '666' WHERE code_iso = 'SPM';
|
||||||
UPDATE llx_c_country SET numeric_code = '670' WHERE code_iso = "VCT";
|
UPDATE llx_c_country SET numeric_code = '670' WHERE code_iso = 'VCT';
|
||||||
UPDATE llx_c_country SET numeric_code = '654' WHERE code_iso = "SHN";
|
UPDATE llx_c_country SET numeric_code = '654' WHERE code_iso = 'SHN';
|
||||||
UPDATE llx_c_country SET numeric_code = '662' WHERE code_iso = "LCA";
|
UPDATE llx_c_country SET numeric_code = '662' WHERE code_iso = 'LCA';
|
||||||
UPDATE llx_c_country SET numeric_code = '678' WHERE code_iso = "STP";
|
UPDATE llx_c_country SET numeric_code = '678' WHERE code_iso = 'STP';
|
||||||
UPDATE llx_c_country SET numeric_code = '686' WHERE code_iso = "SEN";
|
UPDATE llx_c_country SET numeric_code = '686' WHERE code_iso = 'SEN';
|
||||||
UPDATE llx_c_country SET numeric_code = '688' WHERE code_iso = "SRB";
|
UPDATE llx_c_country SET numeric_code = '688' WHERE code_iso = 'SRB';
|
||||||
UPDATE llx_c_country SET numeric_code = '690' WHERE code_iso = "SYC";
|
UPDATE llx_c_country SET numeric_code = '690' WHERE code_iso = 'SYC';
|
||||||
UPDATE llx_c_country SET numeric_code = '694' WHERE code_iso = "SLE";
|
UPDATE llx_c_country SET numeric_code = '694' WHERE code_iso = 'SLE';
|
||||||
UPDATE llx_c_country SET numeric_code = '702' WHERE code_iso = "SGP";
|
UPDATE llx_c_country SET numeric_code = '702' WHERE code_iso = 'SGP';
|
||||||
UPDATE llx_c_country SET numeric_code = '534' WHERE code_iso = "SXM";
|
UPDATE llx_c_country SET numeric_code = '534' WHERE code_iso = 'SXM';
|
||||||
UPDATE llx_c_country SET numeric_code = '760' WHERE code_iso = "SYR";
|
UPDATE llx_c_country SET numeric_code = '760' WHERE code_iso = 'SYR';
|
||||||
UPDATE llx_c_country SET numeric_code = '706' WHERE code_iso = "SOM";
|
UPDATE llx_c_country SET numeric_code = '706' WHERE code_iso = 'SOM';
|
||||||
UPDATE llx_c_country SET numeric_code = '144' WHERE code_iso = "LKA";
|
UPDATE llx_c_country SET numeric_code = '144' WHERE code_iso = 'LKA';
|
||||||
UPDATE llx_c_country SET numeric_code = '748' WHERE code_iso = "SWZ";
|
UPDATE llx_c_country SET numeric_code = '748' WHERE code_iso = 'SWZ';
|
||||||
UPDATE llx_c_country SET numeric_code = '710' WHERE code_iso = "ZAF";
|
UPDATE llx_c_country SET numeric_code = '710' WHERE code_iso = 'ZAF';
|
||||||
UPDATE llx_c_country SET numeric_code = '729' WHERE code_iso = "SDN";
|
UPDATE llx_c_country SET numeric_code = '729' WHERE code_iso = 'SDN';
|
||||||
UPDATE llx_c_country SET numeric_code = '728' WHERE code_iso = "SSD";
|
UPDATE llx_c_country SET numeric_code = '728' WHERE code_iso = 'SSD';
|
||||||
UPDATE llx_c_country SET numeric_code = '752' WHERE code_iso = "SWE";
|
UPDATE llx_c_country SET numeric_code = '752' WHERE code_iso = 'SWE';
|
||||||
UPDATE llx_c_country SET numeric_code = '756' WHERE code_iso = "CHE";
|
UPDATE llx_c_country SET numeric_code = '756' WHERE code_iso = 'CHE';
|
||||||
UPDATE llx_c_country SET numeric_code = '740' WHERE code_iso = "SUR";
|
UPDATE llx_c_country SET numeric_code = '740' WHERE code_iso = 'SUR';
|
||||||
UPDATE llx_c_country SET numeric_code = '744' WHERE code_iso = "SJM";
|
UPDATE llx_c_country SET numeric_code = '744' WHERE code_iso = 'SJM';
|
||||||
UPDATE llx_c_country SET numeric_code = '764' WHERE code_iso = "THA";
|
UPDATE llx_c_country SET numeric_code = '764' WHERE code_iso = 'THA';
|
||||||
UPDATE llx_c_country SET numeric_code = '158' WHERE code_iso = "TWN";
|
UPDATE llx_c_country SET numeric_code = '158' WHERE code_iso = 'TWN';
|
||||||
UPDATE llx_c_country SET numeric_code = '834' WHERE code_iso = "TZA";
|
UPDATE llx_c_country SET numeric_code = '834' WHERE code_iso = 'TZA';
|
||||||
UPDATE llx_c_country SET numeric_code = '762' WHERE code_iso = "TJK";
|
UPDATE llx_c_country SET numeric_code = '762' WHERE code_iso = 'TJK';
|
||||||
UPDATE llx_c_country SET numeric_code = '086' WHERE code_iso = "IOT";
|
UPDATE llx_c_country SET numeric_code = '086' WHERE code_iso = 'IOT';
|
||||||
UPDATE llx_c_country SET numeric_code = '260' WHERE code_iso = "ATF";
|
UPDATE llx_c_country SET numeric_code = '260' WHERE code_iso = 'ATF';
|
||||||
UPDATE llx_c_country SET numeric_code = '626' WHERE code_iso = "TLS";
|
UPDATE llx_c_country SET numeric_code = '626' WHERE code_iso = 'TLS';
|
||||||
UPDATE llx_c_country SET numeric_code = '768' WHERE code_iso = "TGO";
|
UPDATE llx_c_country SET numeric_code = '768' WHERE code_iso = 'TGO';
|
||||||
UPDATE llx_c_country SET numeric_code = '772' WHERE code_iso = "TKL";
|
UPDATE llx_c_country SET numeric_code = '772' WHERE code_iso = 'TKL';
|
||||||
UPDATE llx_c_country SET numeric_code = '776' WHERE code_iso = "TON";
|
UPDATE llx_c_country SET numeric_code = '776' WHERE code_iso = 'TON';
|
||||||
UPDATE llx_c_country SET numeric_code = '780' WHERE code_iso = "TTO";
|
UPDATE llx_c_country SET numeric_code = '780' WHERE code_iso = 'TTO';
|
||||||
UPDATE llx_c_country SET numeric_code = '788' WHERE code_iso = "TUN";
|
UPDATE llx_c_country SET numeric_code = '788' WHERE code_iso = 'TUN';
|
||||||
UPDATE llx_c_country SET numeric_code = '795' WHERE code_iso = "TKM";
|
UPDATE llx_c_country SET numeric_code = '795' WHERE code_iso = 'TKM';
|
||||||
UPDATE llx_c_country SET numeric_code = '792' WHERE code_iso = "TUR";
|
UPDATE llx_c_country SET numeric_code = '792' WHERE code_iso = 'TUR';
|
||||||
UPDATE llx_c_country SET numeric_code = '798' WHERE code_iso = "TUV";
|
UPDATE llx_c_country SET numeric_code = '798' WHERE code_iso = 'TUV';
|
||||||
UPDATE llx_c_country SET numeric_code = '804' WHERE code_iso = "UKR";
|
UPDATE llx_c_country SET numeric_code = '804' WHERE code_iso = 'UKR';
|
||||||
UPDATE llx_c_country SET numeric_code = '800' WHERE code_iso = "UGA";
|
UPDATE llx_c_country SET numeric_code = '800' WHERE code_iso = 'UGA';
|
||||||
UPDATE llx_c_country SET numeric_code = '858' WHERE code_iso = "URY";
|
UPDATE llx_c_country SET numeric_code = '858' WHERE code_iso = 'URY';
|
||||||
UPDATE llx_c_country SET numeric_code = '860' WHERE code_iso = "UZB";
|
UPDATE llx_c_country SET numeric_code = '860' WHERE code_iso = 'UZB';
|
||||||
UPDATE llx_c_country SET numeric_code = '548' WHERE code_iso = "VUT";
|
UPDATE llx_c_country SET numeric_code = '548' WHERE code_iso = 'VUT';
|
||||||
UPDATE llx_c_country SET numeric_code = '336' WHERE code_iso = "VAT";
|
UPDATE llx_c_country SET numeric_code = '336' WHERE code_iso = 'VAT';
|
||||||
UPDATE llx_c_country SET numeric_code = '862' WHERE code_iso = "VEN";
|
UPDATE llx_c_country SET numeric_code = '862' WHERE code_iso = 'VEN';
|
||||||
UPDATE llx_c_country SET numeric_code = '704' WHERE code_iso = "VNM";
|
UPDATE llx_c_country SET numeric_code = '704' WHERE code_iso = 'VNM';
|
||||||
UPDATE llx_c_country SET numeric_code = '876' WHERE code_iso = "WLF";
|
UPDATE llx_c_country SET numeric_code = '876' WHERE code_iso = 'WLF';
|
||||||
UPDATE llx_c_country SET numeric_code = '887' WHERE code_iso = "YEM";
|
UPDATE llx_c_country SET numeric_code = '887' WHERE code_iso = 'YEM';
|
||||||
UPDATE llx_c_country SET numeric_code = '262' WHERE code_iso = "DJI";
|
UPDATE llx_c_country SET numeric_code = '262' WHERE code_iso = 'DJI';
|
||||||
UPDATE llx_c_country SET numeric_code = '894' WHERE code_iso = "ZMB";
|
UPDATE llx_c_country SET numeric_code = '894' WHERE code_iso = 'ZMB';
|
||||||
UPDATE llx_c_country SET numeric_code = '716' WHERE code_iso = "ZWE";
|
UPDATE llx_c_country SET numeric_code = '716' WHERE code_iso = 'ZWE';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -554,7 +554,7 @@ if (!empty($moreforfilter)) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
|
$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
|
||||||
$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
|
$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
|
||||||
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
|
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
|
||||||
|
|
||||||
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
||||||
@ -631,7 +631,7 @@ $totalarray['nbfield'] = 0;
|
|||||||
// --------------------------------------------------------------------
|
// --------------------------------------------------------------------
|
||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
||||||
print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
|
print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
|
||||||
$totalarray['nbfield']++;
|
$totalarray['nbfield']++;
|
||||||
}
|
}
|
||||||
foreach ($object->fields as $key => $val) {
|
foreach ($object->fields as $key => $val) {
|
||||||
@ -663,7 +663,7 @@ print $hookmanager->resPrint;
|
|||||||
}*/
|
}*/
|
||||||
// Action column
|
// Action column
|
||||||
if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
||||||
print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
|
print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
|
||||||
$totalarray['nbfield']++;
|
$totalarray['nbfield']++;
|
||||||
}
|
}
|
||||||
print '</tr>'."\n";
|
print '</tr>'."\n";
|
||||||
|
|||||||
@ -382,7 +382,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
|
|||||||
|
|
||||||
// Close ticket
|
// Close ticket
|
||||||
if ($object->dao->fk_statut >= Ticket::STATUS_NOT_READ && $object->dao->fk_statut < Ticket::STATUS_CLOSED) {
|
if ($object->dao->fk_statut >= Ticket::STATUS_NOT_READ && $object->dao->fk_statut < Ticket::STATUS_CLOSED) {
|
||||||
print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=close&track_id='.$object->dao->track_id.(!empty($entity) && isModEnabled('multicompany')?'&entity='.$entity:'').'">'.$langs->trans('CloseTicket').'</a></div>';
|
print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=close&token='.newToken().'&track_id='.$object->dao->track_id.(!empty($entity) && isModEnabled('multicompany')?'&entity='.$entity:'').'">'.$langs->trans('CloseTicket').'</a></div>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -451,8 +451,6 @@ print '</div>'."\n";
|
|||||||
print '<br>';
|
print '<br>';
|
||||||
|
|
||||||
|
|
||||||
//htmlPrintOnlinePaymentFooter($mysoc, $langs);
|
|
||||||
|
|
||||||
print '<div class="backgreypublicpayment">';
|
print '<div class="backgreypublicpayment">';
|
||||||
print '<div class="center">';
|
print '<div class="center">';
|
||||||
print '<a href="'.$urlforqrcode.'">';
|
print '<a href="'.$urlforqrcode.'">';
|
||||||
|
|||||||
@ -1248,10 +1248,12 @@ if ($action == 'create' || $action == 'presend') {
|
|||||||
}
|
}
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
// Group
|
// Group
|
||||||
print '<tr><td>'.$langs->trans("TicketCategory").'</td><td>';
|
$s = '';
|
||||||
if (!empty($object->category_code)) {
|
if (!empty($object->category_code)) {
|
||||||
print $langs->getLabelFromKey($db, 'TicketCategoryShort'.$object->category_code, 'c_ticket_category', 'code', 'label', $object->category_code);
|
$s = $langs->getLabelFromKey($db, 'TicketCategoryShort'.$object->category_code, 'c_ticket_category', 'code', 'label', $object->category_code);
|
||||||
}
|
}
|
||||||
|
print '<tr><td>'.$langs->trans("TicketCategory").'</td><td class="tdoverflowmax200" title="'.dol_escape_htmltag($s).'">';
|
||||||
|
print dol_escape_htmltag($s);
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
// Severity
|
// Severity
|
||||||
print '<tr><td>'.$langs->trans("TicketSeverity").'</td><td>';
|
print '<tr><td>'.$langs->trans("TicketSeverity").'</td><td>';
|
||||||
|
|||||||
@ -35,9 +35,11 @@
|
|||||||
* \ingroup core
|
* \ingroup core
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
require_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
|
||||||
require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
|
require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
|
||||||
require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
|
require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class to manage Dolibarr users
|
* Class to manage Dolibarr users
|
||||||
*/
|
*/
|
||||||
@ -509,7 +511,7 @@ class User extends CommonObject
|
|||||||
$this->pass_indatabase_crypted = $obj->pass_crypted;
|
$this->pass_indatabase_crypted = $obj->pass_crypted;
|
||||||
$this->pass = $obj->pass;
|
$this->pass = $obj->pass;
|
||||||
$this->pass_temp = $obj->pass_temp;
|
$this->pass_temp = $obj->pass_temp;
|
||||||
$this->api_key = $obj->api_key;
|
$this->api_key = dolDecrypt($obj->api_key);
|
||||||
|
|
||||||
$this->address = $obj->address;
|
$this->address = $obj->address;
|
||||||
$this->zip = $obj->zip;
|
$this->zip = $obj->zip;
|
||||||
@ -1963,7 +1965,7 @@ class User extends CommonObject
|
|||||||
$sql .= ", national_registration_number = '".$this->db->escape($this->national_registration_number)."'";
|
$sql .= ", national_registration_number = '".$this->db->escape($this->national_registration_number)."'";
|
||||||
$sql .= ", employee = ".(int) $this->employee;
|
$sql .= ", employee = ".(int) $this->employee;
|
||||||
$sql .= ", login = '".$this->db->escape($this->login)."'";
|
$sql .= ", login = '".$this->db->escape($this->login)."'";
|
||||||
$sql .= ", api_key = ".($this->api_key ? "'".$this->db->escape($this->api_key)."'" : "null");
|
$sql .= ", api_key = ".($this->api_key ? "'".$this->db->escape(dolEncrypt($this->api_key, '', '', 'dolibarr'))."'" : "null");
|
||||||
$sql .= ", gender = ".($this->gender != -1 ? "'".$this->db->escape($this->gender)."'" : "null"); // 'man' or 'woman'
|
$sql .= ", gender = ".($this->gender != -1 ? "'".$this->db->escape($this->gender)."'" : "null"); // 'man' or 'woman'
|
||||||
$sql .= ", birth=".(strval($this->birth) != '' ? "'".$this->db->idate($this->birth, 'tzserver')."'" : 'null');
|
$sql .= ", birth=".(strval($this->birth) != '' ? "'".$this->db->idate($this->birth, 'tzserver')."'" : 'null');
|
||||||
if (!empty($user->admin)) {
|
if (!empty($user->admin)) {
|
||||||
|
|||||||
@ -1152,10 +1152,13 @@ while ($i < $imaxinloop) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!empty($arrayfields['u.api_key']['checked'])) {
|
if (!empty($arrayfields['u.api_key']['checked'])) {
|
||||||
print '<td class="tdoverflowmax125" title="'.dol_escape_htmltag($obj->api_key).'">';
|
$api_key = dolDecrypt($obj->api_key);
|
||||||
if ($obj->api_key) {
|
print '<td class="tdoverflowmax125" title="'.dol_escape_htmltag($api_key).'">';
|
||||||
|
if ($api_key) {
|
||||||
if ($canreadsecretapi) {
|
if ($canreadsecretapi) {
|
||||||
print dol_escape_htmltag($obj->api_key);
|
print '<span class="opacitymedium">';
|
||||||
|
print showValueWithClipboardCPButton($object->api_key, 1, dol_trunc($api_key, 3)); // TODO Add an option to also reveal the hash, not only copy paste
|
||||||
|
print '</span>';
|
||||||
} else {
|
} else {
|
||||||
print '<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
|
print '<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
|
||||||
}
|
}
|
||||||
|
|||||||
@ -180,12 +180,12 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
|
|||||||
// An attempt for SQL injection
|
// An attempt for SQL injection
|
||||||
$filter='if(now()=sysdate()%2Csleep(6)%2C0)';
|
$filter='if(now()=sysdate()%2Csleep(6)%2C0)';
|
||||||
$sql = forgeSQLFromUniversalSearchCriteria($filter);
|
$sql = forgeSQLFromUniversalSearchCriteria($filter);
|
||||||
$this->assertEquals($sql, '1 = 3');
|
$this->assertEquals($sql, 'Filter syntax error');
|
||||||
|
|
||||||
// A real search string
|
// A real search string
|
||||||
$filter='(((statut:=:1) or (entity:in:__AAA__)) and (abc:<:2.0) and (abc:!=:1.23))';
|
$filter='(((statut:=:1) or (entity:in:__AAA__)) and (abc:<:2.0) and (abc:!=:1.23))';
|
||||||
$sql = forgeSQLFromUniversalSearchCriteria($filter);
|
$sql = forgeSQLFromUniversalSearchCriteria($filter);
|
||||||
$this->assertEquals($sql, ' AND (((statut = 1 or entity IN (__AAA__)) and abc < 2 and abc = 1.23))');
|
$this->assertEquals($sql, ' AND (((statut = 1 or entity IN (__AAA__)) and abc < 2 and abc <> 1.23))');
|
||||||
|
|
||||||
$filter="(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.date_creation:<:'2016-01-01 12:30:00') or (t.nature:is:NULL)";
|
$filter="(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.date_creation:<:'2016-01-01 12:30:00') or (t.nature:is:NULL)";
|
||||||
$sql = forgeSQLFromUniversalSearchCriteria($filter);
|
$sql = forgeSQLFromUniversalSearchCriteria($filter);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user