@@ -34,9 +34,9 @@ |
||
| 34 | 34 | function getYear() |
| 35 | 35 | { |
| 36 | 36 | if (is_numeric($this->context->name())) { |
| 37 | - return new Year($this->getKernel(), $this->context->name()); |
|
| 37 | + return new Year($this->getKernel(), $this->context->name()); |
|
| 38 | 38 | } else { |
| 39 | - return new Year($this->getKernel(), 0, false); |
|
| 39 | + return new Year($this->getKernel(), 0, false); |
|
| 40 | 40 | } |
| 41 | 41 | } |
| 42 | 42 | |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | { |
| 70 | 70 | $this->getKernel()->module('accounting'); |
| 71 | 71 | |
| 72 | - $year = new Year($this->getKernel(), $this->context->name()); |
|
| 72 | + $year = new Year($this->getKernel(), $this->context->name()); |
|
| 73 | 73 | |
| 74 | 74 | $account = new Account($year); |
| 75 | 75 | $accounts = $account->getList('balance'); |
@@ -94,12 +94,12 @@ discard block |
||
| 94 | 94 | { |
| 95 | 95 | $year = $this->getYear(); |
| 96 | 96 | foreach ($_POST['id'] AS $key=>$values) { |
| 97 | - $account = new Account($year, $_POST['id'][$key]); |
|
| 98 | - $account->savePrimosaldo($_POST['debet'][$key], $_POST['credit'][$key]); |
|
| 97 | + $account = new Account($year, $_POST['id'][$key]); |
|
| 98 | + $account->savePrimosaldo($_POST['debet'][$key], $_POST['credit'][$key]); |
|
| 99 | 99 | } |
| 100 | 100 | if (!$account->error->isError()) { |
| 101 | - return new k_SeeOther($this->url()); |
|
| 102 | - } |
|
| 101 | + return new k_SeeOther($this->url()); |
|
| 102 | + } |
|
| 103 | 103 | return $this->render(); |
| 104 | 104 | } |
| 105 | 105 | |
@@ -23,12 +23,12 @@ |
||
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | $data = array( |
| 26 | - 'accounting_module' => $accounting_module, |
|
| 27 | - 'voucher' => $this->getVoucher(), |
|
| 28 | - 'year' => $this->getYear(), |
|
| 29 | - 'depreciation' => $this->getModel(), |
|
| 30 | - 'object' => $this->getDebtor(), |
|
| 31 | - 'year' => $this->getYear()); |
|
| 26 | + 'accounting_module' => $accounting_module, |
|
| 27 | + 'voucher' => $this->getVoucher(), |
|
| 28 | + 'year' => $this->getYear(), |
|
| 29 | + 'depreciation' => $this->getModel(), |
|
| 30 | + 'object' => $this->getDebtor(), |
|
| 31 | + 'year' => $this->getYear()); |
|
| 32 | 32 | |
| 33 | 33 | $smarty = $this->template->create(dirname(__FILE__) . '/../templates/state/depreciation'); |
| 34 | 34 | return $smarty->render($this, $data); |
@@ -29,10 +29,10 @@ |
||
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | $data = array( |
| 32 | - 'kernel' => $this->getKernel(), |
|
| 33 | - 'voucher' => $voucher, |
|
| 34 | - 'payment' => $this->getModel(), |
|
| 35 | - 'year' => $this->getYear(), |
|
| 32 | + 'kernel' => $this->getKernel(), |
|
| 33 | + 'voucher' => $voucher, |
|
| 34 | + 'payment' => $this->getModel(), |
|
| 35 | + 'year' => $this->getYear(), |
|
| 36 | 36 | 'accounting_module' => $accounting_module); |
| 37 | 37 | |
| 38 | 38 | $smarty = $this->template->create(dirname(__FILE__) . '/../templates/state/payment'); |
@@ -28,12 +28,12 @@ discard block |
||
| 28 | 28 | $this->document->setTitle('State procurement #' . $this->getProcurement()->get('id')); |
| 29 | 29 | |
| 30 | 30 | $data = array( |
| 31 | - 'procurement' => $this->getProcurement(), |
|
| 32 | - 'year' => $this->getYear(), |
|
| 31 | + 'procurement' => $this->getProcurement(), |
|
| 32 | + 'year' => $this->getYear(), |
|
| 33 | 33 | 'account' => new Account($this->getYear()), |
| 34 | - 'voucher' => new Voucher($this->getYear()), |
|
| 35 | - 'items' => $this->getProcurement()->getItems(), |
|
| 36 | - 'value' => $this->getValues(), |
|
| 34 | + 'voucher' => new Voucher($this->getYear()), |
|
| 35 | + 'items' => $this->getProcurement()->getItems(), |
|
| 36 | + 'value' => $this->getValues(), |
|
| 37 | 37 | 'vat_account' => new Account($this->getYear(), $this->getYear()->getSetting('vat_in_account_id'))); |
| 38 | 38 | |
| 39 | 39 | $smarty = $this->template->create(dirname(__FILE__) . '/../templates/state/procurement'); |
@@ -81,14 +81,14 @@ discard block |
||
| 81 | 81 | $this->value = $procurement->get(); |
| 82 | 82 | if ($procurement->get('price_items') - $items_amount > 0) { |
| 83 | 83 | $this->value['debet_account'][$i++] = array( |
| 84 | - 'text' => '', |
|
| 84 | + 'text' => '', |
|
| 85 | 85 | 'amount' => number_format($procurement->get('price_items') - $items_amount, 2, ',', '.')); |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | if ($procurement->get('price_shipment_etc') > 0) { |
| 89 | 89 | $this->value['debet_account'][$i++] = array( |
| 90 | - 'text' => $this->t('shipment etc'), |
|
| 91 | - 'amount' => $procurement->get('dk_price_shipment_etc')); |
|
| 90 | + 'text' => $this->t('shipment etc'), |
|
| 91 | + 'amount' => $procurement->get('dk_price_shipment_etc')); |
|
| 92 | 92 | } |
| 93 | 93 | } |
| 94 | 94 | |
@@ -68,11 +68,11 @@ |
||
| 68 | 68 | |
| 69 | 69 | function getAccount() |
| 70 | 70 | { |
| 71 | - return new Account($this->getYear()); |
|
| 71 | + return new Account($this->getYear()); |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | function getPost() |
| 75 | 75 | { |
| 76 | - return new Post($this->getVoucher()); |
|
| 76 | + return new Post($this->getVoucher()); |
|
| 77 | 77 | } |
| 78 | 78 | } |
@@ -11,9 +11,9 @@ discard block |
||
| 11 | 11 | protected function map($name) |
| 12 | 12 | { |
| 13 | 13 | if (is_numeric($name)) { |
| 14 | - return 'Intraface_modules_accounting_Controller_Account_Show'; |
|
| 14 | + return 'Intraface_modules_accounting_Controller_Account_Show'; |
|
| 15 | 15 | } elseif ($name == 'popup') { |
| 16 | - return 'Intraface_modules_accounting_Controller_Account_Popup'; |
|
| 16 | + return 'Intraface_modules_accounting_Controller_Account_Popup'; |
|
| 17 | 17 | } |
| 18 | 18 | } |
| 19 | 19 | |
@@ -66,24 +66,24 @@ discard block |
||
| 66 | 66 | $worksheet->write($i, 0, $kernel->intranet->get('name'), $format_bold); |
| 67 | 67 | |
| 68 | 68 | $i = 2; |
| 69 | - foreach ($accounts AS $account) { |
|
| 70 | - $style = ''; |
|
| 71 | - if ($account['type'] == 'headline') { |
|
| 72 | - $style = $format_bold; |
|
| 73 | - } elseif ($account['type'] == 'sum') { |
|
| 74 | - $style = $format_italic; |
|
| 75 | - } else { |
|
| 76 | - $style = $format; |
|
| 77 | - } |
|
| 78 | - |
|
| 79 | - $worksheet->write($i, 0, $account['number'], $style); |
|
| 80 | - $worksheet->write($i, 1, $account['name'], $style); |
|
| 81 | - $worksheet->write($i, 2, $account['type'], $style); |
|
| 82 | - if ($account['type'] != 'Headline') { |
|
| 83 | - $worksheet->write($i, 3, abs(round($account['saldo'])), $style); |
|
| 84 | - } |
|
| 85 | - $i++; |
|
| 86 | - } |
|
| 69 | + foreach ($accounts AS $account) { |
|
| 70 | + $style = ''; |
|
| 71 | + if ($account['type'] == 'headline') { |
|
| 72 | + $style = $format_bold; |
|
| 73 | + } elseif ($account['type'] == 'sum') { |
|
| 74 | + $style = $format_italic; |
|
| 75 | + } else { |
|
| 76 | + $style = $format; |
|
| 77 | + } |
|
| 78 | + |
|
| 79 | + $worksheet->write($i, 0, $account['number'], $style); |
|
| 80 | + $worksheet->write($i, 1, $account['name'], $style); |
|
| 81 | + $worksheet->write($i, 2, $account['type'], $style); |
|
| 82 | + if ($account['type'] != 'Headline') { |
|
| 83 | + $worksheet->write($i, 3, abs(round($account['saldo'])), $style); |
|
| 84 | + } |
|
| 85 | + $i++; |
|
| 86 | + } |
|
| 87 | 87 | |
| 88 | 88 | $worksheet->hideGridLines(); |
| 89 | 89 | |
@@ -126,12 +126,12 @@ discard block |
||
| 126 | 126 | |
| 127 | 127 | function getAccount() |
| 128 | 128 | { |
| 129 | - return new Account($this->getYear()); |
|
| 129 | + return new Account($this->getYear()); |
|
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | function getAccounts() |
| 133 | 133 | { |
| 134 | - return $this->getAccountGateway()->findByType('stated', true); |
|
| 134 | + return $this->getAccountGateway()->findByType('stated', true); |
|
| 135 | 135 | } |
| 136 | 136 | |
| 137 | 137 | function getKernel() |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | function getAccounts() |
| 18 | 18 | { |
| 19 | 19 | $gateway = new Intraface_modules_accounting_AccountGateway($this->getYear()); |
| 20 | - return $gateway->getAll(); |
|
| 20 | + return $gateway->getAll(); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | function renderHtml() |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | protected function map($name) |
| 12 | 12 | { |
| 13 | 13 | if (is_numeric($name)) { |
| 14 | - return 'Intraface_modules_accounting_Controller_Post_Show'; |
|
| 14 | + return 'Intraface_modules_accounting_Controller_Post_Show'; |
|
| 15 | 15 | } |
| 16 | 16 | } |
| 17 | 17 | |