Merge lp:~openerp-dev/openobject-addons/trunk-journal-dashboard-tpa into lp:openobject-addons

[Turkesh Patel (openERP)]

Create kanban view for Journals.

[lp:~openerp-dev/openobject-addons/trunk-journal-dashboard-tpa]

8679. By Turkesh Patel (openERP) on 2013-05-08

[IMP] remove spakline library

8680. By Turkesh Patel (openERP) on 2013-05-09

[MRG] lp:~openerp-dev/openobject-addons/trunk-journal-dashboard-tpa-graph-aja

[Harry (OpenERP) (hmo-tinyerp)]

Hello turkesh,

Please use 'multi' in function fields of account.journal.

Thanks

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-journal-dashboard-tpa]

8681. By Turkesh Patel (openERP) on 2013-05-09

[IMP] use single function in all fuction fields using multi.

8682. By Turkesh Patel (openERP) on 2013-05-10

[MRG] lp:~openerp-dev/openobject-addons/trunk-journal-dashboard-tpa-graph-aja

8683. By Turkesh Patel (openERP) on 2013-05-10

[MRG] merge with lp:~openerp-dev/openobject-addons/trunk-journal-dashboard-tpa-graph-aja

8684. By Turkesh Patel (openERP) on 2013-05-15

[MRG] improved code and merge with lp:~openerp-dev/openobject-addons/trunk-journal-dashboard-tpa-graph-aja

8685. By Turkesh Patel (openERP) on 2013-05-15

[IMP] show last bank statement date and mount in kanban

8686. By Turkesh Patel (openERP) on 2013-05-17

[MRG] improved code to add bank in jouranls.

8687. By Turkesh Patel (openERP) on 2013-05-21

[MRG] Merge with lp:openobject-addons

8688. By Turkesh Patel (openERP) on 2013-05-21

[IMP] improved code to not show general and situation type journals in kanban

8689. By Turkesh Patel (openERP) on 2013-05-21

[IMP] improved code

[Atul Patel(OpenERP) (atp-openerp)]

Hello Turkesh,

Following things need to improve.

- use proper variable name .
    For example : instead of 'tot' use 'total'

- correct typo in doc string 'passed domain' instead of 'paased domain'.

- In _get_currency_symbol() function no need to call read method of currency.
         you can directly get currency symbol.
         see >
           currency_symbol = journal.company_id.currency_id.symbol or
           if journal.currency:
               currency_symbol = journal.currency.symbol
            res[journal.id] = currency_symbol

   no type='string' return type value of function field.. use type='char'

  correct this 'symbol': fields.function(_get_currency_symbol, string='Currency Symbol', method=True, type='string')

- Remove unused function def get_vouchers() which simply return {}.

- In journal Dashboard kanban view instead of <newline/>
   use alternative solution may be you can use <br/>

- _get_last_statement() function, no need to pass order='id' in bank statement search method.
         may be pass order='create_date desc'

- Improve function _get_inv_data(). define def get_data() as different function(common function) outside of _get_inv_data() and call it
    inside function _get_inv_data() based on field_name we get .
    for examlple
        if name == 'inv_draft':
            domain = [('state', '=', 'draft')]
            total = self.get_data(id, domain, to_pay=False, context=None)

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-journal-dashboard-tpa]

8690. By Turkesh Patel (openERP) on 2013-05-22

[IMP] improved code as per suggetion

8691. By Turkesh Patel (openERP) on 2013-05-23

[IMP] improved code.

[Turkesh Patel (openERP) (turkesh-tinyerp)]

Hello sir,

Improved code as per your suggestion.

review: Needs Resubmitting

[lp:~openerp-dev/openobject-addons/trunk-journal-dashboard-tpa]

8692. By Turkesh Patel (openERP) on 2013-05-23

[IMP] remove code from account_journal and put in account module.

8693. By Turkesh Patel (openERP) on 2013-05-23

[IMP] add doc strings inthe function

8694. By Turkesh Patel (openERP) on 2013-05-24

[IMP] improve qry as per suggetion

8695. By Turkesh Patel (openERP) on 2013-05-29

[IMP] improved view by showing underline below the links and improved code

8696. By Turkesh Patel (openERP) on 2013-05-30

[IMP] lead to invoicing settings view from help of the journal kanban, improved view and css

8697. By Turkesh Patel (openERP) on 2013-05-31

[MRG] merge with lp:openobject-addons

8698. By Turkesh Patel (openERP) on 2013-06-04

[IMP] improved typo.

8699. By Turkesh Patel (openERP) on 2013-06-04

[MRG] merge with lp:openobject-addons

8700. By Turkesh Patel (openERP) on 2013-06-04

[IMP] improved typo for link in cash type journal

8701. By Turkesh Patel (openERP) on 2013-06-05

[MRG] merge with lp:openobject-addons

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Do not add bank reference on accounting journal.

Regards,

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-journal-dashboard-tpa]

8702. By Turkesh Patel (openERP) on 2013-06-05

[IMP] improved help and domain to calculate overdue amount

8703. By Turkesh Patel (openERP) on 2013-06-06

[RMV] remove bank_id from journal

8704. By Turkesh Patel (openERP) on 2013-06-06

[ADD] show graph of bank statements in kanban of type bank and cash journals insted of voucher entries.

8705. By Turkesh Patel (openERP) on 2013-06-06

[IMP] add situation type journal in kanban and improved code

8706. By Turkesh Patel (openERP) on 2013-06-07

[IMP] Improved typo and code

8707. By Turkesh Patel (openERP) on 2013-06-07

[IMP] remove invoice_ids and bank_statement_ids use directly search method

8708. By Turkesh Patel (openERP) on 2013-06-07

[IMP] improved typo and veriable name

8709. By Turkesh Patel (openERP) on 2013-06-07

[ADD] add removed line.

8710. By Turkesh Patel (openERP) on 2013-06-10

[MRG] merge with lp:openobject-addons

8711. By Turkesh Patel (openERP) on 2013-06-11

[IMP] improved code to fix xaxis error

8712. By Turkesh Patel (openERP) on 2013-06-14

[IMP] improved code to show graph in cash and bank type journal based on 'journal entries' insted of bank statements,removed kanban box for type situation journal and related code

8713. By Turkesh Patel (openERP) on 2013-06-14

[MRG] merge with lp:openobject-addons

8714. By Turkesh Patel (openERP) on 2013-06-17

[IMP] improve query to get data from directly account_move_line insted of account_move

