Completed
Push — master ( 7bb44a...72105c )
by Laurent
02:19
created
list.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -136,12 +136,12 @@  discard block
 block discarded – undo
136 136
 
137 137
     //'t.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
138 138
     't.datec'                     => array('label'    => $langs->trans("DateCreationShort"),
139
-                                           'checked'  => 0,
140
-                                           'position' => 500
139
+                                            'checked'  => 0,
140
+                                            'position' => 500
141 141
     ),
142 142
     't.tms'                       => array('label'    => $langs->trans("DateModificationShort"),
143
-                                           'checked'  => 0,
144
-                                           'position' => 500
143
+                                            'checked'  => 0,
144
+                                            'position' => 500
145 145
     ),
146 146
     //'t.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
147 147
 );
@@ -149,9 +149,9 @@  discard block
 block discarded – undo
149 149
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {
150 150
     foreach ($extrafields->attribute_label as $key => $val) {
151 151
         $arrayfields["ef." . $key] = array('label'    => $extrafields->attribute_label[$key],
152
-                                           'checked'  => $extrafields->attribute_list[$key],
153
-                                           'position' => $extrafields->attribute_pos[$key],
154
-                                           'enabled'  => $extrafields->attribute_perms[$key]
152
+                                            'checked'  => $extrafields->attribute_list[$key],
153
+                                            'position' => $extrafields->attribute_pos[$key],
154
+                                            'enabled'  => $extrafields->attribute_perms[$key]
155 155
         );
156 156
     }
157 157
 }
Please login to merge, or discard this patch.
class/bbctypes.class.php 1 patch
Indentation   +491 added lines, -491 removed lines patch added patch discarded remove patch
@@ -41,211 +41,211 @@  discard block
 block discarded – undo
41 41
  */
42 42
 class Bbctypes extends CommonObject
