Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 296

Přidáno uživatelem Jiří Sviták před asi 15 roky(ů)

U vypisu bankovnich uctu pridan stav kreditu. V instalaci je ted vytvoren bankovni ucet sdruzeni v bank_accounts a k nemu prislusny podvojny bankovni ucet, ktery ma nazev jako cislo puvodniho bankovniho uctu a komentar "Bankovni ucty".

Zobrazit rozdíly:

freenetis/trunk/kohana/application/models/bank_account.php
*/
public function get_assoc_bank_accounts()
{
/*
return self::$db->query('SELECT q3.id, ba.name, ba.comment,
return self::$db->query('SELECT q3.id, a.name, a.comment,
CONCAT(ba.account_nr, \'/\', ba.bank_nr) AS account_number,
q3.credit FROM
(SELECT id, member_id, (inbound - outbound) AS credit FROM
(SELECT q1.id, q1.member_id, IFNULL(sum(amount), 0) AS inbound, outbound FROM
(SELECT ba.id, ba.member_id, IFNULL(sum(amount), 0) AS outbound
FROM bank_accounts ba
LEFT JOIN bank_transfers bt ON ba.id = bt.origin_id
GROUP BY ba.id) AS q1
(SELECT a.id, a.member_id, IFNULL(sum(amount), 0) AS outbound
FROM accounts a
LEFT JOIN transfers t ON a.id = t.origin_id
GROUP BY a.id) AS q1
LEFT JOIN transfers t ON q1.id = t.destination_id
GROUP BY q1.id) AS q2
) AS q3
LEFT JOIN bank_accounts ba ON q3.id = ba.id
WHERE a.member_id = 1'
LEFT JOIN accounts a ON q3.id = a.id
LEFT JOIN bank_accounts ba ON a.name = ba.account_nr
WHERE a.member_id = 1 AND a.account_attribute_id = '.Account_attribute_Model::$bank
);
*/
/*
return self::$db->query('SELECT
ba.id, ba.name,
CONCAT(ba.account_nr, \'/\', ba.bank_nr) AS account_number
FROM bank_accounts ba
WHERE ba.member_id = 1'
);
*/
}
freenetis/trunk/kohana/application/controllers/installation.php
$bank_account = new Account_Model();
$bank_account->member_id = $member->id;
$bank_account->name = url_lang::lang('texts.Bank accounts');
$bank_account->name = $form_data["account_nr"];//url_lang::lang('texts.Bank accounts');
$bank_account->account_attribute_id = Account_attribute_Model::$bank;
$bank_account->comment = url_lang::lang('texts.Bank accounts');
$bank_account->save();
freenetis/trunk/kohana/application/controllers/bank_accounts.php
// $acc_grid->add_new_button(url_lang::base().'accounts/add_bank_account/'.$member_id, url_lang::lang('texts.Add new bank account'));
$acc_grid->order_field('id')->label('ID');
$acc_grid->order_field('name')->label(url_lang::lang('texts.Account name'));
//$acc_grid->order_field('comment')->label(url_lang::lang('texts.Comment'));
$acc_grid->order_field('comment')->label(url_lang::lang('texts.Comment'));
$acc_grid->order_field('account_number')->label(url_lang::lang('texts.Account number'));
//$acc_grid->order_field('credit')->label(url_lang::lang('texts.Credit'));
$acc_grid->order_field('credit')->label(url_lang::lang('texts.Credit'));
$acc_grid->action_field('id')->label(url_lang::lang('texts.Transfers'))->url(url_lang::base().'transfers/show_by_bank_account')->action(url_lang::lang('texts.Show'));
$acc_grid->action_field('id')->label(url_lang::lang('texts.Import'))->url(url_lang::base().'accounts/upload_bank_file')->action(url_lang::lang('texts.Import'));
$acc_grid->datasource($accs);

Také k dispozici: Unified diff