intraface / intraface.dk

src/Intraface/modules/debtor/Debtor.php

Spacing +19 added lines, -19 removed lines

@@ -271,7 +271,7 @@ 
 

         // Bruges til at afg�re, hvor debtor er sendt hent til

         $db = new DB_Sql;

-        $db->query("SELECT id, type FROM debtor WHERE where_from > 2 AND where_from_id = " . $this->id . " AND active = 1");

+        $db->query("SELECT id, type FROM debtor WHERE where_from > 2 AND where_from_id = ".$this->id." AND active = 1");

         if ($db->nextRecord()) {

             if ($db->f('type') > 0) {

                 $types = self::getDebtorTypes();

@@ -305,7 +305,7 @@ 
         // @todo Currency is always loaded, should be done with left join. Oh give me more doctrine!

         $currency = $this->getCurrency();

 

-        for ($i = 0, $max = count($item), $total = 0, $total_currency = 0; $i<$max; $i++) {

+        for ($i = 0, $max = count($item), $total = 0, $total_currency = 0; $i < $max; $i++) {

             $total += $item[$i]["amount"]->getAsIso();

             if ($currency) $total_currency += $item[$i]['amount_currency']->getAsIso();

         }

@@ -461,12 +461,12 @@ 
             } while ($db->nextRecord());

 

             $sql_type = "INSERT INTO ";

-            $sql_after = ", date_created = NOW(), identifier_key = \"".$identifier."\", intranet_id = " . $this->kernel->intranet->get('id');

+            $sql_after = ", date_created = NOW(), identifier_key = \"".$identifier."\", intranet_id = ".$this->kernel->intranet->get('id');

         } else {

             $sql_type = "UPDATE ";

-            $sql_after = " WHERE id = " . $this->id . " AND intranet_id = " . $this->kernel->intranet->get('id');

+            $sql_after = " WHERE id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id');

         }

-        $sql = $sql_type . "debtor SET contact_id = " . $contact->get('id') . ",

+        $sql = $sql_type."debtor SET contact_id = ".$contact->get('id').",

             contact_address_id = ".$contact_address_id.",

             contact_person_id = ".$input['contact_person_id'].",

             intranet_address_id = ".$this->kernel->intranet->address->get("address_id").",

@@ -481,7 +481,7 @@ 
             currency_id = ".$currency_id.",

             currency_product_price_exchange_rate_id = ".$currency_exchange_rate_id.",

             payment_method=".$input['payment_method'].",

-            girocode='".$input['girocode']."' " . $internal_note_sql . $sql_after;

+            girocode='".$input['girocode']."' ".$internal_note_sql.$sql_after;

 

             // attention_to = '". $input['attention_to'] ."',

 

@@ -493,7 +493,7 @@ 
         }

 

         if (is_object($this->kernel->user) AND strtolower(get_class($this->kernel->user)) == 'user') {

-            $db->query("UPDATE debtor SET user_id = ".$this->kernel->user->get('id')." WHERE id = " . $this->id);

+            $db->query("UPDATE debtor SET user_id = ".$this->kernel->user->get('id')." WHERE id = ".$this->id);

         }

 

         $this->load();

@@ -513,9 +513,9 @@ 
             return false;

         }

         $db = new DB_Sql;

-        $db->query("SELECT id FROM debtor WHERE id = " . $this->id . " AND intranet_id = " . $this->kernel->intranet->get('id'). " AND type = '".$this->type_key."' LIMIT 1");