43 43
 {
44
-	/**
45
-	 * @var string Id to identify managed objects
46
-	 */
47
-	public $element = 'bbctypes';
48
-	/**
49
-	 * @var string Name of table without prefix where object is stored
50
-	 */
51
-	public $table_element = 'bbc_types';
52
-
53
-	/**
54
-	 * @var BbctypesLine[] Lines
55
-	 */
56
-	public $lines = array();
57
-
58
-	/**
59
-	 */
44
+    /**
45
+     * @var string Id to identify managed objects
46
+     */
47
+    public $element = 'bbctypes';
48
+    /**
49
+     * @var string Name of table without prefix where object is stored
50
+     */
51
+    public $table_element = 'bbc_types';
52
+
53
+    /**
54
+     * @var BbctypesLine[] Lines
55
+     */
56
+    public $lines = array();
57
+
58
+    /**
59
+     */
60 60
 	
61
-	public $idType;
62
-	public $numero;
63
-	public $nom;
64
-	public $active;
65
-
66
-	/**
67
-	 * Constructor
68
-	 *
69
-	 * @param DoliDb $db Database handler
70
-	 */
71
-	public function __construct(DoliDB $db)
72
-	{
73
-		$this->db = $db;
74
-	}
75
-
76
-	/**
77
-	 * Create object into database
78
-	 *
79
-	 * @param  User $user      User that creates
80
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
81
-	 *
82
-	 * @return int <0 if KO, Id of created object if OK
83
-	 */
84
-	public function create(User $user, $notrigger = false)
85
-	{
86
-		dol_syslog(__METHOD__, LOG_DEBUG);
87
-
88
-		$error = 0;
89
-
90
-		// Clean parameters
61
+    public $idType;
62
+    public $numero;
63
+    public $nom;
64
+    public $active;
65
+
66
+    /**
67
+     * Constructor
68
+     *
69
+     * @param DoliDb $db Database handler
70
+     */
71
+    public function __construct(DoliDB $db)
72
+    {
73
+        $this->db = $db;
74
+    }
75
+
76
+    /**
77
+     * Create object into database
78
+     *
79
+     * @param  User $user      User that creates
80
+     * @param  bool $notrigger false=launch triggers after, true=disable triggers
81
+     *
82
+     * @return int <0 if KO, Id of created object if OK
83
+     */
84
+    public function create(User $user, $notrigger = false)
85
+    {
86
+        dol_syslog(__METHOD__, LOG_DEBUG);
87
+
88
+        $error = 0;
89
+
90
+        // Clean parameters
91 91
 		
92
-		if (isset($this->idType)) {
93
-			 $this->idType = trim($this->idType);
94
-		}
95
-		if (isset($this->numero)) {
96
-			 $this->numero = trim($this->numero);
97
-		}
98
-		if (isset($this->nom)) {
99
-			 $this->nom = trim($this->nom);
100
-		}
101
-		if (isset($this->active)) {
102
-			 $this->active = trim($this->active);
103
-		}
104
-
105
-
106
-
107
-		// Check parameters
108
-		// Put here code to add control on parameters values
109
-
110
-		// Insert request
111
-		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
92
+        if (isset($this->idType)) {
93
+                $this->idType = trim($this->idType);
94
+        }
95
+        if (isset($this->numero)) {
96
+                $this->numero = trim($this->numero);
97
+        }
98
+        if (isset($this->nom)) {
99
+                $this->nom = trim($this->nom);
100
+        }
101
+        if (isset($this->active)) {
102
+                $this->active = trim($this->active);
103
+        }
104
+
105
+
106
+
107
+        // Check parameters
108
+        // Put here code to add control on parameters values
109
+
110
+        // Insert request
111
+        $sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
112 112
 		
113
-		$sql.= 'numero,';
114
-		$sql.= 'nom';
115
-		$sql.= 'active';
113
+        $sql.= 'numero,';
114
+        $sql.= 'nom';
115
+        $sql.= 'active';
116 116
 
117 117
 		
118
-		$sql .= ') VALUES (';
118
+        $sql .= ') VALUES (';
119 119
 		
120
-		$sql .= ' '.(! isset($this->numero)?'NULL':$this->numero).',';
121
-		$sql .= ' '.(! isset($this->nom)?'NULL':"'".$this->db->escape($this->nom)."'").',';
122
-		$sql .= ' '.(! isset($this->active)?'NULL':$this->active);
120
+        $sql .= ' '.(! isset($this->numero)?'NULL':$this->numero).',';
121
+        $sql .= ' '.(! isset($this->nom)?'NULL':"'".$this->db->escape($this->nom)."'").',';
122
+        $sql .= ' '.(! isset($this->active)?'NULL':$this->active);
123 123
 
124 124
 		
125
-		$sql .= ')';
126
-
127
-		$this->db->begin();
128
-
129
-		$resql = $this->db->query($sql);
130
-		if (!$resql) {
131
-			$error ++;
132
-			$this->errors[] = 'Error ' . $this->db->lasterror();
133
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
134
-		}
135
-
136
-		if (!$error) {
137
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
138
-
139
-			if (!$notrigger) {
140
-				// Uncomment this and change MYOBJECT to your own tag if you
141
-				// want this action to call a trigger.
142
-
143
-				//// Call triggers
144
-				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
145
-				//if ($result < 0) $error++;
146
-				//// End call triggers
147
-			}
148
-		}
149
-
150
-		// Commit or rollback
151
-		if ($error) {
152
-			$this->db->rollback();
153
-
154
-			return - 1 * $error;
155
-		} else {
156
-			$this->db->commit();
157
-
158
-			return $this->id;
159
-		}
160
-	}
161
-
162
-	/**
163
-	 * Load object in memory from the database
164
-	 *
165
-	 * @param int    $id  Id object
166
-	 * @param string $ref Ref
167
-	 *
168
-	 * @return int <0 if KO, 0 if not found, >0 if OK
169
-	 */
170
-	public function fetch($id, $ref = null)
171
-	{
172
-		dol_syslog(__METHOD__, LOG_DEBUG);
173
-
174
-		$sql = 'SELECT';
175
-		$sql .= ' t.idType,';
125
+        $sql .= ')';
126
+
127
+        $this->db->begin();
128
+
129
+        $resql = $this->db->query($sql);
130
+        if (!$resql) {
131
+            $error ++;
132
+            $this->errors[] = 'Error ' . $this->db->lasterror();
133
+            dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
134
+        }
135
+
136
+        if (!$error) {
137
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
138
+
139
+            if (!$notrigger) {
140
+                // Uncomment this and change MYOBJECT to your own tag if you
141
+                // want this action to call a trigger.
142
+
143
+                //// Call triggers
144
+                //$result=$this->call_trigger('MYOBJECT_CREATE',$user);
145
+                //if ($result < 0) $error++;
146
+                //// End call triggers
147
+            }
148
+        }
149
+
150
+        // Commit or rollback
151
+        if ($error) {
152
+            $this->db->rollback();
153
+
154
+            return - 1 * $error;
155
+        } else {
156
+            $this->db->commit();
157
+
158
+            return $this->id;
159
+        }
160
+    }
161
+
162
+    /**
163
+     * Load object in memory from the database
164
+     *
165
+     * @param int    $id  Id object
166
+     * @param string $ref Ref
167
+     *
168
+     * @return int <0 if KO, 0 if not found, >0 if OK
169
+     */
170
+    public function fetch($id, $ref = null)
171
+    {
172
+        dol_syslog(__METHOD__, LOG_DEBUG);
173
+
174
+        $sql = 'SELECT';
175
+        $sql .= ' t.idType,';
176 176
 		
177
-		$sql .= " t.numero,";
178
-		$sql .= " t.nom,";
179
-		$sql .= " t.active";
177
+        $sql .= " t.numero,";
178
+        $sql .= " t.nom,";
179
+        $sql .= " t.active";
180 180
 
181 181
 		
182
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
183
-		if (null !== $ref) {
184
-			$sql .= ' WHERE t.ref = ' . '\'' . $ref . '\'';
185
-		} else {
186
-			$sql .= ' WHERE t.idType = ' . $id;
187
-		}
188
-
189
-		$resql = $this->db->query($sql);
190
-		if ($resql) {
191
-			$numrows = $this->db->num_rows($resql);
192
-			if ($numrows) {
193
-				$obj = $this->db->fetch_object($resql);
194
-
195
-				$this->id = $obj->idType;
182
+        $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
183
+        if (null !== $ref) {
184
+            $sql .= ' WHERE t.ref = ' . '\'' . $ref . '\'';
185
+        } else {
186
+            $sql .= ' WHERE t.idType = ' . $id;
187
+        }
188
+
189
+        $resql = $this->db->query($sql);
190
+        if ($resql) {
191
+            $numrows = $this->db->num_rows($resql);
192
+            if ($numrows) {
193
+                $obj = $this->db->fetch_object($resql);
194
+
195
+                $this->id = $obj->idType;
196 196
 				
197
-				$this->idType = $obj->idType;
198
-				$this->numero = $obj->numero;
199
-				$this->nom = $obj->nom;
200
-				$this->active = $obj->active;
197
+                $this->idType = $obj->idType;
198
+                $this->numero = $obj->numero;
199
+                $this->nom = $obj->nom;
200
+                $this->active = $obj->active;
201 201
 
202 202
 				
203
-			}
204
-			$this->db->free($resql);
205
-
206
-			if ($numrows) {
207
-				return 1;
208
-			} else {
209
-				return 0;
210
-			}
211
-		} else {
212
-			$this->errors[] = 'Error ' . $this->db->lasterror();
213
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
214
-
215
-			return - 1;
216
-		}
217
-	}
218
-
219
-	/**
220
-	 * Load object in memory from the database
221
-	 *
222
-	 * @param string $sortorder Sort Order
223
-	 * @param string $sortfield Sort field
224
-	 * @param int    $limit     offset limit
225
-	 * @param int    $offset    offset limit
226
-	 * @param array  $filter    filter array
227
-	 * @param string $filtermode filter mode (AND or OR)
228
-	 *
229
-	 * @return int <0 if KO, >0 if OK
230
-	 */
231
-	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
232
-	{
233
-		dol_syslog(__METHOD__, LOG_DEBUG);
234
-
235
-		$sql = 'SELECT';
236
-		$sql .= " t.idType,";
237
-		$sql .= " t.numero,";
238
-		$sql .= " t.nom,";
239
-		$sql .= " t.active";
203
+            }
204
+            $this->db->free($resql);
205
+
206
+            if ($numrows) {
207
+                return 1;
208
+            } else {
209
+                return 0;
210
+            }
211
+        } else {
212
+            $this->errors[] = 'Error ' . $this->db->lasterror();
213
+            dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
214
+
215
+            return - 1;
216
+        }
217
+    }
218
+
219
+    /**
220
+     * Load object in memory from the database
221
+     *
222
+     * @param string $sortorder Sort Order
223
+     * @param string $sortfield Sort field
224
+     * @param int    $limit     offset limit
225
+     * @param int    $offset    offset limit
226
+     * @param array  $filter    filter array
227
+     * @param string $filtermode filter mode (AND or OR)
228
+     *
229
+     * @return int <0 if KO, >0 if OK
230
+     */
231
+    public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
232
+    {
233
+        dol_syslog(__METHOD__, LOG_DEBUG);
234
+
235
+        $sql = 'SELECT';
236
+        $sql .= " t.idType,";
237
+        $sql .= " t.numero,";
238
+        $sql .= " t.nom,";
239
+        $sql .= " t.active";
240 240
 
241 241
 		
242
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
242
+        $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
243 243
 
244
-		// Manage filter
245
-		$sqlwhere = array();
244
+        // Manage filter
245
+        $sqlwhere = array();
246 246
 
247
-		foreach ($filter as $key => $value) {
248
-		    if(is_string($value)){
247
+        foreach ($filter as $key => $value) {
248
+            if(is_string($value)){
249 249
                 $sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
250 250
                 continue;
251 251
             }
@@ -256,232 +256,232 @@  discard block
 block discarded – undo
256 256
             }
257 257
         }
258 258
 
259
-		if (count($sqlwhere) > 0) {
260
-			$sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
261
-		}
259
+        if (count($sqlwhere) > 0) {
260
+            $sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
261
+        }
262 262
 		
263
-		if (!empty($sortfield)) {
264
-			$sql .= $this->db->order($sortfield,$sortorder);
265
-		}
266
-		if (!empty($limit)) {
267
-		 $sql .=  ' ' . $this->db->plimit($limit + 1, $offset);
268
-		}
269
-		$this->lines = array();
270
-
271
-		$resql = $this->db->query($sql);
272
-		if ($resql) {
273
-			$num = $this->db->num_rows($resql);
274
-
275
-			while ($obj = $this->db->fetch_object($resql)) {
276
-				$line = new BbctypesLine();
277
-
278
-				$line->id = $obj->idType;
279
-				$line->idType = $obj->idType;
280
-				$line->numero = $obj->numero;
281
-				$line->nom = $obj->nom;
282
-				$line->active = $obj->active;
283
-
284
-				$this->lines[$line->id] = $line;
285
-			}
286
-			$this->db->free($resql);
287
-
288
-			return $num;
289
-		} else {
290
-			$this->errors[] = 'Error ' . $this->db->lasterror();
291
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
292
-
293
-			return - 1;
294
-		}
295
-	}
296
-
297
-	/**
298
-	 * Update object into database
299
-	 *
300
-	 * @param  User $user      User that modifies
301
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
302
-	 *
303
-	 * @return int <0 if KO, >0 if OK
304
-	 */
305
-	public function update(User $user, $notrigger = false)
306
-	{
307
-		$error = 0;
308
-
309
-		dol_syslog(__METHOD__, LOG_DEBUG);
310
-
311
-		// Clean parameters
263
+        if (!empty($sortfield)) {
264
+            $sql .= $this->db->order($sortfield,$sortorder);
265
+        }
266
+        if (!empty($limit)) {
267
+            $sql .=  ' ' . $this->db->plimit($limit + 1, $offset);
268
+        }
269
+        $this->lines = array();
270
+
271
+        $resql = $this->db->query($sql);
272
+        if ($resql) {
273
+            $num = $this->db->num_rows($resql);
274
+
275
+            while ($obj = $this->db->fetch_object($resql)) {
276
+                $line = new BbctypesLine();
277
+
278
+                $line->id = $obj->idType;
279
+                $line->idType = $obj->idType;
280
+                $line->numero = $obj->numero;
281
+                $line->nom = $obj->nom;
282
+                $line->active = $obj->active;
283
+
284
+                $this->lines[$line->id] = $line;
285
+            }
286
+            $this->db->free($resql);
287
+
288
+            return $num;
289
+        } else {
290
+            $this->errors[] = 'Error ' . $this->db->lasterror();
291
+            dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
292
+
293
+            return - 1;
294
+        }
295
+    }
296
+
297
+    /**
298
+     * Update object into database
299
+     *
300
+     * @param  User $user      User that modifies
301
+     * @param  bool $notrigger false=launch triggers after, true=disable triggers
302
+     *
303
+     * @return int <0 if KO, >0 if OK
304
+     */
305
+    public function update(User $user, $notrigger = false)
306
+    {
307
+        $error = 0;
308
+
309
+        dol_syslog(__METHOD__, LOG_DEBUG);
310
+
311
+        // Clean parameters
312 312
 		
313
-		if (isset($this->idType)) {
314
-			 $this->idType = trim($this->idType);
315
-		}
316
-		if (isset($this->numero)) {
317
-			 $this->numero = trim($this->numero);
318
-		}
319
-		if (isset($this->nom)) {
320
-			 $this->nom = trim($this->nom);
321
-		}
322
-		if (isset($this->active)) {
323
-			 $this->active = trim($this->active);
324
-		}
313
+        if (isset($this->idType)) {
314
+                $this->idType = trim($this->idType);
315
+        }
316
+        if (isset($this->numero)) {
317
+                $this->numero = trim($this->numero);
318
+        }
319
+        if (isset($this->nom)) {
320
+                $this->nom = trim($this->nom);
321
+        }
322
+        if (isset($this->active)) {
323
+                $this->active = trim($this->active);
324
+        }
325 325
 
326 326
 		
327 327
 
328
-		// Check parameters
329
-		// Put here code to add a control on parameters values
328
+        // Check parameters
329
+        // Put here code to add a control on parameters values
330 330
 
331
-		// Update request
332
-		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
331
+        // Update request
332
+        $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
333 333
 		
334
-		$sql .= ' numero = '.(isset($this->numero)?$this->numero:"null").',';
335
-		$sql .= ' nom = '.(isset($this->nom)?"'".$this->db->escape($this->nom)."'":"null").',';
336
-		$sql .= ' active = '.(isset($this->active)?$this->active:"null");
334
+        $sql .= ' numero = '.(isset($this->numero)?$this->numero:"null").',';
335
+        $sql .= ' nom = '.(isset($this->nom)?"'".$this->db->escape($this->nom)."'":"null").',';
336
+        $sql .= ' active = '.(isset($this->active)?$this->active:"null");
337 337
 
338 338
         
339
-		$sql .= ' WHERE idType=' . $this->id;
340
-
341
-		$this->db->begin();
342
-
343
-		$resql = $this->db->query($sql);
344
-		if (!$resql) {
345
-			$error ++;
346
-			$this->errors[] = 'Error ' . $this->db->lasterror();
347
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
348
-		}
349
-
350
-		if (!$error && !$notrigger) {
351
-			// Uncomment this and change MYOBJECT to your own tag if you
352
-			// want this action calls a trigger.
353
-
354
-			//// Call triggers
355
-			//$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
356
-			//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
357
-			//// End call triggers
358
-		}
359
-
360
-		// Commit or rollback
361
-		if ($error) {
362
-			$this->db->rollback();
363
-
364
-			return - 1 * $error;
365
-		} else {
366
-			$this->db->commit();
367
-
368
-			return 1;
369
-		}
370
-	}
371
-
372
-	/**
373
-	 * Delete object in database
374
-	 *
375
-	 * @param User $user      User that deletes
376
-	 * @param bool $notrigger false=launch triggers after, true=disable triggers
377
-	 *
378
-	 * @return int <0 if KO, >0 if OK
379
-	 */
380
-	public function delete(User $user, $notrigger = false)
381
-	{
382
-		dol_syslog(__METHOD__, LOG_DEBUG);
383
-
384
-		$error = 0;
385
-
386
-		$this->db->begin();
387
-
388
-		if (!$error) {
389
-			if (!$notrigger) {
390
-				// Uncomment this and change MYOBJECT to your own tag if you
391
-				// want this action calls a trigger.
392
-
393
-				//// Call triggers
394
-				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
395
-				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
396
-				//// End call triggers
397
-			}
398
-		}
399
-
400
-		if (!$error) {
401
-			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
402
-			$sql .= ' WHERE idType=' . $this->id;
403
-
404
-			$resql = $this->db->query($sql);
405
-			if (!$resql) {
406
-				$error ++;
407
-				$this->errors[] = 'Error ' . $this->db->lasterror();
408
-				dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
409
-			}
410
-		}
411
-
412
-		// Commit or rollback
413
-		if ($error) {
414
-			$this->db->rollback();
415
-
416
-			return - 1 * $error;
417
-		} else {
418
-			$this->db->commit();
419
-
420
-			return 1;
421
-		}
422
-	}
423
-
424
-	/**
425
-	 * Load an object from its id and create a new one in database
426
-	 *
427
-	 * @param int $fromid Id of object to clone
428
-	 *
429
-	 * @return int New id of clone
430
-	 */
431
-	public function createFromClone($fromid)
432
-	{
433
-		dol_syslog(__METHOD__, LOG_DEBUG);
434
-
435
-		global $user;
436
-		$error = 0;
437
-		$object = new Bbctypes($this->db);
438
-
439
-		$this->db->begin();
440
-
441
-		// Load source object
442
-		$object->fetch($fromid);
443
-		// Reset object
444
-		$object->id = 0;
445
-
446
-		// Clear fields
447
-		// ...
448
-
449
-		// Create clone
450
-		$result = $object->create($user);
451
-
452
-		// Other options
453
-		if ($result < 0) {
454
-			$error ++;
455
-			$this->errors = $object->errors;
456
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
457
-		}
458
-
459
-		// End
460
-		if (!$error) {
461
-			$this->db->commit();
462
-
463
-			return $object->id;
464
-		} else {
465
-			$this->db->rollback();
466
-
467
-			return - 1;
468
-		}
469
-	}
470
-
471
-	/**
472
-	 *  Return a link to the user card (with optionaly the picto)
473
-	 * 	Use this->id,this->lastname, this->firstname
474
-	 *
475
-	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
476
-	 *	@param	string	$option				On what the link point to
339
+        $sql .= ' WHERE idType=' . $this->id;
340
+
341
+        $this->db->begin();
342
+
343
+        $resql = $this->db->query($sql);
344
+        if (!$resql) {
345
+            $error ++;
346
+            $this->errors[] = 'Error ' . $this->db->lasterror();
347
+            dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
348
+        }
349
+
350
+        if (!$error && !$notrigger) {
351
+            // Uncomment this and change MYOBJECT to your own tag if you
352
+            // want this action calls a trigger.
353
+
354
+            //// Call triggers
355
+            //$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
356
+            //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
357
+            //// End call triggers
358
+        }
359
+
360
+        // Commit or rollback
361
+        if ($error) {
362
+            $this->db->rollback();
363
+
364
+            return - 1 * $error;
365
+        } else {
366
+            $this->db->commit();
367
+
368
+            return 1;
369
+        }
370
+    }
371
+
372
+    /**
373
+     * Delete object in database
374
+     *
375
+     * @param User $user      User that deletes
376
+     * @param bool $notrigger false=launch triggers after, true=disable triggers
377
+     *
378
+     * @return int <0 if KO, >0 if OK
379
+     */
380
+    public function delete(User $user, $notrigger = false)
381
+    {
382
+        dol_syslog(__METHOD__, LOG_DEBUG);
383
+
384
+        $error = 0;
385
+
386
+        $this->db->begin();
387
+
388
+        if (!$error) {
389
+            if (!$notrigger) {
390
+                // Uncomment this and change MYOBJECT to your own tag if you
391
+                // want this action calls a trigger.
392
+
393
+                //// Call triggers
394
+                //$result=$this->call_trigger('MYOBJECT_DELETE',$user);
395
+                //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
396
+                //// End call triggers
397
+            }
398
+        }
399
+
400
+        if (!$error) {
401
+            $sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
402
+            $sql .= ' WHERE idType=' . $this->id;
403
+
404
+            $resql = $this->db->query($sql);
405
+            if (!$resql) {
406
+                $error ++;
407
+                $this->errors[] = 'Error ' . $this->db->lasterror();
408
+                dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
409
+            }
410
+        }
411
+
412
+        // Commit or rollback
413
+        if ($error) {
414
+            $this->db->rollback();
415
+
416
+            return - 1 * $error;
417
+        } else {
418
+            $this->db->commit();
419
+
420
+            return 1;
421
+        }
422
+    }
423
+
424
+    /**
425
+     * Load an object from its id and create a new one in database
426
+     *
427
+     * @param int $fromid Id of object to clone
428
+     *
429
+     * @return int New id of clone
430
+     */
431
+    public function createFromClone($fromid)
432
+    {
433
+        dol_syslog(__METHOD__, LOG_DEBUG);
434
+
435
+        global $user;
436
+        $error = 0;
437
+        $object = new Bbctypes($this->db);
438
+
439
+        $this->db->begin();
440
+
441
+        // Load source object
442
+        $object->fetch($fromid);
443
+        // Reset object
444
+        $object->id = 0;
445
+
446
+        // Clear fields
447
+        // ...
448
+
449
+        // Create clone
450
+        $result = $object->create($user);
451
+
452
+        // Other options
453
+        if ($result < 0) {
454
+            $error ++;
455
+            $this->errors = $object->errors;
456
+            dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
457
+        }
458
+
459
+        // End
460
+        if (!$error) {
461
+            $this->db->commit();
462
+
463
+            return $object->id;
464
+        } else {
465
+            $this->db->rollback();
466
+
467
+            return - 1;
468
+        }
469
+    }
470
+
471
+    /**
472
+     *  Return a link to the user card (with optionaly the picto)
473
+     * 	Use this->id,this->lastname, this->firstname
474
+     *
475
+     *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
476
+     *	@param	string	$option				On what the link point to
477 477
      *  @param	integer	$notooltip			1=Disable tooltip
478 478
      *  @param	int		$maxlen				Max length of visible user name
479 479
      *  @param  string  $morecss            Add more css on link
480
-	 *	@return	string						String with URL
481
-	 */
482
-	function getNomUrl($withpicto=0, $option='', $notooltip=0, $maxlen=24, $morecss='')
483
-	{
484
-		global $langs, $conf, $db;
480
+     *	@return	string						String with URL
481
+     */
482
+    function getNomUrl($withpicto=0, $option='', $notooltip=0, $maxlen=24, $morecss='')
483
+    {
484
+        global $langs, $conf, $db;
485 485
         global $dolibarr_main_authentication, $dolibarr_main_demo;
486 486
         global $menumanager;
487 487
 
@@ -496,92 +496,92 @@  discard block
 block discarded – undo
496 496
         $link = '<a href="'.DOL_URL_ROOT.'/flightLog/card.php?id='.$this->id.'"';
497 497
         $link.= ($notooltip?'':' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss?' '.$morecss:'').'"');
498 498
         $link.= '>';
499
-		$linkend='</a>';
499
+        $linkend='</a>';
500 500
 
501 501
         if ($withpicto)
502 502
         {
503 503
             $result.=($link.img_object(($notooltip?'':$label), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend);
504 504
             if ($withpicto != 2) $result.=' ';
505
-		}
506
-		$result.= $link . $this->ref . $linkend;
507
-		return $result;
508
-	}
505
+        }
506
+        $result.= $link . $this->ref . $linkend;
507
+        return $result;
508
+    }
509 509
 	
510
-	/**
511
-	 *  Retourne le libelle du status d'un user (actif, inactif)
512
-	 *
513
-	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
514
-	 *  @return	string 			       Label of status
515
-	 */
516
-	function getLibStatut($mode=0)
517
-	{
518
-		return $this->LibStatut($this->status,$mode);
519
-	}
520
-
521
-	/**
522
-	 *  Renvoi le libelle d'un status donne
523
-	 *
524
-	 *  @param	int		$status        	Id status
525
-	 *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
526
-	 *  @return string 			       	Label of status
527
-	 */
528
-	function LibStatut($status,$mode=0)
529
-	{
530
-		global $langs;
531
-
532
-		if ($mode == 0)
533
-		{
534
-			$prefix='';
535
-			if ($status == 1) return $langs->trans('Enabled');
536
-			if ($status == 0) return $langs->trans('Disabled');
537
-		}
538
-		if ($mode == 1)
539
-		{
540
-			if ($status == 1) return $langs->trans('Enabled');
541
-			if ($status == 0) return $langs->trans('Disabled');
542
-		}
543
-		if ($mode == 2)
544
-		{
545
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
546
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
547
-		}
548
-		if ($mode == 3)
549
-		{
550
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
551
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
552
-		}
553
-		if ($mode == 4)
554
-		{
555
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
556
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
557
-		}
558
-		if ($mode == 5)
559
-		{
560
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
561
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
562
-		}
563
-
564
-		return "";
565
-	}
510
+    /**
511
+     *  Retourne le libelle du status d'un user (actif, inactif)
512
+     *
513
+     *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
514
+     *  @return	string 			       Label of status
515
+     */
516
+    function getLibStatut($mode=0)
517
+    {
518
+        return $this->LibStatut($this->status,$mode);
519
+    }
520
+
521
+    /**
522
+     *  Renvoi le libelle d'un status donne
523
+     *
524
+     *  @param	int		$status        	Id status
525
+     *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
526
+     *  @return string 			       	Label of status
527
+     */
528
+    function LibStatut($status,$mode=0)
529
+    {
530
+        global $langs;
531
+
532
+        if ($mode == 0)
533
+        {
534
+            $prefix='';
535
+            if ($status == 1) return $langs->trans('Enabled');
536
+            if ($status == 0) return $langs->trans('Disabled');
537
+        }
538
+        if ($mode == 1)
539
+        {
540
+            if ($status == 1) return $langs->trans('Enabled');
541
+            if ($status == 0) return $langs->trans('Disabled');
542
+        }
543
+        if ($mode == 2)
544
+        {
545
+            if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
546
+            if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
547
+        }
548
+        if ($mode == 3)
549
+        {
550
+            if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
551
+            if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
552
+        }
553
+        if ($mode == 4)
554
+        {
555
+            if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
556
+            if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
557
+        }
558
+        if ($mode == 5)
559
+        {
560
+            if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
561
+            if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
562
+        }
563
+
564
+        return "";
565
+    }
566 566
 	
567 567
 	
568
-	/**
569
-	 * Initialise object with example values
570
-	 * Id must be 0 if object instance is a specimen
571
-	 *
572
-	 * @return void
573
-	 */
574
-	public function initAsSpecimen()
575
-	{
576
-		$this->id = 0;
568
+    /**
569
+     * Initialise object with example values
570
+     * Id must be 0 if object instance is a specimen
571
+     *
572
+     * @return void
573
+     */
574
+    public function initAsSpecimen()
575
+    {
576
+        $this->id = 0;
577 577
 		
578
-		$this->idType = '';
579
-		$this->numero = '';
580
-		$this->nom = '';
581
-		$this->active = '';
578
+        $this->idType = '';
579
+        $this->numero = '';
580
+        $this->nom = '';
581
+        $this->active = '';
582 582
 
583 583
 		
584
-	}
584
+    }
585 585
 
586 586
 }
587 587
 
@@ -590,21 +590,21 @@  discard block
 block discarded – undo
590 590
  */
591 591
 class BbctypesLine
592 592
 {
593
-	/**
594
-	 * @var int ID
595
-	 */
596
-	public $id;
597
-	/**
598
-	 * @var mixed Sample line property 1
599
-	 */
593
+    /**
594
+     * @var int ID
595
+     */
596
+    public $id;
597
+    /**
598
+     * @var mixed Sample line property 1
599
+     */
600 600
 	
601
-	public $idType;
602
-	public $numero;
603
-	public $nom;
604
-	public $active;
605
-
606
-	/**
607
-	 * @var mixed Sample line property 2
608
-	 */
601
+    public $idType;
602
+    public $numero;
603
+    public $nom;
604
+    public $active;
605
+
606
+    /**
607
+     * @var mixed Sample line property 2
608
+     */
609 609
 	
610 610
 }
Please login to merge, or discard this patch.