8715. By Turkesh Patel (openERP) on 2013-06-17

[MRG] merge with lp:openobject-addons

8716. By Turkesh Patel (openERP) on 2013-06-17

[IMP] improved code.

8717. By Turkesh Patel (openERP) on 2013-06-18

[IMP] improved code to oprn cashregisters form and show only data of related journal not all

8718. By Turkesh Patel (openERP) on 2013-06-18

[MRG] merge with lp:openobject-addons

8719. By Niko (OpenERP) on 2013-06-18

[IMP] Change layout for the journal dashboard

8720. By Niko (OpenERP) on 2013-06-18

[IMP] add padding-bottom for oe_journals_details tag

8721. By Turkesh Patel (openERP) on 2013-06-19

[FIX] improved code to set defaut value of journal in account.invoice

8722. By Turkesh Patel (openERP) on 2013-06-20

[IMP] improved code.

8723. By Turkesh Patel (openERP) on 2013-06-20

[MRG] merge with lp:openobject-addons

8724. By Turkesh Patel (openERP) on 2013-06-20

[FIX] give different id names

8725. By Turkesh Patel (openERP) on 2013-06-20

[FIX] changed code to avoid effect of default compny on othe objects

8726. By Turkesh Patel (openERP) on 2013-06-20

[IMP] improved graph size and kanban box

8727. By Turkesh Patel (openERP) on 2013-06-21

[IMP] improve size of graph and code

8728. By Turkesh Patel (openERP) on 2013-06-25

[MRG] merge with lp:openobject-addons

8729. By Turkesh Patel (openERP) on 2013-06-26

[IMP] improved view, show action on top right corner and left bottom corner,show current month if no data in graph,show point in line graph

8730. By Turkesh Patel (openERP) on 2013-06-26

[MRG] merge with lp:openobject-addons

8731. By Turkesh Patel (openERP) on 2013-06-26

[IMP] improved code to fix lenth error.

8732. By Turkesh Patel (openERP) on 2013-06-26

[IMP] calculate pro-forma and pro-forma2 state as draft state

8733. By Turkesh Patel (openERP) on 2013-06-26

[IMP] improved code to show overdue amount which remain to pay only

8734. By Mustufa Rangwala (Open ERP) on 2013-06-28

[MERGE] Merge child branch

8735. By Turkesh Patel (openERP) on 2013-07-01

[MRG] merge with lp:openobject-addons

8736. By Turkesh Patel (openERP) on 2013-07-15

[IMP] improved comment of function.

8737. By Turkesh Patel (openERP) on 2013-07-16

[IMP]improved code: show all months if not data in graph,improved help,show date as per the date format of language.

8738. By Turkesh Patel (openERP) on 2013-07-16

[MRG] merge with lp:openobejct-addons

8739. By Turkesh Patel (openERP) on 2013-07-23

[IMP] improved strings for refunds

8740. By Turkesh Patel (openERP) on 2013-07-23

[MRG] merge with lp:openobject-addons

8741. By Turkesh Patel (openERP) on 2013-08-08

[MRG] merge with lp:openobject-addons

8742. By Turkesh Patel (openERP) on 2013-08-13

[MRG] merge with lp:openobject-addons

8743. By Turkesh Patel (openERP) on 2013-08-16

[IMP] improved strings.

8744. By Turkesh Patel (openERP) on 2013-08-21

[MRG] merge with lp:openobject-addons

8745. By Turkesh Patel (openERP) on 2013-08-22

[MRG] merge with lp:openobject-addons

8746. By Turkesh Patel (openERP) on 2013-08-29

[IMP] improved code to open proper customer invoice form view from link

8747. By Turkesh Patel (openERP) on 2013-08-30

[IMP] Added empty menu tip on action added help on actions

8748. By Turkesh Patel (openERP) on 2013-08-30

[MRG] merge with lp:openobject-addons

8749. By Turkesh Patel (openERP) on 2013-09-04

[MRG] merge with lp:openobject-addons

8750. By Turkesh Patel (openERP) on 2013-09-09

[IMP] improved code to show values in graph based on moves insted of invoices

8751. By Turkesh Patel (openERP) on 2013-09-09

[IMP] improved code of calculation of item to reconcile.

8752. By Turkesh Patel (openERP) on 2013-09-11

[MRG] merge with lp:openobject-addons

8753. By Turkesh Patel (openERP) on 2013-10-09

[MRG] merge with lp:openobject-addons

8754. By Turkesh Patel (openERP) on 2013-10-29

[MRG] merge with lp:openobject-addons

8755. By Turkesh Patel (openERP) on 2014-01-28

[MRG] merge with lp;openobject-addons

8756. By Turkesh Patel (openERP) on 2014-01-31

[IMP] improved code to use NVD3 library insead of Flotr2

8757. By Turkesh Patel (openERP) on 2014-01-31

[MRG] merge with lp:openobject-addons

8758. By Turkesh Patel (openERP) on 2014-02-03

[IMP] improved view by setting parameters and css

8759. By Turkesh Patel (openERP) on 2014-02-03

[MRG] merge with lp:openobject-addons

8760. By Turkesh Patel (openERP) on 2014-02-03

[IMP] remove use of createElementNS as it is not compitable in FF.

8761. By Turkesh Patel (openERP) on 2014-02-03

[MRG] merge with lp:openobject-addons

8762. By Turkesh Patel (openERP) on 2014-02-04

[ADD] added sass file.

8763. By Turkesh Patel (openERP) on 2014-02-05

[IMP] improved code to set title of graph and improved css.

8764. By Turkesh Patel (openERP) on 2014-02-05

[IMP] add seprate file of css for account journal.

8765. By Turkesh Patel (openERP) on 2014-02-12

[IMP] improved code to show dates in graph as per date formate.

8766. By Turkesh Patel (openERP) on 2014-02-12

[MRG] merge with lp:openobject-addons

8767. By Thibault Delavallée (OpenERP) on 2014-02-18

[MERGE] Sync with upstream

[Thibault Delavallée (OpenERP) (tde-openerp)]

Hello,

About the kanban view: try to simplify and lessen it: too many actions defined in account_journal_view, kanban view quite obfuscated
- you should have only 1 action defined
- then for each "case" (each action in the current implementation), the link should be a button that returns action. This way you define several methods that take the base action to open account.invoice, and tweak some values

About account.journal:
- shouldn't the invoice data be limited to the current year ?
- the current implementation is well cut, but I fear there will be too many search / reads
--> maybe perform first a search on invoice, with journal_id in journal_ids and date > beginning of the year
--> then browse them and compute a dictionary according to journal_id and the various conditions
- in _get_last_statement: search with limit=1

About the custom javascript: isn't it possible to create one or two small kanban widgets on some fields instead of doing that in javascript by adding a call ? The widget could have a dictionary or a structure you will define to be rendered, as a line of multibar.

review: Needs Fixing (technical)

[lp:~openerp-dev/openobject-addons/trunk-journal-dashboard-tpa]

8768. By Chirag Dodiya(OpenERP) on 2014-03-04

[MRG]Merge lp:~openerp-dev/openobject-addons/trunk-journal-dashboard-tpa-imp2-cod

8769. By Chirag Dodiya(OpenERP) on 2014-03-04

[MRG]Merge with trunk

8770. By Chirag Dodiya(OpenERP) on 2014-03-04

[IMP]Improved typo

8771. By Chirag Dodiya(OpenERP) on 2014-03-05

[IMP]Improved code for overdue amount and improved typo

8772. By Paramjit Singh Sahota(OpenERP) on 2014-03-05

[FIX] The graph in the kanban view of account is not shown completely itz cutted-off from the bottom.

8773. By Chirag Dodiya(OpenERP) on 2014-03-06

[IMP]Improved typo

8774. By Chirag Dodiya(OpenERP) on 2014-03-06

[FIX]Fixed traceback when click on menu journal items and manualreconcile

8775. By Chirag Dodiya(OpenERP) on 2014-03-07

[IMP]Improved code to show overdue invoices till today and till this month

8776. By Chirag Dodiya(OpenERP) on 2014-03-07

[IMP]Improved code to open action with proper journal

8777. By Chirag Dodiya(OpenERP) on 2014-03-07

[IMP]Set icon to display overdue amount today and this month and set context to open only draft refund on refund to validate

8778. By Chirag Dodiya(OpenERP) on 2014-03-07

[IMP]set color and margin on icon

8779. By Chirag Dodiya(OpenERP) on 2014-03-07

[IMP]Improved typo

8780. By Chirag Dodiya(OpenERP) on 2014-03-10

[IMP]Improved code for graph

8781. By Chirag Dodiya(OpenERP) on 2014-03-10

[IMP]Improved code to solve kanban view issue

8782. By Chirag Dodiya(OpenERP) on 2014-03-10

[MRG]Merge with lp:openobject-addons

8783. By Chirag Dodiya(OpenERP) on 2014-03-10

[IMP]Improved code to get invoices

8784. By Chirag Dodiya(OpenERP) on 2014-03-10

[IMP]Improved view of kanban

8785. By Chirag Dodiya(OpenERP) on 2014-03-10

[IMP]Improved code for graph data

8786. By Chirag Dodiya(OpenERP) on 2014-03-10

[IMP]Improved code

Unmerged revisions

8786. By Chirag Dodiya(OpenERP) on 2014-03-10

[IMP]Improved code

8785. By Chirag Dodiya(OpenERP) on 2014-03-10

[IMP]Improved code for graph data

8784. By Chirag Dodiya(OpenERP) on 2014-03-10

[IMP]Improved view of kanban

8783. By Chirag Dodiya(OpenERP) on 2014-03-10

[IMP]Improved code to get invoices

8782. By Chirag Dodiya(OpenERP) on 2014-03-10

[MRG]Merge with lp:openobject-addons

8781. By Chirag Dodiya(OpenERP) on 2014-03-10

[IMP]Improved code to solve kanban view issue

8780. By Chirag Dodiya(OpenERP) on 2014-03-10

[IMP]Improved code for graph

8779. By Chirag Dodiya(OpenERP) on 2014-03-07

[IMP]Improved typo

8778. By Chirag Dodiya(OpenERP) on 2014-03-07

[IMP]set color and margin on icon

8777. By Chirag Dodiya(OpenERP) on 2014-03-07

[IMP]Set icon to display overdue amount today and this month and set context to open only draft refund on refund to validate

=== modified file 'account/__init__.py'
--- account/__init__.py	2012-11-29 22:26:45 +0000
+++ account/__init__.py	2014-03-10 10:51:38 +0000
@@ -38,5 +38,6 @@
 import res_currency
 import edi
 import res_config
+import account_journal_dashboard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account/__openerp__.py'
--- account/__openerp__.py	2014-02-13 17:39:10 +0000
+++ account/__openerp__.py	2014-03-10 10:51:38 +0000
@@ -124,12 +124,13 @@
         'account_bank_view.xml',
         'res_config_view.xml',
         'account_pre_install.yml',
-
+        'account_journal_view.xml',
         'views/report_vat.xml',
     ],
     'js': [
         'static/src/js/account_move_reconciliation.js',
         'static/src/js/account_move_line_quickadd.js',
+        'static/src/js/account_journal.js',
     ],
     'qweb' : [
         "static/src/xml/account_move_reconciliation.xml",
@@ -139,6 +140,7 @@
         'static/src/css/account_move_reconciliation.css',
         'static/src/css/account_move_line_quickadd.css',
         'static/src/css/account_bank_and_cash.css',
+        'static/src/css/account_journal.css',
     ],
     'demo': [
         'demo/account_demo.xml',

=== modified file 'account/account.py'
--- account/account.py	2014-02-10 05:26:55 +0000
+++ account/account.py	2014-03-10 10:51:38 +0000
@@ -761,7 +761,7 @@
     _constraints = [
         (_check_currency, 'Configuration error!\nThe currency chosen should be shared by the default accounts too.', ['currency','default_debit_account_id','default_credit_account_id']),
     ]
-
+    
     def copy(self, cr, uid, id, default=None, context=None, done_list=None, local=False):
         default = {} if default is None else default.copy()
         if done_list is None:

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2014-02-12 17:51:41 +0000
+++ account/account_invoice.py	2014-03-10 10:51:38 +0000
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import time
+from datetime import datetime, date, timedelta
 from lxml import etree
 import openerp.addons.decimal_precision as dp
 import openerp.exceptions
@@ -46,6 +47,8 @@
     def _get_journal(self, cr, uid, context=None):
         if context is None:
             context = {}
+        if context.get('default_journal_id'):
+            return context.get('default_journal_id')
         type_inv = context.get('type', 'out_invoice')
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         company_id = context.get('company_id', user.company_id.id)
@@ -340,9 +343,6 @@
         ('number_uniq', 'unique(number, company_id, journal_id, type)', 'Invoice Number must be unique per Company!'),
     ]
 
