@@ -36,9 +36,9 @@ discard block |
||
| 36 | 36 | require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; |
| 37 | 37 | |
| 38 | 38 | // Load translation files required by the page |
| 39 | -$langsLoad=array('projects', 'companies'); |
|
| 39 | +$langsLoad = array('projects', 'companies'); |
|
| 40 | 40 | if (isModEnabled('eventorganization')) { |
| 41 | - $langsLoad[]='eventorganization'; |
|
| 41 | + $langsLoad[] = 'eventorganization'; |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | $langs->loadLangs($langsLoad); |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | |
| 108 | 108 | $permissiontoadd = $user->hasRight('projet', 'creer'); |
| 109 | 109 | $permissiontodelete = $user->hasRight('projet', 'supprimer'); |
| 110 | -$permissiondellink = $user->hasRight('projet', 'creer'); // Used by the include of actions_dellink.inc.php |
|
| 110 | +$permissiondellink = $user->hasRight('projet', 'creer'); // Used by the include of actions_dellink.inc.php |
|
| 111 | 111 | |
| 112 | 112 | |
| 113 | 113 | /* |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | $action = ''; |
| 159 | 159 | } |
| 160 | 160 | |
| 161 | - include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once |
|
| 161 | + include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once |
|
| 162 | 162 | |
| 163 | 163 | // Action setdraft object |
| 164 | 164 | if ($action == 'confirm_setdraft' && $confirm == 'yes' && $permissiontoadd) { |
@@ -318,7 +318,7 @@ discard block |
||
| 318 | 318 | $object->date_end_event = (!GETPOST('date_end_event')) ? '' : $date_end_event; |
| 319 | 319 | $object->location = $location; |
| 320 | 320 | if (GETPOSTISSET('opp_amount')) { |
| 321 | - $object->opp_amount = price2num(GETPOST('opp_amount', 'alpha')); |
|
| 321 | + $object->opp_amount = price2num(GETPOST('opp_amount', 'alpha')); |
|
| 322 | 322 | } |
| 323 | 323 | if (GETPOSTISSET('budget_amount')) { |
| 324 | 324 | $object->budget_amount = price2num(GETPOST('budget_amount', 'alpha')); |
@@ -470,7 +470,7 @@ discard block |
||
| 470 | 470 | if (!empty($_SESSION['pageforbacktolist']) && !empty($_SESSION['pageforbacktolist']['project'])) { |
| 471 | 471 | $tmpurl = $_SESSION['pageforbacktolist']['project']; |
| 472 | 472 | $tmpurl = preg_replace('/__SOCID__/', $object->socid, $tmpurl); |
| 473 | - $urlback = $tmpurl.(preg_match('/\?/', $tmpurl) ? '&' : '?'). 'restore_lastsearch_values=1'; |
|
| 473 | + $urlback = $tmpurl.(preg_match('/\?/', $tmpurl) ? '&' : '?').'restore_lastsearch_values=1'; |
|
| 474 | 474 | } else { |
| 475 | 475 | $urlback = DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1'; |
| 476 | 476 | } |
@@ -1024,7 +1024,7 @@ discard block |
||
| 1024 | 1024 | print '<br>'; |
| 1025 | 1025 | } |
| 1026 | 1026 | if (!getDolGlobalString('PROJECT_HIDE_TASKS')) { |
| 1027 | - print '<input type="checkbox" id="usage_task" name="usage_task"' . (GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')) . '> '; |
|
| 1027 | + print '<input type="checkbox" id="usage_task" name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'> '; |
|
| 1028 | 1028 | $htmltext = $langs->trans("ProjectFollowTasks"); |
| 1029 | 1029 | print '<label for="usage_task">'.$form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext).'</label>'; |
| 1030 | 1030 | print '<script>'; |
@@ -1050,7 +1050,7 @@ discard block |
||
| 1050 | 1050 | print '<br>'; |
| 1051 | 1051 | } |
| 1052 | 1052 | if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('PROJECT_BILL_TIME_SPENT')) { |
| 1053 | - print '<input type="checkbox" id="usage_bill_time" name="usage_bill_time"' . (GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')) . '> '; |
|
| 1053 | + print '<input type="checkbox" id="usage_bill_time" name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')).'> '; |
|
| 1054 | 1054 | $htmltext = $langs->trans("ProjectBillTimeDescription"); |
| 1055 | 1055 | print '<label for="usage_bill_time">'.$form->textwithpicto($langs->trans("BillTime"), $htmltext).'</label>'; |
| 1056 | 1056 | print '<script>'; |
@@ -1076,7 +1076,7 @@ discard block |
||
| 1076 | 1076 | print '<br>'; |
| 1077 | 1077 | } |
| 1078 | 1078 | if (isModEnabled('eventorganization')) { |
| 1079 | - print '<input type="checkbox" id="usage_organize_event" name="usage_organize_event"'. (GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_organize_event ? ' checked="checked"' : '')) . '> '; |
|
| 1079 | + print '<input type="checkbox" id="usage_organize_event" name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_organize_event ? ' checked="checked"' : '')).'> '; |
|
| 1080 | 1080 | $htmltext = $langs->trans("EventOrganizationDescriptionLong"); |
| 1081 | 1081 | print '<label for="usage_organize_event">'.$form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext).'</label>'; |
| 1082 | 1082 | print '<script>'; |
@@ -1254,7 +1254,7 @@ discard block |
||
| 1254 | 1254 | if (!empty($_SESSION['pageforbacktolist']) && !empty($_SESSION['pageforbacktolist']['project'])) { |
| 1255 | 1255 | $tmpurl = $_SESSION['pageforbacktolist']['project']; |
| 1256 | 1256 | $tmpurl = preg_replace('/__SOCID__/', $object->socid, $tmpurl); |
| 1257 | - $linkback = '<a href="'.$tmpurl.(preg_match('/\?/', $tmpurl) ? '&' : '?'). 'restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>'; |
|
| 1257 | + $linkback = '<a href="'.$tmpurl.(preg_match('/\?/', $tmpurl) ? '&' : '?').'restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>'; |
|
| 1258 | 1258 | } else { |
| 1259 | 1259 | $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>'; |
| 1260 | 1260 | } |
@@ -1556,7 +1556,7 @@ discard block |
||
| 1556 | 1556 | if ($userWrite > 0) { |
| 1557 | 1557 | print dolGetButtonAction('', $langs->trans('SetToDraft'), 'default', $_SERVER["PHP_SELF"].'?action=confirm_setdraft&confirm=yes&token='.newToken().'&id='.$object->id, ''); |
| 1558 | 1558 | } else { |
| 1559 | - print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('SetToDraft'), 'default', $_SERVER['PHP_SELF']. '#', '', false); |
|
| 1559 | + print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('SetToDraft'), 'default', $_SERVER['PHP_SELF'].'#', '', false); |
|
| 1560 | 1560 | } |
| 1561 | 1561 | } |
| 1562 | 1562 | } |
@@ -1566,7 +1566,7 @@ discard block |
||
| 1566 | 1566 | if ($userWrite > 0) { |
| 1567 | 1567 | print dolGetButtonAction('', $langs->trans('Modify'), 'default', $_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&id='.$object->id, ''); |
| 1568 | 1568 | } else { |
| 1569 | - print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('Modify'), 'default', $_SERVER['PHP_SELF']. '#', '', false); |
|
| 1569 | + print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('Modify'), 'default', $_SERVER['PHP_SELF'].'#', '', false); |
|
| 1570 | 1570 | } |
| 1571 | 1571 | } |
| 1572 | 1572 | |
@@ -1575,7 +1575,7 @@ discard block |
||
| 1575 | 1575 | if ($userWrite > 0) { |
| 1576 | 1576 | print dolGetButtonAction('', $langs->trans('Validate'), 'default', $_SERVER["PHP_SELF"].'?action=validate&token='.newToken().'&id='.$object->id, ''); |
| 1577 | 1577 | } else { |
| 1578 | - print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('Validate'), 'default', $_SERVER['PHP_SELF']. '#', '', false); |
|
| 1578 | + print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('Validate'), 'default', $_SERVER['PHP_SELF'].'#', '', false); |
|
| 1579 | 1579 | } |
| 1580 | 1580 | } |
| 1581 | 1581 | |
@@ -1584,7 +1584,7 @@ discard block |
||
| 1584 | 1584 | if ($userWrite > 0) { |
| 1585 | 1585 | print dolGetButtonAction('', $langs->trans('Close'), 'default', $_SERVER["PHP_SELF"].'?action=close&token='.newToken().'&id='.$object->id, ''); |
| 1586 | 1586 | } else { |
| 1587 | - print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('Close'), 'default', $_SERVER['PHP_SELF']. '#', '', false); |
|
| 1587 | + print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('Close'), 'default', $_SERVER['PHP_SELF'].'#', '', false); |
|
| 1588 | 1588 | } |
| 1589 | 1589 | } |
| 1590 | 1590 | |
@@ -1593,7 +1593,7 @@ discard block |
||
| 1593 | 1593 | if ($userWrite > 0) { |
| 1594 | 1594 | print dolGetButtonAction('', $langs->trans('ReOpen'), 'default', $_SERVER["PHP_SELF"].'?action=reopen&token='.newToken().'&id='.$object->id, ''); |
| 1595 | 1595 | } else { |
| 1596 | - print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('ReOpen'), 'default', $_SERVER['PHP_SELF']. '#', '', false); |
|
| 1596 | + print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('ReOpen'), 'default', $_SERVER['PHP_SELF'].'#', '', false); |
|
| 1597 | 1597 | } |
| 1598 | 1598 | } |
| 1599 | 1599 | |
@@ -1622,7 +1622,7 @@ discard block |
||
| 1622 | 1622 | if ($userWrite > 0) { |
| 1623 | 1623 | print dolGetButtonAction('', $langs->trans('ToClone'), 'default', $_SERVER["PHP_SELF"].'?action=clone&token='.newToken().'&id='.$object->id, ''); |
| 1624 | 1624 | } else { |
| 1625 | - print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('ToClone'), 'default', $_SERVER['PHP_SELF']. '#', '', false); |
|
| 1625 | + print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('ToClone'), 'default', $_SERVER['PHP_SELF'].'#', '', false); |
|
| 1626 | 1626 | } |
| 1627 | 1627 | } |
| 1628 | 1628 | |
@@ -1631,7 +1631,7 @@ discard block |
||
| 1631 | 1631 | if ($userDelete > 0 || ($object->statut == Project::STATUS_DRAFT && $user->hasRight('projet', 'creer'))) { |
| 1632 | 1632 | print dolGetButtonAction('', $langs->trans('Delete'), 'delete', $_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id, ''); |
| 1633 | 1633 | } else { |
| 1634 | - print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('Delete'), 'default', $_SERVER['PHP_SELF']. '#', '', false); |
|
| 1634 | + print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('Delete'), 'default', $_SERVER['PHP_SELF'].'#', '', false); |
|
| 1635 | 1635 | } |
| 1636 | 1636 | } |
| 1637 | 1637 | } |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | if ($result > 0) { |
| 112 | 112 | setEventMessages($langs->trans("AllMovementsWereRecordedAsValidated"), null, 'mesgs'); |
| 113 | 113 | |
| 114 | - header("Location: " . $_SERVER['PHP_SELF'] . (isset($current_fiscal_period) ? '?fiscal_period_id=' . $current_fiscal_period['id'] : '')); |
|
| 114 | + header("Location: ".$_SERVER['PHP_SELF'].(isset($current_fiscal_period) ? '?fiscal_period_id='.$current_fiscal_period['id'] : '')); |
|
| 115 | 115 | exit; |
| 116 | 116 | } else { |
| 117 | 117 | setEventMessages($langs->trans("NotAllMovementsCouldBeRecordedAsValidated"), null, 'errors'); |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | } else { |
| 130 | 130 | setEventMessages($langs->trans("AccountancyClosureCloseSuccessfully"), null, 'mesgs'); |
| 131 | 131 | |
| 132 | - header("Location: " . $_SERVER['PHP_SELF'] . (isset($current_fiscal_period) ? '?fiscal_period_id=' . $current_fiscal_period['id'] : '')); |
|
| 132 | + header("Location: ".$_SERVER['PHP_SELF'].(isset($current_fiscal_period) ? '?fiscal_period_id='.$current_fiscal_period['id'] : '')); |
|
| 133 | 133 | exit; |
| 134 | 134 | } |
| 135 | 135 | } elseif ($action == 'confirm_step_3' && $confirm == "yes") { |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | } else { |
| 145 | 145 | setEventMessages($langs->trans("AccountancyClosureInsertAccountingReversalSuccessfully"), null, 'mesgs'); |
| 146 | 146 | |
| 147 | - header("Location: " . $_SERVER['PHP_SELF'] . (isset($current_fiscal_period) ? '?fiscal_period_id=' . $current_fiscal_period['id'] : '')); |
|
| 147 | + header("Location: ".$_SERVER['PHP_SELF'].(isset($current_fiscal_period) ? '?fiscal_period_id='.$current_fiscal_period['id'] : '')); |
|
| 148 | 148 | exit; |
| 149 | 149 | } |
| 150 | 150 | } |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | |
| 162 | 162 | $title = $langs->trans('Closure'); |
| 163 | 163 | |
| 164 | -$help_url ='EN:Module_Double_Entry_Accounting'; |
|
| 164 | +$help_url = 'EN:Module_Double_Entry_Accounting'; |
|
| 165 | 165 | |
| 166 | 166 | llxHeader('', $title, $help_url); |
| 167 | 167 | |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | ); |
| 186 | 186 | |
| 187 | 187 | $formconfirm = $form->formconfirm( |
| 188 | - $_SERVER["PHP_SELF"] . '?fiscal_period_id=' . $current_fiscal_period['id'], |
|
| 188 | + $_SERVER["PHP_SELF"].'?fiscal_period_id='.$current_fiscal_period['id'], |
|
| 189 | 189 | $langs->trans('ValidateMovements'), |
| 190 | 190 | $langs->trans('DescValidateMovements', $langs->transnoentitiesnoconv("RegistrationInAccounting")), |
| 191 | 191 | 'confirm_step_1', |
@@ -222,7 +222,7 @@ discard block |
||
| 222 | 222 | ); |
| 223 | 223 | |
| 224 | 224 | $formconfirm = $form->formconfirm( |
| 225 | - $_SERVER["PHP_SELF"] . '?fiscal_period_id=' . $current_fiscal_period['id'], |
|
| 225 | + $_SERVER["PHP_SELF"].'?fiscal_period_id='.$current_fiscal_period['id'], |
|
| 226 | 226 | $langs->trans('AccountancyClosureClose'), |
| 227 | 227 | $langs->trans('AccountancyClosureConfirmClose'), |
| 228 | 228 | 'confirm_step_2', |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | ); |
| 266 | 266 | |
| 267 | 267 | $formconfirm = $form->formconfirm( |
| 268 | - $_SERVER["PHP_SELF"] . '?fiscal_period_id=' . $current_fiscal_period['id'], |
|
| 268 | + $_SERVER["PHP_SELF"].'?fiscal_period_id='.$current_fiscal_period['id'], |
|
| 269 | 269 | $langs->trans('AccountancyClosureAccountingReversal'), |
| 270 | 270 | $langs->trans('AccountancyClosureConfirmAccountingReversal'), |
| 271 | 271 | 'confirm_step_3', |
@@ -291,13 +291,13 @@ discard block |
||
| 291 | 291 | |
| 292 | 292 | $fiscal_period_nav_text = $langs->trans("FiscalPeriod"); |
| 293 | 293 | |
| 294 | -$fiscal_period_nav_text .= ' <a href="' . (isset($last_fiscal_period) ? $_SERVER["PHP_SELF"] . '?fiscal_period_id=' . $last_fiscal_period['id'] : '#" class="disabled') . '">' . img_previous() . '</a>'; |
|
| 295 | -$fiscal_period_nav_text .= ' <a href="' . (isset($next_fiscal_period) ? $_SERVER["PHP_SELF"] . '?fiscal_period_id=' . $next_fiscal_period['id'] : '#" class="disabled') . '">' . img_next() . '</a>'; |
|
| 294 | +$fiscal_period_nav_text .= ' <a href="'.(isset($last_fiscal_period) ? $_SERVER["PHP_SELF"].'?fiscal_period_id='.$last_fiscal_period['id'] : '#" class="disabled').'">'.img_previous().'</a>'; |
|
| 295 | +$fiscal_period_nav_text .= ' <a href="'.(isset($next_fiscal_period) ? $_SERVER["PHP_SELF"].'?fiscal_period_id='.$next_fiscal_period['id'] : '#" class="disabled').'">'.img_next().'</a>'; |
|
| 296 | 296 | if (!empty($current_fiscal_period)) { |
| 297 | - $fiscal_period_nav_text .= $current_fiscal_period['label'].' (' . (isset($current_fiscal_period) ? dol_print_date($current_fiscal_period['date_start'], 'day') . ' - ' . dol_print_date($current_fiscal_period['date_end'], 'day') . ')' : ''); |
|
| 297 | + $fiscal_period_nav_text .= $current_fiscal_period['label'].' ('.(isset($current_fiscal_period) ? dol_print_date($current_fiscal_period['date_start'], 'day').' - '.dol_print_date($current_fiscal_period['date_end'], 'day').')' : ''); |
|
| 298 | 298 | } |
| 299 | 299 | |
| 300 | -print load_fiche_titre($langs->trans("Closure") . " - " . $fiscal_period_nav_text, '', 'title_accountancy'); |
|
| 300 | +print load_fiche_titre($langs->trans("Closure")." - ".$fiscal_period_nav_text, '', 'title_accountancy'); |
|
| 301 | 301 | |
| 302 | 302 | if (empty($current_fiscal_period)) { |
| 303 | 303 | print $langs->trans('ErrorNoFiscalPeriodActiveFound'); |
@@ -306,12 +306,12 @@ discard block |
||
| 306 | 306 | if (isset($current_fiscal_period)) { |
| 307 | 307 | // Step 1 |
| 308 | 308 | $head = array(); |
| 309 | - $head[0][0] = DOL_URL_ROOT . '/accountancy/closure/index.php?fiscal_period_id=' . $current_fiscal_period['id']; |
|
| 309 | + $head[0][0] = DOL_URL_ROOT.'/accountancy/closure/index.php?fiscal_period_id='.$current_fiscal_period['id']; |
|
| 310 | 310 | $head[0][1] = $langs->trans("AccountancyClosureStep1"); |
| 311 | 311 | $head[0][2] = 'step1'; |
| 312 | 312 | print dol_get_fiche_head($head, 'step1', '', -1, 'title_accountancy'); |
| 313 | 313 | |
| 314 | - print '<span class="opacitymedium">' . $langs->trans("AccountancyClosureStep1Desc") . '</span><br>'; |
|
| 314 | + print '<span class="opacitymedium">'.$langs->trans("AccountancyClosureStep1Desc").'</span><br>'; |
|
| 315 | 315 | |
| 316 | 316 | $count_by_month = $object->getCountByMonthForFiscalPeriod($current_fiscal_period['date_start'], $current_fiscal_period['date_end']); |
| 317 | 317 | if (!is_array($count_by_month)) { |
@@ -319,9 +319,9 @@ discard block |
||
| 319 | 319 | } |
| 320 | 320 | |
| 321 | 321 | if (empty($count_by_month['total'])) { |
| 322 | - $buttonvalidate = '<a class="butActionRefused classfortooltip" href="#">' . $langs->trans("ValidateMovements") . '</a>'; |
|
| 322 | + $buttonvalidate = '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("ValidateMovements").'</a>'; |
|
| 323 | 323 | } else { |
| 324 | - $buttonvalidate = '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=step_1&fiscal_period_id=' . $current_fiscal_period['id'] . '">' . $langs->trans("ValidateMovements") . '</a>'; |
|
| 324 | + $buttonvalidate = '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=step_1&fiscal_period_id='.$current_fiscal_period['id'].'">'.$langs->trans("ValidateMovements").'</a>'; |
|
| 325 | 325 | } |
| 326 | 326 | print_barre_liste($langs->trans("OverviewOfMovementsNotValidated"), '', '', '', '', '', '', -1, '', '', 0, $buttonvalidate, '', 0, 1, 0); |
| 327 | 327 | |
@@ -331,24 +331,24 @@ discard block |
||
| 331 | 331 | print '<tr class="liste_titre">'; |
| 332 | 332 | $nb_years = is_array($count_by_month['list']) ? count($count_by_month['list']) : 0; |
| 333 | 333 | if ($nb_years > 1) { |
| 334 | - print '<td class="right">' . $langs->trans("Year") . '</td>'; |
|
| 334 | + print '<td class="right">'.$langs->trans("Year").'</td>'; |
|
| 335 | 335 | } |
| 336 | 336 | for ($i = 1; $i <= 12; $i++) { |
| 337 | - print '<td class="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>'; |
|
| 337 | + print '<td class="right">'.$langs->trans('MonthShort'.str_pad($i, 2, '0', STR_PAD_LEFT)).'</td>'; |
|
| 338 | 338 | } |
| 339 | - print '<td class="right"><b>' . $langs->trans("Total") . '</b></td>'; |
|
| 339 | + print '<td class="right"><b>'.$langs->trans("Total").'</b></td>'; |
|
| 340 | 340 | print '</tr>'; |
| 341 | 341 | |
| 342 | 342 | if (is_array($count_by_month['list'])) { |
| 343 | 343 | foreach ($count_by_month['list'] as $info) { |
| 344 | 344 | print '<tr class="oddeven">'; |
| 345 | 345 | if ($nb_years > 1) { |
| 346 | - print '<td class="right">' . $info['year'] . '</td>'; |
|
| 346 | + print '<td class="right">'.$info['year'].'</td>'; |
|
| 347 | 347 | } |
| 348 | 348 | for ($i = 1; $i <= 12; $i++) { |
| 349 | - print '<td class="right">' . ((int) $info['count'][$i]) . '</td>'; |
|
| 349 | + print '<td class="right">'.((int) $info['count'][$i]).'</td>'; |
|
| 350 | 350 | } |
| 351 | - print '<td class="right"><b>' . $info['total'] . '</b></td></tr>'; |
|
| 351 | + print '<td class="right"><b>'.$info['total'].'</b></td></tr>'; |
|
| 352 | 352 | } |
| 353 | 353 | } |
| 354 | 354 | |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | |
| 358 | 358 | // Step 2 |
| 359 | 359 | $head = array(); |
| 360 | - $head[0][0] = DOL_URL_ROOT . '/accountancy/closure/index.php?fiscal_period_id=' . $current_fiscal_period['id']; |
|
| 360 | + $head[0][0] = DOL_URL_ROOT.'/accountancy/closure/index.php?fiscal_period_id='.$current_fiscal_period['id']; |
|
| 361 | 361 | $head[0][1] = $langs->trans("AccountancyClosureStep2"); |
| 362 | 362 | $head[0][2] = 'step2'; |
| 363 | 363 | print dol_get_fiche_head($head, 'step2', '', -1, 'title_accountancy'); |
@@ -365,15 +365,15 @@ discard block |
||
| 365 | 365 | // print '<span class="opacitymedium">' . $langs->trans("AccountancyClosureStep2Desc") . '</span><br>'; |
| 366 | 366 | |
| 367 | 367 | if (empty($count_by_month['total']) && empty($current_fiscal_period['status'])) { |
| 368 | - $button = '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=step_2&fiscal_period_id=' . $current_fiscal_period['id'] . '">' . $langs->trans("AccountancyClosureClose") . '</a>'; |
|
| 368 | + $button = '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=step_2&fiscal_period_id='.$current_fiscal_period['id'].'">'.$langs->trans("AccountancyClosureClose").'</a>'; |
|
| 369 | 369 | } else { |
| 370 | - $button = '<a class="butActionRefused classfortooltip" href="#">' . $langs->trans("AccountancyClosureClose") . '</a>'; |
|
| 370 | + $button = '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AccountancyClosureClose").'</a>'; |
|
| 371 | 371 | } |
| 372 | 372 | print_barre_liste('', '', '', '', '', '', '', -1, '', '', 0, $button, '', 0, 1, 0); |
| 373 | 373 | |
| 374 | 374 | // Step 3 |
| 375 | 375 | $head = array(); |
| 376 | - $head[0][0] = DOL_URL_ROOT . '/accountancy/closure/index.php?fiscal_period_id=' . $current_fiscal_period['id']; |
|
| 376 | + $head[0][0] = DOL_URL_ROOT.'/accountancy/closure/index.php?fiscal_period_id='.$current_fiscal_period['id']; |
|
| 377 | 377 | $head[0][1] = $langs->trans("AccountancyClosureStep3"); |
| 378 | 378 | $head[0][2] = 'step3'; |
| 379 | 379 | print dol_get_fiche_head($head, 'step3', '', -1, 'title_accountancy'); |
@@ -381,9 +381,9 @@ discard block |
||
| 381 | 381 | // print '<span class="opacitymedium">' . $langs->trans("AccountancyClosureStep3Desc") . '</span><br>'; |
| 382 | 382 | |
| 383 | 383 | if (empty($current_fiscal_period['status'])) { |
| 384 | - $button = '<a class="butActionRefused classfortooltip" href="#">' . $langs->trans("AccountancyClosureAccountingReversal") . '</a>'; |
|
| 384 | + $button = '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AccountancyClosureAccountingReversal").'</a>'; |
|
| 385 | 385 | } else { |
| 386 | - $button = '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=step_3&fiscal_period_id=' . $current_fiscal_period['id'] . '">' . $langs->trans("AccountancyClosureAccountingReversal") . '</a>'; |
|
| 386 | + $button = '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=step_3&fiscal_period_id='.$current_fiscal_period['id'].'">'.$langs->trans("AccountancyClosureAccountingReversal").'</a>'; |
|
| 387 | 387 | } |
| 388 | 388 | print_barre_liste('', '', '', '', '', '', '', -1, '', '', 0, $button, '', 0, 1, 0); |
| 389 | 389 | } |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | 'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers, 'position'=>55), |
| 182 | 182 | 'c.date_commande'=>array('label'=>"OrderDateShort", 'checked'=>1, 'position'=>60, 'csslist'=>'nowraponall'), |
| 183 | 183 | 'c.date_delivery'=>array('label'=>"DateDeliveryPlanned", 'checked'=>1, 'enabled'=>!getDolGlobalString('ORDER_DISABLE_DELIVERY_DATE'), 'position'=>65, 'csslist'=>'nowraponall'), |
| 184 | - 'c.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>-1, 'position'=>66 , 'enabled'=>isModEnabled("expedition")), |
|
| 184 | + 'c.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>-1, 'position'=>66, 'enabled'=>isModEnabled("expedition")), |
|
| 185 | 185 | 'c.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>-1, 'position'=>67), |
| 186 | 186 | 'c.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>-1, 'position'=>68), |
| 187 | 187 | 'c.fk_input_reason'=>array('label'=>"Channel", 'checked'=>-1, 'position'=>69), |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | 'c.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>130), |
| 205 | 205 | 'c.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES')), 'position'=>135), |
| 206 | 206 | 'c.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES')), 'position'=>140), |
| 207 | - 'shippable'=>array('label'=>"Shippable", 'checked'=>1,'enabled'=>(isModEnabled("expedition")), 'position'=>990), |
|
| 207 | + 'shippable'=>array('label'=>"Shippable", 'checked'=>1, 'enabled'=>(isModEnabled("expedition")), 'position'=>990), |
|
| 208 | 208 | 'c.facture'=>array('label'=>"Billed", 'checked'=>1, 'enabled'=>(!getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT')), 'position'=>995), |
| 209 | 209 | 'c.import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>999), |
| 210 | 210 | 'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000) |
@@ -322,8 +322,8 @@ discard block |
||
| 322 | 322 | } |
| 323 | 323 | $uploaddir = $conf->commande->multidir_output[$conf->entity]; |
| 324 | 324 | $triggersendname = 'ORDER_SENTBYMAIL'; |
| 325 | - $year=""; |
|
| 326 | - $month=""; |
|
| 325 | + $year = ""; |
|
| 326 | + $month = ""; |
|
| 327 | 327 | include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; |
| 328 | 328 | |
| 329 | 329 | if ($massaction == 'confirm_createbills') { // Create bills from orders. |
@@ -338,7 +338,7 @@ discard block |
||
| 338 | 338 | $TFactThirdNbLines = array(); |
| 339 | 339 | |
| 340 | 340 | $nb_bills_created = 0; |
| 341 | - $lastid= 0; |
|
| 341 | + $lastid = 0; |
|
| 342 | 342 | $lastref = ''; |
| 343 | 343 | |
| 344 | 344 | $db->begin(); |
@@ -1036,7 +1036,7 @@ discard block |
||
| 1036 | 1036 | if ($searchCategoryProductOperator == 0) { |
| 1037 | 1037 | $searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."commandedet as cd WHERE cd.fk_commande = c.rowid AND cd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")"; |
| 1038 | 1038 | } else { |
| 1039 | - $listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct); |
|
| 1039 | + $listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct); |
|
| 1040 | 1040 | } |
| 1041 | 1041 | } |
| 1042 | 1042 | } |
@@ -2602,13 +2602,13 @@ discard block |
||
| 2602 | 2602 | print '<td class="center">'; |
| 2603 | 2603 | if (!empty($show_shippable_command) && isModEnabled('stock')) { |
| 2604 | 2604 | if (($obj->fk_statut > $generic_commande::STATUS_DRAFT) && ($obj->fk_statut < $generic_commande::STATUS_CLOSED)) { |
| 2605 | - $generic_commande->getLinesArray(); // Load array ->lines |
|
| 2606 | - $generic_commande->loadExpeditions(); // Load array ->expeditions |
|
| 2605 | + $generic_commande->getLinesArray(); // Load array ->lines |
|
| 2606 | + $generic_commande->loadExpeditions(); // Load array ->expeditions |
|
| 2607 | 2607 | |
| 2608 | 2608 | $numlines = count($generic_commande->lines); // Loop on each line of order |
| 2609 | 2609 | for ($lig = 0; $lig < $numlines; $lig++) { |
| 2610 | 2610 | if (isset($generic_commande->expeditions[$generic_commande->lines[$lig]->id])) { |
| 2611 | - $reliquat = $generic_commande->lines[$lig]->qty - $generic_commande->expeditions[$generic_commande->lines[$lig]->id]; |
|
| 2611 | + $reliquat = $generic_commande->lines[$lig]->qty - $generic_commande->expeditions[$generic_commande->lines[$lig]->id]; |
|
| 2612 | 2612 | } else { |
| 2613 | 2613 | $reliquat = $generic_commande->lines[$lig]->qty; |
| 2614 | 2614 | } |
@@ -298,9 +298,9 @@ discard block |
||
| 298 | 298 | // Create a line of payments |
| 299 | 299 | $paiement = new PaymentSalary($db); |
| 300 | 300 | $paiement->fk_salary = $object->id; |
| 301 | - $paiement->chid = $object->id; // deprecated |
|
| 301 | + $paiement->chid = $object->id; // deprecated |
|
| 302 | 302 | $paiement->datep = $datep; |
| 303 | - $paiement->datev = $datev; |
|
| 303 | + $paiement->datev = $datev; |
|
| 304 | 304 | $paiement->amounts = array($object->id=>$amount); // Tableau de montant |
| 305 | 305 | $paiement->fk_typepayment = $type_payment; |
| 306 | 306 | $paiement->num_payment = GETPOST("num_payment", 'alphanohtml'); |
@@ -329,10 +329,10 @@ discard block |
||
| 329 | 329 | |
| 330 | 330 | if (GETPOST('saveandnew', 'alpha')) { |
| 331 | 331 | setEventMessages($langs->trans("RecordSaved"), null, 'mesgs'); |
| 332 | - header("Location: card.php?action=create&fk_project=" . urlencode($projectid) . "&accountid=" . urlencode($accountid) . '&paymenttype=' . urlencode(GETPOST('paymenttype', 'az09')) . '&datepday=' . GETPOST("datepday", 'int') . '&datepmonth=' . GETPOST("datepmonth", 'int') . '&datepyear=' . GETPOST("datepyear", 'int')); |
|
| 332 | + header("Location: card.php?action=create&fk_project=".urlencode($projectid)."&accountid=".urlencode($accountid).'&paymenttype='.urlencode(GETPOST('paymenttype', 'az09')).'&datepday='.GETPOST("datepday", 'int').'&datepmonth='.GETPOST("datepmonth", 'int').'&datepyear='.GETPOST("datepyear", 'int')); |
|
| 333 | 333 | exit; |
| 334 | 334 | } else { |
| 335 | - header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $object->id); |
|
| 335 | + header("Location: ".$_SERVER['PHP_SELF'].'?id='.$object->id); |
|
| 336 | 336 | exit; |
| 337 | 337 | } |
| 338 | 338 | } else { |
@@ -618,7 +618,7 @@ discard block |
||
| 618 | 618 | |
| 619 | 619 | // Auto create payment |
| 620 | 620 | print '<tr><td><label for="auto_create_paiement">'.$langs->trans('AutomaticCreationPayment').'</label></td>'; |
| 621 | - print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" ' . (empty($auto_create_paiement) ? '' : 'checked="checked"') . ' value="1"></td></tr>'."\n"; // Date payment |
|
| 621 | + print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" '.(empty($auto_create_paiement) ? '' : 'checked="checked"').' value="1"></td></tr>'."\n"; // Date payment |
|
| 622 | 622 | |
| 623 | 623 | // Bank |
| 624 | 624 | if (isModEnabled("banque")) { |
@@ -824,10 +824,10 @@ discard block |
||
| 824 | 824 | $userstatic = new User($db); |
| 825 | 825 | $result = $userstatic->fetch($object->fk_user); |
| 826 | 826 | if ($result > 0) { |
| 827 | - $morehtmlref .= '<br>' .$langs->trans('Employee').' : '.$userstatic->getNomUrl(-1); |
|
| 827 | + $morehtmlref .= '<br>'.$langs->trans('Employee').' : '.$userstatic->getNomUrl(-1); |
|
| 828 | 828 | } |
| 829 | 829 | } else { |
| 830 | - $morehtmlref .= '<br>' . $form->editfieldkey("Employee", 'fk_user', $object->label, $object, $permissiontoadd, 'string', '', 0, 1); |
|
| 830 | + $morehtmlref .= '<br>'.$form->editfieldkey("Employee", 'fk_user', $object->label, $object, $permissiontoadd, 'string', '', 0, 1); |
|
| 831 | 831 | |
| 832 | 832 | if (!empty($object->fk_user)) { |
| 833 | 833 | $userstatic = new User($db); |
@@ -893,7 +893,7 @@ discard block |
||
| 893 | 893 | print "</td></tr>"; |
| 894 | 894 | } else { |
| 895 | 895 | print "<tr>"; |
| 896 | - print '<td class="titlefield">' . $langs->trans("DateStartPeriod") . '</td><td>'; |
|
| 896 | + print '<td class="titlefield">'.$langs->trans("DateStartPeriod").'</td><td>'; |
|
| 897 | 897 | print dol_print_date($object->datesp, 'day'); |
| 898 | 898 | print '</td></tr>'; |
| 899 | 899 | } |
@@ -904,7 +904,7 @@ discard block |
||
| 904 | 904 | print "</td></tr>"; |
| 905 | 905 | } else { |
| 906 | 906 | print "<tr>"; |
| 907 | - print '<td>' . $langs->trans("DateEndPeriod") . '</td><td>'; |
|
| 907 | + print '<td>'.$langs->trans("DateEndPeriod").'</td><td>'; |
|
| 908 | 908 | print dol_print_date($object->dateep, 'day'); |
| 909 | 909 | print '</td></tr>'; |
| 910 | 910 | } |
@@ -919,9 +919,9 @@ discard block |
||
| 919 | 919 | print '</td></tr>';*/ |
| 920 | 920 | |
| 921 | 921 | if ($action == 'edit') { |
| 922 | - print '<tr><td class="fieldrequired">' . $langs->trans("Amount") . '</td><td><input name="amount" size="10" value="' . price($object->amount) . '"></td></tr>'; |
|
| 922 | + print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.price($object->amount).'"></td></tr>'; |
|
| 923 | 923 | } else { |
| 924 | - print '<tr><td>' . $langs->trans("Amount") . '</td><td><span class="amount">' . price($object->amount, 0, $langs, 1, -1, -1, $conf->currency) . '</span></td></tr>'; |
|
| 924 | + print '<tr><td>'.$langs->trans("Amount").'</td><td><span class="amount">'.price($object->amount, 0, $langs, 1, -1, -1, $conf->currency).'</span></td></tr>'; |
|
| 925 | 925 | } |
| 926 | 926 | |
| 927 | 927 | // Default mode of payment |
@@ -1099,7 +1099,7 @@ discard block |
||
| 1099 | 1099 | if (empty($user->socid)) { |
| 1100 | 1100 | $canSendMail = true; |
| 1101 | 1101 | |
| 1102 | - print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=presend&token='.newToken().'&mode=init#formmailbeforetitle', '', $canSendMail); |
|
| 1102 | + print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle', '', $canSendMail); |
|
| 1103 | 1103 | } |
| 1104 | 1104 | } |
| 1105 | 1105 | |
@@ -1115,7 +1115,7 @@ discard block |
||
| 1115 | 1115 | |
| 1116 | 1116 | // Emit payment |
| 1117 | 1117 | if ($object->paye == 0 && ((price2num($object->amount) < 0 && $resteapayer < 0) || (price2num($object->amount) > 0 && $resteapayer > 0)) && $permissiontoadd) { |
| 1118 | - print dolGetButtonAction('', $langs->trans('DoPayment'), 'default', DOL_URL_ROOT.'/salaries/paiement_salary.php?action=create&token='.newToken().'&id='. $object->id, ''); |
|
| 1118 | + print dolGetButtonAction('', $langs->trans('DoPayment'), 'default', DOL_URL_ROOT.'/salaries/paiement_salary.php?action=create&token='.newToken().'&id='.$object->id, ''); |
|
| 1119 | 1119 | } |
| 1120 | 1120 | |
| 1121 | 1121 | // Classify 'paid' |
@@ -107,7 +107,7 @@ |
||
| 107 | 107 | // Create a line of payments |
| 108 | 108 | $paiement = new PaymentSalary($db); |
| 109 | 109 | $paiement->fk_salary = $id; |
| 110 | - $paiement->chid = $id; // deprecated |
|
| 110 | + $paiement->chid = $id; // deprecated |
|
| 111 | 111 | $paiement->datep = $datepaye; |
| 112 | 112 | $paiement->amounts = $amounts; // Tableau de montant |
| 113 | 113 | $paiement->fk_typepayment = GETPOST("paiementtype", 'alphanohtml'); |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | $label = (string) GETPOST('label', 'alphanohtml'); |
| 51 | 51 | |
| 52 | 52 | $exporttype = GETPOSTISSET('exporttype') ? GETPOST('exporttype', 'alphanohtml') : 'deb'; // DEB or DES |
| 53 | -$type_declaration = (string) GETPOST('type_declaration', 'alphanohtml'); // 'introduction' or 'expedition' |
|
| 53 | +$type_declaration = (string) GETPOST('type_declaration', 'alphanohtml'); // 'introduction' or 'expedition' |
|
| 54 | 54 | |
| 55 | 55 | $backtopage = GETPOST('backtopage', 'alpha'); |
| 56 | 56 | |
@@ -124,8 +124,8 @@ discard block |
||
| 124 | 124 | |
| 125 | 125 | if ($action == 'add' && $permissiontoadd) { |
| 126 | 126 | $object->label = trim($label); |
| 127 | - $object->exporttype = trim($exporttype); // 'des' or 'deb' |
|
| 128 | - $object->type_declaration = $type_declaration; // 'introduction' or 'expedition' |
|
| 127 | + $object->exporttype = trim($exporttype); // 'des' or 'deb' |
|
| 128 | + $object->type_declaration = $type_declaration; // 'introduction' or 'expedition' |
|
| 129 | 129 | //$object->subscription = (int) $subscription; |
| 130 | 130 | |
| 131 | 131 | // Fill array 'array_options' with data from add form |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | public $picto = 'intracommreport'; |
| 57 | 57 | |
| 58 | 58 | |
| 59 | - public $label; // ref ??? |
|
| 59 | + public $label; // ref ??? |
|
| 60 | 60 | |
| 61 | 61 | public $period; |
| 62 | 62 | |
@@ -67,8 +67,8 @@ discard block |
||
| 67 | 67 | */ |
| 68 | 68 | public $declaration_number; |
| 69 | 69 | |
| 70 | - public $exporttype; // deb or des |
|
| 71 | - public $type_declaration; // 'introduction' or 'expedition' |
|
| 70 | + public $exporttype; // deb or des |
|
| 71 | + public $type_declaration; // 'introduction' or 'expedition' |
|
| 72 | 72 | public $numero_declaration; |
| 73 | 73 | |
| 74 | 74 | |
@@ -299,10 +299,10 @@ discard block |
||
| 299 | 299 | if (getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) { |
| 300 | 300 | if ($tmpsource && $REF) { |
| 301 | 301 | // Use the source in the hash to avoid duplicates if the references are identical |
| 302 | - $tokenisok = dol_verifyHash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . $tmpsource.$REF, $SECUREKEY, '2'); |
|
| 302 | + $tokenisok = dol_verifyHash(getDolGlobalString('PAYMENT_SECURITY_TOKEN').$tmpsource.$REF, $SECUREKEY, '2'); |
|
| 303 | 303 | // Do a second test for retro-compatibility (token may have been hashed with membersubscription in external module) |
| 304 | 304 | if ($tmpsource != $source) { |
| 305 | - $tokenisok = dol_verifyHash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . $source.$REF, $SECUREKEY, '2'); |
|
| 305 | + $tokenisok = dol_verifyHash(getDolGlobalString('PAYMENT_SECURITY_TOKEN').$source.$REF, $SECUREKEY, '2'); |
|
| 306 | 306 | } |
| 307 | 307 | } else { |
| 308 | 308 | $tokenisok = dol_verifyHash($conf->global->PAYMENT_SECURITY_TOKEN, $SECUREKEY, '2'); |
@@ -311,7 +311,7 @@ discard block |
||
| 311 | 311 | $tokenisok = ($conf->global->PAYMENT_SECURITY_TOKEN == $SECUREKEY); |
| 312 | 312 | } |
| 313 | 313 | |
| 314 | - if (! $tokenisok) { |
|
| 314 | + if (!$tokenisok) { |
|
| 315 | 315 | if (!getDolGlobalString('PAYMENT_SECURITY_ACCEPT_ANY_TOKEN')) { |
| 316 | 316 | $valid = false; // PAYMENT_SECURITY_ACCEPT_ANY_TOKEN is for backward compatibility |
| 317 | 317 | } else { |
@@ -340,9 +340,9 @@ discard block |
||
| 340 | 340 | $paramcreditor = 'ONLINE_PAYMENT_CREDITOR'; |
| 341 | 341 | $paramcreditorlong = 'ONLINE_PAYMENT_CREDITOR_'.$suffix; |
| 342 | 342 | if (!empty($conf->global->$paramcreditorlong)) { |
| 343 | - $creditor = $conf->global->$paramcreditorlong; // use label long of the seller to show |
|
| 343 | + $creditor = $conf->global->$paramcreditorlong; // use label long of the seller to show |
|
| 344 | 344 | } elseif (!empty($conf->global->$paramcreditor)) { |
| 345 | - $creditor = $conf->global->$paramcreditor; // use label short of the seller to show |
|
| 345 | + $creditor = $conf->global->$paramcreditor; // use label short of the seller to show |
|
| 346 | 346 | } |
| 347 | 347 | |
| 348 | 348 | $mesg = ''; |
@@ -791,8 +791,8 @@ discard block |
||
| 791 | 791 | $remoteip = getUserRemoteIP(); |
| 792 | 792 | |
| 793 | 793 | $_SESSION["onlinetoken"] = $stripeToken; |
| 794 | - $_SESSION["FinalPaymentAmt"] = $amount; // amount really paid (coming from Stripe). Will be used for check in paymentok.php. |
|
| 795 | - $_SESSION["currencyCodeType"] = $currency; // currency really used for payment (coming from Stripe). Will be used for check in paymentok.php. |
|
| 794 | + $_SESSION["FinalPaymentAmt"] = $amount; // amount really paid (coming from Stripe). Will be used for check in paymentok.php. |
|
| 795 | + $_SESSION["currencyCodeType"] = $currency; // currency really used for payment (coming from Stripe). Will be used for check in paymentok.php. |
|
| 796 | 796 | $_SESSION["paymentType"] = ''; |
| 797 | 797 | $_SESSION['ipaddress'] = ($remoteip ? $remoteip : 'unknown'); // Payer ip |
| 798 | 798 | $_SESSION['payerID'] = is_object($customer) ? $customer->id : ''; |
@@ -838,7 +838,7 @@ discard block |
||
| 838 | 838 | |
| 839 | 839 | $head = ''; |
| 840 | 840 | if (getDolGlobalString('ONLINE_PAYMENT_CSS_URL')) { |
| 841 | - $head = '<link rel="stylesheet" type="text/css" href="' . getDolGlobalString('ONLINE_PAYMENT_CSS_URL').'?lang='.(!empty($getpostlang) ? $getpostlang : $langs->defaultlang).'">'."\n"; |
|
| 841 | + $head = '<link rel="stylesheet" type="text/css" href="'.getDolGlobalString('ONLINE_PAYMENT_CSS_URL').'?lang='.(!empty($getpostlang) ? $getpostlang : $langs->defaultlang).'">'."\n"; |
|
| 842 | 842 | } |
| 843 | 843 | |
| 844 | 844 | $conf->dol_hide_topmenu = 1; |
@@ -962,7 +962,7 @@ discard block |
||
| 962 | 962 | if (preg_match('/^\((.*)\)$/', $conf->global->PAYMENT_NEWFORM_TEXT, $reg)) { |
| 963 | 963 | $text .= $langs->trans($reg[1])."<br>\n"; |
| 964 | 964 | } else { |
| 965 | - $text .= getDolGlobalString('PAYMENT_NEWFORM_TEXT') . "<br>\n"; |
|
| 965 | + $text .= getDolGlobalString('PAYMENT_NEWFORM_TEXT')."<br>\n"; |
|
| 966 | 966 | } |
| 967 | 967 | $text = '<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n"; |
| 968 | 968 | } |
@@ -1013,7 +1013,7 @@ discard block |
||
| 1013 | 1013 | // Currency |
| 1014 | 1014 | print ' <b>'.$langs->trans("Currency".$currency).'</b>'; |
| 1015 | 1015 | } else { |
| 1016 | - print '<b class="amount">'.price($amount, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency |
|
| 1016 | + print '<b class="amount">'.price($amount, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency |
|
| 1017 | 1017 | print '<input type="hidden" name="amount" value="'.$amount.'">'; |
| 1018 | 1018 | print '<input type="hidden" name="newamount" value="'.$amount.'">'; |
| 1019 | 1019 | } |
@@ -1114,7 +1114,7 @@ discard block |
||
| 1114 | 1114 | // Currency |
| 1115 | 1115 | print ' <b>'.$langs->trans("Currency".$currency).'</b>'; |
| 1116 | 1116 | } else { |
| 1117 | - print '<b class="amount">'.price($amount, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency |
|
| 1117 | + print '<b class="amount">'.price($amount, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency |
|
| 1118 | 1118 | print '<input type="hidden" name="amount" value="'.$amount.'">'; |
| 1119 | 1119 | print '<input type="hidden" name="newamount" value="'.$amount.'">'; |
| 1120 | 1120 | } |
@@ -1245,12 +1245,12 @@ discard block |
||
| 1245 | 1245 | print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount", "alpha"), 'MT').'">'; |
| 1246 | 1246 | print ' <b>'.$langs->trans("Currency".$currency).'</b>'; |
| 1247 | 1247 | } else { |
| 1248 | - print '<b class="amount">'.price($amount, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency |
|
| 1248 | + print '<b class="amount">'.price($amount, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency |
|
| 1249 | 1249 | print '<input type="hidden" name="amount" value="'.$amount.'">'; |
| 1250 | 1250 | print '<input type="hidden" name="newamount" value="'.$amount.'">'; |
| 1251 | 1251 | } |
| 1252 | 1252 | } else { |
| 1253 | - print '<b class="amount">'.price($object->total_ttc, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency |
|
| 1253 | + print '<b class="amount">'.price($object->total_ttc, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency |
|
| 1254 | 1254 | } |
| 1255 | 1255 | print '<input type="hidden" name="currency" value="'.$currency.'">'; |
| 1256 | 1256 | print '</td></tr>'."\n"; |
@@ -1445,7 +1445,7 @@ discard block |
||
| 1445 | 1445 | // Currency |
| 1446 | 1446 | print ' <b>'.$langs->trans("Currency".$currency).'</b>'; |
| 1447 | 1447 | } else { |
| 1448 | - print '<b class="amount">'.price($amount, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency |
|
| 1448 | + print '<b class="amount">'.price($amount, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency |
|
| 1449 | 1449 | print '<input type="hidden" name="amount" value="'.$amount.'">'; |
| 1450 | 1450 | print '<input type="hidden" name="newamount" value="'.$amount.'">'; |
| 1451 | 1451 | } |
@@ -1496,7 +1496,7 @@ discard block |
||
| 1496 | 1496 | if ($source == 'member' || $source == 'membersubscription') { |
| 1497 | 1497 | $newsource = 'member'; |
| 1498 | 1498 | |
| 1499 | - $tag=""; |
|
| 1499 | + $tag = ""; |
|
| 1500 | 1500 | $found = true; |
| 1501 | 1501 | $langs->load("members"); |
| 1502 | 1502 | |
@@ -1647,7 +1647,7 @@ discard block |
||
| 1647 | 1647 | print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Amount"); |
| 1648 | 1648 | // This place no longer allows amount edition |
| 1649 | 1649 | if (getDolGlobalString('MEMBER_EXT_URL_SUBSCRIPTION_INFO')) { |
| 1650 | - print ' - <a href="' . getDolGlobalString('MEMBER_EXT_URL_SUBSCRIPTION_INFO').'" rel="external" target="_blank" rel="noopener noreferrer">'.$langs->trans("SeeHere").'</a>'; |
|
| 1650 | + print ' - <a href="'.getDolGlobalString('MEMBER_EXT_URL_SUBSCRIPTION_INFO').'" rel="external" target="_blank" rel="noopener noreferrer">'.$langs->trans("SeeHere").'</a>'; |
|
| 1651 | 1651 | } |
| 1652 | 1652 | print '</td><td class="CTableRow2">'; |
| 1653 | 1653 | if (getDolGlobalString('MEMBER_MIN_AMOUNT') && $amount) { |
@@ -1663,9 +1663,9 @@ discard block |
||
| 1663 | 1663 | print '<input type="text" class="width75" name="newamount" value="'.price($amount, 1, $langs, 1, -1, -1).'">'; |
| 1664 | 1664 | } |
| 1665 | 1665 | } else { |
| 1666 | - print '<b class="amount">'.price($amount, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency |
|
| 1666 | + print '<b class="amount">'.price($amount, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency |
|
| 1667 | 1667 | if ($minimumamount > $amount) { |
| 1668 | - print ' <span class="opacitymedium small">'. $langs->trans("AmountIsLowerToMinimumNotice", price($minimumamount, 1, $langs, 1, -1, -1, $currency)).'</span>'; |
|
| 1668 | + print ' <span class="opacitymedium small">'.$langs->trans("AmountIsLowerToMinimumNotice", price($minimumamount, 1, $langs, 1, -1, -1, $currency)).'</span>'; |
|
| 1669 | 1669 | } |
| 1670 | 1670 | print '<input type="hidden" name="newamount" value="'.$amount.'">'; |
| 1671 | 1671 | } |
@@ -1785,7 +1785,7 @@ discard block |
||
| 1785 | 1785 | print ' ('.$langs->trans("ToComplete"); |
| 1786 | 1786 | } |
| 1787 | 1787 | if (getDolGlobalString('DONATION_EXT_URL_SUBSCRIPTION_INFO')) { |
| 1788 | - print ' - <a href="' . getDolGlobalString('DONATION_EXT_URL_SUBSCRIPTION_INFO').'" rel="external" target="_blank" rel="noopener noreferrer">'.$langs->trans("SeeHere").'</a>'; |
|
| 1788 | + print ' - <a href="'.getDolGlobalString('DONATION_EXT_URL_SUBSCRIPTION_INFO').'" rel="external" target="_blank" rel="noopener noreferrer">'.$langs->trans("SeeHere").'</a>'; |
|
| 1789 | 1789 | } |
| 1790 | 1790 | if (!getDolGlobalString('DONATION_NEWFORM_AMOUNT')) { |
| 1791 | 1791 | print ')'; |
@@ -1823,7 +1823,7 @@ discard block |
||
| 1823 | 1823 | $valtoshow = max(getDolGlobalString('DONATION_MIN_AMOUNT'), $valtoshow); |
| 1824 | 1824 | $amount = $valtoshow; |
| 1825 | 1825 | } |
| 1826 | - print '<b class="amount">'.price($valtoshow, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency |
|
| 1826 | + print '<b class="amount">'.price($valtoshow, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency |
|
| 1827 | 1827 | print '<input type="hidden" name="amount" value="'.$valtoshow.'">'; |
| 1828 | 1828 | print '<input type="hidden" name="newamount" value="'.$valtoshow.'">'; |
| 1829 | 1829 | } |
@@ -1899,7 +1899,7 @@ discard block |
||
| 1899 | 1899 | print '</b>'; |
| 1900 | 1900 | print '</td></tr>'."\n"; |
| 1901 | 1901 | |
| 1902 | - if (! is_object($attendee->project)) { |
|
| 1902 | + if (!is_object($attendee->project)) { |
|
| 1903 | 1903 | $text = 'ErrorProjectNotFound'; |
| 1904 | 1904 | } else { |
| 1905 | 1905 | $text = $langs->trans("PaymentEvent").' - '.$attendee->project->title; |
@@ -1916,7 +1916,7 @@ discard block |
||
| 1916 | 1916 | print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Amount"); |
| 1917 | 1917 | print '</td><td class="CTableRow2">'; |
| 1918 | 1918 | $valtoshow = $amount; |
| 1919 | - print '<b class="amount">'.price($valtoshow, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency |
|
| 1919 | + print '<b class="amount">'.price($valtoshow, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency |
|
| 1920 | 1920 | print '<input type="hidden" name="amount" value="'.$valtoshow.'">'; |
| 1921 | 1921 | print '<input type="hidden" name="newamount" value="'.$valtoshow.'">'; |
| 1922 | 1922 | print '<input type="hidden" name="currency" value="'.$currency.'">'; |
@@ -2000,7 +2000,7 @@ discard block |
||
| 2000 | 2000 | print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Amount"); |
| 2001 | 2001 | print '</td><td class="CTableRow2">'; |
| 2002 | 2002 | $valtoshow = $amount; |
| 2003 | - print '<b class="amount">'.price($valtoshow, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency |
|
| 2003 | + print '<b class="amount">'.price($valtoshow, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency |
|
| 2004 | 2004 | print '<input type="hidden" name="amount" value="'.$valtoshow.'">'; |
| 2005 | 2005 | print '<input type="hidden" name="newamount" value="'.$valtoshow.'">'; |
| 2006 | 2006 | print '<input type="hidden" name="currency" value="'.$currency.'">'; |
@@ -2237,7 +2237,7 @@ discard block |
||
| 2237 | 2237 | |
| 2238 | 2238 | //print '<br>'; |
| 2239 | 2239 | |
| 2240 | - print '<!-- Show Stripe form payment-form STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = ' . getDolGlobalString('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION').' STRIPE_USE_NEW_CHECKOUT = ' . getDolGlobalString('STRIPE_USE_NEW_CHECKOUT').' -->'."\n"; |
|
| 2240 | + print '<!-- Show Stripe form payment-form STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = '.getDolGlobalString('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION').' STRIPE_USE_NEW_CHECKOUT = '.getDolGlobalString('STRIPE_USE_NEW_CHECKOUT').' -->'."\n"; |
|
| 2241 | 2241 | print '<form action="'.$_SERVER['REQUEST_URI'].'" method="POST" id="payment-form">'."\n"; |
| 2242 | 2242 | |
| 2243 | 2243 | print '<input type="hidden" name="token" value="'.newToken().'">'."\n"; |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | if (getDolGlobalString('THEME_DARKMODEENABLED')) { |
| 67 | 67 | print "/* For dark mode */\n"; |
| 68 | 68 | if (getDolGlobalInt('THEME_DARKMODEENABLED') != 2) { |
| 69 | - print "@media (prefers-color-scheme: dark) {"; // To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes |
|
| 69 | + print "@media (prefers-color-scheme: dark) {"; // To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes |
|
| 70 | 70 | } else { |
| 71 | 71 | print "@media not print {"; |
| 72 | 72 | } |
@@ -5176,7 +5176,7 @@ discard block |
||
| 5176 | 5176 | if (getDolGlobalString('THEME_DARKMODEENABLED')) { |
| 5177 | 5177 | print "/* For dark mode */\n"; |
| 5178 | 5178 | if (getDolGlobalInt('THEME_DARKMODEENABLED') != 2) { |
| 5179 | - print "@media (prefers-color-scheme: dark) {"; // To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes |
|
| 5179 | + print "@media (prefers-color-scheme: dark) {"; // To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes |
|
| 5180 | 5180 | } else { |
| 5181 | 5181 | print "@media not print {"; |
| 5182 | 5182 | } ?> |