@@ -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) |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | 'type'=>'info', |
117 | 117 | ); |
118 | 118 | } else { |
119 | - $keyforprovider = ''; // @FIXME |
|
119 | + $keyforprovider = ''; // @FIXME |
|
120 | 120 | |
121 | 121 | $this->google_id = getDolGlobalString('OAUTH_GOOGLE_ID'); |
122 | 122 | $this->google_secret = getDolGlobalString('OAUTH_GOOGLE_SECRET'); |
@@ -258,7 +258,7 @@ discard block |
||
258 | 258 | global $conf; |
259 | 259 | $ret = array(); |
260 | 260 | |
261 | - $keyforprovider = ''; // @FIXME |
|
261 | + $keyforprovider = ''; // @FIXME |
|
262 | 262 | |
263 | 263 | // Token storage |
264 | 264 | $storage = new DoliStorage($this->db, $conf, $keyforprovider); |
@@ -400,7 +400,7 @@ discard block |
||
400 | 400 | 'contentType' => $contenttype, |
401 | 401 | ); |
402 | 402 | |
403 | - $keyforprovider = ''; // @FIXME |
|
403 | + $keyforprovider = ''; // @FIXME |
|
404 | 404 | |
405 | 405 | // Dolibarr Token storage |
406 | 406 | $storage = new DoliStorage($this->db, $conf, $keyforprovider); |
@@ -452,7 +452,7 @@ discard block |
||
452 | 452 | $error = 0; |
453 | 453 | $html = ''; |
454 | 454 | |
455 | - $keyforprovider = ''; // @FIXME |
|
455 | + $keyforprovider = ''; // @FIXME |
|
456 | 456 | |
457 | 457 | // Token storage |
458 | 458 | $storage = new DoliStorage($this->db, $conf, $keyforprovider); |
@@ -76,8 +76,8 @@ discard block |
||
76 | 76 | |
77 | 77 | public $multilangs; |
78 | 78 | |
79 | - public $product_type; // type in line |
|
80 | - public $fk_product; // product id in line (when line is linked to a product) |
|
79 | + public $product_type; // type in line |
|
80 | + public $fk_product; // product id in line (when line is linked to a product) |
|
81 | 81 | |
82 | 82 | /** |
83 | 83 | * Description of the line |
@@ -93,12 +93,12 @@ discard block |
||
93 | 93 | */ |
94 | 94 | public $description; |
95 | 95 | |
96 | - public $product; // To store full product object after a fetch_product() on a line |
|
97 | - public $product_ref; // ref in product table |
|
98 | - public $product_label; // label in product table |
|
99 | - public $product_barcode; // barcode in product table |
|
100 | - public $product_desc; // desc in product table |
|
101 | - public $fk_product_type; // type in product table |
|
96 | + public $product; // To store full product object after a fetch_product() on a line |
|
97 | + public $product_ref; // ref in product table |
|
98 | + public $product_label; // label in product table |
|
99 | + public $product_barcode; // barcode in product table |
|
100 | + public $product_desc; // desc in product table |
|
101 | + public $fk_product_type; // type in product table |
|
102 | 102 | |
103 | 103 | public $qty; |
104 | 104 | public $duree; |
@@ -244,7 +244,7 @@ |
||
244 | 244 | |
245 | 245 | $this->id = $obj->rowid; |
246 | 246 | $this->ref = $obj->rowid; |
247 | - $this->date_start = $this->db->jdate($obj->date_start); |
|
247 | + $this->date_start = $this->db->jdate($obj->date_start); |
|
248 | 248 | $this->date_end = $this->db->jdate($obj->date_end); |
249 | 249 | $this->label = $obj->label; |
250 | 250 | $this->statut = $obj->status; |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | $backtopage = GETPOST('backtopage'); |
49 | 49 | |
50 | 50 | $id = GETPOST('id', 'int'); |
51 | -$element = GETPOST('element', 'alpha'); // 'myobject' (myobject=mymodule) or 'myobject@mymodule' or 'myobject_mysubobject' (myobject=mymodule) |
|
51 | +$element = GETPOST('element', 'alpha'); // 'myobject' (myobject=mymodule) or 'myobject@mymodule' or 'myobject_mysubobject' (myobject=mymodule) |
|
52 | 52 | $field = GETPOST('field', 'alpha'); |
53 | 53 | $value = GETPOST('value', 'int'); |
54 | 54 | $format = 'int'; |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | // Load object according to $id and $element |
57 | 57 | $object = fetchObjectByElement($id, $element); |
58 | 58 | if (!is_object($object)) { |
59 | - httponly_accessforbidden("Bad value for combination of parameters element/field: Object not found."); // This includes the exit. |
|
59 | + httponly_accessforbidden("Bad value for combination of parameters element/field: Object not found."); // This includes the exit. |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | $object->fields[$field] = array('type' => $format, 'enabled' => 1); |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | if (!empty($user->socid)) { |
75 | 75 | $socid = $user->socid; |
76 | 76 | if (!empty($object->socid) && $socid != $object->socid) { |
77 | - httponly_accessforbidden("Access on object not allowed for this external user."); // This includes the exit. |
|
77 | + httponly_accessforbidden("Access on object not allowed for this external user."); // This includes the exit. |
|
78 | 78 | } |
79 | 79 | } |
80 | 80 | |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | } elseif ($element == 'product' && in_array($field, array('tosell', 'tobuy', 'tobatch'))) { // Special case for products |
86 | 86 | restrictedArea($user, 'produit|service', $object, 'product&product', '', '', 'rowid'); |
87 | 87 | } else { |
88 | - httponly_accessforbidden("Bad value for combination of parameters element/field: Field not supported."); // This includes the exit. |
|
88 | + httponly_accessforbidden("Bad value for combination of parameters element/field: Field not supported."); // This includes the exit. |
|
89 | 89 | } |
90 | 90 | |
91 | 91 |
@@ -60,7 +60,7 @@ |
||
60 | 60 | $showempty = 0; |
61 | 61 | } |
62 | 62 | |
63 | - $return['value'] = $formProject->selectInvoiceAndLine($invoice_id, 0, 'invoiceid', 'invoicelineid', 'maxwidth500', array(), 1); |
|
63 | + $return['value'] = $formProject->selectInvoiceAndLine($invoice_id, 0, 'invoiceid', 'invoicelineid', 'maxwidth500', array(), 1); |
|
64 | 64 | //$return['num'] = $form->num; |
65 | 65 | //$return['error'] = $form->error; |
66 | 66 |
@@ -57,7 +57,7 @@ |
||
57 | 57 | //print $object->id.' - '.$object->module.' - '.$object->element.' - '.$object->table_element.' - '.$usesublevelpermission."\n"; |
58 | 58 | |
59 | 59 | // Security check |
60 | -$result = restrictedArea($user, $object->module, $object, $object->table_element, $usesublevelpermission, 'fk_soc', 'rowid', 0, 1); // Call with mode return |
|
60 | +$result = restrictedArea($user, $object->module, $object, $object->table_element, $usesublevelpermission, 'fk_soc', 'rowid', 0, 1); // Call with mode return |
|
61 | 61 | if (!$result) { |
62 | 62 | httponly_accessforbidden('Not allowed by restrictArea'); |
63 | 63 | } |
@@ -40,7 +40,7 @@ |
||
40 | 40 | |
41 | 41 | |
42 | 42 | $id = GETPOST('id', 'aZ09'); |
43 | -$objecttype = GETPOST('objecttype', 'aZ09arobase'); // 'module' or 'myobject@mymodule', 'mymodule_myobject' |
|
43 | +$objecttype = GETPOST('objecttype', 'aZ09arobase'); // 'module' or 'myobject@mymodule', 'mymodule_myobject' |
|
44 | 44 | |
45 | 45 | $params = array('fromajaxtooltip' => 1); |
46 | 46 | if (GETPOSTISSET('infologin')) { |