-
-
-
     def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
         journal_obj = self.pool.get('account.journal')
         if context is None:
@@ -587,7 +587,8 @@
     def onchange_company_id(self, cr, uid, ids, company_id, part_id, type, invoice_line, currency_id, context=None):
         #TODO: add the missing context parameter when forward-porting in trunk so we can remove
         #      this hack!
-        context = self.pool['res.users'].context_get(cr, uid)
+        if not context:
+            context = self.pool['res.users'].context_get(cr, uid)
 
         val = {}
         dom = {}
@@ -655,6 +656,8 @@
             journal_ids = obj_journal.search(cr, uid, [('company_id','=',company_id), ('type', '=', journal_type)])
             if journal_ids:
                 val['journal_id'] = journal_ids[0]
+                if context.get('default_journal_id') in journal_ids:
+                    val['journal_id'] = context.get('default_journal_id')
             ir_values_obj = self.pool.get('ir.values')
             res_journal_default = ir_values_obj.get(cr, uid, 'default', 'type=%s' % (type), ['account.invoice'])
             for r in res_journal_default:

=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml	2014-02-10 05:26:55 +0000
+++ account/account_invoice_view.xml	2014-03-10 10:51:38 +0000
@@ -460,6 +460,7 @@
                     <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="user_id" string="Salesperson"/>
                     <field name="period_id" string="Period"/>
+                    <field name="state"/>
                     <separator/>
                     <filter domain="[('user_id','=',uid)]" help="My Invoices"/>
                     <group expand="0" string="Group By...">