+        $db->query("SELECT id FROM debtor WHERE id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id')." AND type = '".$this->type_key."' LIMIT 1");

         if ($db->nextRecord()) {

-            $db->query("UPDATE debtor SET active = 0 WHERE id = " . $this->id . " AND intranet_id = " . $this->kernel->intranet->get('id') . "  AND type = '".$this->type_key."'");

+            $db->query("UPDATE debtor SET active = 0 WHERE id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id')."  AND type = '".$this->type_key."'");

             return true;

         }

         return false;

@@ -565,7 +565,7 @@ 
 

         switch ($this->type) {

             case "invoice":

-                $values['due_date'] = date("d-m-Y", time() + 24 * 60 * 60 * $debtor_object->contact->get("paymentcondition"));

+                $values['due_date'] = date("d-m-Y", time() + 24*60*60*$debtor_object->contact->get("paymentcondition"));

                 if (empty($values['payment_method']) AND $this->kernel->setting->get('intranet', 'bank_account_number')) {

                     $values['payment_method'] = 1;

                 }

@@ -626,7 +626,7 @@ 
             if ($status_id === false) {

                 throw new Exception("Debtor->setStatus(): Ugyldig status (streng)");

             }

-        } else{

+        } else {

             $status_id = intval($status);

             $status_types = $this->getStatusTypes();

             if (isset($status_types[$status_id])) {

@@ -662,7 +662,7 @@ 
         }

 

         $db = new Db_Sql;

-        $db->query("UPDATE debtor SET status = ".$status_id.", ".$sql."  WHERE id = " . $this->id . " AND intranet_id = " . $this->kernel->intranet->get('id'));

+        $db->query("UPDATE debtor SET status = ".$status_id.", ".$sql."  WHERE id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id'));

         $this->load();

 

         return true;

@@ -689,7 +689,7 @@ 
             return false;

         }

         $db = new Db_Sql;

-        $db->query("UPDATE debtor SET where_from = ".(int)$from.", where_from_id = " . $from_id . " WHERE id = " . $this->id);

+        $db->query("UPDATE debtor SET where_from = ".(int)$from.", where_from_id = ".$from_id." WHERE id = ".$this->id);

         return true;

     }

 

@@ -710,7 +710,7 @@ 
         }

         $contact_id = (int)$contact_id;

         $db = new DB_Sql;

-        $db->query("UPDATE debtor SET contact_id = " . $contact_id . " WHERE id = " . $this->id . " AND intranet_id = " . $this->kernel->intranet->get("id") . " AND type='".$this->type_key."'");

+        $db->query("UPDATE debtor SET contact_id = ".$contact_id." WHERE id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get("id")." AND type='".$this->type_key."'");

 

         return true;

     }

@@ -739,7 +739,7 @@ 
             case 'contact':

                 $sql = "SELECT id

                 FROM debtor

-                    WHERE intranet_id = " . $this->kernel->intranet->get("id") . "

+                    WHERE intranet_id = " . $this->kernel->intranet->get("id")."

                         AND contact_id = ".(int)$type_id."

               AND type='".$this->type_key."'

               AND active = 1";

@@ -773,7 +773,7 @@ 
     public function isFilledIn()

     {

         $db = new DB_Sql;

-        $db->query("SELECT id FROM debtor WHERE type = " . $this->type_key . " AND intranet_id = " . $this->kernel->intranet->get('id'));

+        $db->query("SELECT id FROM debtor WHERE type = ".$this->type_key." AND intranet_id = ".$this->kernel->intranet->get('id'));

         return $db->numRows();

     }

 

@@ -978,7 +978,7 @@ 
     {

         $number = safeToDb($number);

         $db = new DB_Sql;

-        $sql = "SELECT id FROM debtor WHERE intranet_id = " . $this->kernel->intranet->get('id') . " AND number = '".$number."' AND type = '".$this->type_key."' AND id != " . $this->id." AND active = 1";

+        $sql = "SELECT id FROM debtor WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND number = '".$number."' AND type = '".$this->type_key."' AND id != ".$this->id." AND active = 1";

         $db->query($sql);

         if ($db->numRows() == 0) {

             return true;

@@ -1063,7 +1063,7 @@ 
     {

         // FIXME - check on date

         $db = new DB_Sql;

-        $db->query("UPDATE debtor SET date_stated = '" . $voucher_date . "', voucher_id = '".$voucher_id."' WHERE id = " . $this->id . " AND intranet_id = " . $this->kernel->intranet->get('id'));

+        $db->query("UPDATE debtor SET date_stated = '".$voucher_date."', voucher_id = '".$voucher_id."' WHERE id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id'));

         return true;

     }

 

@@ -1307,6 +1307,6 @@ 
 

     function getPaymentLink($url)

     {

-        return $url . $this->getIdentifier();

+        return $url.$this->getIdentifier();

     }

 }
\ No newline at end of file

src/Intraface/modules/debtor/Visitor/Text.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
                 $currency_iso_code = 'DKK';
             }
 
-            $table->addRow(array(round($item["quantity"]), substr($item["name"], 0, 40), $currency_iso_code.' ' . $amount));
+            $table->addRow(array(round($item["quantity"]), substr($item["name"], 0, 40), $currency_iso_code.' '.$amount));
         }
         return $table->getTable();
     }

