@@ -484,7 +484,7 @@ |
||
484 | 484 | setEventMessages($messagetoshow, null, 'warnings'); |
485 | 485 | setEventMessages($langs->trans('PleaseRememberThisId'), null, 'warnings'); |
486 | 486 | |
487 | - header("Location: index.php".(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'')); |
|
487 | + header("Location: index.php".(!empty($entity) && isModEnabled('multicompany') ? '?entity='.$entity : '')); |
|
488 | 488 | exit; |
489 | 489 | } |
490 | 490 | } else { |
@@ -133,16 +133,16 @@ |
||
133 | 133 | } |
134 | 134 | |
135 | 135 | $coldisplay++; |
136 | - print '<td class="nobottom linecolqtyfrozen right"><input type="checkbox" name="qty_frozen" id="qty_frozen" class="flat right" value="1"' . (GETPOSTISSET("qty_frozen") ? (GETPOST('qty_frozen', 'int') ? ' checked="checked"' : '') : ($line->qty_frozen ? ' checked="checked"' : '')) . '>'; |
|
136 | + print '<td class="nobottom linecolqtyfrozen right"><input type="checkbox" name="qty_frozen" id="qty_frozen" class="flat right" value="1"'.(GETPOSTISSET("qty_frozen") ? (GETPOST('qty_frozen', 'int') ? ' checked="checked"' : '') : ($line->qty_frozen ? ' checked="checked"' : '')).'>'; |
|
137 | 137 | print '</td>'; |
138 | 138 | |
139 | 139 | $coldisplay++; |
140 | - print '<td class="nobottom linecoldisablestockchange right"><input type="checkbox" name="disable_stock_change" id="disable_stock_change" class="flat right" value="1"' . (GETPOSTISSET('disablestockchange') ? (GETPOST("disable_stock_change", 'int') ? ' checked="checked"' : '') : ($line->disable_stock_change ? ' checked="checked"' : '')) . '">'; |
|
140 | + print '<td class="nobottom linecoldisablestockchange right"><input type="checkbox" name="disable_stock_change" id="disable_stock_change" class="flat right" value="1"'.(GETPOSTISSET('disablestockchange') ? (GETPOST("disable_stock_change", 'int') ? ' checked="checked"' : '') : ($line->disable_stock_change ? ' checked="checked"' : '')).'">'; |
|
141 | 141 | print '</td>'; |
142 | 142 | |
143 | 143 | $coldisplay++; |
144 | 144 | print '<td class="nobottom nowrap linecollost right">'; |
145 | - print '<input type="text" size="2" name="efficiency" id="efficiency" class="flat right" value="' . $line->efficiency . '"></td>'; |
|
145 | + print '<input type="text" size="2" name="efficiency" id="efficiency" class="flat right" value="'.$line->efficiency.'"></td>'; |
|
146 | 146 | |
147 | 147 | $coldisplay++; |
148 | 148 | print '<td class="nobottom nowrap linecolcostprice right">'; |
@@ -47,7 +47,9 @@ |
||
47 | 47 | $forceall = 0; |
48 | 48 | } |
49 | 49 | |
50 | -if (empty($filtertype)) $filtertype = 0; |
|
50 | +if (empty($filtertype)) { |
|
51 | + $filtertype = 0; |
|
52 | +} |
|
51 | 53 | |
52 | 54 | $formproduct = new FormProduct($object->db); |
53 | 55 |
@@ -40,7 +40,9 @@ discard block |
||
40 | 40 | } |
41 | 41 | |
42 | 42 | global $filtertype; |
43 | -if (empty($filtertype)) $filtertype = 0; |
|
43 | +if (empty($filtertype)) { |
|
44 | + $filtertype = 0; |
|
45 | +} |
|
44 | 46 | |
45 | 47 | print "<!-- BEGIN PHP TEMPLATE objectline_title.tpl.php -->\n"; |
46 | 48 | |
@@ -85,7 +87,9 @@ discard block |
||
85 | 87 | } else { |
86 | 88 | print '<td class="linecolunit right">' . $form->textwithpicto($langs->trans('Unit'), '').'</td>'; |
87 | 89 | |
88 | - if (isModEnabled('workstation')) print '<td class="linecolworkstation right">' . $form->textwithpicto($langs->trans('DefaultWorkstation'), '') . '</td>'; |
|
90 | + if (isModEnabled('workstation')) { |
|
91 | + print '<td class="linecolworkstation right">' . $form->textwithpicto($langs->trans('DefaultWorkstation'), '') . '</td>'; |
|
92 | + } |
|
89 | 93 | |
90 | 94 | // Cost |
91 | 95 | print '<td class="linecolcost right">'.$form->textwithpicto($langs->trans("TotalCost"), $langs->trans("BOMTotalCostService")).'</td>'; |
@@ -68,24 +68,24 @@ |
||
68 | 68 | |
69 | 69 | if ($filtertype != 1) { |
70 | 70 | if (getDolGlobalInt('PRODUCT_USE_UNITS')) { |
71 | - print '<td class="linecoluseunit left">' . $langs->trans('Unit') . '</td>'; |
|
71 | + print '<td class="linecoluseunit left">'.$langs->trans('Unit').'</td>'; |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | // Qty frozen |
75 | - print '<td class="linecolqtyfrozen right">' . $form->textwithpicto($langs->trans('QtyFrozen'), $langs->trans("QuantityConsumedInvariable")) . '</td>'; |
|
75 | + print '<td class="linecolqtyfrozen right">'.$form->textwithpicto($langs->trans('QtyFrozen'), $langs->trans("QuantityConsumedInvariable")).'</td>'; |
|
76 | 76 | |
77 | 77 | // Disable stock change |
78 | - print '<td class="linecoldisablestockchange right">' . $form->textwithpicto($langs->trans('DisableStockChange'), $langs->trans('DisableStockChangeHelp')) . '</td>'; |
|
78 | + print '<td class="linecoldisablestockchange right">'.$form->textwithpicto($langs->trans('DisableStockChange'), $langs->trans('DisableStockChangeHelp')).'</td>'; |
|
79 | 79 | |
80 | 80 | // Efficiency |
81 | - print '<td class="linecolefficiency right">' . $form->textwithpicto($langs->trans('ManufacturingEfficiency'), $langs->trans('ValueOfMeansLoss')) . '</td>'; |
|
81 | + print '<td class="linecolefficiency right">'.$form->textwithpicto($langs->trans('ManufacturingEfficiency'), $langs->trans('ValueOfMeansLoss')).'</td>'; |
|
82 | 82 | |
83 | 83 | // Cost |
84 | 84 | print '<td class="linecolcost right">'.$form->textwithpicto($langs->trans("TotalCost"), $langs->trans("BOMTotalCost")).'</td>'; |
85 | 85 | } else { |
86 | - print '<td class="linecolunit right">' . $form->textwithpicto($langs->trans('Unit'), '').'</td>'; |
|
86 | + print '<td class="linecolunit right">'.$form->textwithpicto($langs->trans('Unit'), '').'</td>'; |
|
87 | 87 | |
88 | - if (isModEnabled('workstation')) print '<td class="linecolworkstation right">' . $form->textwithpicto($langs->trans('DefaultWorkstation'), '') . '</td>'; |
|
88 | + if (isModEnabled('workstation')) print '<td class="linecolworkstation right">'.$form->textwithpicto($langs->trans('DefaultWorkstation'), '').'</td>'; |
|
89 | 89 | |
90 | 90 | // Cost |
91 | 91 | print '<td class="linecolcost right">'.$form->textwithpicto($langs->trans("TotalCost"), $langs->trans("BOMTotalCostService")).'</td>'; |
@@ -44,7 +44,9 @@ discard block |
||
44 | 44 | $forceall = 0; |
45 | 45 | } |
46 | 46 | |
47 | -if (empty($filtertype)) $filtertype = 0; |
|
47 | +if (empty($filtertype)) { |
|
48 | + $filtertype = 0; |
|
49 | +} |
|
48 | 50 | if (!empty($object->element) && $object->element == 'contrat' && empty($conf->global->STOCK_SUPPORT_SERVICES)) { |
49 | 51 | $filtertype = -1; |
50 | 52 | } |
@@ -84,7 +86,9 @@ discard block |
||
84 | 86 | print '<td class="linecollost right">' . $form->textwithpicto($langs->trans('ManufacturingEfficiency'), $langs->trans('ValueOfMeansLoss')) . '</td>'; |
85 | 87 | } else { |
86 | 88 | print '<td class="linecolunit right">' . $form->textwithpicto($langs->trans('Unit'), '').'</td>'; |
87 | - if (isModEnabled('workstation')) print '<td class="linecolworkstation right">' . $form->textwithpicto($langs->trans('Workstation'), '') . '</td>'; |
|
89 | + if (isModEnabled('workstation')) { |
|
90 | + print '<td class="linecolworkstation right">' . $form->textwithpicto($langs->trans('Workstation'), '') . '</td>'; |
|
91 | + } |
|
88 | 92 | print '<td class="linecoltotalcost right">' . $form->textwithpicto($langs->trans('TotalCost'), '') . '</td>'; |
89 | 93 | } |
90 | 94 |
@@ -79,16 +79,16 @@ discard block |
||
79 | 79 | print $langs->trans('Unit'); |
80 | 80 | print '</span></td>'; |
81 | 81 | } |
82 | - print '<td class="linecolqtyfrozen right">' . $form->textwithpicto($langs->trans('QtyFrozen'), $langs->trans("QuantityConsumedInvariable")) . '</td>'; |
|
83 | - print '<td class="linecoldisablestockchange right">' . $form->textwithpicto($langs->trans('DisableStockChange'), $langs->trans('DisableStockChangeHelp')) . '</td>'; |
|
84 | - print '<td class="linecollost right">' . $form->textwithpicto($langs->trans('ManufacturingEfficiency'), $langs->trans('ValueOfMeansLoss')) . '</td>'; |
|
82 | + print '<td class="linecolqtyfrozen right">'.$form->textwithpicto($langs->trans('QtyFrozen'), $langs->trans("QuantityConsumedInvariable")).'</td>'; |
|
83 | + print '<td class="linecoldisablestockchange right">'.$form->textwithpicto($langs->trans('DisableStockChange'), $langs->trans('DisableStockChangeHelp')).'</td>'; |
|
84 | + print '<td class="linecollost right">'.$form->textwithpicto($langs->trans('ManufacturingEfficiency'), $langs->trans('ValueOfMeansLoss')).'</td>'; |
|
85 | 85 | } else { |
86 | - print '<td class="linecolunit right">' . $form->textwithpicto($langs->trans('Unit'), '').'</td>'; |
|
87 | - if (isModEnabled('workstation')) print '<td class="linecolworkstation right">' . $form->textwithpicto($langs->trans('Workstation'), '') . '</td>'; |
|
88 | - print '<td class="linecoltotalcost right">' . $form->textwithpicto($langs->trans('TotalCost'), '') . '</td>'; |
|
86 | + print '<td class="linecolunit right">'.$form->textwithpicto($langs->trans('Unit'), '').'</td>'; |
|
87 | + if (isModEnabled('workstation')) print '<td class="linecolworkstation right">'.$form->textwithpicto($langs->trans('Workstation'), '').'</td>'; |
|
88 | + print '<td class="linecoltotalcost right">'.$form->textwithpicto($langs->trans('TotalCost'), '').'</td>'; |
|
89 | 89 | } |
90 | 90 | |
91 | - print '<td class="linecoledit" colspan="' . $colspan . '"> </td>'; |
|
91 | + print '<td class="linecoledit" colspan="'.$colspan.'"> </td>'; |
|
92 | 92 | print '</tr>'; |
93 | 93 | } |
94 | 94 | print '<tr class="pair nodrag nodrop nohoverpair'.(($nolinesbefore || $object->element == 'contrat') ? '' : ' liste_titre_create').'">'; |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | |
124 | 124 | echo '</span>'; |
125 | 125 | } |
126 | -if (!empty($conf->global->BOM_SUB_BOM) && $filtertype!=1) { |
|
126 | +if (!empty($conf->global->BOM_SUB_BOM) && $filtertype != 1) { |
|
127 | 127 | print '<br><span class="opacitymedium">'.$langs->trans("or").'</span><br>'.$langs->trans("BOM"); |
128 | 128 | print $form->select_bom('', 'bom_id', 0, 1, 0, '1', '', 1); |
129 | 129 | } |
@@ -153,17 +153,17 @@ discard block |
||
153 | 153 | } |
154 | 154 | |
155 | 155 | $coldisplay++; |
156 | - print '<td class="bordertop nobottom linecolqtyfrozen right"><input type="checkbox" name="qty_frozen" id="qty_frozen" class="flat right" value="1"' . (GETPOST("qty_frozen", 'alpha') ? ' checked="checked"' : '') . '>'; |
|
156 | + print '<td class="bordertop nobottom linecolqtyfrozen right"><input type="checkbox" name="qty_frozen" id="qty_frozen" class="flat right" value="1"'.(GETPOST("qty_frozen", 'alpha') ? ' checked="checked"' : '').'>'; |
|
157 | 157 | print '</td>'; |
158 | 158 | |
159 | 159 | |
160 | 160 | $coldisplay++; |
161 | - print '<td class="bordertop nobottom linecoldisablestockchange right"><input type="checkbox" name="disable_stock_change" id="disable_stock_change" class="flat right" value="1"' . (GETPOST("disable_stock_change", 'alpha') ? ' checked="checked"' : '') . '">'; |
|
161 | + print '<td class="bordertop nobottom linecoldisablestockchange right"><input type="checkbox" name="disable_stock_change" id="disable_stock_change" class="flat right" value="1"'.(GETPOST("disable_stock_change", 'alpha') ? ' checked="checked"' : '').'">'; |
|
162 | 162 | print '</td>'; |
163 | 163 | |
164 | 164 | $coldisplay++; |
165 | 165 | print '<td class="bordertop nobottom nowrap linecollost right">'; |
166 | - print '<input type="text" size="2" name="efficiency" id="efficiency" class="flat right" value="' . ((GETPOSTISSET("efficiency") && $action == 'addline') ? GETPOST("efficiency", 'alpha') : 1) . '">'; |
|
166 | + print '<input type="text" size="2" name="efficiency" id="efficiency" class="flat right" value="'.((GETPOSTISSET("efficiency") && $action == 'addline') ? GETPOST("efficiency", 'alpha') : 1).'">'; |
|
167 | 167 | print '</td>'; |
168 | 168 | |
169 | 169 | $coldisplay++; |
@@ -191,8 +191,8 @@ discard block |
||
191 | 191 | } |
192 | 192 | |
193 | 193 | $coldisplay += $colspan; |
194 | - print '<td class="bordertop nobottom linecoledit center valignmiddle" colspan="' . $colspan . '">'; |
|
195 | - print '<input type="submit" class="button button-add" name="addline" id="addline" value="' . $langs->trans('Add') . '">'; |
|
194 | + print '<td class="bordertop nobottom linecoledit center valignmiddle" colspan="'.$colspan.'">'; |
|
195 | + print '<input type="submit" class="button button-add" name="addline" id="addline" value="'.$langs->trans('Add').'">'; |
|
196 | 196 | print '</td>'; |
197 | 197 | print '</tr>'; |
198 | 198 |
@@ -77,7 +77,9 @@ |
||
77 | 77 | $k = 0; |
78 | 78 | if ($resql) { |
79 | 79 | $obj = $db->fetch_object($resql); |
80 | - if ($obj->rowid && $obj->rowid > 0) $k = $obj->rowid; |
|
80 | + if ($obj->rowid && $obj->rowid > 0) { |
|
81 | + $k = $obj->rowid; |
|
82 | + } |
|
81 | 83 | } |
82 | 84 | echo '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=dellink&token=' . newToken() . '&dellinkid=' . $k . '">' . img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink') . '</a>'; |
83 | 85 | echo '</td>'; |
@@ -53,25 +53,25 @@ discard block |
||
53 | 53 | |
54 | 54 | $trclass = 'oddeven'; |
55 | 55 | |
56 | - echo '<tr class="' . $trclass . '" >'; |
|
57 | - echo '<td class="linkedcol-element tdoverflowmax100">' . $langs->trans("ManufacturingOrder"); |
|
56 | + echo '<tr class="'.$trclass.'" >'; |
|
57 | + echo '<td class="linkedcol-element tdoverflowmax100">'.$langs->trans("ManufacturingOrder"); |
|
58 | 58 | if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) { |
59 | - print '<a class="objectlinked_importbtn" href="' . $objectlink->getNomUrl(0, '', 0, 1) . '&action=selectlines" data-element="' . $objectlink->element . '" data-id="' . $objectlink->id . '" > <i class="fa fa-indent"></i> </a'; |
|
59 | + print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&action=selectlines" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'" > <i class="fa fa-indent"></i> </a'; |
|
60 | 60 | } |
61 | 61 | echo '</td>'; |
62 | - echo '<td class="linkedcol-name nowraponall" >' . $objectlink->getNomUrl(1) . '</td>'; |
|
62 | + echo '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>'; |
|
63 | 63 | |
64 | 64 | echo '<td class="linkedcol-ref center">'; |
65 | 65 | // $result = $product_static->fetch($objectlink->fk_product); |
66 | 66 | print '</td>'; |
67 | - echo '<td class="linkedcol-date center">' . dol_print_date($objectlink->date_creation, 'day') . '</td>'; |
|
67 | + echo '<td class="linkedcol-date center">'.dol_print_date($objectlink->date_creation, 'day').'</td>'; |
|
68 | 68 | echo '<td class="linkedcol-amount right">-</td>'; |
69 | - echo '<td class="linkedcol-statut right">' . $objectlink->getLibStatut(3) . '</td>'; |
|
69 | + echo '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>'; |
|
70 | 70 | echo '<td class="linkedcol-action right">'; |
71 | 71 | |
72 | 72 | // we want to make the link via element_element for delete action |
73 | - $sql = " Select rowid from " . MAIN_DB_PREFIX . "element_element"; |
|
74 | - $sql .= " WHERE fk_source = " . (int) $object->id . " and fk_target = '" . dol_escape_htmltag($key) . "'"; |
|
73 | + $sql = " Select rowid from ".MAIN_DB_PREFIX."element_element"; |
|
74 | + $sql .= " WHERE fk_source = ".(int) $object->id." and fk_target = '".dol_escape_htmltag($key)."'"; |
|
75 | 75 | |
76 | 76 | $resql = $db->query($sql); |
77 | 77 | $k = 0; |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | $obj = $db->fetch_object($resql); |
80 | 80 | if ($obj->rowid && $obj->rowid > 0) $k = $obj->rowid; |
81 | 81 | } |
82 | - echo '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=dellink&token=' . newToken() . '&dellinkid=' . $k . '">' . img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink') . '</a>'; |
|
82 | + echo '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&token='.newToken().'&dellinkid='.$k.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a>'; |
|
83 | 83 | echo '</td>'; |
84 | 84 | echo "</tr>\n"; |
85 | 85 | } |
@@ -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 |