@@ -94,7 +94,7 @@ |
||
94 | 94 | $sql .= " AND u.statut = " . User::STATUS_ENABLED; |
95 | 95 | $sql .= dolSqlDateFilter('u.dateemployment', 0, $tmparray['mon'], 0); |
96 | 96 | $sql .= " AND u.dateemployment < '" . $this->db->idate(dol_get_first_day($tmparray['year'])) . "'"; |
97 | - $sql .= " ORDER BY daya ASC"; // We want to have date of the month sorted by the day without taking into consideration the year |
|
97 | + $sql .= " ORDER BY daya ASC"; // We want to have date of the month sorted by the day without taking into consideration the year |
|
98 | 98 | $sql .= $this->db->plimit($max, 0); |
99 | 99 | |
100 | 100 | dol_syslog(get_class($this) . "::loadBox", LOG_DEBUG); |
@@ -127,7 +127,7 @@ |
||
127 | 127 | if (empty($endyear)) { |
128 | 128 | $endyear = $nowarray['year']; |
129 | 129 | } |
130 | - $startyear = $endyear - getDolGlobalInt('MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH', 3) + 1; // Default is 3 years |
|
130 | + $startyear = $endyear - getDolGlobalInt('MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH', 3) + 1; // Default is 3 years |
|
131 | 131 | |
132 | 132 | $mode = 'customer'; |
133 | 133 | $WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '256' : '320'; |
@@ -141,7 +141,7 @@ |
||
141 | 141 | $userid = 0; // No filter on user creation |
142 | 142 | |
143 | 143 | $WIDTH = ($nbofgraph >= 2 || !empty($conf->dol_optimize_smallscreen)) ? '300' : '320'; |
144 | - $HEIGHT = '150'; // Height require to have 5+1 entries into legend visible. |
|
144 | + $HEIGHT = '150'; // Height require to have 5+1 entries into legend visible. |
|
145 | 145 | |
146 | 146 | if (isModEnabled("propal") && $user->hasRight('propal', 'lire')) { |
147 | 147 | // Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...) |
@@ -322,7 +322,7 @@ |
||
322 | 322 | |
323 | 323 | // Add font-awesome (if $val2['level'] == 0, we are on level2 |
324 | 324 | if ($val2['level'] == 0 && !empty($val2['prefix'])) { |
325 | - print $val2['prefix']; // the picto must have class="pictofixedwidth paddingright" |
|
325 | + print $val2['prefix']; // the picto must have class="pictofixedwidth paddingright" |
|
326 | 326 | } |
327 | 327 | |
328 | 328 | print $val2['titre']; |
@@ -176,7 +176,7 @@ |
||
176 | 176 | // $this->menu->liste is top menu |
177 | 177 | //var_dump($this->menu->liste);exit; |
178 | 178 | $lastlevel = array(); |
179 | - $showmenu = true; // Is current menu shown - define here to keep static code checker happy |
|
179 | + $showmenu = true; // Is current menu shown - define here to keep static code checker happy |
|
180 | 180 | print '<!-- Generate menu list from menu handler ' . $this->name . ' -->' . "\n"; |
181 | 181 | foreach ($this->menu->liste as $key => $val) { // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu' |
182 | 182 | print '<ul class="ulmenu" data-inset="true">'; |
@@ -1766,7 +1766,7 @@ discard block |
||
1766 | 1766 | $nature = "expensereports"; |
1767 | 1767 | } |
1768 | 1768 | if ($objp->nature == 1 && isModEnabled('asset')) { |
1769 | - $nature = "various"; // Warning: The page /accountancy/journal/variousjournal.php is bugged. It read tables that does not exists. |
|
1769 | + $nature = "various"; // Warning: The page /accountancy/journal/variousjournal.php is bugged. It read tables that does not exists. |
|
1770 | 1770 | } |
1771 | 1771 | if ($objp->nature == 8) { |
1772 | 1772 | $nature = "inventory"; |
@@ -1790,7 +1790,7 @@ discard block |
||
1790 | 1790 | $journallabel = '<span class="opacitymedium">(' . $langs->trans($objp->label) . ')</span>'; // Label of bank account in llx_accounting_journal |
1791 | 1791 | } |
1792 | 1792 | |
1793 | - $key = $langs->trans("AccountingJournalType" . $objp->nature); // $objp->nature is 1, 2, 3 ... |
|
1793 | + $key = $langs->trans("AccountingJournalType" . $objp->nature); // $objp->nature is 1, 2, 3 ... |
|
1794 | 1794 | $transferlabel = (($objp->nature && $key != "AccountingJournalType" . $objp->nature) ? $key . ($journallabelwithoutspan != $key ? ' ' . $journallabel : '') : $journallabel); |
1795 | 1795 | |
1796 | 1796 | $newmenu->add('/accountancy/journal/' . $nature . 'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=' . $objp->rowid, $transferlabel, 2, $user->hasRight('accounting', 'comptarapport', 'lire')); |
@@ -176,7 +176,7 @@ |
||
176 | 176 | // $this->menu->liste is top menu |
177 | 177 | //var_dump($this->menu->liste);exit; |
178 | 178 | $lastlevel = array(); |
179 | - $showmenu = true; // Is current menu shown - define here to keep static code checker happy |
|
179 | + $showmenu = true; // Is current menu shown - define here to keep static code checker happy |
|
180 | 180 | print '<!-- Generate menu list from menu handler ' . $this->name . ' -->' . "\n"; |
181 | 181 | foreach ($this->menu->liste as $key => $val) { // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu' |
182 | 182 | print '<ul class="ulmenu" data-inset="true">'; |
@@ -57,7 +57,7 @@ |
||
57 | 57 | $mode_search = 2; // Search on a foreign key int |
58 | 58 | } |
59 | 59 | if (in_array($typ, array('sellist')) && !is_numeric($crit)) { |
60 | - $mode_search = 0;// Search on a foreign key string |
|
60 | + $mode_search = 0; // Search on a foreign key string |
|
61 | 61 | } |
62 | 62 | if (in_array($typ, array('chkbxlst', 'checkbox', 'select'))) { |
63 | 63 | $mode_search = 4; // Search on a multiselect field with sql type = text |
@@ -189,7 +189,7 @@ |
||
189 | 189 | <div class="tagtd center noborderbottom"> |
190 | 190 | <input type="submit" id="add-customer-contact" class="button small" value="<?php echo $langs->trans("Add"); ?>"<?php if (!$nbofcontacts) { |
191 | 191 | echo ' disabled'; |
192 | - } ?>> |
|
192 | + } ?>> |
|
193 | 193 | </div> |
194 | 194 | </form> |
195 | 195 |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | $module = $object->element; |
42 | 42 | |
43 | 43 | // Special cases |
44 | -if (isset($permissiontoadd) && ! isset($permission)) { |
|
44 | +if (isset($permissiontoadd) && !isset($permission)) { |
|
45 | 45 | $permission = $permissiontoadd; |
46 | 46 | } |
47 | 47 | // TODO Remove this section. We already got $permissiontoadd. |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | <div class="tagtd nowrap noborderbottom"> |
166 | 166 | <?php |
167 | 167 | $selectedCompany = GETPOSTISSET("newcompany") ? GETPOSTINT("newcompany") : (empty($object->socid) ? 0 : $object->socid); |
168 | - $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0, '', 'minwidth300imp maxwidth400 widthcentpercentminusx'); // This also print the select component?> |
|
168 | + $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0, '', 'minwidth300imp maxwidth400 widthcentpercentminusx'); // This also print the select component?> |
|
169 | 169 | </div> |
170 | 170 | <div class="tagtd noborderbottom minwidth500imp"> |
171 | 171 | <?php |