src/Intraface/modules/debtor/Visitor/OIOXML.php

Spacing +3 added lines, -3 removed lines

@@ -39,8 +39,8 @@ 
 

     private function start()

     {

-        $this->output .= '<?xml version="1.0" encoding="iso-8859-1"?>' . "\n";

-        $this->output .= '<Invoice xmlns="http://rep.oio.dk/ubl/xml/schemas/0p71/pie/" xmlns:com="http://rep.oio.dk/ubl/xml/schemas/0p71/common/" xmlns:main="http://rep.oio.dk/ubl/xml/schemas/0p71/maindoc/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://rep.oio.dk/ubl/xml/schemas/0p71/pie/ http://rep.oio.dk/ubl/xml/schemas/0p71/pie/pieStrict.xsd">' . "\n";

+        $this->output .= '<?xml version="1.0" encoding="iso-8859-1"?>'."\n";

+        $this->output .= '<Invoice xmlns="http://rep.oio.dk/ubl/xml/schemas/0p71/pie/" xmlns:com="http://rep.oio.dk/ubl/xml/schemas/0p71/common/" xmlns:main="http://rep.oio.dk/ubl/xml/schemas/0p71/maindoc/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://rep.oio.dk/ubl/xml/schemas/0p71/pie/ http://rep.oio.dk/ubl/xml/schemas/0p71/pie/pieStrict.xsd">'."\n";

     }

 

     private function end()

@@ -51,7 +51,7 @@ 
     public function output($debtor)

     {

         $this->start();

-        $this->output .= '<com:ID>'.$debtor->get('id').'</com:ID>' . "\n";

+        $this->output .= '<com:ID>'.$debtor->get('id').'</com:ID>'."\n";

         $this->output .= '<com:IssueDate>'.$debtor->get('date_due').'</com:IssueDate>';

         $this->output .= '<com:TypeCode>PIE</com:TypeCode>';

         $this->output .= '<main:InvoiceCurrencyCode>DKK</main:InvoiceCurrencyCode>';

src/Intraface/modules/debtor/Visitor/Pdf.php

Spacing +19 added lines, -19 removed lines

@@ -74,7 +74,7 @@ 
 
         $this->doc->setY('-'.$this->doc->get("font_spacing"));
 
-        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
             $this->doc->nextPage(true);
         }
 
@@ -83,7 +83,7 @@ 
             foreach ($text AS $line) {
                 if ($line == "") {
                     $this->doc->setY('-'.$this->doc->get("font_spacing"));
-                    if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+                    if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                         $this->doc->nextPage(true);
                     }
                 } else {
@@ -91,7 +91,7 @@ 
                         $this->doc->setY('-'.($this->doc->get("font_padding_top") + $this->doc->get("font_size")));
                         $line = $this->doc->addTextWrap($this->doc->get('margin_left'), $this->doc->get('y'), $this->doc->get('content_width'), $this->doc->get("font_size"), $line);
                         $this->doc->setY('-'.$this->doc->get("font_padding_bottom"));
-                        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+                        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                             $this->doc->nextPage(true);
                         }
                     }
@@ -116,7 +116,7 @@ 
         $this->doc->addText($apointX["tekst"], $this->doc->get('y'), $this->doc->get("font_size"), "Tekst");
         $this->doc->addText($apointX["antal"] - $this->doc->getTextWidth($this->doc->get("font_size"), "Antal"), $this->doc->get('y'), $this->doc->get("font_size"), "Antal");
         $this->doc->addText($apointX["pris"] - $this->doc->getTextWidth($this->doc->get("font_size"), "Pris"), $this->doc->get('y'), $this->doc->get("font_size"), "Pris");
-        $this->doc->addText($apointX["beloeb"] - $this->doc->getTextWidth($this->doc->get("font_size"), "Beløb") -3, $this->doc->get('y'), $this->doc->get("font_size"), "Beløb");
+        $this->doc->addText($apointX["beloeb"] - $this->doc->getTextWidth($this->doc->get("font_size"), "Beløb") - 3, $this->doc->get('y'), $this->doc->get("font_size"), "Beløb");
 
         $this->doc->setY('-'.($this->doc->get("font_spacing") - $this->doc->get("font_size")));
 
