@@ -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; |
@@ -176,7 +176,7 @@ |
||
| 176 | 176 | $maxfilesizearray = getMaxFileSizeArray(); |
| 177 | 177 | $maxmin = $maxfilesizearray['maxmin']; |
| 178 | 178 | if ($maxmin > 0) { |
| 179 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 179 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 180 | 180 | } |
| 181 | 181 | $texte .= ' <input type="file" name="uploadfile">'; |
| 182 | 182 | $texte .= '<input type="hidden" value="EXPEDITION_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -210,7 +210,7 @@ |
||
| 210 | 210 | $maxfilesizearray = getMaxFileSizeArray(); |
| 211 | 211 | $maxmin = $maxfilesizearray['maxmin']; |
| 212 | 212 | if ($maxmin > 0) { |
| 213 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 213 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 214 | 214 | } |
| 215 | 215 | $texte .= ' <input type="file" name="uploadfile">'; |
| 216 | 216 | $texte .= '<input type="hidden" value="PROPALE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -198,7 +198,7 @@ |
||
| 198 | 198 | $maxfilesizearray = getMaxFileSizeArray(); |
| 199 | 199 | $maxmin = $maxfilesizearray['maxmin']; |
| 200 | 200 | if ($maxmin > 0) { |
| 201 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 201 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 202 | 202 | } |
| 203 | 203 | $texte .= ' <input type="file" name="uploadfile">'; |
| 204 | 204 | $texte .= '<input type="hidden" value="USER_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -115,7 +115,7 @@ |
||
| 115 | 115 | $maxfilesizearray = getMaxFileSizeArray(); |
| 116 | 116 | $maxmin = $maxfilesizearray['maxmin']; |
| 117 | 117 | if ($maxmin > 0) { |
| 118 | - $s .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 118 | + $s .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 119 | 119 | } |
| 120 | 120 | $s .= '<input type="file" name="username" class="flat">'; |
| 121 | 121 | return $s; |
@@ -167,7 +167,7 @@ |
||
| 167 | 167 | $maxfilesizearray = getMaxFileSizeArray(); |
| 168 | 168 | $maxmin = $maxfilesizearray['maxmin']; |
| 169 | 169 | if ($maxmin > 0) { |
| 170 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 170 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 171 | 171 | } |
| 172 | 172 | $texte .= ' <input type="file" name="uploadfile">'; |
| 173 | 173 | $texte .= '<input type="hidden" value="MEMBER_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="BOM_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -177,7 +177,7 @@ |
||
| 177 | 177 | $maxfilesizearray = getMaxFileSizeArray(); |
| 178 | 178 | $maxmin = $maxfilesizearray['maxmin']; |
| 179 | 179 | if ($maxmin > 0) { |
| 180 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 180 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 181 | 181 | } |
| 182 | 182 | $texte .= ' <input type="file" name="uploadfile">'; |
| 183 | 183 | $texte .= '<input type="hidden" value="COMMANDE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |