@@ -314,7 +314,9 @@ |
||
314 | 314 | } |
315 | 315 | // Now loop on each link of record in bank (code similar to bankentries_list.php) |
316 | 316 | foreach ($links as $key => $val) { |
317 | - if ($links[$key]['type'] == 'user' && !$is_sc) continue; |
|
317 | + if ($links[$key]['type'] == 'user' && !$is_sc) { |
|
318 | + continue; |
|
319 | + } |
|
318 | 320 | if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation', 'member', 'payment_loan', 'payment_salary', 'payment_various'))) { |
319 | 321 | // So we excluded 'company' and 'user' here. We want only payment lines |
320 | 322 |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu4 ON bu4.fk_bank = b.rowid AND bu4.type='payment_supplier'"; |
140 | 140 | $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as soc on bu1.url_id=soc.rowid"; |
141 | 141 | if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) { |
142 | - $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = soc.rowid AND spe.entity = " . ((int) $conf->entity); |
|
142 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = soc.rowid AND spe.entity = ".((int) $conf->entity); |
|
143 | 143 | } |
144 | 144 | $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on bu2.url_id=u.rowid"; |
145 | 145 | $sql .= " WHERE ba.fk_accountancy_journal=".((int) $id_journal); |
@@ -620,7 +620,7 @@ discard block |
||
620 | 620 | // Line into bank account |
621 | 621 | foreach ($tabbq[$key] as $k => $mt) { |
622 | 622 | if ($mt) { |
623 | - $accountingaccount->fetch(null, $k, true); // $k is accounting bank account. TODO We should use a cache here to avoid this fetch |
|
623 | + $accountingaccount->fetch(null, $k, true); // $k is accounting bank account. TODO We should use a cache here to avoid this fetch |
|
624 | 624 | $account_label = $accountingaccount->label; |
625 | 625 | |
626 | 626 | $reflabel = ''; |
@@ -736,43 +736,43 @@ discard block |
||
736 | 736 | } elseif (in_array($tabtype[$key], array('sc', 'payment_sc'))) { // If payment is payment of social contribution |
737 | 737 | $bookkeeping->subledger_account = ''; |
738 | 738 | $bookkeeping->subledger_label = ''; |
739 | - $accountingaccount->fetch(null, $k, true); // TODO Use a cache |
|
739 | + $accountingaccount->fetch(null, $k, true); // TODO Use a cache |
|
740 | 740 | $bookkeeping->numero_compte = $k; |
741 | 741 | $bookkeeping->label_compte = $accountingaccount->label; |
742 | 742 | } elseif ($tabtype[$key] == 'payment_vat') { |
743 | 743 | $bookkeeping->subledger_account = ''; |
744 | 744 | $bookkeeping->subledger_label = ''; |
745 | - $accountingaccount->fetch(null, $k, true); // TODO Use a cache |
|
745 | + $accountingaccount->fetch(null, $k, true); // TODO Use a cache |
|
746 | 746 | $bookkeeping->numero_compte = $k; |
747 | 747 | $bookkeeping->label_compte = $accountingaccount->label; |
748 | 748 | } elseif ($tabtype[$key] == 'payment_donation') { |
749 | 749 | $bookkeeping->subledger_account = ''; |
750 | 750 | $bookkeeping->subledger_label = ''; |
751 | - $accountingaccount->fetch(null, $k, true); // TODO Use a cache |
|
751 | + $accountingaccount->fetch(null, $k, true); // TODO Use a cache |
|
752 | 752 | $bookkeeping->numero_compte = $k; |
753 | 753 | $bookkeeping->label_compte = $accountingaccount->label; |
754 | 754 | } elseif ($tabtype[$key] == 'member') { |
755 | 755 | $bookkeeping->subledger_account = ''; |
756 | 756 | $bookkeeping->subledger_label = ''; |
757 | - $accountingaccount->fetch(null, $k, true); // TODO Use a cache |
|
757 | + $accountingaccount->fetch(null, $k, true); // TODO Use a cache |
|
758 | 758 | $bookkeeping->numero_compte = $k; |
759 | 759 | $bookkeeping->label_compte = $accountingaccount->label; |
760 | 760 | } elseif ($tabtype[$key] == 'payment_loan') { |
761 | 761 | $bookkeeping->subledger_account = ''; |
762 | 762 | $bookkeeping->subledger_label = ''; |
763 | - $accountingaccount->fetch(null, $k, true); // TODO Use a cache |
|
763 | + $accountingaccount->fetch(null, $k, true); // TODO Use a cache |
|
764 | 764 | $bookkeeping->numero_compte = $k; |
765 | 765 | $bookkeeping->label_compte = $accountingaccount->label; |
766 | 766 | } elseif ($tabtype[$key] == 'payment_various') { |
767 | 767 | $bookkeeping->subledger_account = $k; |
768 | 768 | $bookkeeping->subledger_label = $tabcompany[$key]['name']; |
769 | - $accountingaccount->fetch(null, $tabpay[$key]["account_various"], true); // TODO Use a cache |
|
769 | + $accountingaccount->fetch(null, $tabpay[$key]["account_various"], true); // TODO Use a cache |
|
770 | 770 | $bookkeeping->numero_compte = $tabpay[$key]["account_various"]; |
771 | 771 | $bookkeeping->label_compte = $accountingaccount->label; |
772 | 772 | } elseif ($tabtype[$key] == 'banktransfert') { |
773 | 773 | $bookkeeping->subledger_account = ''; |
774 | 774 | $bookkeeping->subledger_label = ''; |
775 | - $accountingaccount->fetch(null, $k, true); // TODO Use a cache |
|
775 | + $accountingaccount->fetch(null, $k, true); // TODO Use a cache |
|
776 | 776 | $bookkeeping->numero_compte = $k; |
777 | 777 | $bookkeeping->label_compte = $accountingaccount->label; |
778 | 778 | } else { |
@@ -803,7 +803,7 @@ discard block |
||
803 | 803 | } |
804 | 804 | } else { |
805 | 805 | if ($lettering && getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && getDolGlobalInt('ACCOUNTING_ENABLE_AUTOLETTERING')) { |
806 | - require_once DOL_DOCUMENT_ROOT . '/accountancy/class/lettering.class.php'; |
|
806 | + require_once DOL_DOCUMENT_ROOT.'/accountancy/class/lettering.class.php'; |
|
807 | 807 | $lettering_static = new Lettering($db); |
808 | 808 | $nb_lettering = $lettering_static->bookkeepingLetteringAll(array($bookkeeping->id)); |
809 | 809 | } |
@@ -1199,7 +1199,7 @@ discard block |
||
1199 | 1199 | |
1200 | 1200 | // Label operation |
1201 | 1201 | print '<td>'; |
1202 | - print $reflabel; // This is already html escaped content |
|
1202 | + print $reflabel; // This is already html escaped content |
|
1203 | 1203 | print "</td>"; |
1204 | 1204 | |
1205 | 1205 | print '<td class="center">'.$val["type_payment"]."</td>"; |
@@ -1292,7 +1292,7 @@ discard block |
||
1292 | 1292 | } |
1293 | 1293 | } |
1294 | 1294 | print '<td class="maxwidth300" title="'.dol_escape_htmltag(dol_string_nohtmltag($accounttoshow)).'">'; |
1295 | - print $accounttoshow; // This is a HTML string |
|
1295 | + print $accounttoshow; // This is a HTML string |
|
1296 | 1296 | print "</td>"; |
1297 | 1297 | |
1298 | 1298 | // Subledger account |
@@ -1321,7 +1321,7 @@ discard block |
||
1321 | 1321 | } |
1322 | 1322 | } |
1323 | 1323 | print '<td class="maxwidth300">'; |
1324 | - print $accounttoshowsubledger; // This is a html string |
|
1324 | + print $accounttoshowsubledger; // This is a html string |
|
1325 | 1325 | print "</td>"; |
1326 | 1326 | |
1327 | 1327 | print "<td>".$reflabel."</td>"; |
@@ -113,7 +113,7 @@ |
||
113 | 113 | $maxfilesizearray = getMaxFileSizeArray(); |
114 | 114 | $maxmin = $maxfilesizearray['maxmin']; |
115 | 115 | if ($maxmin > 0) { |
116 | - $s .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
116 | + $s .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
117 | 117 | } |
118 | 118 | $s .= '<input type="file" name="username" class="flat">'; |
119 | 119 | return $s; |
@@ -101,7 +101,7 @@ |
||
101 | 101 | /** |
102 | 102 | * @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor. |
103 | 103 | */ |
104 | - public $fields=array( |
|
104 | + public $fields = array( |
|
105 | 105 | 'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"), |
106 | 106 | 'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'index'=>1, 'searchall'=>1, 'validate'=>'1', 'comment'=>"Reference of object"), |
107 | 107 | 'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1',), |
@@ -58,7 +58,7 @@ |
||
58 | 58 | $search_date_endday = GETPOST('search_date_endday', 'int'); |
59 | 59 | $search_date_endmonth = GETPOST('search_date_endmonth', 'int'); |
60 | 60 | $search_date_endyear = GETPOST('search_date_endyear', 'int'); |
61 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
61 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
62 | 62 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
63 | 63 | $search_date_limit_startday = GETPOST('search_date_limit_startday', 'int'); |
64 | 64 | $search_date_limit_startmonth = GETPOST('search_date_limit_startmonth', 'int'); |
@@ -96,7 +96,7 @@ |
||
96 | 96 | $vals = array(); |
97 | 97 | $bool = false; |
98 | 98 | // -1=Canceled, 0=Draft, 1=Validated, 2=Accepted/On process, 3=Closed (Sent/Received, billed or not) |
99 | - if ($num>0) { |
|
99 | + if ($num > 0) { |
|
100 | 100 | while ($row = $db->fetch_row($resql)) { |
101 | 101 | if (!isset($vals[$row[1]])) { |
102 | 102 | $vals[$row[1]] = 0; |
@@ -115,7 +115,9 @@ |
||
115 | 115 | print '<table class="noborder nohover centpercent">'; |
116 | 116 | print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Interventions").'</th></tr>'."\n"; |
117 | 117 | $listofstatus = array(Fichinter::STATUS_DRAFT, Fichinter::STATUS_VALIDATED); |
118 | - if (getDolGlobalString('FICHINTER_CLASSIFY_BILLED')) $listofstatus[] = Fichinter::STATUS_BILLED; |
|
118 | + if (getDolGlobalString('FICHINTER_CLASSIFY_BILLED')) { |
|
119 | + $listofstatus[] = Fichinter::STATUS_BILLED; |
|
120 | + } |
|
119 | 121 | |
120 | 122 | foreach ($listofstatus as $status) { |
121 | 123 | $dataseries[] = array($fichinterstatic->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0)); |
@@ -552,9 +552,9 @@ |
||
552 | 552 | while ($i < $nbofloop) { |
553 | 553 | $obj = $db->fetch_object($resql); |
554 | 554 | |
555 | - $fichinterstatic->id=$obj->rowid; |
|
556 | - $fichinterstatic->ref=$obj->ref; |
|
557 | - $fichinterstatic->statut=$obj->fk_statut; |
|
555 | + $fichinterstatic->id = $obj->rowid; |
|
556 | + $fichinterstatic->ref = $obj->ref; |
|
557 | + $fichinterstatic->statut = $obj->fk_statut; |
|
558 | 558 | |
559 | 559 | $companystatic->id = $obj->socid; |
560 | 560 | $companystatic->name = $obj->name; |
@@ -46,26 +46,26 @@ |
||
46 | 46 | */ |
47 | 47 | |
48 | 48 | $parameters = array(); |
49 | -$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks |
|
49 | +$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks |
|
50 | 50 | if ($reshook < 0) { |
51 | 51 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
52 | 52 | } |
53 | 53 | |
54 | 54 | if (($action == 'update' && !GETPOST("cancel", 'alpha')) |
55 | 55 | || ($action == 'updateedit')) { |
56 | - dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NAME", GETPOST("nom", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
57 | - dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ADDRESS", GETPOST("address", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
58 | - dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_TOWN", GETPOST("town", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
59 | - dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ZIP", GETPOST("zipcode", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
60 | - dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_STATE", GETPOST("state_id", 'int'), 'chaine', 0, '', $conf->entity); |
|
61 | - dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_REGION", GETPOST("region_code", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
62 | - dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_COUNTRY", GETPOST('country_id', 'int'), 'chaine', 0, '', $conf->entity); |
|
63 | - dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_PHONE", GETPOST("tel", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
64 | - dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_FAX", GETPOST("fax", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
65 | - dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_MAIL", GETPOST("mail", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
66 | - dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_WEB", GETPOST("web", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
67 | - dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_CODE", GETPOST("code", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
68 | - dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NOTE", GETPOST("note", 'restricthtml'), 'chaine', 0, '', $conf->entity); |
|
56 | + dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NAME", GETPOST("nom", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
57 | + dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ADDRESS", GETPOST("address", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
58 | + dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_TOWN", GETPOST("town", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
59 | + dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ZIP", GETPOST("zipcode", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
60 | + dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_STATE", GETPOST("state_id", 'int'), 'chaine', 0, '', $conf->entity); |
|
61 | + dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_REGION", GETPOST("region_code", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
62 | + dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_COUNTRY", GETPOST('country_id', 'int'), 'chaine', 0, '', $conf->entity); |
|
63 | + dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_PHONE", GETPOST("tel", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
64 | + dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_FAX", GETPOST("fax", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
65 | + dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_MAIL", GETPOST("mail", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
66 | + dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_WEB", GETPOST("web", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
67 | + dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_CODE", GETPOST("code", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
68 | + dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NOTE", GETPOST("note", 'restricthtml'), 'chaine', 0, '', $conf->entity); |
|
69 | 69 | |
70 | 70 | if ($action != 'updateedit' && !$error) { |
71 | 71 | setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); |
@@ -208,12 +208,12 @@ |
||
208 | 208 | |
209 | 209 | $numFinal = get_next_value($db, $mask, 'societe', $field, $where, '', $now); |
210 | 210 | //Begin barcode with key: for barcode with key (EAN13...) calculate and substitute the last character (* or ?) used in the mask by the key |
211 | - if ((substr($numFinal, -1)=='*') or (substr($numFinal, -1)=='?')) { // if last mask character is * or ? a joker, probably we have to calculate a key as last character (EAN13...) |
|
211 | + if ((substr($numFinal, -1) == '*') or (substr($numFinal, -1) == '?')) { // if last mask character is * or ? a joker, probably we have to calculate a key as last character (EAN13...) |
|
212 | 212 | $literaltype = ''; |
213 | - $literaltype = $this->literalBarcodeType($db, $type);//get literal_Barcode_Type |
|
213 | + $literaltype = $this->literalBarcodeType($db, $type); //get literal_Barcode_Type |
|
214 | 214 | switch ($literaltype) { |
215 | 215 | case 'EAN13': //EAN13 rowid = 2 |
216 | - if (strlen($numFinal)==13) {// be sure that the mask length is correct for EAN13 |
|
216 | + if (strlen($numFinal) == 13) {// be sure that the mask length is correct for EAN13 |
|
217 | 217 | $ean = substr($numFinal, 0, 12); //take first 12 digits |
218 | 218 | $eansum = barcode_gen_ean_sum($ean); |
219 | 219 | $ean .= $eansum; //substitute the las character by the key |
@@ -335,7 +335,9 @@ |
||
335 | 335 | if ($AutoSendMail && !$error) { |
336 | 336 | // send a mail to the user |
337 | 337 | $returnSendMail = sendMail($result, $cancreate, $now, $autoValidation); |
338 | - if (!empty($returnSendMail->msg)) setEventMessage($returnSendMail->msg, $returnSendMail->style); |
|
338 | + if (!empty($returnSendMail->msg)) { |
|
339 | + setEventMessage($returnSendMail->msg, $returnSendMail->style); |
|
340 | + } |
|
339 | 341 | } |
340 | 342 | } |
341 | 343 | } |
@@ -46,14 +46,14 @@ discard block |
||
46 | 46 | $action = GETPOST('action', 'aZ09'); |
47 | 47 | $cancel = GETPOST('cancel', 'alpha'); |
48 | 48 | $confirm = GETPOST('confirm', 'alpha'); |
49 | -$id = GETPOST('id', 'int'); |
|
50 | -$ref = GETPOST('ref', 'alpha'); |
|
49 | +$id = GETPOST('id', 'int'); |
|
50 | +$ref = GETPOST('ref', 'alpha'); |
|
51 | 51 | $fuserid = (GETPOST('fuserid', 'int') ?GETPOST('fuserid', 'int') : $user->id); |
52 | -$users = (GETPOST('users', 'array') ?GETPOST('users', 'array') : array($user->id)); |
|
52 | +$users = (GETPOST('users', 'array') ?GETPOST('users', 'array') : array($user->id)); |
|
53 | 53 | $groups = GETPOST('groups', 'array'); |
54 | 54 | $socid = GETPOST('socid', 'int'); |
55 | -$autoValidation = GETPOST('autoValidation', 'int'); |
|
56 | -$AutoSendMail = GETPOST('AutoSendMail', 'int'); |
|
55 | +$autoValidation = GETPOST('autoValidation', 'int'); |
|
56 | +$AutoSendMail = GETPOST('AutoSendMail', 'int'); |
|
57 | 57 | // Load translation files required by the page |
58 | 58 | $langs->loadLangs(array("other", "holiday", "mails", "trips")); |
59 | 59 | |
@@ -163,8 +163,8 @@ discard block |
||
163 | 163 | } |
164 | 164 | |
165 | 165 | if (!$error) { |
166 | - $users = GETPOST('users', 'array'); |
|
167 | - $groups = GETPOST('groups', 'array'); |
|
166 | + $users = GETPOST('users', 'array'); |
|
167 | + $groups = GETPOST('groups', 'array'); |
|
168 | 168 | |
169 | 169 | $date_debut = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year')); |
170 | 170 | $date_fin = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year')); |
@@ -264,9 +264,9 @@ discard block |
||
264 | 264 | // usergroup select |
265 | 265 | // better perf on single sql |
266 | 266 | /** GROUPS */ |
267 | - $sql = ' SELECT DISTINCT u.rowid,u.lastname,u.firstname from ' . MAIN_DB_PREFIX . 'user as u'; |
|
268 | - $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'usergroup_user as ug on ug.fk_user = u.rowid '; |
|
269 | - $sql .= ' WHERE fk_usergroup in (' .$db->sanitize(implode(',', $groups)) . ')'; |
|
267 | + $sql = ' SELECT DISTINCT u.rowid,u.lastname,u.firstname from '.MAIN_DB_PREFIX.'user as u'; |
|
268 | + $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'usergroup_user as ug on ug.fk_user = u.rowid '; |
|
269 | + $sql .= ' WHERE fk_usergroup in ('.$db->sanitize(implode(',', $groups)).')'; |
|
270 | 270 | $resql = $db->query($sql); |
271 | 271 | |
272 | 272 | if ($resql) { |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | $result = $userError->fetch($u); |
291 | 291 | |
292 | 292 | if ($result) { |
293 | - setEventMessages($langs->trans("UseralreadyCPexist", $userError->firstname . ' '. $userError->lastname), null, 'errors'); |
|
293 | + setEventMessages($langs->trans("UseralreadyCPexist", $userError->firstname.' '.$userError->lastname), null, 'errors'); |
|
294 | 294 | } else { |
295 | 295 | setEventMessages($langs->trans("ErrorUserFetch", $u), null, 'errors'); |
296 | 296 | } |
@@ -327,7 +327,7 @@ discard block |
||
327 | 327 | $htemp->statut = Holiday::STATUS_VALIDATED; |
328 | 328 | $resultValidated = $htemp->update($approverid); |
329 | 329 | |
330 | - if ($resultValidated < 0 ) { |
|
330 | + if ($resultValidated < 0) { |
|
331 | 331 | setEventMessages($object->error, $object->errors, 'errors'); |
332 | 332 | $error++; |
333 | 333 | } |
@@ -495,7 +495,7 @@ discard block |
||
495 | 495 | print '<td>'; |
496 | 496 | print img_picto($langs->trans("groups"), 'group', 'class="pictofixedwidth"'); |
497 | 497 | |
498 | - $sql =' SELECT rowid, nom from '.MAIN_DB_PREFIX.'usergroup WHERE entity IN ('.getEntity('usergroup').')'; |
|
498 | + $sql = ' SELECT rowid, nom from '.MAIN_DB_PREFIX.'usergroup WHERE entity IN ('.getEntity('usergroup').')'; |
|
499 | 499 | $resql = $db->query($sql); |
500 | 500 | $Tgroup = array(); |
501 | 501 | while ($obj = $db->fetch_object($resql)) { |
@@ -524,7 +524,7 @@ discard block |
||
524 | 524 | } |
525 | 525 | } |
526 | 526 | |
527 | - print img_picto('', 'users') . $form->multiselectarray('users', $userlist, GETPOST('users', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0); |
|
527 | + print img_picto('', 'users').$form->multiselectarray('users', $userlist, GETPOST('users', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0); |
|
528 | 528 | print '</td>'; |
529 | 529 | |
530 | 530 | // Type |
@@ -700,7 +700,7 @@ discard block |
||
700 | 700 | $objStd->error++; |
701 | 701 | $objStd->msg = $langs->trans('ErroremailTo'); |
702 | 702 | $objStd->status = 'error'; |
703 | - $objStd->style="warnings"; |
|
703 | + $objStd->style = "warnings"; |
|
704 | 704 | return $objStd; |
705 | 705 | } |
706 | 706 | |
@@ -726,7 +726,7 @@ discard block |
||
726 | 726 | |
727 | 727 | // option to warn the validator in case of too short delay |
728 | 728 | if (!getDolGlobalString('HOLIDAY_HIDE_APPROVER_ABOUT_TOO_LOW_DELAY')) { |
729 | - $delayForRequest = 0; // TODO Set delay depending of holiday leave type |
|
729 | + $delayForRequest = 0; // TODO Set delay depending of holiday leave type |
|
730 | 730 | if ($delayForRequest) { |
731 | 731 | $nowplusdelay = dol_time_plus_duree($now, $delayForRequest, 'd'); |
732 | 732 | |
@@ -762,7 +762,7 @@ discard block |
||
762 | 762 | $endhalfdaykey = "Afternoon"; |
763 | 763 | } |
764 | 764 | |
765 | - $link = dol_buildpath("/holiday/card.php", 3) . '?id='.$object->id; |
|
765 | + $link = dol_buildpath("/holiday/card.php", 3).'?id='.$object->id; |
|
766 | 766 | |
767 | 767 | $message .= "<ul>"; |
768 | 768 | $message .= "<li>".$langs->transnoentitiesnoconv("Name")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."</li>\n"; |
@@ -781,7 +781,7 @@ discard block |
||
781 | 781 | if (!$result) { |
782 | 782 | $objStd->error++; |
783 | 783 | $objStd->msg = $langs->trans('ErroreSendmail'); |
784 | - $objStd->style="warnings"; |
|
784 | + $objStd->style = "warnings"; |
|
785 | 785 | $objStd->status = 'error'; |
786 | 786 | } else { |
787 | 787 | $objStd->msg = $langs->trans('mailSended'); |
@@ -792,7 +792,7 @@ discard block |
||
792 | 792 | $objStd->error++; |
793 | 793 | $objStd->msg = $langs->trans('ErroreVerif'); |
794 | 794 | $objStd->status = 'error'; |
795 | - $objStd->style="errors"; |
|
795 | + $objStd->style = "errors"; |
|
796 | 796 | return $objStd; |
797 | 797 | } |
798 | 798 | } |
@@ -800,7 +800,7 @@ discard block |
||
800 | 800 | $objStd->error++; |
801 | 801 | $objStd->msg = $langs->trans('ErrorloadUserOnSendingMail'); |
802 | 802 | $objStd->status = 'error'; |
803 | - $objStd->style="warnings"; |
|
803 | + $objStd->style = "warnings"; |
|
804 | 804 | return $objStd; |
805 | 805 | } |
806 | 806 |