@@ -138,7 +138,7 @@ 
 
         $bg_color = 0;
 
-        for ($i = 0, $max = count($items); $i <  $max; $i++) {
+        for ($i = 0, $max = count($items); $i < $max; $i++) {
             $vat = $items[$i]["vat"];
 
             if ($bg_color == 1) {
@@ -161,9 +161,9 @@ 
             }
             
             if ($debtor->getCurrency()) {
-                $amount =  $items[$i]["quantity"] * $items[$i]["price_currency"]->getAsIso(2);
+                $amount = $items[$i]["quantity"]*$items[$i]["price_currency"]->getAsIso(2);
             } else {
-                $amount =  $items[$i]["quantity"] * $items[$i]["price"]->getAsIso(2);
+                $amount = $items[$i]["quantity"]*$items[$i]["price"]->getAsIso(2);
             }
             $total += $amount;
 
@@ -188,7 +188,7 @@ 
 
                 $tekst = $this->doc->addTextWrap($apointX["tekst"], $this->doc->get('y'), $apointX["tekst_width_small"], $this->doc->get("font_size"), $tekst);
                 $this->doc->setY('-'.$this->doc->get("font_padding_bottom"));
-                if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+                if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                     $this->doc->nextPage(true);
                 }
             }
@@ -211,7 +211,7 @@ 
                             $this->doc->setColor(0, 0, 0);
                         }
                         $this->doc->setY('-'.$this->doc->get("font_spacing"));
-                        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+                        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                             $this->doc->nextPage(true);
                         }
                     } else {
@@ -227,7 +227,7 @@ 
                             $line = $this->doc->addTextWrap($apointX["tekst"], $this->doc->get('y') + 1, $apointX["tekst_width"], $this->doc->get("font_size"), $line); // Ups Ups, hvor kommer '+ 1' fra - jo ser du, ellers kappes det nederste af teksten!
                             $this->doc->setY('-'.$this->doc->get("font_padding_bottom"));
 
-                            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+                            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                                 $this->doc->nextPage(true);
                             }
                         }
@@ -236,12 +236,12 @@ 
 
             }
 
-            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                 $this->doc->nextPage(true);
             }
 
             // If products with VAT and next post is without we add VAT.
-            if (($vat == 1 && isset($items[$i+1]["vat"]) && $items[$i+1]["vat"] == 0) || ($vat == 1 && $i+1 >= $max)) {
+            if (($vat == 1 && isset($items[$i + 1]["vat"]) && $items[$i + 1]["vat"] == 0) || ($vat == 1 && $i + 1 >= $max)) {
                 // If VAT on current product, but next has no VAT OR if VAT and last product
 
                 ($bg_color == 1) ? $bg_color = 0 : $bg_color = 1;
@@ -256,8 +256,8 @@ 
                 $this->doc->line($this->doc->get("margin_left"), $this->doc->get('y'), $this->doc->get('right_margin_position'), $this->doc->get('y'));
                 $this->doc->setY('-'.($this->doc->get("font_size") + $this->doc->get("font_padding_top")));
                 $this->doc->addText($apointX["tekst"], $this->doc->get('y'), $this->doc->get("font_size"), "<b>25% moms af ".number_format($total, 2, ",", ".")."</b>");
-                $this->doc->addText($apointX["beloeb"] - $this->doc->getTextWidth($this->doc->get("font_size"), "<b>".number_format($total * 0.25, 2, ",", ".")."</b>"), $this->doc->get('y'), $this->doc->get("font_size"), "<b>".number_format($total * 0.25, 2, ",", ".")."</b>");
-                $total = $total * 1.25;
+                $this->doc->addText($apointX["beloeb"] - $this->doc->getTextWidth($this->doc->get("font_size"), "<b>".number_format($total*0.25, 2, ",", ".")."</b>"), $this->doc->get('y'), $this->doc->get("font_size"), "<b>".number_format($total*0.25, 2, ",", ".")."</b>");
+                $total = $total*1.25;
                 $this->doc->setY('-'.$this->doc->get("font_padding_bottom"));
                 $this->doc->line($this->doc->get("margin_left"), $this->doc->get('y'), $this->doc->get('right_margin_position'), $this->doc->get('y'));
                 $this->doc->setLineStyle(1);
@@ -268,7 +268,7 @@ 
         }
 
 
-        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
             $this->doc->nextPage();
         }
 
