@@ -552,9 +552,9 @@ |
||
552 | 552 | while ($i < $nbofloop) { |
553 | 553 | $obj = $db->fetch_object($resql); |
554 | 554 | |
555 | - $fichinterstatic->id=$obj->rowid; |
|
556 | - $fichinterstatic->ref=$obj->ref; |
|
557 | - $fichinterstatic->statut=$obj->fk_statut; |
|
555 | + $fichinterstatic->id = $obj->rowid; |
|
556 | + $fichinterstatic->ref = $obj->ref; |
|
557 | + $fichinterstatic->statut = $obj->fk_statut; |
|
558 | 558 | |
559 | 559 | $companystatic->id = $obj->socid; |
560 | 560 | $companystatic->name = $obj->name; |
@@ -46,26 +46,26 @@ |
||
46 | 46 | */ |
47 | 47 | |
48 | 48 | $parameters = array(); |
49 | -$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks |
|
49 | +$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks |
|
50 | 50 | if ($reshook < 0) { |
51 | 51 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
52 | 52 | } |
53 | 53 | |
54 | 54 | if (($action == 'update' && !GETPOST("cancel", 'alpha')) |
55 | 55 | || ($action == 'updateedit')) { |
56 | - dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NAME", GETPOST("nom", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
57 | - dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ADDRESS", GETPOST("address", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
58 | - dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_TOWN", GETPOST("town", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
59 | - dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ZIP", GETPOST("zipcode", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
60 | - dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_STATE", GETPOST("state_id", 'int'), 'chaine', 0, '', $conf->entity); |
|
61 | - dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_REGION", GETPOST("region_code", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
62 | - dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_COUNTRY", GETPOST('country_id', 'int'), 'chaine', 0, '', $conf->entity); |
|
63 | - dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_PHONE", GETPOST("tel", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
64 | - dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_FAX", GETPOST("fax", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
65 | - dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_MAIL", GETPOST("mail", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
66 | - dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_WEB", GETPOST("web", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
67 | - dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_CODE", GETPOST("code", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
68 | - dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NOTE", GETPOST("note", 'restricthtml'), 'chaine', 0, '', $conf->entity); |
|
56 | + dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NAME", GETPOST("nom", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
57 | + dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ADDRESS", GETPOST("address", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
58 | + dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_TOWN", GETPOST("town", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
59 | + dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ZIP", GETPOST("zipcode", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
60 | + dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_STATE", GETPOST("state_id", 'int'), 'chaine', 0, '', $conf->entity); |
|
61 | + dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_REGION", GETPOST("region_code", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
62 | + dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_COUNTRY", GETPOST('country_id', 'int'), 'chaine', 0, '', $conf->entity); |
|
63 | + dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_PHONE", GETPOST("tel", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
64 | + dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_FAX", GETPOST("fax", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
65 | + dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_MAIL", GETPOST("mail", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
66 | + dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_WEB", GETPOST("web", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
67 | + dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_CODE", GETPOST("code", 'alphanohtml'), 'chaine', 0, '', $conf->entity); |
|
68 | + dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NOTE", GETPOST("note", 'restricthtml'), 'chaine', 0, '', $conf->entity); |
|
69 | 69 | |
70 | 70 | if ($action != 'updateedit' && !$error) { |
71 | 71 | setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); |
@@ -208,12 +208,12 @@ |
||
208 | 208 | |
209 | 209 | $numFinal = get_next_value($db, $mask, 'societe', $field, $where, '', $now); |
210 | 210 | //Begin barcode with key: for barcode with key (EAN13...) calculate and substitute the last character (* or ?) used in the mask by the key |
211 | - if ((substr($numFinal, -1)=='*') or (substr($numFinal, -1)=='?')) { // if last mask character is * or ? a joker, probably we have to calculate a key as last character (EAN13...) |
|
211 | + if ((substr($numFinal, -1) == '*') or (substr($numFinal, -1) == '?')) { // if last mask character is * or ? a joker, probably we have to calculate a key as last character (EAN13...) |
|
212 | 212 | $literaltype = ''; |
213 | - $literaltype = $this->literalBarcodeType($db, $type);//get literal_Barcode_Type |
|
213 | + $literaltype = $this->literalBarcodeType($db, $type); //get literal_Barcode_Type |
|
214 | 214 | switch ($literaltype) { |
215 | 215 | case 'EAN13': //EAN13 rowid = 2 |
216 | - if (strlen($numFinal)==13) {// be sure that the mask length is correct for EAN13 |
|
216 | + if (strlen($numFinal) == 13) {// be sure that the mask length is correct for EAN13 |
|
217 | 217 | $ean = substr($numFinal, 0, 12); //take first 12 digits |
218 | 218 | $eansum = barcode_gen_ean_sum($ean); |
219 | 219 | $ean .= $eansum; //substitute the las character by the key |
@@ -115,9 +115,9 @@ |
||
115 | 115 | |
116 | 116 | $now = dol_now(); |
117 | 117 | |
118 | -$title = $object->ref . ' - ' . $langs->trans("Notes"); |
|
118 | +$title = $object->ref.' - '.$langs->trans("Notes"); |
|
119 | 119 | if (!empty($withproject)) { |
120 | - $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '') ; |
|
120 | + $title .= ' | '.$langs->trans("Project").(!empty($projectstatic->ref) ? ': '.$projectstatic->ref : ''); |
|
121 | 121 | } |
122 | 122 | $help_url = ''; |
123 | 123 |
@@ -121,9 +121,9 @@ |
||
121 | 121 | */ |
122 | 122 | $form = new Form($db); |
123 | 123 | |
124 | -$title = $object->ref . ' - ' . $langs->trans("Documents"); |
|
124 | +$title = $object->ref.' - '.$langs->trans("Documents"); |
|
125 | 125 | if (!empty($withproject)) { |
126 | - $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '') ; |
|
126 | + $title .= ' | '.$langs->trans("Project").(!empty($projectstatic->ref) ? ': '.$projectstatic->ref : ''); |
|
127 | 127 | } |
128 | 128 | $help_url = ''; |
129 | 129 |
@@ -146,9 +146,9 @@ |
||
146 | 146 | $userstatic = new User($db); |
147 | 147 | $result = $projectstatic->fetch($object->fk_project); |
148 | 148 | |
149 | -$title = $object->ref . ' - ' . $langs->trans("Contacts"); |
|
149 | +$title = $object->ref.' - '.$langs->trans("Contacts"); |
|
150 | 150 | if (!empty($withproject)) { |
151 | - $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '') ; |
|
151 | + $title .= ' | '.$langs->trans("Project").(!empty($projectstatic->ref) ? ': '.$projectstatic->ref : ''); |
|
152 | 152 | } |
153 | 153 | $help_url = ''; |
154 | 154 |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | $actionType = 'delete'; |
63 | 63 | $n++; |
64 | 64 | $id = 'mybuttonid'.$n; |
65 | - $url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id; |
|
65 | + $url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id; |
|
66 | 66 | print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight); |
67 | 67 | |
68 | 68 | |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | $actionType = 'danger'; |
71 | 71 | $n++; |
72 | 72 | $id = 'mybuttonid'.$n; |
73 | - $url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id; |
|
73 | + $url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id; |
|
74 | 74 | print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight); |
75 | 75 | |
76 | 76 | ?> |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | $actionType = 'delete'; |
96 | 96 | $n++; |
97 | 97 | $id = 'mybuttonid'.$n; |
98 | - $url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id; |
|
98 | + $url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id; |
|
99 | 99 | print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight); |
100 | 100 | |
101 | 101 | |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | $actionType = 'danger'; |
104 | 104 | $n++; |
105 | 105 | $id = 'mybuttonid'.$n; |
106 | - $url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id; |
|
106 | + $url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id; |
|
107 | 107 | print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight); |
108 | 108 | |
109 | 109 | ?> |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | $actionType = 'delete'; |
135 | 135 | $n++; |
136 | 136 | $id = 'mybuttonid'.$n; |
137 | - $url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id; |
|
137 | + $url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id; |
|
138 | 138 | |
139 | 139 | $params = array( |
140 | 140 | 'confirm' => array( |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | $actionType = 'delete'; |
174 | 174 | $n++; |
175 | 175 | $id = 'mybuttonid'.$n; |
176 | - $url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id; |
|
176 | + $url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id; |
|
177 | 177 | |
178 | 178 | $params = array( |
179 | 179 | 'confirm' => array( |
@@ -328,7 +328,7 @@ |
||
328 | 328 | |
329 | 329 | foreach ($arrayofvat[$key] as $k => $mt) { |
330 | 330 | if ($mt) { |
331 | - $accountingaccount->fetch(null, $k, true); // TODO Use a cache for label |
|
331 | + $accountingaccount->fetch(null, $k, true); // TODO Use a cache for label |
|
332 | 332 | $account_label = $accountingaccount->label; |
333 | 333 | |
334 | 334 | // get compte id and label |
@@ -46,7 +46,7 @@ |
||
46 | 46 | $error = 0; |
47 | 47 | $connect_id = null; |
48 | 48 | $newsectioniso = ''; |
49 | - $mesg=""; |
|
49 | + $mesg = ""; |
|
50 | 50 | |
51 | 51 | if (!is_numeric($ftp_port)) { |
52 | 52 | $mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServer", $ftp_server, $ftp_port); |