intraface / intraface.dk

src/Intraface/modules/accounting/YearGateway.php

Indentation +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
     function findById($id, $load_active = true)
     {
         require_once dirname(__FILE__) . '/Year.php';
-    	return new Year($this->kernel, $id, $load_active);
+        return new Year($this->kernel, $id, $load_active);
     }
 
     /**

src/Intraface/modules/accounting/Account.php

Indentation +3 added lines, -3 removed lines

@@ -197,7 +197,7 @@ 
                     $this->value['vat_account_id'] = 0;

                 }

                 $this->value['vat_shorthand'] = $this->value['vat'];

-             }

+                }

         }

 

         return $this->get('id');

@@ -236,7 +236,7 @@ 
             $this->error->set('Ikke en tilladt type');

         }

 

-         $validator->isNumeric($var['use_key'], 'Det kan en konto ikke bruges til');

+            $validator->isNumeric($var['use_key'], 'Det kan en konto ikke bruges til');

 

         if (!array_key_exists($var['use_key'], $this->use)) {

             $this->error->set('Ikke en tilladt brug af kontoen');

@@ -642,6 +642,6 @@ 
 

     public function getNumber()

     {

-    	return $this->get('number');

+        return $this->get('number');

     }

 }

src/Intraface/modules/accounting/Year.php

Indentation +8 added lines, -8 removed lines

@@ -311,7 +311,7 @@ 
     public function isDateInYear($date)

     {

         if ($this->getId() == 0) {

-        	throw new Exception('Year has not been loaded yet - maybe not saved');

+            throw new Exception('Year has not been loaded yet - maybe not saved');

         }

 

         $date = safeToDb($date);

@@ -319,9 +319,9 @@ 
         $db = new Db_Sql;

         $db->query("SELECT from_date, to_date FROM accounting_year WHERE id= " . $this->id . " AND intranet_id = " . $this->kernel->intranet->get('id') . " LIMIT 1");

         if ($db->nextRecord()) {

-          if ($db->f('from_date') <= $date AND $date <= $db->f('to_date')) {

-              return true;

-          }

+            if ($db->f('from_date') <= $date AND $date <= $db->f('to_date')) {

+                return true;

+            }

         }

         return false;

     }

@@ -397,7 +397,7 @@ 
         $balance_accounts = unserialize($this->getSetting('balance_accounts'));

 

         if (!is_array($balance_accounts)) {

-        	throw new Exception('Balance accounts are not an array');

+            throw new Exception('Balance accounts are not an array');

         }

 

         $sql_where = "";

@@ -448,7 +448,7 @@ 
     function createAccounts($type, $last_year_id = 0)

     {

         if ($this->getId() == 0) {

-        	throw new Exception('Year has no id');

+            throw new Exception('Year has no id');

         }

 

         $last_year_id = (int)$last_year_id;

@@ -525,7 +525,7 @@ 
                     $this->setSetting('buy_abroad_accounts', serialize($buy_abroad));

                     $this->setSetting('buy_eu_accounts', serialize($buy_eu));

 

-                  break;

+                    break;

             case 'transfer_from_last_year':

                     // oprette konti

                     if ($last_year_id == 0) {

@@ -844,6 +844,6 @@ 
 

     public function getId()

     {

-    	return $this->get('id');

+        return $this->get('id');

     }

 }

src/Intraface/modules/accounting/VatPeriodGateway.php

Indentation +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
 
     function findFromId($id = 0)
     {
-    	require_once dirname(__FILE__) . '/VatPeriod.php';
+        require_once dirname(__FILE__) . '/VatPeriod.php';
         return new VatPeriod($this->year);
     }
 }
\ No newline at end of file

src/Intraface/modules/accounting/VoucherFile.php

Indentation +1 added lines, -1 removed lines

@@ -104,5 +104,5 @@
     {

         $gateway = new Intraface_modules_accounting_VoucherFileGateway($this->voucher);

         return $gateway->getList();

-   }

+    }

 }
\ No newline at end of file

src/Intraface/modules/accounting/Controller/Vat/Show.php

Indentation +15 added lines, -15 removed lines

@@ -26,22 +26,22 @@
 

     function renderHtml()

     {

-     	$vat_period = $this->getVatPeriod();

-       	$vat_period->loadAmounts();

-       	$account_vat_in = $vat_period->get('account_vat_in');

-       	$account_vat_out = $vat_period->get('account_vat_out');

-       	$account_vat_abroad = $vat_period->get('account_vat_abroad');

-       	$saldo_rubrik_a = $vat_period->get('saldo_rubrik_a');

-       	$saldo_total = $vat_period->get('saldo_total');

+            $vat_period = $this->getVatPeriod();

+            $vat_period->loadAmounts();

+            $account_vat_in = $vat_period->get('account_vat_in');

+            $account_vat_out = $vat_period->get('account_vat_out');

+            $account_vat_abroad = $vat_period->get('account_vat_abroad');

+            $saldo_rubrik_a = $vat_period->get('saldo_rubrik_a');

+            $saldo_total = $vat_period->get('saldo_total');

 

-       	$data = array(

-       	    'vat_period' => $vat_period,

-       	    'account_vat_in' => $account_vat_in,

-       	    'account_vat_out' => $account_vat_out,

-       	    'account_vat_abroad' => $account_vat_abroad,

-       	    'saldo_rubrik_a' => $saldo_rubrik_a,

-       	    'saldo_total' => $saldo_total

-       	);

+            $data = array(

+                'vat_period' => $vat_period,

+                'account_vat_in' => $account_vat_in,

+                'account_vat_out' => $account_vat_out,

+                'account_vat_abroad' => $account_vat_abroad,

+                'saldo_rubrik_a' => $saldo_rubrik_a,

+                'saldo_total' => $saldo_total

+            );

 

         $smarty = $this->template->create(dirname(__FILE__) . '/../templates/vat/show');

         return $smarty->render($this, $data);

src/Intraface/modules/accounting/Controller/Vat/Index.php

Indentation +6 added lines, -6 removed lines

@@ -47,13 +47,13 @@
 

     function postForm()

     {

-    	if (isset($_POST['vat_period_key'])) {

-    		$this->getYear()->setSetting('vat_period', $_POST['vat_period_key']);

-    	}

-    	$vat_period = new VatPeriod($this->getYear());

-    	$vat_period->createPeriods();

+        if (isset($_POST['vat_period_key'])) {

+            $this->getYear()->setSetting('vat_period', $_POST['vat_period_key']);

+        }

+        $vat_period = new VatPeriod($this->getYear());

+        $vat_period->createPeriods();

 

-    	return new k_SeeOther($this->url(null));

+        return new k_SeeOther($this->url(null));

     }

     

     function getPeriods()

src/Intraface/modules/accounting/Controller/Year/End.php

Indentation +108 added lines, -108 removed lines

@@ -8,15 +8,15 @@ 
         $this->template = $template;
     }
 
-	function renderHtml()
-	{
+    function renderHtml()
+    {
         $smarty = $this->template->create(dirname(__FILE__) . '/../templates/year/end');
         return $smarty->render($this);
-	}
+    }
 
     function renderXls()
     {
-    	$module = $this->getKernel()->module('accounting');
+        $module = $this->getKernel()->module('accounting');
         $module->includeFile('YearEnd.php');
 
         $kernel = $this->getKernel();
@@ -55,25 +55,25 @@ 
 
         $i += 2;
         if (count($accounts) > 0) {
-        	foreach ($accounts AS $account) {
-        		$style = '';
-        		if ($account['type'] == 'headline') {
-        			$style = $format_bold;
-        		}
-        		elseif ($account['type'] == 'sum') {
-        			$style = $format_italic;
-        		}
-        		else {
-        			$style = $format;
-        		}
-
-        		$worksheet->write($i, 0, $account['number'], $style);
-        		$worksheet->write($i, 1, $account['name'], $style);
-        		if ($account['type'] != 'headline') {
-        			$worksheet->write($i, 2, abs(round($account['saldo'])), $style);
-        		}
-        		$i++;
-        	}
+            foreach ($accounts AS $account) {
+                $style = '';
+                if ($account['type'] == 'headline') {
+                    $style = $format_bold;
+                }
+                elseif ($account['type'] == 'sum') {
+                    $style = $format_italic;
+                }
+                else {
+                    $style = $format;
+                }
+
+                $worksheet->write($i, 0, $account['number'], $style);
+                $worksheet->write($i, 1, $account['name'], $style);
+                if ($account['type'] != 'headline') {
+                    $worksheet->write($i, 2, abs(round($account['saldo'])), $style);
+                }
+                $i++;
+            }
         }
 
         $accounts = $year_end->getStatement('balance');
@@ -82,25 +82,25 @@ 
 
         $i += 2;
         if (count($accounts) > 0) {
-        	foreach ($accounts AS $account) {
-        		$style = '';
-        		if ($account['type'] == 'headline') {
-        			$style = $format_bold;
-        		}
-        		elseif ($account['type'] == 'sum') {
-        			$style = $format_italic;
-        		}
-        		else {
-        			$style = $format;
-        		}
-
-        		$worksheet->write($i, 0, $account['number'], $style);
-        		$worksheet->write($i, 1, $account['name'], $style);
-        		if ($account['type'] != 'headline') {
-        			$worksheet->write($i, 2, abs(round($account['saldo'])), $style);
-        		}
-        		$i++;
-        	}
+            foreach ($accounts AS $account) {
+                $style = '';
+                if ($account['type'] == 'headline') {
+                    $style = $format_bold;
+                }
+                elseif ($account['type'] == 'sum') {
+                    $style = $format_italic;
+                }
+                else {
+                    $style = $format;
+                }
+
+                $worksheet->write($i, 0, $account['number'], $style);
+                $worksheet->write($i, 1, $account['name'], $style);
+                if ($account['type'] != 'headline') {
+                    $worksheet->write($i, 2, abs(round($account['saldo'])), $style);
+                }
+                $i++;
+            }
 
 
         }
@@ -109,95 +109,95 @@ 
         $workbook->close();
     }
     
-	function postForm()
-	{
+    function postForm()
+    {
         $year = $this->getYear();
         $account = new Account($year);
         $year_end = new YearEnd($year);
         $post = new Post(new Voucher($year));
         $vat_period = new VatPeriod($year);
 
-	    // These makes it possible to switch between steps
+        // These makes it possible to switch between steps
         if (!empty($_POST['previous'])) {
-        	$year_end = new YearEnd($year);
-        	$year_end->setStep($_POST['step'] - 2);
+            $year_end = new YearEnd($year);
+            $year_end->setStep($_POST['step'] - 2);
 
         }
         elseif (!empty($_POST['next'])) {
-        	$year_end = new YearEnd($year);
-        	$year_end->setStep($_POST['step']);
+            $year_end = new YearEnd($year);
+            $year_end->setStep($_POST['step']);
         }
 
         // reacts to the different steps
         if (!empty($_POST['step_save_result'])) {
-        	$year_end = new YearEnd($year);
+            $year_end = new YearEnd($year);
 
-        	if (!$year_end->saveStatement('operating')) {
-        		throw new Exception('Kunne ikke gemme resultatopgørelsen');
-        	}
-        	// @todo save "resultatopgørelsen"
+            if (!$year_end->saveStatement('operating')) {
+                throw new Exception('Kunne ikke gemme resultatopgørelsen');
+            }
+            // @todo save "resultatopgørelsen"
 
-        	$year_end->setStep($_POST['step']);
+            $year_end->setStep($_POST['step']);
         }
 
         elseif (!empty($_POST['step_save_balance'])) {
-        	$year_end = new YearEnd($year);
+            $year_end = new YearEnd($year);
 
-        	if (!$year_end->saveStatement('balance')) {
-        		throw new Exception('Kunne ikke gemme balancen');
-        	}
+            if (!$year_end->saveStatement('balance')) {
+                throw new Exception('Kunne ikke gemme balancen');
+            }
 
-        	$year_end->setStep($_POST['step']);
+            $year_end->setStep($_POST['step']);
         }
         elseif (!empty($_POST['step_transfer_result'])) {
-        	$year_end = new YearEnd($year);
+            $year_end = new YearEnd($year);
 
-        	if (!$year_end->resetYearResult()) {
-        		throw new Exception('Kunne ikke nulstille årets resultat');
-        	}
+            if (!$year_end->resetYearResult()) {
+                throw new Exception('Kunne ikke nulstille årets resultat');
+            }
 
-        	$year_end->setStep($_POST['step']);
+            $year_end->setStep($_POST['step']);
         }
         elseif (!empty($_POST['step_reverse_result_account_reset'])) {
-        	$year_end = new YearEnd($year);
-        	if (!$year_end->resetYearResult('reverse')) {
-        		echo $year_end->error->view();
-        		throw new Exception('Kunne ikke tilbageføre årets resultat');
-        	}
-        	$year_end->setStep($_POST['step'] - 1);
+            $year_end = new YearEnd($year);
+            if (!$year_end->resetYearResult('reverse')) {
+                echo $year_end->error->view();
+                throw new Exception('Kunne ikke tilbageføre årets resultat');
+            }
+            $year_end->setStep($_POST['step'] - 1);
         }
 
         // step 1
         elseif (!empty($_POST['step_things_stated'])) {
-        	$year_end = new YearEnd($year);
-        	$year_end->setStep($_POST['step']);
+            $year_end = new YearEnd($year);
+            $year_end->setStep($_POST['step']);
         }
 
         // transfer "resultatopgørelsen"
         elseif (!empty($_POST['step_result'])) {
-        	$year_end = new YearEnd($year);
-        	$account = new Account($year);
-        	$year->setSetting('result_account_id', $_POST['result_account_id']);
-
-        	if ($year_end->resetOperatingAccounts()) {
-        		$year_end->setStep($_POST['step']);
-        	} else {
-        		echo $year_end->error->view();
-        	}
+            $year_end = new YearEnd($year);
+            $account = new Account($year);
+            $year->setSetting('result_account_id', $_POST['result_account_id']);
+
+            if ($year_end->resetOperatingAccounts()) {
+                $year_end->setStep($_POST['step']);
+            } else {
+                echo $year_end->error->view();
+            }
         } elseif (!empty($_POST['step_lock_year'])) {
-        	if (!empty($_POST['lock']) AND $_POST['lock'] == '1') {
-        		$year->lock();
-        	}
-        	$year_end = new YearEnd($year);
-        	$year_end->setStep($_POST['step']);
+            if (!empty($_POST['lock']) AND $_POST['lock'] == '1') {
+                $year->lock();
+            }
+            $year_end = new YearEnd($year);
+            $year_end->setStep($_POST['step']);
         } elseif (!empty($_POST['step_reverse_result_reset'])) {
-        	$year_end = new YearEnd($year);
-        	$year_end->resetOperatingAccounts('reverse');
-        	$year_end->setStep($_POST['step'] - 1);
+            $year_end = new YearEnd($year);
+            $year_end->resetOperatingAccounts('reverse');
+            $year_end->setStep($_POST['step'] - 1);
         }
 
         return $this->render();
-	}
+    }
 
     function getAccount()
     {
@@ -205,28 +205,28 @@ 
         return $account = new Account($year);
     }
 
-	function getPost()
-	{
+    function getPost()
+    {
         return $post = new Post(new Voucher($this->getYear()));
-	}
+    }
 
-	function getVatPeriod()
-	{
+    function getVatPeriod()
+    {
         return $vat_period = new VatPeriod($this->getYear());
-	}
+    }
 
-	function getYearEnd()
-	{
+    function getYearEnd()
+    {
         return $year_end = new YearEnd($this->getYear());
-	}
+    }
 
-	function getYear()
-	{
-	    return $this->context->getYear();
-	}
+    function getYear()
+    {
+        return $this->context->getYear();
+    }
 
-	function getKernel()
-	{
-	    return $this->context->getKernel();
-	}
+    function getKernel()
+    {
+        return $this->context->getKernel();
+    }
 }

src/Intraface/modules/accounting/Controller/Year/Show.php

Indentation +3 added lines, -3 removed lines

@@ -95,17 +95,17 @@
 
     function getYears()
     {
-    	return $this->getYear()->getList();
+        return $this->getYear()->getList();
     }
 
     function getAccount()
     {
-    	return new Account($this->getYear());
+        return new Account($this->getYear());
     }
 
     function getVatPeriod()
     {
-    	return new VatPeriod($this->getYear());
+        return new VatPeriod($this->getYear());
     }
 
     function getYearGateway()