@@ -293,7 +293,7 @@ 
             $total_text = "Total ".$currency_iso_code.":";
         }
 
-        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
             $this->doc->nextPage(true);
         }
 
@@ -330,7 +330,7 @@ 
 
             $this->doc->setY('-'.$this->doc->get("font_spacing"));
 
-            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                 $this->doc->nextPage(true);
             }
 
@@ -338,7 +338,7 @@ 
             foreach ($text AS $line) {
                 if ($line == "") {
                     $this->doc->setY('-'.$this->doc->get("font_spacing"));
-                    if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+                    if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                         $this->doc->nextPage(true);
                     }
                 } else {
@@ -347,7 +347,7 @@ 
                         $line = $this->doc->addTextWrap($this->doc->get('margin_left'), $this->doc->get('y'), $this->doc->get('content_width'), $this->doc->get("font_size"), $line);
                         $this->doc->setY('-'.$this->doc->get("font_padding_bottom"));
 
-                        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+                        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                             $this->doc->nextPage(true);
                         }
                     }

src/Intraface/modules/debtor/DebtorItem.php

Spacing +8 added lines, -8 removed lines

@@ -228,7 +228,7 @@ 
         // TODO how do we handle vat? this should return raw prices

         // and then the tax percent should return the tax to apply

         // the calculator should handle the final price

-        return $this->getProductPrice() * $this->get('quantity');

