@@ -552,11 +552,11 @@ discard block |
||
552 | 552 | $out = ''; |
553 | 553 | |
554 | 554 | if (is_array($events) && count($events)) { // If an array of js events to do were provided. |
555 | - $out = '<!-- JS code to manage event for id = ' . $htmlname . ' --> |
|
555 | + $out = '<!-- JS code to manage event for id = '.$htmlname.' --> |
|
556 | 556 | <script> |
557 | 557 | $(document).ready(function () { |
558 | 558 | jQuery("#'.$htmlname.'").change(function () { |
559 | - var obj = '.json_encode($events) . '; |
|
559 | + var obj = '.json_encode($events).'; |
|
560 | 560 | $.each(obj, function(key,values) { |
561 | 561 | if (values.method.length) { |
562 | 562 | runJsCodeForEvent'.$htmlname.'(values); |
@@ -675,9 +675,9 @@ discard block |
||
675 | 675 | confirmConstantAction("del", url, code, input, input.alert.del, entity, yesButton, noButton, strict, userid, token); |
676 | 676 | } else {'; |
677 | 677 | if (empty($setzeroinsteadofdel)) { |
678 | - $out .=' delConstant(url, code, input, entity, 0, '.((int) $forcereload).', userid, token);'; |
|
678 | + $out .= ' delConstant(url, code, input, entity, 0, '.((int) $forcereload).', userid, token);'; |
|
679 | 679 | } else { |
680 | - $out .=' setConstant(url, code, input, entity, 0, '.((int) $forcereload).', userid, token, 0);'; |
|
680 | + $out .= ' setConstant(url, code, input, entity, 0, '.((int) $forcereload).', userid, token, 0);'; |
|
681 | 681 | } |
682 | 682 | $out .= ' } |
683 | 683 | }); |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | $maxfilesizearray = getMaxFileSizeArray(); |
163 | 163 | $maxmin = $maxfilesizearray['maxmin']; |
164 | 164 | if ($maxmin > 0) { |
165 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
165 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
166 | 166 | } |
167 | 167 | $texte .= ' <input type="file" name="uploadfile">'; |
168 | 168 | $texte .= '<input type="hidden" value="TICKET_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | $newfiletmp = preg_replace('/template_/i', '', $newfiletmp); |
254 | 254 | $newfiletmp = preg_replace('/modele_/i', '', $newfiletmp); |
255 | 255 | |
256 | - $newfiletmp = $objectref . '_' . $newfiletmp; |
|
256 | + $newfiletmp = $objectref.'_'.$newfiletmp; |
|
257 | 257 | |
258 | 258 | // Get extension (ods or odt) |
259 | 259 | $newfileformat = substr($newfile, strrpos($newfile, '.') + 1); |
@@ -262,11 +262,11 @@ discard block |
||
262 | 262 | if ($format == '1') { |
263 | 263 | $format = '%Y%m%d%H%M%S'; |
264 | 264 | } |
265 | - $filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat; |
|
265 | + $filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat; |
|
266 | 266 | } else { |
267 | - $filename = $newfiletmp . '.' . $newfileformat; |
|
267 | + $filename = $newfiletmp.'.'.$newfileformat; |
|
268 | 268 | } |
269 | - $file = $dir . '/' . $filename; |
|
269 | + $file = $dir.'/'.$filename; |
|
270 | 270 | //print "newdir=".$dir; |
271 | 271 | //print "newfile=".$newfile; |
272 | 272 | //print "file=".$file; |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | dol_mkdir($conf->ticket->dir_temp); |
276 | 276 | if (!is_writable($conf->ticket->dir_temp)) { |
277 | 277 | $this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->ticket->dir_temp); |
278 | - dol_syslog('Error in write_file: ' . $this->error, LOG_ERR); |
|
278 | + dol_syslog('Error in write_file: '.$this->error, LOG_ERR); |
|
279 | 279 | return -1; |
280 | 280 | } |
281 | 281 |
@@ -33,7 +33,7 @@ |
||
33 | 33 | * Dolibarr version of the loaded document |
34 | 34 | * @var string |
35 | 35 | */ |
36 | - public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' |
|
36 | + public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' |
|
37 | 37 | |
38 | 38 | /** |
39 | 39 | * @var string Error code (or message) |
@@ -141,11 +141,11 @@ discard block |
||
141 | 141 | |
142 | 142 | // Add here list of permission defined by an id, a label, a boolean and two constant strings. |
143 | 143 | // Example: |
144 | - $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used) |
|
145 | - $this->rights[$r][1] = 'Generate/modify users API key'; // Permission label |
|
146 | - $this->rights[$r][3] = 0; // Permission by default for new user (0/1) |
|
147 | - $this->rights[$r][4] = 'apikey'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2) |
|
148 | - $this->rights[$r][5] = 'generate'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2) |
|
144 | + $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used) |
|
145 | + $this->rights[$r][1] = 'Generate/modify users API key'; // Permission label |
|
146 | + $this->rights[$r][3] = 0; // Permission by default for new user (0/1) |
|
147 | + $this->rights[$r][4] = 'apikey'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2) |
|
148 | + $this->rights[$r][5] = 'generate'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2) |
|
149 | 149 | $r++; |
150 | 150 | |
151 | 151 | |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | { |
230 | 230 | // Remove old constants with entity fields different of 0 |
231 | 231 | $sql = array( |
232 | - "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = ".$this->db->encrypt('MAIN_MODULE_API'), // API can't be enabled per environment. Why ? |
|
232 | + "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = ".$this->db->encrypt('MAIN_MODULE_API'), // API can't be enabled per environment. Why ? |
|
233 | 233 | "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = ".$this->db->encrypt('API_PRODUCTION_MODE') // Not in production mode by default at activation |
234 | 234 | ); |
235 | 235 |
@@ -246,7 +246,7 @@ |
||
246 | 246 | $this->export_fields_array[$r] = array( |
247 | 247 | 's.rowid'=>"IdCompany", 's.nom'=>'ThirdParty', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'd.nom'=>'State', 'co.label'=>'Country', |
248 | 248 | 'co.code'=>'CountryCode', 's.phone'=>'Phone', 's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 's.idprof5'=>'ProfId5', |
249 | - 's.idprof6'=>'ProfId6', 'c.rowid'=>"Id", 'c.ref'=>"Ref", 'c.ref_customer'=>"RefCustomer", 'c.fk_soc'=>"IdCompany", 'c.date_creation'=>"DateCreation", 'c.date_valid'=>"DateValidation", |
|
249 | + 's.idprof6'=>'ProfId6', 'c.rowid'=>"Id", 'c.ref'=>"Ref", 'c.ref_customer'=>"RefCustomer", 'c.fk_soc'=>"IdCompany", 'c.date_creation'=>"DateCreation", 'c.date_valid'=>"DateValidation", |
|
250 | 250 | 'c.date_delivery'=>"DateDeliveryPlanned", 'c.tracking_number'=>"TrackingNumber", 'c.height'=>"Height", 'c.width'=>"Width", 'c.size'=>"Depth", |
251 | 251 | 'c.size_units'=>'SizeUnits', 'c.weight'=>"Weight", 'c.weight_units'=>"WeightUnits", 'c.fk_statut'=>'Status', 'c.note_public'=>"NotePublic", |
252 | 252 | 'ed.rowid'=>'LineId', 'cd.description'=>'Description', 'ed.qty'=>"Qty", 'p.rowid'=>'ProductId', 'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel', |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | $address = SwissQrBill\DataGroup\Element\CombinedAddress::create( |
121 | 121 | $this->emetteur->name, |
122 | 122 | $this->emetteur->address, |
123 | - $this->emetteur->zip . " " . $this->emetteur->town, |
|
123 | + $this->emetteur->zip." ".$this->emetteur->town, |
|
124 | 124 | $this->emetteur->country_code |
125 | 125 | ); |
126 | 126 | if (!$address->isValid()) { |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | $address = SwissQrBill\DataGroup\Element\CombinedAddress::create( |
176 | 176 | $object->thirdparty->name, |
177 | 177 | $object->thirdparty->address, |
178 | - $object->thirdparty->zip . " " . $object->thirdparty->town, |
|
178 | + $object->thirdparty->zip." ".$object->thirdparty->town, |
|
179 | 179 | $object->thirdparty->country_code |
180 | 180 | ); |
181 | 181 | if (!$address->isValid()) { |
@@ -363,7 +363,7 @@ |
||
363 | 363 | if ($typefield == 'Text' || $typefield == 'TextAuto') { |
364 | 364 | // If $newvalue start with an equal sign we don't want it to be interpreted as a formula, so we add a '. Such transformation should be |
365 | 365 | // done by SetCellValueByColumnAndRow but it is not, so we do it ourself. |
366 | - $newvalue = (dol_substr($newvalue, 0, 1) === '=' ? '\'' : '') . $newvalue; |
|
366 | + $newvalue = (dol_substr($newvalue, 0, 1) === '=' ? '\'' : '').$newvalue; |
|
367 | 367 | $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $newvalue); |
368 | 368 | $coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate(); |
369 | 369 | $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@'); |
@@ -209,8 +209,8 @@ discard block |
||
209 | 209 | 'd.code_departement'=>'List:c_departements:code_departement:code_departement:', 'c.code'=>'List:c_country:code:code:', |
210 | 210 | 'e.phone'=>'Text', 'e.fax'=>'Text', 'e.statut'=>'Text', 'pe.rowid'=>'List:entrepot:ref:rowid:stock', 'pe.ref'=>'Text' |
211 | 211 | ); |
212 | - $this->export_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into export_icon |
|
213 | - $this->export_aggregate_array[$r] = array(); // TODO Not used yet |
|
212 | + $this->export_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into export_icon |
|
213 | + $this->export_aggregate_array[$r] = array(); // TODO Not used yet |
|
214 | 214 | $keyforselect = 'warehouse'; |
215 | 215 | $keyforelement = 'warehouse'; |
216 | 216 | $keyforaliasextra = 'extra'; |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | 'p.datec'=>'product', 'p.tms'=>'product', 'p.pmp'=>'product', 'p.cost_price'=>'product', |
258 | 258 | 'ps.reel'=>'stock', |
259 | 259 | 'p.seuil_stock_alerte'=>'product', 'p.barcode'=>'product', 'bt.libelle'=>'c_barcode_type', |
260 | - ); // We define here only fields that use another icon that the one defined into export_icon |
|
260 | + ); // We define here only fields that use another icon that the one defined into export_icon |
|
261 | 261 | if (isModEnabled('barcode')) { |
262 | 262 | $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'product')); |
263 | 263 | } |
@@ -316,7 +316,7 @@ discard block |
||
316 | 316 | 'p.datec'=>'product', 'p.tms'=>'product', 'p.pmp'=>'product', 'p.cost_price'=>'product', |
317 | 317 | 'pb.rowid'=>'batch', 'pb.batch'=>'batch', 'pb.qty'=>'batch', |
318 | 318 | 'pl.eatby'=>'batch', 'pl.sellby'=>'batch' |
319 | - ); // We define here only fields that use another icon that the one defined into export_icon |
|
319 | + ); // We define here only fields that use another icon that the one defined into export_icon |
|
320 | 320 | if (isModEnabled('barcode')) { |
321 | 321 | $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'product')); |
322 | 322 | } |
@@ -366,7 +366,7 @@ discard block |
||
366 | 366 | 'e.rowid'=>'warehouse', 'e.ref'=>'warehouse', 'e.description'=>'warehouse', 'e.lieu'=>'warehouse', 'e.address'=>'warehouse', 'e.zip'=>'warehouse', 'e.town'=>'warehouse', |
367 | 367 | 'p.rowid'=>"product", 'p.ref'=>"product", 'p.fk_product_type'=>"product", 'p.label'=>"product", 'p.description'=>"product", 'p.note'=>"product", |
368 | 368 | 'p.price'=>"product", 'p.tva_tx'=>'product', 'p.tosell'=>"product", 'p.tobuy'=>"product", 'p.duration'=>"product", 'p.datec'=>'product', 'p.tms'=>'product' |
369 | - ); // We define here only fields that use another icon that the one defined into export_icon |
|
369 | + ); // We define here only fields that use another icon that the one defined into export_icon |
|
370 | 370 | if (isModEnabled('productbatch')) { |
371 | 371 | $this->export_fields_array[$r]['sm.batch'] = 'Batch'; |
372 | 372 | $this->export_TypeFields_array[$r]['sm.batch'] = 'Text'; |
@@ -259,17 +259,17 @@ |
||
259 | 259 | $r = 0; |
260 | 260 | // Add here entries to declare new permissions |
261 | 261 | /* BEGIN MODULEBUILDER PERMISSIONS */ |
262 | - $this->rights[$r][0] = $this->numero . sprintf("%02d", $r + 1); // Permission id (must not be already used) |
|
262 | + $this->rights[$r][0] = $this->numero.sprintf("%02d", $r + 1); // Permission id (must not be already used) |
|
263 | 263 | $this->rights[$r][1] = 'Read Webhooks'; // Permission label |
264 | 264 | $this->rights[$r][4] = 'webhook_target'; |
265 | 265 | $this->rights[$r][5] = 'read'; // In php code, permission will be checked by test if ($user->rights->webhook->webhook_target->read) |
266 | 266 | $r++; |
267 | - $this->rights[$r][0] = $this->numero . sprintf("%02d", $r + 1); // Permission id (must not be already used) |
|
267 | + $this->rights[$r][0] = $this->numero.sprintf("%02d", $r + 1); // Permission id (must not be already used) |
|
268 | 268 | $this->rights[$r][1] = 'Create/Update Webhooks'; // Permission label |
269 | 269 | $this->rights[$r][4] = 'webhook_target'; |
270 | 270 | $this->rights[$r][5] = 'write'; // In php code, permission will be checked by test if ($user->rights->webhook->webhook_target->write) |
271 | 271 | $r++; |
272 | - $this->rights[$r][0] = $this->numero . sprintf("%02d", $r + 1); // Permission id (must not be already used) |
|
272 | + $this->rights[$r][0] = $this->numero.sprintf("%02d", $r + 1); // Permission id (must not be already used) |
|
273 | 273 | $this->rights[$r][1] = 'Delete Webhooks'; // Permission label |
274 | 274 | $this->rights[$r][4] = 'webhook_target'; |
275 | 275 | $this->rights[$r][5] = 'delete'; // In php code, permission will be checked by test if ($user->rights->webhook->webhook_target->delete) |