=== added file 'account/account_journal_dashboard.py'
--- account/account_journal_dashboard.py	1970-01-01 00:00:00 +0000
+++ account/account_journal_dashboard.py	2014-03-10 10:51:38 +0000
@@ -0,0 +1,246 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#########################################################################
+
+from datetime import datetime, date, timedelta
+
+from openerp.osv import fields, osv
+from dateutil.relativedelta import relativedelta
+
+class account_invoice(osv.osv):
+    _inherit = "account.invoice"
+    
+    def _prepare_where_clause_dashboard(self, cr, uid, journal_id, context=None):
+        if context is None:
+            context = {}
+        where_clause = "journal_id = %s" % (journal_id)
+        fiscalyear_id = self.pool.get('account.fiscalyear').find(cr, uid, context=context)
+        if context.get('company_id', False):
+            company_id = context['company_id']
+        else:
+            company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
+        if company_id:
+            where_clause += " AND company_id = %s" % (company_id)
+        if fiscalyear_id:
+            where_clause += " AND period_id in (SELECT account_period.id from account_period WHERE account_period.fiscalyear_id = %s)" % (fiscalyear_id)
+        return where_clause
+            
+    def _get_remaining_payment_stats(self, cr, uid, journal_id, context=None):
+        where_clause = self._prepare_where_clause_dashboard(cr, uid, journal_id, context=context)
+        where_clause += " AND state = 'open'"
+        cr.execute("SELECT date_due, sum(residual) FROM account_invoice WHERE %s GROUP BY date_due" % where_clause);
+        residual_values = cr.fetchall()
+        todo_payment_amount, overdue_amount_today, overdue_amount_month = 0,0,0
+        
+        overdue_today_date = date.today()
+        overdue_month_end_date = date.today() + relativedelta(day=1, months=+1, days=-1)
+        for date_due, overdue_invoice_amount in residual_values:
+            todo_payment_amount +=  overdue_invoice_amount
+            due_date = datetime.strptime(date_due,"%Y-%m-%d").date()
+            if due_date <= overdue_today_date:
+                overdue_amount_today += overdue_invoice_amount
+            if due_date <= overdue_month_end_date:
+                overdue_amount_month += overdue_invoice_amount
+        
+        res = {
+            'overdue_invoice_amount' : overdue_amount_today,
+            'overdue_invoice_amount_month': overdue_amount_month,
+            'todo_payment_amount': todo_payment_amount
+        }
+        
+        return res
+        
+    def get_stats(self, cr, uid, journal_id, context=None):
+        where_clause = self._prepare_where_clause_dashboard(cr, uid, journal_id, context=context)
+        cr.execute('SELECT state, sum(amount_total) FROM account_invoice WHERE %s GROUP BY state' % (where_clause));
+        invoice_stats = cr.fetchall()
+        res = {}
+        for state, amount_total in invoice_stats:
+            if state in ('draft', 'proforma', 'proforma2'):
+                res['draft_invoice_amount'] = amount_total
+            elif state == 'open':   
+                res['open_invoice_amount'] = amount_total
+            elif state == 'paid':
+                res['paid_invoice_amount'] = amount_total
+        
+        remaining_payment_stats = self._get_remaining_payment_stats(cr, uid, journal_id, context=context)
+        res.update(remaining_payment_stats)
+        return res
+
+class account_journal(osv.osv):
+    _inherit = "account.journal"
+    
+    def _kanban_dashboard(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        for journal_id in ids:
+            res[journal_id] = self.get_journal_dashboard_datas(cr, uid, journal_id, context=context)
+        return res
+    def _kanban_graph(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        for journal_id in ids:
+            res[journal_id] = self._prepare_graph_data(cr, uid, journal_id, context=context)
+        return res
+        
+    _columns = {
+        'kanban_dashboard':fields.function(_kanban_dashboard, type="text"),
+        'kanban_graph':fields.function(_kanban_graph, type="text"),
+    }
+    
+    def get_journal_dashboard_datas(self, cr, uid, journal_id, context=None):
+        invoice_obj = self.pool['account.invoice']
+        move_line_obj = self.pool['account.move.line']
+        
+        journal = self.browse(cr, uid, journal_id ,context=context)
+        
+        balance, date = self._get_last_statement(cr, uid, journal_id, context=context)
+        values = invoice_obj.get_stats(cr, uid, journal_id, context=context)
+        
+        currency_symbol = journal.company_id.currency_id.symbol
+        if journal.currency:
+            currency_symbol = journal.currency.symbol
+        
+        fiscalyear_id = self.pool.get('account.fiscalyear').find(cr, uid, context=context)
+        total_reconcile_amount = move_line_obj.search(cr, uid, [('journal_id', '=', journal_id), ('period_id.fiscalyear_id', '=', fiscalyear_id), ('reconcile_partial_id','!=',False)], count=True ,context=context)
+        
+        values.update({
+            'currency_symbol' : currency_symbol,
+            'last_statement_amount' : balance,
+            'last_statement_date' : date,
+            'total_reconcile_amount' : total_reconcile_amount,
+            'credit_account_name': journal.default_credit_account_id.name,
+            'credit_account_balance' : journal.default_credit_account_id.balance,
+        })
+        return values
+
+    
+    def _get_last_statement(self, cr, uid, journal_id, context=None):
+        """Get last bank statement amount and date."""
+        balance = False
+        date = False
+        statement_obj = self.pool['account.bank.statement']
+        date_format = self.pool['res.lang'].search_read(cr, uid, [('code','=', context.get('lang', 'en_US'))], ['date_format'], context=context)[0]['date_format']
+        statement_ids = statement_obj.search(cr, uid, [('journal_id', '=', journal_id)], order='create_date desc', limit=1, context=context)
+        if statement_ids:
+            statement = statement_obj.browse(cr, uid, statement_ids[0], context=context)
+            if statement.journal_id.type == 'cash':
+                balance = statement.balance_end
+            elif statement.journal_id.type == 'bank':
+                balance = statement.balance_end_real
+            date = datetime.strptime(str(statement.date), '%Y-%m-%d').date().strftime(date_format)
+        return (balance , date)
+
+    def _prepare_graph_data(self, cr, uid, journal_id, context=None):
+        """Prepare data to show graph in kanban of journals which will be called from the js"""
+        res = False
+        journal = self.browse(cr, uid, journal_id, context=context)
+        if journal.type in ['general','situation']:
+            return res
+        if journal.type in ['cash','bank']:
+            res = self._get_moves_per_day(cr, uid, journal, context=context)
+        else:
+            res = self._get_moves_per_month(cr, uid, journal, context=context)
+        return res
+
+    def _get_moves_per_month(self, cr, uid, journal, context=None):
+        """Get amount of moves related to the perticular journals per month"""
+        total = {}
+        fiscalyear_pool = self.pool.get('account.fiscalyear')
+        fiscalyear_id = fiscalyear_pool.find(cr, uid, context=context)
+        fiscalyear = fiscalyear_pool.browse(cr, uid, fiscalyear_id, context=context)
+        months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
+        state = ['posted'] if journal.type=='sale' else ['draft','posted']
+        
+                    
+        cr.execute("SELECT to_char(line.date, 'MM') as month, SUM(line.debit) as amount\
+                    FROM account_move_line AS line LEFT JOIN account_move AS move ON line.move_id=move.id\
+                    WHERE line.journal_id = %s AND line.period_id in (SELECT account_period.id from account_period WHERE account_period.fiscalyear_id = %s) \
+                    AND move.state in %s\
+                    GROUP BY to_char(line.date, 'MM') \
+                    ORDER BY to_char(line.date, 'MM')", (journal.id, fiscalyear_id, tuple(state)))
+        
+        values = []
+        for month, amount in cr.fetchall():
+            values.append({
+                'x': months[int(month) - 1],
+                'y': amount
+            })
+        data = {
+            'values': [],
+            'bar': True,
+            'key': fiscalyear.name
+        }
+        for month in months:
+            amount = 0
+            for value in values:
+                if month == value['x']:
+                    amount = value['y']
+            data['values'].append({'x': month, 'y': amount})
+        return data
+
+    def _get_moves_per_day(self, cr, uid, journal, context=None):
+        """Get total transactions per day for related journals"""
+        data = {'values': [], 'key': 'Total'}
+        date_format = self.pool['res.lang'].search_read(cr, uid, [('code', '=', context.get('lang', 'en_US'))], ['date_format'], context=context)[0]['date_format']
+        move_date = date.today()-timedelta(days=14)
+        fiscalyear_id = self.pool.get('account.fiscalyear').find(cr, uid, context=context)
+        #left join on account_move if we want only posted entries then we can use.
+        cr.execute("SELECT SUM(line.debit), line.date\
+                         FROM account_move_line AS line LEFT JOIN account_move AS move ON line.move_id=move.id\
+                         WHERE line.journal_id = %s AND line.period_id in (SELECT account_period.id from account_period WHERE account_period.fiscalyear_id = %s) \
+                         AND line.date >= %s\
+                         GROUP BY line.date \
+                         ORDER BY line.date",(journal.id, fiscalyear_id, move_date))
+        for value in cr.dictfetchall():
+            data['values'].append({
+                'x': datetime.strptime(str(value['date']), '%Y-%m-%d').date().strftime(date_format),
+                'y': value['sum']
+            })
+        if not data['values']:
+            data['values'].append({'x': datetime.strptime(str(date.today()), '%Y-%m-%d').date().strftime(date_format), 'y': 0})
+        return data
+        
+    def open_action(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        ir_model_obj = self.pool.get('ir.model.data')
+        rec = self.browse(cr, uid, ids[0], context=context)
+        if rec.type == 'bank':
+            action_name = 'action_bank_statement_tree'
+        elif rec.type == 'cash':
+            action_name = 'action_view_bank_statement_tree'
+        elif rec.type == 'sale':
+            action_name = 'action_invoice_tree1'
+        elif rec.type == 'purchase':
+            action_name = 'action_invoice_tree2'
+        elif rec.type == 'sale_refund':
+            action_name = 'action_invoice_tree3'
+        elif rec.type == 'purchase_refund':
+            action_name = 'action_invoice_tree4'
+        action_name = context.get('action_name',action_name)
+        ctx = context.copy()
+        _journal_invoice_type_map = {'sale': 'out_invoice', 'purchase': 'in_invoice', 'sale_refund': 'out_refund', 'purchase_refund': 'in_refund', 'bank': 'bank', 'cash': 'cash'}
+        invoice_type = _journal_invoice_type_map[rec.type]
+        ctx.update({'journal_type': rec.type,'default_journal_id': rec.id,'search_default_journal_id': rec.id,'default_type': invoice_type,'type': invoice_type})
+        domain = [('journal_id.type', '=', rec.type),('journal_id', '=', rec.id)]
+        model, action_id = ir_model_obj.get_object_reference(cr, uid, 'account', action_name)
+        action = self.pool.get(model).read(cr, uid, action_id, context=context)
+        action['context'] = ctx
+        action['domain'] = domain
+        return action

=== added file 'account/account_journal_view.xml'
--- account/account_journal_view.xml	1970-01-01 00:00:00 +0000
+++ account/account_journal_view.xml	2014-03-10 10:51:38 +0000
@@ -0,0 +1,181 @@
+<openerp>
+    <data>
+        <!--account.journal kanban view-->
+        <record id="view_account_journal_kanban_view" model="ir.ui.view">
+            <field name="name">account.journal.dashboard.kanban</field>
+            <field name="model">account.journal</field>
+            <field name="arch" type="xml">
+                <kanban create="false">
+                    <field name="name"/>
+                    <field name="type"/>
+                    <field name="kanban_graph"/>
+                    <field name="kanban_dashboard"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <t t-value="record.kanban_dashboard.raw_value" t-set="dashboard"/>
+                            <t t-value="record.type.raw_value" t-set="journal_type"/>
+                            <t t-value="dashboard.draft_invoice_amount or dashboard.overdue_invoice_amount or dashboard.todo_payment_amount or dashboard.paid_invoice_amount" t-set="is_invoice_stats"/>
+                            <div class="oe_kanban_vignette oe_semantic_html_override oe_kanban_card oe_journal_card">
+                                <div class="row">
+                                    <t t-call="JournalTop" />
+                                </div>
+                                <div class="row">
+                                    <t t-call="JournalDetails"/>
+                                </div>
+                                <div class="row">
+                                    <t t-call="JournalBottom"/>
+                                </div>
+                            </div>
+                        </t>
+                        <t t-name="JournalTop">
+                                    
+                            <div class="col-md-6 oe_journal_card_title">
+                                <a class="mt0" style="font-size: 16px;" t-att-title="record.name.raw_value"><strong><field name="name"/></strong></a>
+                            </div>
+                            <div class="col-md-6">
+                                <div class="pull-right">
+                                    <div t-if="is_invoice_stats">
+                                        <a t-if="journal_type == 'sale' or journal_type == 'purchase'" type="object" name="open_action">All Invoices</a>
+                                        <a t-if="journal_type == 'purchase_refund' or journal_type == 'sale_refund'" type="object" name="open_action">All Refunds</a>
+                                        <t t-if="dashboard.draft_invoice_amount">
+                                            <a> | </a>
+                                            <a t-if="journal_type == 'sale'" type="object" name="open_action" context="{'search_default_state':'draft','action_name':'action_invoice_tree'}">Invoices to Validate</a>
+                                            <a t-if="journal_type == 'purchase'" type="object" name="open_action" context="{'search_default_state':'draft','action_name':'action_invoice_tree'}">Control Invoices</a>
+                                            <a t-if="journal_type == 'sale_refund'" type="object" name="open_action" context="{'search_default_state':'draft'}">Refunds to Validate</a>
+                                            <a t-if="journal_type == 'purchase_refund'" type="object" name="open_action" context="{'search_default_state':'draft'}">Control Refunds</a>
+                                        </t>
+                                    </div>
+                                    <div t-if="!is_invoice_stats">
+                                        <a t-if="journal_type == 'sale' or journal_type == 'purchase'" type="object" name="open_action">No Invoices yet, click to create.</a>
+                                        <a t-if="journal_type == 'purchase_refund' or journal_type == 'sale_refund'" type="object" name="open_action">No Refunds yet, click to create.</a>
+                                    </div>
+                                </div>
+                                <div t-if="dashboard.last_statement_amount" class="pull-right">
+                                    <a t-if="journal_type == 'bank' or journal_type == 'cash'" type="object" name="open_action">Statements</a>
+                                </div>
+                                <div t-if="dashboard.last_statement_amount == 0" class="pull-right">
+                                    <a t-if="journal_type == 'bank' or journal_type == 'cash'" type="object" name="open_action">No Statements yet, click to create.</a>
+                                </div>
+                            </div>
+                        </t>
+                        <t t-name="JournalDetails">
+                            <div class="col-md-4">
+                                <div t-if="dashboard.draft_invoice_amount">
+                                    <div class="oe_journal_title">
+                                        <h4 t-if="journal_type == 'sale' or journal_type == 'purchase'">Draft Invoices</h4>
+                                        <h4 t-if="journal_type == 'sale_refund' or journal_type == 'purchase_refund'">Draft Refunds</h4>
+                                    </div>
+                                    <div class="oe_journal_data">
+                                        <span t-esc="dashboard.draft_invoice_amount"/>
+                                        <p t-esc="dashboard.currency_symbol"/>
+                                    </div>
+                                </div>
+                                <div t-if="dashboard.todo_payment_amount">
+                                    <div class="oe_journal_title">
+                                        <h4 t-if="journal_type == 'sale'">Receivable</h4>
+                                        <h4 t-if="journal_type == 'sale_refund'">Refunds to Pay</h4>
+                                        <h4 t-if="journal_type == 'purchase'">Payable</h4>
+                                        <h4 t-if="journal_type == 'purchase_refund'">Refunds to Receive</h4>
+                                    </div>
+                                    <div class="oe_journal_data">
+                                        <span t-esc="dashboard.todo_payment_amount"/>
+                                        <p t-esc="dashboard.currency_symbol"/>
+                                    </div>
+                                </div>
+                                <div t-if="dashboard.paid_invoice_amount">
+                                    <div class="oe_journal_title">
+                                        <h4 t-if="journal_type == 'sale' or journal_type == 'purchase'">Paid Invoices</h4>
+                                        <h4 t-if="journal_type == 'sale_refund' or journal_type == 'purchase_refund'">Paid Refunds</h4>
+                                    </div>
+                                    <div class="oe_journal_data">
+                                        <span t-esc="dashboard.paid_invoice_amount"/>
+                                        <p t-esc="dashboard.currency_symbol"/>
+                                    </div>
+                                </div>
+                                <div t-if="dashboard.overdue_invoice_amount or dashboard.overdue_invoice_amount_month">
+                                    <div class="oe_journal_title">
+                                        <h4 t-if="journal_type == 'sale' or journal_type == 'purchase'">Overdue Invoices</h4>
+                                        <h4 t-if="journal_type == 'sale_refund' or journal_type == 'purchase_refund'">Overdue Refunds</h4>
+                                    </div>
+                                    <div class="oe_journal_data">
+                                        <i class="fa fa-clock-o" title="Overdue Invoices till today" style="color:red">
+                                            <span t-esc="dashboard.overdue_invoice_amount"/>
+                                            <p t-esc="dashboard.currency_symbol"/>
+                                        </i>
+                                        <i class="fa fa-clock-o" title="Overdue Invoices till the end of this month" style="color:#ee7700;">
+                                            <span t-esc="dashboard.overdue_invoice_amount_month"/>
+                                            <p t-esc="dashboard.currency_symbol"/>
+                                        </i>
+                                    </div>
+                                </div>
+                                <div t-if="journal_type == 'cash' or journal_type == 'bank'">
+                                    <div t-if="dashboard.last_statement_amount">
+                                        <div class="oe_journal_title">
+                                            <h4 t-if="dashboard.last_statement_date">Last Statement, <div t-esc='dashboard.last_statement_date'/></h4>
+                                        </div>
+                                        <div class="oe_journal_data">
+                                            <span t-esc="dashboard.last_statement_amount"/>
+                                            <p t-esc="dashboard.currency_symbol"/>
+                                        </div>
+                                    </div>
+                                    <div t-att-class="dashboard.credit_account_balance == dashboard.last_statement_amount ? 'oe_amount' : ''" t-if="dashboard.credit_account_balance">
+                                        <div class="oe_journal_title">
+                                            <h4>Account <div t-esc="dashboard.credit_account_name"/></h4>
+                                        </div>
+                                        <div class="oe_journal_data">
+                                            <span t-esc="dashboard.credit_account_balance"/>
+                                            <p t-esc="dashboard.currency_symbol"/>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-md-8">
+                                <div class="text-center">
+                                    <h4 t-if="journal_type == 'bank'"> Bank Payments </h4>
+                                    <h4 t-if="journal_type == 'cash'"> Cash Payments </h4>
+                                    <h4 t-if="journal_type == 'sale'"> Aged Balance </h4>
+                                    <h4 t-if="journal_type == 'purchase'"> Invoices Per Month </h4>
+                                    <h4 t-if="journal_type == 'sale_refund' or journal_type == 'purchase_refund'"> Refunds Per Month </h4>
+                                </div>
+                                <div class="oe_graph">
+                                    <field name="kanban_graph" t-att-journal_type="journal_type" widget="journal_dashboard_graph"></field>
+                                </div>
+                            </div>
+                        </t>
+                        <t t-name="JournalBottom">
+                            <div class="col-md-12">
+                                <div t-if="journal_type == 'sale'" name="sale_journal_bottom">
+                                </div>
+                                <div t-if="journal_type == 'purchase'">
+                                    <a t-attf-href="{dashboard.open_action}" type="object" name="open_action" context="{'search_default_state':'open'}">Invoices to Pay</a>
+                                </div>
+                                <div t-if="journal_type == 'bank' or journal_type == 'cash' and dashboard.total_reconcile_amount gt 0">
+                                    <a t-if="dashboard.total_reconcile_amount == 1" type="object" name="open_action" context="{'search_default_unreconciled':1,'view_mode':1,'action_name':'action_account_manual_reconcile'}" t-esc="dashboard.total_reconcile_amount"> Item to Reconcile</a>
+                                    <a t-if="dashboard.total_reconcile_amount gt 1" type="object" name="open_action" context="{'search_default_unreconciled':1,'view_mode':1,'action_name':'action_account_manual_reconcile'}" t-esc="dashboard.total_reconcile_amount"> Items to Reconcile</a>
+                                </div>
+                            </div>
+                        </t>
+                </templates>
+                </kanban>
+            </field>
+        </record>
+
+        <record id="open_account_journal_kanban" model="ir.actions.act_window">
+            <field name="name">Journals</field>
+            <field name="res_model">account.journal</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">kanban</field>
+            <field name="usage">menu</field>
+            <field name="domain">[('type','not in',['general','situation'])]</field>
+            <field name="help" type="html">
+                <p style="margin-left: -90px;">
+                    To track activities in your bank accounts and analyse your sales and purchase journals, install the <a type="action" name="%(account.open_account_charts_modules)d" class="oe_link">chart of account matching your country</a> or <a type="action" name="%(account.action_account_configuration_installer)d" class="oe_link">configure the custom chart of accounts.</a>
+                </p>
+            </field>
+        </record>
+
+        <menuitem id="menu_finance_journal_board" name="Journals" parent="menu_finance" sequence="1"/>
+        <menuitem id="menu_board_journal_1" name="Dashboard" action="open_account_journal_kanban" parent="menu_finance_journal_board" sequence="1"/>
+
+    </data>
+</openerp>

=== modified file 'account/account_view.xml'
--- account/account_view.xml	2014-02-20 16:38:15 +0000
+++ account/account_view.xml	2014-03-10 10:51:38 +0000
@@ -376,9 +376,10 @@
             <field name="arch" type="xml">
                 <search string="Search Account Journal">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Journal"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <filter domain="['|', ('type', '=', 'sale'), ('type', '=', 'sale_refund')]" string="Sale" icon="terp-camera_test"/>
                     <filter domain="['|', ('type', '=', 'purchase'), ('type', '=', 'purchase_refund')]" string="Purchase" icon="terp-purchase"/>
-                    <filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity" icon="terp-dolar"/>
+                    <filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Bank &amp; Cash" icon="terp-dolar"/>
                     <filter domain="['|', ('type', '=', 'general'), ('type', '=', 'situation')]" string="Others" icon="terp-stock"/>
                     <field name="user_id"/>
                     <group expand="0" string="Group By...">
@@ -2400,6 +2401,7 @@
             </field>
         </record>
 
+
         <record model="ir.actions.act_window.view" id="act_cash_statement1_all">
             <field name="sequence" eval="1"/>
             <field name="view_mode">tree</field>

=== modified file 'account/company.py'
--- account/company.py	2013-10-27 12:31:04 +0000
+++ account/company.py	2014-03-10 10:51:38 +0000
@@ -47,5 +47,13 @@
 Best Regards,'''
     }
 
-
+    def _company_default_get(self, cr, uid, object=False, field=False, context=None):
+        """ Check if the default_journal_id sent in the context to set default value of journal then 
+        avoid to set default company as it will set company_id from onchange_journal_id """
+        if not context:
+            context = {}
+        company_id = super(res_company, self)._company_default_get(cr, uid, object=object, field=field, context=context)
+        if context.get('default_journal_id') and object == 'account.invoice':
+            company_id = False
+        return company_id
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account/static/src/css/Makefile'
--- account/static/src/css/Makefile	1970-01-01 00:00:00 +0000
+++ account/static/src/css/Makefile	2014-03-10 10:51:38 +0000
@@ -0,0 +1,2 @@
+sass:
+    sass -t expanded --compass --unix-newlines --watch account_journal.sass:account_journal.css&
\ No newline at end of file

=== added file 'account/static/src/css/account_journal.css'
--- account/static/src/css/account_journal.css	1970-01-01 00:00:00 +0000
+++ account/static/src/css/account_journal.css	2014-03-10 10:51:38 +0000
@@ -0,0 +1,26 @@
+.openerp .oe_kanban_view .oe_journal_card {
+  width: 500px;
+}
+.openerp .oe_kanban_view .oe_journal_title {
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  padding: 5px;
+  background: #f0eeee;
+  color: #666666;
+}
+.openerp .oe_kanban_view .oe_journal_data {
+  margin-left:10px;
+}
+.openerp .oe_kanban_view .oe_graph {
+  float: right;
+  width: 325px;
+}
+.openerp .oe_kanban_view .oe_graph > div {
+  height: 224px;
+}
+.openerp .oe_kanban_view .oe_journal_card_title {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}

=== added file 'account/static/src/css/account_journal.sass'
--- account/static/src/css/account_journal.sass	1970-01-01 00:00:00 +0000
+++ account/static/src/css/account_journal.sass	2014-03-10 10:51:38 +0000
@@ -0,0 +1,22 @@
+.openerp
+    .oe_kanban_view
+        .oe_journal_card
+            width: 500px
+        .oe_journal_title
+            -webkit-border-radius: 3px
+            -moz-border-radius: 3px
+            border-radius: 3px
+            padding: 5px
+            background: #f0eeee
+            color: #666666
+        .oe_journal_data
+            margin-left:10px;
+        .oe_graph
+            float: right
+            width: 325px
+            > div
+                height: 224px
+        .oe_journal_card_title
+            overflow: hidden
+            white-space: nowrap
+            text-overflow: ellipsis

=== added file 'account/static/src/js/account_journal.js'
--- account/static/src/js/account_journal.js	1970-01-01 00:00:00 +0000
+++ account/static/src/js/account_journal.js	2014-03-10 10:51:38 +0000
@@ -0,0 +1,47 @@
+openerp.account.graph_kanban = function (instance)
+{   
+    var _t = instance.web._t,
+   _lt = instance.web._lt;
+    instance.web_kanban.JournalDashboardGraph = instance.web_kanban.AbstractField.extend({
+        start: function() {
+            var self = this;
+            self.journal_type = self.$node.attr('journal_type')
+            self.display_graph(self.field.raw_value);
+        },
+        display_graph : function(data) {
+            var self = this;
+            nv.addGraph(function () {
+                self.$el.append('<svg>');
+                if (self.journal_type === 'cash' || self.journal_type === 'bank') {
+                    var chart = nv.models.lineChart()
+                        .x(function (d,u) { return u })
+                        .forceY([0, 100])
+                        .width(300)
+                        .height(225);
+                    chart.xAxis
+                        .tickFormat(function(d) {
+                            return data.values[d] && data.values[d].x || '';
+                        })
+                        .rotateLabels(35)
+                        .showMaxMin(false);
+
+                } else {
+                    var chart = nv.models.multiBarChart()
+                        .width(335)
+                        .height(240)
+                        .showControls(false)
+                        .rotateLabels(35)
+                        .forceY([0, 100])
+                        .reduceXTicks(false);
+                }
+                self.svg = self.$el.find('svg')[0];
+                d3.select(self.svg)
+                    .datum([data])
+                    .transition().duration(1200)
+                    .call(chart);
+                nv.utils.windowResize(function() { d3.select(self.svg).call(chart) });
+            });
+        },
+    });
+    instance.web_kanban.fields_registry.add("journal_dashboard_graph", "instance.web_kanban.JournalDashboardGraph");
+};

=== modified file 'account/static/src/js/account_move_reconciliation.js'
--- account/static/src/js/account_move_reconciliation.js	2013-10-27 12:31:04 +0000
+++ account/static/src/js/account_move_reconciliation.js	2014-03-10 10:51:38 +0000
@@ -1,5 +1,6 @@
 openerp.account = function (instance) {
     openerp.account.quickadd(instance);
+    openerp.account.graph_kanban(instance);
     var _t = instance.web._t,
         _lt = instance.web._lt;
     var QWeb = instance.web.qweb;

=== modified file 'account_followup/__openerp__.py'
--- account_followup/__openerp__.py	2012-12-09 10:55:27 +0000
+++ account_followup/__openerp__.py	2014-03-10 10:51:38 +0000
@@ -51,10 +51,10 @@
         'security/account_followup_security.xml',
         'security/ir.model.access.csv',
         'report/account_followup_report.xml',
+        'wizard/account_followup_print_view.xml',
         'account_followup_data.xml',
         'account_followup_view.xml',
         'account_followup_customers.xml',
-        'wizard/account_followup_print_view.xml',
     ],
     'demo': ['account_followup_demo.xml'],
     'test': [

=== modified file 'account_followup/account_followup_customers.xml'
--- account_followup/account_followup_customers.xml	2013-11-27 15:32:57 +0000
+++ account_followup/account_followup_customers.xml	2014-03-10 10:51:38 +0000
@@ -159,5 +159,32 @@
         <menuitem id="base.menu_sales_followup" parent="base.menu_base_partner" name="Payment Follow-up" groups="account.group_account_invoice" sequence="2"/>
         <menuitem id="menu_sale_followup" parent="base.menu_sales_followup" sequence="10" 
                   action="action_customer_my_followup"  groups="account.group_account_invoice"/>
+
+        <!--account.journal kanban view-->
+
+        <record id="action_customer_followup" model="ir.actions.act_window">
+            <field name="name">Follow-Ups</field>
+            <field name="view_id" ref="customer_followup_tree"/>
+            <field name="res_model">res.partner</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('payment_amount_due', '>', 0.0)]</field>
+            <field name="context">{'Followupfirst':True, 'search_default_todo': True} </field>
+            <field name="search_view_id" ref="customer_followup_search_view"/>
+        </record>
+
+        <record id="view_account_journal_kanban_view_followup" model="ir.ui.view">
+            <field name="name">account.journal.dashboard.kanban.followup</field>
+            <field name="model">account.journal</field>
+            <field name="inherit_id" ref="account.view_account_journal_kanban_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='sale_journal_bottom']" position="inside">
+                    <a type='action' name='%(account_followup.action_account_followup_print)d'>Automated Follow-Ups</a>
+                    <a> | </a>
+                    <a type='action' name='%(action_customer_followup)d'>Manual Follow-Ups</a>
+                </xpath>
+            </field>
+        </record>
+
     </data>
 </openerp>