+        return $this->getProductPrice()*$this->get('quantity');

     }

 

     /**

@@ -238,7 +238,7 @@ 
      */

     public function getWeight()

     {

-        return $this->getProductWeight() * $this->get('quantity');

+        return $this->getProductWeight()*$this->get('quantity');

     }

 

     /**

@@ -470,14 +470,14 @@ 
                     $variation = $product->getVariation($db->f('product_variation_id'));

                     $detail = $variation->getDetail($db->f('product_variation_detail_id'));

                     $item["name"] = $product->get("name").' - '.$variation->getName();

-                    $item["number"]= $product->get("number").'.'.$variation->getNumber();

+                    $item["number"] = $product->get("number").'.'.$variation->getNumber();

                     $item["price"] = $detail->getPrice($product);

                     if ($currency) {

                         $item['price_currency'] = $detail->getPriceInCurrency($currency, $this->debtor->get('currency_product_price_exchange_rate_id'), $product);

                     }

                 } else {

                     $item["name"] = $product->get("name");

-                    $item["number"]= $product->get("number");

+                    $item["number"] = $product->get("number");

                     $item["price"] = $product->getDetails()->getPrice();

                     if ($currency) {

                         $item['price_currency'] = $product->getDetails()->getPriceInCurrency($currency, $this->debtor->get('currency_product_price_exchange_rate_id'));

@@ -486,16 +486,16 @@ 
 

                 if ($product->get("vat") == 0) {

                     $item_no_vat[$j] = $item;

-                    $item_no_vat[$j]["amount"] = new Ilib_Variable_Float($item["quantity"] * $item["price"]->getAsIso(2));

+                    $item_no_vat[$j]["amount"] = new Ilib_Variable_Float($item["quantity"]*$item["price"]->getAsIso(2));

                     if ($currency) {

-                        $item_no_vat[$j]["amount_currency"] = new Ilib_Variable_Float($item["quantity"] * $item["price_currency"]->getAsIso(2), 'iso');

+                        $item_no_vat[$j]["amount_currency"] = new Ilib_Variable_Float($item["quantity"]*$item["price_currency"]->getAsIso(2), 'iso');

                     }

                     $j++;

                 } else {

                     $item_with_vat[$i] = $item;

-                    $item_with_vat[$i]["amount"] = new Ilib_Variable_Float($item["quantity"] * $item["price"]->getAsIso(2) * 1.25);

+                    $item_with_vat[$i]["amount"] = new Ilib_Variable_Float($item["quantity"]*$item["price"]->getAsIso(2)*1.25);

                     if ($currency) {

-                        $item_with_vat[$i]["amount_currency"] = new Ilib_Variable_Float($item["quantity"] * $item["price_currency"]->getAsIso(2) * 1.25, 'iso');

+                        $item_with_vat[$i]["amount_currency"] = new Ilib_Variable_Float($item["quantity"]*$item["price_currency"]->getAsIso(2)*1.25, 'iso');

                     }

                     $i++;

                 }

src/Intraface/modules/debtor/DebtorDoctrineGateway.php

Spacing +5 added lines, -5 removed lines

@@ -103,7 +103,7 @@ 
             ->addWhere('intranet_id = ?', $this->user->getActiveIntranetId());
 
         if ($dbquery->checkFilter("contact_id")) {
-            $query = $query->addWhere("contact_id = ?",intval($dbquery->getFilter("contact_id")));
+            $query = $query->addWhere("contact_id = ?", intval($dbquery->getFilter("contact_id")));
         }
 
         if ($dbquery->checkFilter("text")) {
@@ -204,16 +204,16 @@ 
 
         switch ($dbquery->getFilter("sorting")) {
             case 1:
-                $query =  $query->addOrderBy('number ASC, item.position');
+                $query = $query->addOrderBy('number ASC, item.position');
                 break;
             case 2:
-                $query =  $query->addOrderBy('contact.number ASC, item.position');
+                $query = $query->addOrderBy('contact.number ASC, item.position');
                 break;
             case 3:
-                $query =  $query->addOrderBy('contact_address.name ASC, item.position');
+                $query = $query->addOrderBy('contact_address.name ASC, item.position');
                 break;
             default:
-                $query =  $query->addOrderBy('number DESC, item.position');
+                $query = $query->addOrderBy('number DESC, item.position');
         }
 
 

src/Intraface/modules/debtor/Pdf.php

Spacing +17 added lines, -17 removed lines

@@ -87,7 +87,7 @@ 
         $box_padding_top = 8; // space from top box to first line
         $box_padding_bottom = 9;
         $box_width = 275; // ($page_width - $margin_left - 10)/2;
-        $box_small_height = $this->doc->get("font_spacing") * 3 + $box_padding_top + $box_padding_bottom + 2;
+        $box_small_height = $this->doc->get("font_spacing")*3 + $box_padding_top + $box_padding_bottom + 2;
 
         // Write the receiver
         $this->doc->setY('-'.$this->doc->get("font_spacing")); // $pointY -= $box_padding_top;
@@ -151,7 +151,7 @@ 
                 if ($i == 2) $i = count($line);
             }
             $this->doc->addText($this->doc->get('x') + 10, $this->doc->get('y'), $this->doc->get("font_size"), $intranet["postcode"]." ".$intranet["city"]);
-            $this->doc->setY('-'.($this->doc->get("font_spacing") * 2)); // $pointY -= $this->doc->get("font_spacing") * 2;
+            $this->doc->setY('-'.($this->doc->get("font_spacing")*2)); // $pointY -= $this->doc->get("font_spacing") * 2;
 
             $this->doc->addText($this->doc->get('x') + 10, $this->doc->get('y'), $this->doc->get("font_size"), "CVR.:");
             $this->doc->addText($this->doc->get('x') + 10 + 60, $this->doc->get('y'), $this->doc->get("font_size"), $intranet["cvr"]);
@@ -188,7 +188,7 @@ 
         if (is_array($docinfo) && count($docinfo) > 0) {
             $this->doc->setY('-10'); // $pointY -= 10;
             $box_small_top = $this->doc->get('y');
-            $box_small_height = count($docinfo) * $this->doc->get("font_spacing") + $box_padding_top + $box_padding_bottom;
+            $box_small_height = count($docinfo)*$this->doc->get("font_spacing") + $box_padding_top + $box_padding_bottom;
             $this->doc->setY('-'.$box_padding_top); // $pointY -= $box_padding_top;
 
             for ($i = 0; $i < count($docinfo); $i++) {
@@ -280,7 +280,7 @@ 
             $payment_left = 230;
             $payment_right = $this->doc->get("right_margin_position") - $this->doc->get("margin_left") - $payment_left;
 
-            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") + 4 + $payment_line * 3) {
+            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") + 4 + $payment_line*3) {
                 $this->doc->nextPage(true);
             }
 
@@ -298,10 +298,10 @@ 
 
             if ($payment_method == 1) {
 
-                $this->doc->rectangle($this->doc->get('x'), $this->doc->get('y') - $payment_line * 2, $this->doc->get("right_margin_position") - $this->doc->get("margin_left"), $payment_line * 2);
-                $this->doc->line($this->doc->get('x') + $payment_left, $this->doc->get('y') - $payment_line * 2, $this->doc->get('x') + $payment_left, $this->doc->get('y'));
+                $this->doc->rectangle($this->doc->get('x'), $this->doc->get('y') - $payment_line*2, $this->doc->get("right_margin_position") - $this->doc->get("margin_left"), $payment_line*2);
+                $this->doc->line($this->doc->get('x') + $payment_left, $this->doc->get('y') - $payment_line*2, $this->doc->get('x') + $payment_left, $this->doc->get('y'));
                 $this->doc->line($this->doc->get('x'), $this->doc->get('y') - $payment_line, $this->doc->get("right_margin_position"), $this->doc->get('y') - $payment_line);
-                $this->doc->line($this->doc->get('x') + $payment_left / 2, $this->doc->get('y') - $payment_line * 2, $this->doc->get('x') + $payment_left / 2, $this->doc->get('y') - $payment_line);
+                $this->doc->line($this->doc->get('x') + $payment_left/2, $this->doc->get('y') - $payment_line*2, $this->doc->get('x') + $payment_left/2, $this->doc->get('y') - $payment_line);
 
                 $this->doc->setY('-7'); // $pointY -= 7;
                 $this->doc->addText($this->doc->get('x') + 4, $this->doc->get('y'), $this->doc->get("font_size") - 4, "Bank:");
@@ -325,9 +325,9 @@ 
                 $this->doc->setValue('y', $payment_start - $payment_line); // Sets exact position
                 $this->doc->setY('-7'); // $pointY -= 7;
 
-                $this->doc->addText($this->doc->get('x') + $payment_left / 2 + 4, $this->doc->get('y'), $this->doc->get("font_size") - 4, "Betalingsdato:");
+                $this->doc->addText($this->doc->get('x') + $payment_left/2 + 4, $this->doc->get('y'), $this->doc->get("font_size") - 4, "Betalingsdato:");
                 $this->doc->setY('-'.($payment_line - 12));
-                $this->doc->addText($this->doc->get('x') + $payment_left / 2 + 10, $this->doc->get('y'), $this->doc->get("font_size"), $parameter["due_date"]);
+                $this->doc->addText($this->doc->get('x') + $payment_left/2 + 10, $this->doc->get('y'), $this->doc->get("font_size"), $parameter["due_date"]);
 
                 $this->doc->setValue('y', $payment_start - $payment_line); // Sets exact position
                 $this->doc->setY('-7');
@@ -339,11 +339,11 @@ 
 
             } elseif ($payment_method == 2) {
 
-                $this->doc->rectangle($this->doc->get('x'), $this->doc->get('y') - $payment_line * 3, $this->doc->get("right_margin_position") - $this->doc->get("margin_left"), $payment_line * 3);
-                $this->doc->line($this->doc->get('x') + $payment_left, $this->doc->get('y') - $payment_line * 3, $this->doc->get('x') + $payment_left, $this->doc->get('y'));
+                $this->doc->rectangle($this->doc->get('x'), $this->doc->get('y') - $payment_line*3, $this->doc->get("right_margin_position") - $this->doc->get("margin_left"), $payment_line*3);
+                $this->doc->line($this->doc->get('x') + $payment_left, $this->doc->get('y') - $payment_line*3, $this->doc->get('x') + $payment_left, $this->doc->get('y'));
                 $this->doc->line($this->doc->get('x') + $payment_left, $this->doc->get('y') - $payment_line, $this->doc->get("right_margin_position"), $this->doc->get('y') - $payment_line);
-                $this->doc->line($this->doc->get('x') + $payment_left, $this->doc->get('y') - $payment_line * 2, $this->doc->get("right_margin_position"), $this->doc->get('y') - $payment_line * 2);
-                $this->doc->line($this->doc->get('x') + $payment_left + $payment_right / 2, $this->doc->get('y') - $payment_line * 2, $this->doc->get('x') + $payment_left + $payment_right / 2, $this->doc->get('y') - $payment_line);
+                $this->doc->line($this->doc->get('x') + $payment_left, $this->doc->get('y') - $payment_line*2, $this->doc->get("right_margin_position"), $this->doc->get('y') - $payment_line*2);
+                $this->doc->line($this->doc->get('x') + $payment_left + $payment_right/2, $this->doc->get('y') - $payment_line*2, $this->doc->get('x') + $payment_left + $payment_right/2, $this->doc->get('y') - $payment_line);
 
                 $this->doc->setY('-7');
                 $this->doc->addText($this->doc->get('x') + 4, $this->doc->get('y'), $this->doc->get("font_size") - 4, "Indbetaler:");
@@ -376,11 +376,11 @@ 
                 $this->doc->setValue('y', $payment_start - $payment_line); // Sets exact position
                 $this->doc->setY('-7');
 
-                $this->doc->addText($this->doc->get('x') + $payment_left + $payment_right / 2 + 4, $this->doc->get('y'), $this->doc->get("font_size") - 4, "Betalingsdato:");
+                $this->doc->addText($this->doc->get('x') + $payment_left + $payment_right/2 + 4, $this->doc->get('y'), $this->doc->get("font_size") - 4, "Betalingsdato:");
                 $this->doc->setY('-'.($payment_line - 12));
-                $this->doc->addText($this->doc->get('x') + $payment_left + $payment_right / 2 + 10, $this->doc->get('y'), $this->doc->get("font_size"), $parameter["due_date"]);
+                $this->doc->addText($this->doc->get('x') + $payment_left + $payment_right/2 + 10, $this->doc->get('y'), $this->doc->get("font_size"), $parameter["due_date"]);
 
-                $this->doc->setValue('y', $payment_start - $payment_line * 2); // Sets exact position
+                $this->doc->setValue('y', $payment_start - $payment_line*2); // Sets exact position
                 $this->doc->setY('-7');
 
 
@@ -392,7 +392,7 @@ 
                 $this->doc->addText($this->doc->get('x') + $payment_left + 10, $this->doc->get('y'), $this->doc->get('font_size'), $this_text);
             } elseif ($payment_method == 3) {
 
-                $this->doc->rectangle($this->doc->get('x'), $this->doc->get('y') - $payment_line * 2, $this->doc->get("right_margin_position") - $this->doc->get("margin_left"), $payment_line * 2);
+                $this->doc->rectangle($this->doc->get('x'), $this->doc->get('y') - $payment_line*2, $this->doc->get("right_margin_position") - $this->doc->get("margin_left"), $payment_line*2);
                 $this->doc->line($this->doc->get("margin_left"), $this->doc->get('y') - $payment_line, $this->doc->get("right_margin_position"), $this->doc->get('y') - $payment_line);
                 $this->doc->line($this->doc->get('x') + $payment_left, $this->doc->get('y'), $this->doc->get('x') + $payment_left, $this->doc->get('y') - $payment_line);
 

src/Intraface/modules/debtor/Debtor/Item.php

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
      */
     public function getAmount()
     {
-        return new Ilib_Variable_Float($this->getQuantity()->getAsIso(2) * $this->getProductPriceObject()->getPriceIncludingVat($this->getProduct())->getAsIso(2), 'iso');
+        return new Ilib_Variable_Float($this->getQuantity()->getAsIso(2)*$this->getProductPriceObject()->getPriceIncludingVat($this->getProduct())->getAsIso(2), 'iso');
     }
     
     public function getQuantity()

src/Intraface/modules/debtor/Controller/Depreciations.php

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
         $depreciation = $this->getDepreciation();
         if ($id = $depreciation->update($_POST)) {
             if ($this->getKernel()->user->hasModuleAccess('accounting')) {
-                return new k_SeeOther($this->url($id . '/state'));
+                return new k_SeeOther($this->url($id.'/state'));
             } else {
                 return new k_SeeOther($this->url('../'));
             }
@@ -64,7 +64,7 @@ 
     {
         $invoice_module = $this->getKernel()->useModule('invoice');
         $depreciation = $this->getDepreciation();
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/depreciation');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/depreciation');
         return $smarty->render($this);
     }
 }
\ No newline at end of file