@@ -57,7 +57,7 @@ |
||
57 | 57 | */ |
58 | 58 | public $name = 'Muguet'; |
59 | 59 | |
60 | - public $prefix = 'PO'; // PO for "Purchase Order" |
|
60 | + public $prefix = 'PO'; // PO for "Purchase Order" |
|
61 | 61 | |
62 | 62 | |
63 | 63 | /** |
@@ -174,7 +174,7 @@ |
||
174 | 174 | $maxfilesizearray = getMaxFileSizeArray(); |
175 | 175 | $maxmin = $maxfilesizearray['maxmin']; |
176 | 176 | if ($maxmin > 0) { |
177 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
177 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
178 | 178 | } |
179 | 179 | $texte .= ' <input type="file" name="uploadfile">'; |
180 | 180 | $texte .= '<input type="hidden" value="CONTRACT_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -164,7 +164,7 @@ |
||
164 | 164 | $maxfilesizearray = getMaxFileSizeArray(); |
165 | 165 | $maxmin = $maxfilesizearray['maxmin']; |
166 | 166 | if ($maxmin > 0) { |
167 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
167 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
168 | 168 | } |
169 | 169 | $texte .= ' <input type="file" name="uploadfile">'; |
170 | 170 | $texte .= '<input type="hidden" value="TICKET_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -199,7 +199,7 @@ |
||
199 | 199 | $maxfilesizearray = getMaxFileSizeArray(); |
200 | 200 | $maxmin = $maxfilesizearray['maxmin']; |
201 | 201 | if ($maxmin > 0) { |
202 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
202 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
203 | 203 | } |
204 | 204 | $texte .= ' <input type="file" name="uploadfile">'; |
205 | 205 | $texte .= '<input type="hidden" value="USERGROUP_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -171,7 +171,7 @@ |
||
171 | 171 | $maxfilesizearray = getMaxFileSizeArray(); |
172 | 172 | $maxmin = $maxfilesizearray['maxmin']; |
173 | 173 | if ($maxmin > 0) { |
174 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
174 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
175 | 175 | } |
176 | 176 | $texte .= ' <input type="file" name="uploadfile">'; |
177 | 177 | $texte .= '<input type="hidden" value="PRODUCT_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -170,7 +170,7 @@ |
||
170 | 170 | $maxfilesizearray = getMaxFileSizeArray(); |
171 | 171 | $maxmin = $maxfilesizearray['maxmin']; |
172 | 172 | if ($maxmin > 0) { |
173 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
173 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
174 | 174 | } |
175 | 175 | $texte .= ' <input type="file" name="uploadfile">'; |
176 | 176 | $texte .= '<input type="hidden" value="RECEPTION_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | $maxfilesizearray = getMaxFileSizeArray(); |
176 | 176 | $maxmin = $maxfilesizearray['maxmin']; |
177 | 177 | if ($maxmin > 0) { |
178 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
178 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
179 | 179 | } |
180 | 180 | $texte .= ' <input type="file" name="uploadfile">'; |
181 | 181 | $texte .= '<input type="hidden" value="FACTURE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -410,10 +410,10 @@ discard block |
||
410 | 410 | } |
411 | 411 | |
412 | 412 | // Define substitution array |
413 | - $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object); // Set tags __...__ |
|
413 | + $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object); // Set tags __...__ |
|
414 | 414 | $array_object_from_properties = $this->get_substitutionarray_each_var_object($object, $outputlangs); |
415 | - $array_objet = $this->get_substitutionarray_object($object, $outputlangs); // Set tags object_... |
|
416 | - $array_user = $this->get_substitutionarray_user($user, $outputlangs); // Set tags myuser_... |
|
415 | + $array_objet = $this->get_substitutionarray_object($object, $outputlangs); // Set tags object_... |
|
416 | + $array_user = $this->get_substitutionarray_user($user, $outputlangs); // Set tags myuser_... |
|
417 | 417 | $array_soc = $this->get_substitutionarray_mysoc($mysoc, $outputlangs); |
418 | 418 | $array_thirdparty = $this->get_substitutionarray_thirdparty($socobject, $outputlangs); |
419 | 419 | $array_propal = is_object($propal_object) ? $this->get_substitutionarray_object($propal_object, $outputlangs, 'propal') : array(); |
@@ -71,8 +71,8 @@ discard block |
||
71 | 71 | */ |
72 | 72 | public $version = 'dolibarr'; |
73 | 73 | |
74 | - public $posxcomm; // For customer comment column |
|
75 | - public $posxweightvol; // For weight or volume |
|
74 | + public $posxcomm; // For customer comment column |
|
75 | + public $posxweightvol; // For weight or volume |
|
76 | 76 | public $posxremainingqty; |
77 | 77 | |
78 | 78 | |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | |
116 | 116 | // Define position of columns |
117 | 117 | $this->posxdesc = $this->marge_gauche + 1; |
118 | - $this->posxcomm = 112; // customer comment |
|
118 | + $this->posxcomm = 112; // customer comment |
|
119 | 119 | //$this->posxtva=112; |
120 | 120 | //$this->posxup=126; |
121 | 121 | $this->posxqty = 165; |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | |
169 | 169 | if ($forlogin) { |
170 | 170 | // Set approval_prompt |
171 | - $approval_prompt = getDolGlobalString('OAUTH_GOOGLE_FORCE_PROMPT_ON_LOGIN', 'auto'); // Can be 'force' |
|
171 | + $approval_prompt = getDolGlobalString('OAUTH_GOOGLE_FORCE_PROMPT_ON_LOGIN', 'auto'); // Can be 'force' |
|
172 | 172 | $apiService->setApprouvalPrompt($approval_prompt); |
173 | 173 | } |
174 | 174 | |
@@ -311,7 +311,7 @@ discard block |
||
311 | 311 | $storage->clearToken('Google'); |
312 | 312 | |
313 | 313 | $tmpuser = new User($db); |
314 | - $res = $tmpuser->fetch(0, '', '', 0, $entitytosearchuser, $useremail, 0, 1); // Load user. Can load with email_oauth2. |
|
314 | + $res = $tmpuser->fetch(0, '', '', 0, $entitytosearchuser, $useremail, 0, 1); // Load user. Can load with email_oauth2. |
|
315 | 315 | |
316 | 316 | if ($res > 0) { |
317 | 317 | $username = $tmpuser->login; |