@@ -148,10 +148,10 @@ |
||
148 | 148 | $this->document->setTitle('Files'); |
149 | 149 | |
150 | 150 | $data = array('filemanager' => $filemanager, |
151 | - 'multiple_choice' => $multiple_choice, |
|
152 | - //'receive_redirect' => $receive_redirect, |
|
153 | - 'files' => $files, |
|
154 | - 'selected_files' => $selected_files |
|
151 | + 'multiple_choice' => $multiple_choice, |
|
152 | + //'receive_redirect' => $receive_redirect, |
|
153 | + 'files' => $files, |
|
154 | + 'selected_files' => $selected_files |
|
155 | 155 | ); |
156 | 156 | |
157 | 157 | $tpl = $this->template->create(dirname(__FILE__) . '/../templates/ckeditor'); |
@@ -391,7 +391,7 @@ discard block |
||
391 | 391 | } |
392 | 392 | |
393 | 393 | if ($this->type == "invoice") { |
394 | - // Hvis det er en faktura skal der indtastes en due_date, ellers er det ligegyldigt! |
|
394 | + // Hvis det er en faktura skal der indtastes en due_date, ellers er det ligegyldigt! |
|
395 | 395 | if ($validator->isDate($input["due_date"], "Ugyldig leveringsdato", "allow_no_year")) { |
396 | 396 | $due_date = new Intraface_Date($input["due_date"]); |
397 | 397 | $due_date->convert2db(); |
@@ -447,7 +447,7 @@ discard block |
||
447 | 447 | $input["round_off"] = 0; |
448 | 448 | } |
449 | 449 | |
450 | - // user_id = ".$this->kernel->user->get('id').", // skal puttes p�, men kun hvis det ikke er fra webshop. |
|
450 | + // user_id = ".$this->kernel->user->get('id').", // skal puttes p�, men kun hvis det ikke er fra webshop. |
|
451 | 451 | $db = new DB_Sql; |
452 | 452 | if ($this->id == 0) { |
453 | 453 | $infinite_check = 0; |
@@ -1124,9 +1124,9 @@ discard block |
||
1124 | 1124 | function getPaymentInformation() |
1125 | 1125 | { |
1126 | 1126 | $info = array('bank_name' => $this->kernel->setting->get("intranet", "bank_name"), |
1127 | - 'bank_reg_number' => $this->kernel->setting->get("intranet", "bank_reg_number"), |
|
1128 | - 'bank_account_number' => $this->kernel->setting->get("intranet", "bank_account_number"), |
|
1129 | - 'giro_account_number' => $this->kernel->setting->get("intranet", "giro_account_number") |
|
1127 | + 'bank_reg_number' => $this->kernel->setting->get("intranet", "bank_reg_number"), |
|
1128 | + 'bank_account_number' => $this->kernel->setting->get("intranet", "bank_account_number"), |
|
1129 | + 'giro_account_number' => $this->kernel->setting->get("intranet", "giro_account_number") |
|
1130 | 1130 | ); |
1131 | 1131 | |
1132 | 1132 | return $info; |
@@ -282,7 +282,7 @@ discard block |
||
282 | 282 | $product = new Product($this->debtor->kernel, $input["product_id"], $input['product_detail_id']); |
283 | 283 | |
284 | 284 | if (!is_object($product) || $product->get('id') == 0) { |
285 | - $this->error->set("Ugyldigt produkt"); |
|
285 | + $this->error->set("Ugyldigt produkt"); |
|
286 | 286 | } else { |
287 | 287 | $product_detail_id = $product->get("detail_id"); |
288 | 288 | } |
@@ -374,7 +374,7 @@ discard block |
||
374 | 374 | $product = new Product($this->debtor->kernel, $product_id); |
375 | 375 | |
376 | 376 | if (!is_object($product) || $product->get('id') == 0) { |
377 | - throw new Excetion('Invalid product id'); |
|
377 | + throw new Excetion('Invalid product id'); |
|
378 | 378 | } else { |
379 | 379 | $product_detail_id = $product->get("detail_id"); |
380 | 380 | } |
@@ -501,7 +501,7 @@ discard block |
||
501 | 501 | $i++; |
502 | 502 | } |
503 | 503 | } else { |
504 | - throw new Exception("Ugyldig produktdetalje i DebtorItem->getList() on ".$db->f('product_id').'/'.$db->f('product_detail_id')); |
|
504 | + throw new Exception("Ugyldig produktdetalje i DebtorItem->getList() on ".$db->f('product_id').'/'.$db->f('product_detail_id')); |
|
505 | 505 | } |
506 | 506 | } |
507 | 507 | unset($db); |
@@ -51,7 +51,6 @@ |
||
51 | 51 | |
52 | 52 | /** |
53 | 53 | * Creates the dbquery object |
54 | - |
|
55 | 54 | * @return void |
56 | 55 | */ |
57 | 56 | public function getDBQuery() |
@@ -115,7 +115,6 @@ discard block |
||
115 | 115 | |
116 | 116 | /** |
117 | 117 | * Creates the dbquery object |
118 | - |
|
119 | 118 | * @return void |
120 | 119 | */ |
121 | 120 | public function getDBQuery() |
@@ -569,7 +568,7 @@ discard block |
||
569 | 568 | $product_number = (int)$product_number; |
570 | 569 | |
571 | 570 | $db = new DB_Sql; |
572 | - $sql = "SELECT product.id FROM product |
|
571 | + $sql = "SELECT product.id FROM product |
|
573 | 572 | INNER JOIN product_detail detail |
574 | 573 | ON product.id = detail.product_id |
575 | 574 | WHERE detail.number = '" . $product_number . "' |
@@ -818,7 +817,7 @@ discard block |
||
818 | 817 | "AND product_attribute_group.intranet_id = ".$db->quote($this->intranet->getId())." " . |
819 | 818 | "WHERE product_x_attribute_group.intranet_id = ".$db->quote($this->intranet->getId())." " . |
820 | 819 | "AND product_x_attribute_group.product_id=" . $this->getId() . " " . |
821 | - "ORDER BY product_attribute_group.id"); |
|
820 | + "ORDER BY product_attribute_group.id"); |
|
822 | 821 | |
823 | 822 | if (PEAR::isError($result)) { |
824 | 823 | throw new Exception('Error in query :'.$result->getUserInfo()); |
@@ -42,9 +42,9 @@ |
||
42 | 42 | { |
43 | 43 | $q = Doctrine_Query::create(); |
44 | 44 | $rows = $q->delete() |
45 | - ->from('Intraface_modules_language_Languages') |
|
46 | - ->where('intranet_id = ?', $GLOBALS['intraface_doctrine_intranet_id']) |
|
47 | - ->execute(); |
|
45 | + ->from('Intraface_modules_language_Languages') |
|
46 | + ->where('intranet_id = ?', $GLOBALS['intraface_doctrine_intranet_id']) |
|
47 | + ->execute(); |
|
48 | 48 | return true; |
49 | 49 | } |
50 | 50 | } |
@@ -77,7 +77,7 @@ |
||
77 | 77 | private function load() |
78 | 78 | { |
79 | 79 | $db = new DB_Sql; |
80 | - $db->query("SELECT id, list_id, subject, text, deadline, sent_to_receivers, status FROM newsletter_archieve WHERE id = " . $this->id . " AND active = 1 LIMIT 1"); |
|
80 | + $db->query("SELECT id, list_id, subject, text, deadline, sent_to_receivers, status FROM newsletter_archieve WHERE id = " . $this->id . " AND active = 1 LIMIT 1"); |
|
81 | 81 | |
82 | 82 | $db2 = new DB_Sql; |
83 | 83 | if ($db->nextRecord()) { |
@@ -29,7 +29,7 @@ |
||
29 | 29 | $this->year = $year; |
30 | 30 | } |
31 | 31 | |
32 | - /** |
|
32 | + /** |
|
33 | 33 | * Denne funktion bruges bl.a. under bogf�ringen, s� man bare taster kontonummer |
34 | 34 | * og s� s�ttes den rigtige konto. |
35 | 35 | * |
@@ -277,7 +277,7 @@ |
||
277 | 277 | $var['amount'] = abs(round($this->get('saldo_vat_in'))); |
278 | 278 | |
279 | 279 | if (!$voucher->saveInDaybook($var, $skip_daybook)) { |
280 | - $this->error->set('Systemet kunne ikke opdatere indgående moms'); |
|
280 | + $this->error->set('Systemet kunne ikke opdatere indgående moms'); |
|
281 | 281 | } |
282 | 282 | |
283 | 283 | if ($this->error->isError()) { |