@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | $permissionnote = $user->hasRight('contrat', 'creer'); // Used by the include of actions_setnotes.inc.php |
111 | 111 | $permissiondellink = $user->hasRight('contrat', 'creer'); // Used by the include of actions_dellink.inc.php |
112 | 112 | $permissiontodelete = ($user->hasRight('contrat', 'creer') && $object->statut == $object::STATUS_DRAFT) || $user->hasRight('contrat', 'supprimer'); |
113 | -$permissiontoadd = $user->hasRight('contrat', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php |
|
113 | +$permissiontoadd = $user->hasRight('contrat', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php |
|
114 | 114 | $permissiontoedit = $permissiontoadd; |
115 | 115 | $permissiontoactivate = $user->hasRight('contrat', 'activer'); |
116 | 116 | $error = 0; |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | |
156 | 156 | include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php'; // Must be include, not include_once |
157 | 157 | |
158 | - include DOL_DOCUMENT_ROOT . '/core/actions_lineupdown.inc.php'; // Must be include, not include_once |
|
158 | + include DOL_DOCUMENT_ROOT . '/core/actions_lineupdown.inc.php'; // Must be include, not include_once |
|
159 | 159 | |
160 | 160 | if ($action == 'confirm_active' && $confirm == 'yes' && $permissiontoactivate) { |
161 | 161 | $date_start = ''; |
@@ -533,8 +533,8 @@ discard block |
||
533 | 533 | $result = $prodcustprice->fetchAll('', '', 0, 0, $filter); |
534 | 534 | if ($result) { |
535 | 535 | if (count($prodcustprice->lines) > 0) { |
536 | - $price_min = price($prodcustprice->lines[0]->price_min); |
|
537 | - $price_min_ttc = price($prodcustprice->lines[0]->price_min_ttc); |
|
536 | + $price_min = price($prodcustprice->lines[0]->price_min); |
|
537 | + $price_min_ttc = price($prodcustprice->lines[0]->price_min_ttc); |
|
538 | 538 | /*$tva_tx = $prodcustprice->lines[0]->tva_tx; |
539 | 539 | if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) { |
540 | 540 | $tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')'; |
@@ -711,7 +711,7 @@ discard block |
||
711 | 711 | if (!empty($date_start_update) && !empty($date_end_update) && $date_start_update > $date_end_update) { |
712 | 712 | setEventMessages($langs->trans("Error") . ': ' . $langs->trans("DateStartPlanned") . ' > ' . $langs->trans("DateEndPlanned"), null, 'errors'); |
713 | 713 | $action = 'editline'; |
714 | - $_GET['rowid'] = GETPOST('elrowid'); // Keep $_GET here. Used by GETPOST('rowid') later |
|
714 | + $_GET['rowid'] = GETPOST('elrowid'); // Keep $_GET here. Used by GETPOST('rowid') later |
|
715 | 715 | $error++; |
716 | 716 | } |
717 | 717 | |
@@ -770,7 +770,7 @@ discard block |
||
770 | 770 | // update price_ht with discount |
771 | 771 | // TODO Use object->updateline instead objectline->update |
772 | 772 | |
773 | - $price_ht = price2num(GETPOST('elprice'), 'MU'); |
|
773 | + $price_ht = price2num(GETPOST('elprice'), 'MU'); |
|
774 | 774 | $remise_percent = price2num(GETPOST('elremise_percent'), '', 2); |
775 | 775 | if ($remise_percent > 0) { |
776 | 776 | $remise = round(((float) $price_ht * (float) $remise_percent / 100), 2); |
@@ -875,7 +875,7 @@ discard block |
||
875 | 875 | } elseif ($action == 'confirm_activate' && $confirm == 'yes' && $user->hasRight('contrat', 'creer')) { |
876 | 876 | $date_start = dol_mktime(12, 0, 0, GETPOST('d_startmonth'), GETPOST('d_startday'), GETPOST('d_startyear')); |
877 | 877 | $date_end = dol_mktime(12, 0, 0, GETPOST('d_endmonth'), GETPOST('d_endday'), GETPOST('d_endyear')); |
878 | - $comment = GETPOST('comment', 'alpha'); |
|
878 | + $comment = GETPOST('comment', 'alpha'); |
|
879 | 879 | $result = $object->activateAll($user, $date_start, 0, $comment, $date_end); |
880 | 880 | if ($result < 0) { |
881 | 881 | setEventMessages($object->error, $object->errors, 'errors'); |
@@ -1504,7 +1504,7 @@ discard block |
||
1504 | 1504 | } |
1505 | 1505 | |
1506 | 1506 | |
1507 | - $arrayothercontracts = $object->getListOfContracts('others'); // array or -1 if technical error |
|
1507 | + $arrayothercontracts = $object->getListOfContracts('others'); // array or -1 if technical error |
|
1508 | 1508 | |
1509 | 1509 | /* |
1510 | 1510 | * Lines of contracts |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | |
76 | 76 | dol_get_fiche_head($head, 'ticket', $langs->trans("Contract"), -1, 'contract'); |
77 | 77 | |
78 | -$linkback = '<a href="' . constant('BASE_URL') . '/contrat/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">'; |
|
78 | +$linkback = '<a href="' . constant('BASE_URL') . '/contrat/list.php' . (!empty($socid) ? '?socid=' . $socid : '') . '">'; |
|
79 | 79 | $linkback .= $langs->trans("BackToList") . '</a>'; |
80 | 80 | |
81 | 81 | $morehtmlref = ''; |
@@ -136,12 +136,12 @@ discard block |
||
136 | 136 | // Thirdparty |
137 | 137 | $morehtmlref .= '<br>' . $langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1); |
138 | 138 | // Project |
139 | -if (! empty($conf->projet->enabled)) { |
|
139 | +if (!empty($conf->projet->enabled)) { |
|
140 | 140 | require_once constant('DOL_DOCUMENT_ROOT') . '/projet/class/task.class.php'; |
141 | 141 | |
142 | 142 | $langs->load("projects"); |
143 | 143 | $morehtmlref .= '<br>' . $langs->trans('Project') . ' : '; |
144 | - if (! empty($object->fk_project)) { |
|
144 | + if (!empty($object->fk_project)) { |
|
145 | 145 | $proj = new Project($db); |
146 | 146 | $proj->fetch($object->fk_project); |
147 | 147 | $morehtmlref .= '<a href="' . constant('BASE_URL') . '/projet/card.php?id='; |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | |
154 | 154 | $object->fields = dol_sort_array($object->fields, 'position'); |
155 | 155 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
156 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
156 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
157 | 157 | |
158 | 158 | $permissiontoread = $user->hasRight('contrat', 'lire'); |
159 | 159 | $permissiontoadd = $user->hasRight('contrat', 'creer'); |
@@ -573,7 +573,7 @@ discard block |
||
573 | 573 | } |
574 | 574 | |
575 | 575 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
576 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
576 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
577 | 577 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
578 | 578 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
579 | 579 |
@@ -89,7 +89,7 @@ |
||
89 | 89 | // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context |
90 | 90 | $hookmanager->initHooks(array('agendacontract', 'globalcard')); |
91 | 91 | |
92 | -$permissiontoadd = $user->hasRight('contrat', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php |
|
92 | +$permissiontoadd = $user->hasRight('contrat', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php |
|
93 | 93 | |
94 | 94 | $result = restrictedArea($user, 'contrat', $object->id); |
95 | 95 |
@@ -54,7 +54,7 @@ |
||
54 | 54 | // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context |
55 | 55 | $hookmanager->initHooks(array('contractcontactcard', 'globalcard')); |
56 | 56 | |
57 | -$permissiontoadd = $user->hasRight('contrat', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php |
|
57 | +$permissiontoadd = $user->hasRight('contrat', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php |
|
58 | 58 | |
59 | 59 | $result = restrictedArea($user, 'contrat', $object->id); |
60 | 60 |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | $search_date_endday = GETPOSTINT('search_date_endday'); |
86 | 86 | $search_date_endmonth = GETPOSTINT('search_date_endmonth'); |
87 | 87 | $search_date_endyear = GETPOSTINT('search_date_endyear'); |
88 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
88 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
89 | 89 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
90 | 90 | $searchCategoryCustomerOperator = 0; |
91 | 91 | if (GETPOSTISSET('formfilteraction')) { |
@@ -98,20 +98,20 @@ discard block |
||
98 | 98 | $search_date_creation_startmonth = GETPOSTINT('search_date_creation_startmonth'); |
99 | 99 | $search_date_creation_startyear = GETPOSTINT('search_date_creation_startyear'); |
100 | 100 | $search_date_creation_startday = GETPOSTINT('search_date_creation_startday'); |
101 | -$search_date_creation_start = dol_mktime(0, 0, 0, $search_date_creation_startmonth, $search_date_creation_startday, $search_date_creation_startyear); // Use tzserver |
|
101 | +$search_date_creation_start = dol_mktime(0, 0, 0, $search_date_creation_startmonth, $search_date_creation_startday, $search_date_creation_startyear); // Use tzserver |
|
102 | 102 | $search_date_creation_endmonth = GETPOSTINT('search_date_creation_endmonth'); |
103 | 103 | $search_date_creation_endyear = GETPOSTINT('search_date_creation_endyear'); |
104 | 104 | $search_date_creation_endday = GETPOSTINT('search_date_creation_endday'); |
105 | -$search_date_creation_end = dol_mktime(23, 59, 59, $search_date_creation_endmonth, $search_date_creation_endday, $search_date_creation_endyear); // Use tzserver |
|
105 | +$search_date_creation_end = dol_mktime(23, 59, 59, $search_date_creation_endmonth, $search_date_creation_endday, $search_date_creation_endyear); // Use tzserver |
|
106 | 106 | |
107 | 107 | $search_date_modif_startmonth = GETPOSTINT('search_date_modif_startmonth'); |
108 | 108 | $search_date_modif_startyear = GETPOSTINT('search_date_modif_startyear'); |
109 | 109 | $search_date_modif_startday = GETPOSTINT('search_date_modif_startday'); |
110 | -$search_date_modif_start = dol_mktime(0, 0, 0, $search_date_modif_startmonth, $search_date_modif_startday, $search_date_modif_startyear); // Use tzserver |
|
110 | +$search_date_modif_start = dol_mktime(0, 0, 0, $search_date_modif_startmonth, $search_date_modif_startday, $search_date_modif_startyear); // Use tzserver |
|
111 | 111 | $search_date_modif_endmonth = GETPOSTINT('search_date_modif_endmonth'); |
112 | 112 | $search_date_modif_endyear = GETPOSTINT('search_date_modif_endyear'); |
113 | 113 | $search_date_modif_endday = GETPOSTINT('search_date_modif_endday'); |
114 | -$search_date_modif_end = dol_mktime(23, 59, 59, $search_date_modif_endmonth, $search_date_modif_endday, $search_date_modif_endyear); // Use tzserver |
|
114 | +$search_date_modif_end = dol_mktime(23, 59, 59, $search_date_modif_endmonth, $search_date_modif_endday, $search_date_modif_endyear); // Use tzserver |
|
115 | 115 | |
116 | 116 | // Load variable for pagination |
117 | 117 | $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | |
201 | 201 | $object->fields = dol_sort_array($object->fields, 'position'); |
202 | 202 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
203 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
203 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
204 | 204 | |
205 | 205 | if (!$user->hasRight('societe', 'client', 'voir')) { |
206 | 206 | $search_sale = $user->id; |
@@ -534,7 +534,7 @@ discard block |
||
534 | 534 | $resql = $db->query($sql, 0, 'auto', 1); |
535 | 535 | while ($db->fetch_object($resql)) { |
536 | 536 | if (empty($nbtotalofrecords)) { |
537 | - $nbtotalofrecords = 1; // We can't make +1 because init value is '' |
|
537 | + $nbtotalofrecords = 1; // We can't make +1 because init value is '' |
|
538 | 538 | } else { |
539 | 539 | $nbtotalofrecords++; |
540 | 540 | } |
@@ -986,55 +986,55 @@ discard block |
||
986 | 986 | print '<tr class="liste_titre">'; |
987 | 987 | if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { |
988 | 988 | print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch '); |
989 | - $totalarray['nbfield']++; // For the column action |
|
989 | + $totalarray['nbfield']++; // For the column action |
|
990 | 990 | } |
991 | 991 | if (!empty($arrayfields['c.ref']['checked'])) { |
992 | 992 | print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], "c.ref", "", $param, '', $sortfield, $sortorder); |
993 | - $totalarray['nbfield']++; // For the column action |
|
993 | + $totalarray['nbfield']++; // For the column action |
|
994 | 994 | } |
995 | 995 | if (!empty($arrayfields['c.ref_customer']['checked'])) { |
996 | 996 | print_liste_field_titre($arrayfields['c.ref_customer']['label'], $_SERVER["PHP_SELF"], "c.ref_customer", "", $param, '', $sortfield, $sortorder); |
997 | - $totalarray['nbfield']++; // For the column action |
|
997 | + $totalarray['nbfield']++; // For the column action |
|
998 | 998 | } |
999 | 999 | if (!empty($arrayfields['c.ref_supplier']['checked'])) { |
1000 | 1000 | print_liste_field_titre($arrayfields['c.ref_supplier']['label'], $_SERVER["PHP_SELF"], "c.ref_supplier", "", $param, '', $sortfield, $sortorder); |
1001 | - $totalarray['nbfield']++; // For the column action |
|
1001 | + $totalarray['nbfield']++; // For the column action |
|
1002 | 1002 | } |
1003 | 1003 | if (!empty($arrayfields['s.nom']['checked'])) { |
1004 | 1004 | print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder); |
1005 | - $totalarray['nbfield']++; // For the column action |
|
1005 | + $totalarray['nbfield']++; // For the column action |
|
1006 | 1006 | } |
1007 | 1007 | if (!empty($arrayfields['s.email']['checked'])) { |
1008 | 1008 | print_liste_field_titre($arrayfields['s.email']['label'], $_SERVER["PHP_SELF"], "s.email", "", $param, '', $sortfield, $sortorder); |
1009 | - $totalarray['nbfield']++; // For the column action |
|
1009 | + $totalarray['nbfield']++; // For the column action |
|
1010 | 1010 | } |
1011 | 1011 | if (!empty($arrayfields['s.town']['checked'])) { |
1012 | 1012 | print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder); |
1013 | - $totalarray['nbfield']++; // For the column action |
|
1013 | + $totalarray['nbfield']++; // For the column action |
|
1014 | 1014 | } |
1015 | 1015 | if (!empty($arrayfields['s.zip']['checked'])) { |
1016 | 1016 | print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder); |
1017 | - $totalarray['nbfield']++; // For the column action |
|
1017 | + $totalarray['nbfield']++; // For the column action |
|
1018 | 1018 | } |
1019 | 1019 | if (!empty($arrayfields['state.nom']['checked'])) { |
1020 | 1020 | print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder); |
1021 | - $totalarray['nbfield']++; // For the column action |
|
1021 | + $totalarray['nbfield']++; // For the column action |
|
1022 | 1022 | } |
1023 | 1023 | if (!empty($arrayfields['country.code_iso']['checked'])) { |
1024 | 1024 | print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center '); |
1025 | - $totalarray['nbfield']++; // For the column action |
|
1025 | + $totalarray['nbfield']++; // For the column action |
|
1026 | 1026 | } |
1027 | 1027 | if (!empty($arrayfields['typent.code']['checked'])) { |
1028 | 1028 | print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center '); |
1029 | - $totalarray['nbfield']++; // For the column action |
|
1029 | + $totalarray['nbfield']++; // For the column action |
|
1030 | 1030 | } |
1031 | 1031 | if (!empty($arrayfields['sale_representative']['checked'])) { |
1032 | 1032 | print_liste_field_titre($arrayfields['sale_representative']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder); |
1033 | - $totalarray['nbfield']++; // For the column action |
|
1033 | + $totalarray['nbfield']++; // For the column action |
|
1034 | 1034 | } |
1035 | 1035 | if (!empty($arrayfields['c.date_contrat']['checked'])) { |
1036 | 1036 | print_liste_field_titre($arrayfields['c.date_contrat']['label'], $_SERVER["PHP_SELF"], "c.date_contrat", "", $param, '', $sortfield, $sortorder, 'center '); |
1037 | - $totalarray['nbfield']++; // For the column action |
|
1037 | + $totalarray['nbfield']++; // For the column action |
|
1038 | 1038 | } |
1039 | 1039 | // Extra fields |
1040 | 1040 | include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_title.tpl.php'; |
@@ -1044,29 +1044,29 @@ discard block |
||
1044 | 1044 | print $hookmanager->resPrint; |
1045 | 1045 | if (!empty($arrayfields['c.datec']['checked'])) { |
1046 | 1046 | print_liste_field_titre($arrayfields['c.datec']['label'], $_SERVER["PHP_SELF"], "c.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap '); |
1047 | - $totalarray['nbfield']++; // For the column action |
|
1047 | + $totalarray['nbfield']++; // For the column action |
|
1048 | 1048 | } |
1049 | 1049 | if (!empty($arrayfields['c.tms']['checked'])) { |
1050 | 1050 | print_liste_field_titre($arrayfields['c.tms']['label'], $_SERVER["PHP_SELF"], "c.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap '); |
1051 | - $totalarray['nbfield']++; // For the column action |
|
1051 | + $totalarray['nbfield']++; // For the column action |
|
1052 | 1052 | } |
1053 | 1053 | if (!empty($arrayfields['lower_planned_end_date']['checked'])) { |
1054 | 1054 | print_liste_field_titre($arrayfields['lower_planned_end_date']['label'], $_SERVER["PHP_SELF"], "lower_planned_end_date", "", $param, '', $sortfield, $sortorder, 'center '); |
1055 | - $totalarray['nbfield']++; // For the column action |
|
1055 | + $totalarray['nbfield']++; // For the column action |
|
1056 | 1056 | } |
1057 | 1057 | if (!empty($arrayfields['status']['checked'])) { |
1058 | 1058 | print_liste_field_titre($staticcontratligne->LibStatut(0, 3, -1, 'class="nochangebackground"'), '', '', '', '', 'width="16"'); |
1059 | - $totalarray['nbfield']++; // For the column action |
|
1059 | + $totalarray['nbfield']++; // For the column action |
|
1060 | 1060 | print_liste_field_titre($staticcontratligne->LibStatut(4, 3, 0, 'class="nochangebackground"'), '', '', '', '', 'width="16"'); |
1061 | - $totalarray['nbfield']++; // For the column action |
|
1061 | + $totalarray['nbfield']++; // For the column action |
|
1062 | 1062 | print_liste_field_titre($staticcontratligne->LibStatut(4, 3, 1, 'class="nochangebackground"'), '', '', '', '', 'width="16"'); |
1063 | - $totalarray['nbfield']++; // For the column action |
|
1063 | + $totalarray['nbfield']++; // For the column action |
|
1064 | 1064 | print_liste_field_titre($staticcontratligne->LibStatut(5, 3, -1, 'class="nochangebackground"'), '', '', '', '', 'width="16"'); |
1065 | - $totalarray['nbfield']++; // For the column action |
|
1065 | + $totalarray['nbfield']++; // For the column action |
|
1066 | 1066 | } |
1067 | 1067 | if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { |
1068 | 1068 | print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch '); |
1069 | - $totalarray['nbfield']++; // For the column action |
|
1069 | + $totalarray['nbfield']++; // For the column action |
|
1070 | 1070 | } |
1071 | 1071 | print "</tr>\n"; |
1072 | 1072 | |
@@ -1356,7 +1356,7 @@ discard block |
||
1356 | 1356 | |
1357 | 1357 | // If no record found |
1358 | 1358 | if ($num == 0) { |
1359 | - $colspan = 4; // Include the 4 columns of status |
|
1359 | + $colspan = 4; // Include the 4 columns of status |
|
1360 | 1360 | foreach ($arrayfields as $key => $val) { |
1361 | 1361 | if (!empty($val['checked'])) { |
1362 | 1362 | $colspan++; |
@@ -286,12 +286,12 @@ discard block |
||
286 | 286 | /* |
287 | 287 | * No signature |
288 | 288 | */ |
289 | - const STATUS_NO_SIGNATURE = 0; |
|
289 | + const STATUS_NO_SIGNATURE = 0; |
|
290 | 290 | |
291 | 291 | /* |
292 | 292 | * Signed by sender |
293 | 293 | */ |
294 | - const STATUS_SIGNED_SENDER = 1; |
|
294 | + const STATUS_SIGNED_SENDER = 1; |
|
295 | 295 | |
296 | 296 | /* |
297 | 297 | * Signed by receiver |
@@ -301,7 +301,7 @@ discard block |
||
301 | 301 | /* |
302 | 302 | * Signed by all |
303 | 303 | */ |
304 | - const STATUS_SIGNED_ALL = 9; // To handle future kind of signature (ex: tripartite contract) |
|
304 | + const STATUS_SIGNED_ALL = 9; // To handle future kind of signature (ex: tripartite contract) |
|
305 | 305 | |
306 | 306 | |
307 | 307 | /** |
@@ -437,7 +437,7 @@ discard block |
||
437 | 437 | if ($contratline->statut != ContratLigne::STATUS_OPEN) { |
438 | 438 | $contratline->context = $this->context; |
439 | 439 | |
440 | - $result = $contratline->active_line($user, $date_start, !empty($date_end) ? $date_end : -1, $comment); // This call trigger LINECONTRACT_ACTIVATE |
|
440 | + $result = $contratline->active_line($user, $date_start, !empty($date_end) ? $date_end : -1, $comment); // This call trigger LINECONTRACT_ACTIVATE |
|
441 | 441 | if ($result < 0) { |
442 | 442 | $error++; |
443 | 443 | $this->error = $contratline->error; |
@@ -487,7 +487,7 @@ discard block |
||
487 | 487 | // Close lines not already closed |
488 | 488 | if ($contratline->statut != ContratLigne::STATUS_CLOSED) { |
489 | 489 | $contratline->date_end_real = $now; |
490 | - $contratline->date_cloture = $now; // For backward compatibility |
|
490 | + $contratline->date_cloture = $now; // For backward compatibility |
|
491 | 491 | $contratline->user_closing_id = $user->id; |
492 | 492 | $contratline->statut = ContratLigne::STATUS_CLOSED; |
493 | 493 | $result = $contratline->close_line($user, $now, $comment, $notrigger); |
@@ -942,7 +942,7 @@ discard block |
||
942 | 942 | //$line->date_fin_prevue = $this->db->jdate($objp->date_fin_validite); |
943 | 943 | //$line->date_fin_reel = $this->db->jdate($objp->date_cloture); |
944 | 944 | |
945 | - $line->rang = $objp->rang; |
|
945 | + $line->rang = $objp->rang; |
|
946 | 946 | |
947 | 947 | // Retrieve all extrafields for contract line |
948 | 948 | // fetch optionals attributes and labels |
@@ -1454,7 +1454,7 @@ discard block |
||
1454 | 1454 | } |
1455 | 1455 | |
1456 | 1456 | if (!$error) { |
1457 | - $result = $this->insertExtraFields(); // This delete and reinsert extrafields |
|
1457 | + $result = $this->insertExtraFields(); // This delete and reinsert extrafields |
|
1458 | 1458 | if ($result < 0) { |
1459 | 1459 | $error++; |
1460 | 1460 | } |
@@ -2558,7 +2558,7 @@ discard block |
||
2558 | 2558 | global $user; |
2559 | 2559 | |
2560 | 2560 | $ticket = new Ticket($this->db); |
2561 | - $nbTicket = $ticket->fetchAll($user, 'ASC', 't.datec', '', 0, '', array('t.fk_contract' => $this->id)); |
|
2561 | + $nbTicket = $ticket->fetchAll($user, 'ASC', 't.datec', '', 0, '', array('t.fk_contract' => $this->id)); |
|
2562 | 2562 | |
2563 | 2563 | return ($nbTicket < 0 ? $nbTicket : $ticket->lines); |
2564 | 2564 | } |
@@ -2580,7 +2580,7 @@ discard block |
||
2580 | 2580 | global $conf, $langs; |
2581 | 2581 | |
2582 | 2582 | if (!dol_strlen($modele)) { |
2583 | - $modele = ''; // No doc template/generation by default |
|
2583 | + $modele = ''; // No doc template/generation by default |
|
2584 | 2584 | |
2585 | 2585 | if (!empty($this->model_pdf)) { |
2586 | 2586 | $modele = $this->model_pdf; |
@@ -2806,7 +2806,7 @@ discard block |
||
2806 | 2806 | |
2807 | 2807 | // Load contract |
2808 | 2808 | $object = new Contrat($this->db); |
2809 | - $object->fetch($obj->rowid); // fetch also lines |
|
2809 | + $object->fetch($obj->rowid); // fetch also lines |
|
2810 | 2810 | //$object->fetch_thirdparty(); |
2811 | 2811 | |
2812 | 2812 | if ($object->id <= 0) { |
@@ -2853,7 +2853,7 @@ discard block |
||
2853 | 2853 | if ($expirationdate && $expirationdate < $enddatetoscan) { |
2854 | 2854 | dol_syslog("Define the newdate of end of services from expirationdate=" . $expirationdate); |
2855 | 2855 | $newdate = $expirationdate; |
2856 | - $protecti = 0; //$protecti is to avoid infinite loop |
|
2856 | + $protecti = 0; //$protecti is to avoid infinite loop |
|
2857 | 2857 | while ($newdate < $enddatetoscan && $protecti < 1000) { |
2858 | 2858 | $newdate = dol_time_plus_duree($newdate, $duration_value, $duration_unit); |
2859 | 2859 | $protecti++; |
@@ -2881,20 +2881,20 @@ discard block |
||
2881 | 2881 | |
2882 | 2882 | // Create an event |
2883 | 2883 | $actioncomm = new ActionComm($this->db); |
2884 | - $actioncomm->type_code = 'AC_OTH_AUTO'; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...) |
|
2884 | + $actioncomm->type_code = 'AC_OTH_AUTO'; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...) |
|
2885 | 2885 | $actioncomm->code = 'AC_' . $actioncode; |
2886 | 2886 | $actioncomm->label = $label; |
2887 | 2887 | $actioncomm->datep = $now; |
2888 | 2888 | $actioncomm->datef = $now; |
2889 | - $actioncomm->percentage = -1; // Not applicable |
|
2889 | + $actioncomm->percentage = -1; // Not applicable |
|
2890 | 2890 | $actioncomm->socid = $object->socid; |
2891 | - $actioncomm->authorid = $user->id; // User saving action |
|
2892 | - $actioncomm->userownerid = $user->id; // Owner of action |
|
2891 | + $actioncomm->authorid = $user->id; // User saving action |
|
2892 | + $actioncomm->userownerid = $user->id; // Owner of action |
|
2893 | 2893 | $actioncomm->fk_element = $object->id; |
2894 | 2894 | $actioncomm->elementtype = 'contract'; |
2895 | 2895 | $actioncomm->note_private = $comment; |
2896 | 2896 | |
2897 | - $ret = $actioncomm->create($user); // User creating action |
|
2897 | + $ret = $actioncomm->create($user); // User creating action |
|
2898 | 2898 | } else { |
2899 | 2899 | $contracterror[$object->id] = $object->ref; |
2900 | 2900 | |
@@ -2903,7 +2903,7 @@ discard block |
||
2903 | 2903 | $this->error = $this->db->lasterror(); |
2904 | 2904 | } |
2905 | 2905 | |
2906 | - if (! $errorforlocaltransaction) { |
|
2906 | + if (!$errorforlocaltransaction) { |
|
2907 | 2907 | $this->db->commit(); |
2908 | 2908 | } else { |
2909 | 2909 | $this->db->rollback(); |
@@ -511,7 +511,7 @@ |
||
511 | 511 | } |
512 | 512 | if ($field == 'array_options' && is_array($value)) { |
513 | 513 | foreach ($value as $index => $val) { |
514 | - $this->contract->array_options[$index] = $this->_checkValForAPI($field, $val, $this->contract);; |
|
514 | + $this->contract->array_options[$index] = $this->_checkValForAPI($field, $val, $this->contract); ; |
|
515 | 515 | } |
516 | 516 | continue; |
517 | 517 | } |
@@ -53,7 +53,7 @@ |
||
53 | 53 | $object = new Contrat($db); |
54 | 54 | $object->fetch($id, $ref); |
55 | 55 | |
56 | -$permissiontoadd = $user->hasRight('contrat', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php |
|
56 | +$permissiontoadd = $user->hasRight('contrat', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php |
|
57 | 57 | $permissionnote = $user->hasRight('contrat', 'creer'); // Used by the include of actions_setnotes.inc.php |
58 | 58 | |
59 | 59 | $result = restrictedArea($user, 'contrat', $object->id); |