@@ -393,7 +393,7 @@ |
||
393 | 393 | print '<td class="right">'.$val['nb'].'</td>'; |
394 | 394 | print '<td class="right opacitylow" style="'.($greennb ? 'color: green;' : 'color: red;').'">'.(!empty($val['nb_diff']) && $val['nb_diff'] < 0 ? '' : '+').round(!empty($val['nb_diff']) ? $val['nb_diff'] : 0).'%</td>'; |
395 | 395 | print '<td class="right"><span class="amount">'.price(price2num($val['total'], 'MT'), 1).'</span></td>'; |
396 | - print '<td class="right opacitylow" style="'.($greentotal ? 'color: green;' : 'color: red;').'">'.( !empty($val['total_diff']) && $val['total_diff'] < 0 ? '' : '+').round(!empty($val['total_diff']) ? $val['total_diff'] : 0).'%</td>'; |
|
396 | + print '<td class="right opacitylow" style="'.($greentotal ? 'color: green;' : 'color: red;').'">'.(!empty($val['total_diff']) && $val['total_diff'] < 0 ? '' : '+').round(!empty($val['total_diff']) ? $val['total_diff'] : 0).'%</td>'; |
|
397 | 397 | print '<td class="right"><span class="amount">'.price(price2num($val['avg'], 'MT'), 1).'</span></td>'; |
398 | 398 | print '<td class="right opacitylow" style="'.($greenavg ? 'color: green;' : 'color: red;').'">'.(!empty($val['avg_diff']) && $val['avg_diff'] < 0 ? '' : '+').round(!empty($val['avg_diff']) ? $val['avg_diff'] : 0).'%</td>'; |
399 | 399 | print '</tr>'; |
@@ -89,8 +89,8 @@ discard block |
||
89 | 89 | $month_current = dol_print_date(dol_now(), '%m'); |
90 | 90 | $year_start = $year; |
91 | 91 | } |
92 | -$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
93 | -$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
92 | +$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
93 | +$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
94 | 94 | // Quarter |
95 | 95 | if (empty($date_start) || empty($date_end)) { // We define date_start and date_end |
96 | 96 | $q = GETPOST("q", "int") ?GETPOST("q", "int") : 0; |
@@ -336,7 +336,7 @@ discard block |
||
336 | 336 | $address_town[$obj->socid] = $obj->town; |
337 | 337 | $address_pays[$obj->socid] = getCountry($obj->fk_pays); |
338 | 338 | |
339 | - $catotal_ht += (empty($obj->amount) ? 0 : $obj->amount); |
|
339 | + $catotal_ht += (empty($obj->amount) ? 0 : $obj->amount); |
|
340 | 340 | $catotal += $obj->amount_ttc; |
341 | 341 | |
342 | 342 | $i++; |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | $search_status = GETPOST('search_status') ?GETPOST('search_status', 'alpha') : 'opened'; // 'all' or ''='opened' |
60 | 60 | $optioncss = GETPOST('optioncss', 'alpha'); |
61 | 61 | |
62 | -$search_category_list =""; |
|
62 | +$search_category_list = ""; |
|
63 | 63 | if (isModEnabled('categorie')) { |
64 | 64 | $search_category_list = GETPOST("search_category_".Categorie::TYPE_ACCOUNT."_list", "array"); |
65 | 65 | } |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | } |
156 | 156 | |
157 | 157 | if (empty($reshook)) { |
158 | - include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php'; |
|
158 | + include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php'; |
|
159 | 159 | |
160 | 160 | // Purge search criteria |
161 | 161 | if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | $objectclass = 'Account'; |
171 | 171 | $objectlabel = 'FinancialAccount'; |
172 | 172 | $uploaddir = $conf->banque->dir_output; |
173 | - include DOL_DOCUMENT_ROOT . '/core/actions_massactions.inc.php'; |
|
173 | + include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; |
|
174 | 174 | } |
175 | 175 | |
176 | 176 | /* |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | if ($searchCategoryBankOperator == 0) { |
232 | 232 | $searchCategoryBankSqlList[] = " EXISTS (SELECT ck.fk_account FROM ".MAIN_DB_PREFIX."categorie_account as ck WHERE b.rowid = ck.fk_account AND ck.fk_categorie = ".((int) $searchCategoryBank).")"; |
233 | 233 | } else { |
234 | - $listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryBank); |
|
234 | + $listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryBank); |
|
235 | 235 | } |
236 | 236 | } |
237 | 237 | } |
@@ -347,7 +347,7 @@ discard block |
||
347 | 347 | if (isModEnabled('category') && $user->rights->banque->modifier) { |
348 | 348 | $arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"').$langs->trans("AffectTag"); |
349 | 349 | } |
350 | -if (in_array($massaction, array('presend', 'predelete','preaffecttag'))) { |
|
350 | +if (in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) { |
|
351 | 351 | $arrayofmassactions = array(); |
352 | 352 | } |
353 | 353 | $massactionbutton = $form->selectMassAction('', $arrayofmassactions); |
@@ -55,8 +55,8 @@ discard block |
||
55 | 55 | |
56 | 56 | $id = GETPOST('rowid', 'int'); |
57 | 57 | $rowid = GETPOST("rowid", 'int'); |
58 | -$accountoldid = GETPOST('account', 'int'); // GETPOST('account') is old account id |
|
59 | -$accountid = GETPOST('accountid', 'int'); // GETPOST('accountid') is new account id |
|
58 | +$accountoldid = GETPOST('account', 'int'); // GETPOST('account') is old account id |
|
59 | +$accountid = GETPOST('accountid', 'int'); // GETPOST('accountid') is new account id |
|
60 | 60 | $ref = GETPOST('ref', 'alpha'); |
61 | 61 | $action = GETPOST('action', 'aZ09'); |
62 | 62 | $confirm = GETPOST('confirm', 'alpha'); |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | |
131 | 131 | $result = $object->fetch($rowid); |
132 | 132 | if ($result <= 0) { |
133 | - dol_syslog('Failed to read bank line with id '.$rowid, LOG_WARNING); // This happens due to old bug that has set fk_account to null. |
|
133 | + dol_syslog('Failed to read bank line with id '.$rowid, LOG_WARNING); // This happens due to old bug that has set fk_account to null. |
|
134 | 134 | $object->id = $rowid; |
135 | 135 | } |
136 | 136 |
@@ -343,7 +343,7 @@ |
||
343 | 343 | $sql .= ", ".MAIN_DB_PREFIX."societe as s"; |
344 | 344 | $sql .= " WHERE pl.fk_prelevement_bons = ".((int) $id); |
345 | 345 | $sql .= " AND pl.fk_prelevement_bons = pb.rowid"; |
346 | - $sql .= " AND pb.entity = ".((int) $conf->entity); // No sharing of entity here |
|
346 | + $sql .= " AND pb.entity = ".((int) $conf->entity); // No sharing of entity here |
|
347 | 347 | $sql .= " AND pl.fk_soc = s.rowid"; |
348 | 348 | if ($socid) { |
349 | 349 | $sql .= " AND s.rowid = ".((int) $socid); |
@@ -52,7 +52,7 @@ |
||
52 | 52 | |
53 | 53 | $result = restrictedArea($user, 'commande', $id, ''); |
54 | 54 | |
55 | -$usercancreate = $user->hasRight("commande", "creer"); |
|
55 | +$usercancreate = $user->hasRight("commande", "creer"); |
|
56 | 56 | |
57 | 57 | $permissionnote = $user->rights->commande->creer; // Used by the include of actions_setnotes.inc.php |
58 | 58 |
@@ -73,7 +73,7 @@ |
||
73 | 73 | |
74 | 74 | $object = new Commande($db); |
75 | 75 | |
76 | -$usercancreate = $user->hasRight("commande", "creer"); |
|
76 | +$usercancreate = $user->hasRight("commande", "creer"); |
|
77 | 77 | $permissiontoadd = $usercancreate; |
78 | 78 | |
79 | 79 | // Security check |
@@ -47,7 +47,7 @@ |
||
47 | 47 | } |
48 | 48 | $result = restrictedArea($user, 'commande', $id, ''); |
49 | 49 | |
50 | -$usercancreate = $user->hasRight("commande", "creer"); |
|
50 | +$usercancreate = $user->hasRight("commande", "creer"); |
|
51 | 51 | |
52 | 52 | $object = new Commande($db); |
53 | 53 |
@@ -38,21 +38,21 @@ discard block |
||
38 | 38 | $langs->loadLangs(array('other')); |
39 | 39 | |
40 | 40 | // Get Parameters |
41 | -$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ... |
|
42 | -$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists) |
|
43 | -$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ? |
|
44 | -$confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation |
|
45 | -$cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button |
|
46 | -$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list |
|
47 | -$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'targetlist'; // To manage different context of search |
|
48 | -$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page |
|
49 | -$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') |
|
41 | +$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ... |
|
42 | +$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists) |
|
43 | +$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ? |
|
44 | +$confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation |
|
45 | +$cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button |
|
46 | +$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list |
|
47 | +$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'targetlist'; // To manage different context of search |
|
48 | +$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page |
|
49 | +$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') |
|
50 | 50 | $mode = GETPOST('mode', 'aZ'); |
51 | 51 | if (empty($mode)) { |
52 | 52 | $mode = 'modulesetup'; |
53 | 53 | } |
54 | 54 | |
55 | -$id = GETPOST('id', 'int'); |
|
55 | +$id = GETPOST('id', 'int'); |
|
56 | 56 | |
57 | 57 | // Load variable for pagination |
58 | 58 | $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit; |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | |
82 | 82 | // Default sort order (if not yet defined by previous GETPOST) |
83 | 83 | if (!$sortfield) { |
84 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
84 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
85 | 85 | $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition. |
86 | 86 | } |
87 | 87 | if (!$sortorder) { |