@@ -85,7 +85,7 @@ |
||
| 85 | 85 | $sql .= " WHERE u.entity IN (" . getEntity('adherent') . ")"; |
| 86 | 86 | $sql .= " AND u.statut = " . Adherent::STATUS_VALIDATED; |
| 87 | 87 | $sql .= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0); |
| 88 | - $sql .= " ORDER BY daya ASC"; // We want to have date of the month sorted by the day without taking into consideration the year |
|
| 88 | + $sql .= " ORDER BY daya ASC"; // We want to have date of the month sorted by the day without taking into consideration the year |
|
| 89 | 89 | $sql .= $this->db->plimit($max, 0); |
| 90 | 90 | |
| 91 | 91 | dol_syslog(get_class($this) . "::loadBox", LOG_DEBUG); |
@@ -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">'; |
@@ -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 |
@@ -198,7 +198,7 @@ |
||
| 198 | 198 | // we need to fetch product associated to line for some test |
| 199 | 199 | if ($object->element == 'propal' || $object->element == 'order' || $object->element == 'facture' || $object->element == 'propal_supplier' || $object->element == 'supplier_proposal' || $object->element == 'commande') { |
| 200 | 200 | $res = $line->fetch_product(); |
| 201 | - if ($res > 0) { |
|
| 201 | + if ($res > 0) { |
|
| 202 | 202 | if ($line->product->isService() && $line->product->isMandatoryPeriod()) { |
| 203 | 203 | print '<div><span class="clearboth nowraponall warning">' . $langs->trans("mandatoryPeriodNeedTobeSet") . '</span></div>'; |
| 204 | 204 | } |