Merge lp:~openerp-dev/openobject-addons/trunk-kanban-views2-account-bank-tta into lp:~openerp-dev/openobject-addons/trunk-kanban-views2

Proposed by SnippetBucket.com on 2011-10-25
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-kanban-views2-account-bank-tta
Merge into: lp:~openerp-dev/openobject-addons/trunk-kanban-views2
Diff against target: 121 lines (+70/-2)
2 files modified
account/account_bank_statement.py (+2/-0)
account/account_view.xml (+68/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-kanban-views2-account-bank-tta
Reviewer Review Type Date Requested Status
SnippetBucket.com (community) Resubmit on 2011-10-25
Ajay Patel (OpenERP) 2011-10-25 Pending
Review via email: mp+80298@code.launchpad.net

Description of the Change

Hello,

Kanban view for account bank statements.

Thanks,
Tejas - TTA

To post a comment you must log in.
5246. By SnippetBucket.com on 2011-10-25

kanban view cash register

SnippetBucket.com (tta-openerp) wrote :

Hello,

I have added kanban view for cash registers.

Thanks,
Tejas - TTA

review: Resubmit

Unmerged revisions

5246. By SnippetBucket.com on 2011-10-25

kanban view cash register

5245. By SnippetBucket.com on 2011-10-25

kanban view account bank statements

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account/account_bank_statement.py'
--- account/account_bank_statement.py 2011-10-12 11:36:55 +0000
+++ account/account_bank_statement.py 2011-10-25 10:24:58 +0000
@@ -158,6 +158,7 @@
158 'currency': fields.function(_currency, string='Currency',158 'currency': fields.function(_currency, string='Currency',
159 type='many2one', relation='res.currency'),159 type='many2one', relation='res.currency'),
160 'account_id': fields.related('journal_id', 'default_debit_account_id', type='many2one', relation='account.account', string='Account used in this journal', readonly=True, help='used in statement reconciliation domain, but shouldn\'t be used elswhere.'),160 'account_id': fields.related('journal_id', 'default_debit_account_id', type='many2one', relation='account.account', string='Account used in this journal', readonly=True, help='used in statement reconciliation domain, but shouldn\'t be used elswhere.'),
161 'color': fields.integer('Color'),
161 }162 }
162163
163 _defaults = {164 _defaults = {
@@ -167,6 +168,7 @@
167 'journal_id': _default_journal_id,168 'journal_id': _default_journal_id,
168 'period_id': _get_period,169 'period_id': _get_period,
169 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.bank.statement',context=c),170 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.bank.statement',context=c),
171 'color':-1,
170 }172 }
171173
172 def onchange_date(self, cr, user, ids, date, context=None):174 def onchange_date(self, cr, user, ids, date, context=None):
173175
=== modified file 'account/account_view.xml'
--- account/account_view.xml 2011-10-19 12:20:53 +0000
+++ account/account_view.xml 2011-10-25 10:24:58 +0000
@@ -608,6 +608,66 @@
608 </form>608 </form>
609 </field>609 </field>
610 </record>610 </record>
611
612 <record model="ir.ui.view" id="account_bank_statement_kanban_view">
613 <field name="name">account.bank.statement.supplier</field>
614 <field name="model">account.bank.statement</field>
615 <field name="type">kanban</field>
616 <field name="arch" type="xml">
617 <kanban default_group_by="state">
618 <templates>
619 <t t-name="kanban-box">
620 <t t-set="color" t-value="kanban_color(record.color.raw_value )"/>
621 <div t-att-class="color + ('')">
622 <div class="oe_kanban_box oe_kanban_color_border">
623 <table class="oe_kanban_table oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle">
624 <tr>
625 <td class="oe_kanban_title1" align="left" valign="middle">
626 <field name="name"/>
627 </td>
628 <td valign="top" width="22"></td>
629 </tr>
630 </table>
631 <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger">
632 <div class="oe_kanban_title2">
633 Journal : <field name="journal_id"/> <br/>
634 </div>
635 <div class="oe_kanban_title3">
636 <t t-if="record.period_id.raw_value">
637 Period : <i><field name="period_id"/></i><br/>
638 </t>
639 <t t-if="record.balance_start.raw_value">
640 Starting Balanace: <i><field name="balance_start"/></i> <br/>
641 </t>
642 <t t-if="record.balance_end_real.raw_value">
643 Ending Balance: <i><field name="balance_end_real"/></i> <br/>
644 </t>
645 <t t-if="record.company_id.raw_value">
646 Company : <i><field name="company_id"/></i> <br/>
647 </t>
648 </div>
649 </div>
650 <div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
651 <div class="oe_kanban_left">
652 <a string="Edit" icon="gtk-edit" type="edit"/>
653 <a string="Delete" icon="gtk-close" type="delete"/>
654 <a string="Change Color" icon="color-picker" type="color" name="color"/>
655 </div>
656 <div class="oe_kanban_right">
657 <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
658 <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
659 <button name="button_confirm_bank" states="draft" string="Confirm" type="object" icon="terp-camera_test"/>
660 </div>
661 <br class="oe_kanban_clear"/>
662 </div>
663 </div>
664 </div>
665 </t>
666 </templates>
667 </kanban>
668 </field>
669 </record>
670
611671
612 <record id="view_bank_statement_periodic_form" model="ir.ui.view">672 <record id="view_bank_statement_periodic_form" model="ir.ui.view">
613 <field name="name">account.bank.statement.reconcile.form</field>673 <field name="name">account.bank.statement.reconcile.form</field>
@@ -658,7 +718,7 @@
658 <field name="name">Bank Statements</field>718 <field name="name">Bank Statements</field>
659 <field name="res_model">account.bank.statement</field>719 <field name="res_model">account.bank.statement</field>
660 <field name="view_type">form</field>720 <field name="view_type">form</field>
661 <field name="view_mode">tree,form,graph</field>721 <field name="view_mode">tree,form,graph,kanban</field>
662 <field name="domain">[('journal_id.type', '=', 'bank')]</field>722 <field name="domain">[('journal_id.type', '=', 'bank')]</field>
663 <field name="context">{'journal_type':'bank'}</field>723 <field name="context">{'journal_type':'bank'}</field>
664 <field name="search_view_id" ref="view_bank_statement_search"/>724 <field name="search_view_id" ref="view_bank_statement_search"/>
@@ -2672,7 +2732,7 @@
2672 <field name="type">ir.actions.act_window</field>2732 <field name="type">ir.actions.act_window</field>
2673 <field name="res_model">account.bank.statement</field>2733 <field name="res_model">account.bank.statement</field>
2674 <field name="view_type">form</field>2734 <field name="view_type">form</field>
2675 <field name="view_mode">tree,form,graph</field>2735 <field name="view_mode">tree,form,graph,kanban</field>
2676 <field name="view_id" ref="view_cash_statement_tree"/>2736 <field name="view_id" ref="view_cash_statement_tree"/>
2677 <field name="search_view_id" ref="view_account_bank_statement_filter"/>2737 <field name="search_view_id" ref="view_account_bank_statement_filter"/>
2678 <field name="domain">[('journal_id.type', '=', 'cash')]</field>2738 <field name="domain">[('journal_id.type', '=', 'cash')]</field>
@@ -2682,6 +2742,12 @@
2682 <record model="ir.actions.act_window.view" id="act_cash_statement1_all">2742 <record model="ir.actions.act_window.view" id="act_cash_statement1_all">
2683 <field name="sequence" eval="1"/>2743 <field name="sequence" eval="1"/>
2684 <field name="view_mode">tree</field>2744 <field name="view_mode">tree</field>
2745 <field name="view_id" ref="account_bank_statement_kanban_view"/>
2746 <field name="act_window_id" ref="action_view_bank_statement_tree"/>
2747 </record>
2748 <record model="ir.actions.act_window.view" id="act_cash_statement1_all">
2749 <field name="sequence" eval="1"/>
2750 <field name="view_mode">tree</field>
2685 <field name="view_id" ref="view_cash_statement_tree"/>2751 <field name="view_id" ref="view_cash_statement_tree"/>
2686 <field name="act_window_id" ref="action_view_bank_statement_tree"/>2752 <field name="act_window_id" ref="action_view_bank_statement_tree"/>
2687 </record>2753 </record>

Subscribers

People subscribed via source and target branches

to all changes: