Merge lp:~serpentcs/account-financial-report/account-serpentcs into lp:~account-report-core-editor/account-financial-report/7.0

[Nishant Jogi (Serpent Consulting Services)]

[Omar (Pexego) (omar7r)]

Could you take the time to bring this to the 7.0 community addons coding conventions. This includes:

* not using the shortcut imports (things in the openerp namespace need to be imported from openerp)
* using the from . import xxx for relative imports (typically in __init__.py files)
* using orm.Model and orm.TransientModel as base class rather than osv.osv and osv.osv_memory
* not instanciating the model classes
* following PEP8 for spacing, line wrapping, etc.

Thanks

review: Needs Fixing (code review)

[Pedro Manuel Baeza (pedro.baeza)]

This project is now hosted on https://github.com/OCA/account-financial-reporting. Please move your proposal there. This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub

review: Needs Resubmitting

Unmerged revisions

54. By Nishant Jogi (Serpent Consulting Services) on 2013-10-10

[ADD] Added Accounting report modules with conversion from rml to webkit.

=== added directory 'account_analytic_plans_webkit'
=== added file 'account_analytic_plans_webkit/__init__.py'
--- account_analytic_plans_webkit/__init__.py	1970-01-01 00:00:00 +0000
+++ account_analytic_plans_webkit/__init__.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+
+import wizard
+import report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
 
=== added file 'account_analytic_plans_webkit/__openerp__.py'
--- account_analytic_plans_webkit/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_analytic_plans_webkit/__openerp__.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+
+{
+    'name': 'Multiple Analytic Plans Webkit',
+    'version': '1.0',
+    'category': 'Accounting & Finance',
+    'description': """
+This module allows to use several analytic plans according to the general journal.
+==================================================================================
+    It is conversion of rml report to Webkit Report.
+
+        """,
+    'author': 'Serpent Consulting Services',
+    'website': 'http://www.serpentcs.com',
+    'depends': ['report_webkit', 'account_analytic_plans'],
+    'data': [
+             'account_analytic_plans_report.xml',
+             ],
+    'installable': True,
+    'auto_install': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'account_analytic_plans_webkit/account_analytic_plans_report.xml'
--- account_analytic_plans_webkit/account_analytic_plans_report.xml	1970-01-01 00:00:00 +0000
+++ account_analytic_plans_webkit/account_analytic_plans_report.xml	2013-10-10 09:47:29 +0000
@@ -0,0 +1,147 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+		       <record id="account_webkit_header" model="ir.header_webkit">
+            <field name="footer_html"><![CDATA[]]></field>
+            <field name="orientation">Portrait</field>
+            <field name="format">A4</field>
+            <field name="html"><![CDATA[
+<html>
+   <head>
+       <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
+       <script>
+           function subst() {
+           var vars={};
+           var x=document.location.search.substring(1).split('&');
+           for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
+           var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
+           for(var i in x) {
+           var y = document.getElementsByClassName(x[i]);
+           for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
+               }
+           }
+       </script>
+       <style type="text/css">
+       
+           ${css}
+       </style>
+   </head>
+   
+               ${_debug or ''|n} </body>
+</html>]]>
+            </field>
+            <field name="orientation">Portrait</field>           
+            <field name="format">A4</field>
+            <field name="html"><![CDATA[
+<html>
+    <head>
+        <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
+        <script>
+            function subst() {
+            var vars={};
+            var x=document.location.search.substring(1).split('&');
+            for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
+            var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
+            for(var i in x) {
+            var y = document.getElementsByClassName(x[i]);
+            for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
+                }
+            }
+        </script>  
+        <style type="text/css">
+            ${css}
+        </style>
+    </head>
+    <body style="border:0;" onload="subst()">
+        <table style="border-bottom: 1px solid black; width: 100%">
+           <tr >
+            	 <td style="text-align:right;font-size:12;" width="15%">${time.strftime('%m/%d/%Y %I:%M')}</td>
+			               <td style="text-align:center;font-size:16;" width="78%">${company.partner_id.name |entity}</td>
+			               <td style="text-align:left;font-size:12;" width="3%"><span class="page"/>  </td>
+			               <td style="text-align:left;font-size:12;" width="1%"> /</td>
+			               <td style="text-align:right;font-size:12;" width="3%"><span class="topage"/></td>
+            </tr>
+       </table> ${_debug or ''|n} </body>   
+       
+</html>]]>
+            </field>
+            <field eval="15.0" name="margin_top"/>
+            <field eval="5.0" name="margin_bottom"/>
+            <field name="css"><![CDATA[
+
+	.cell_extended{
+		border-spacing: 0;
+		border-collapse: collapse;
+		border-style:solid;
+		border: 1px;
+        border-style:solid;
+		border-color:#C0C0C0;
+		font-size:10px;
+	}
+            
+    tr.table_parent_data{
+	font-family: Helvetica-Bold;
+	font-size: 10px;
+	caption-side: top;
+	font-weight: bold;
+}
+	tr.table_child_data{
+	font-family: Helvetica;
+	font-size: 8px;
+	caption-side: top;
+}
+            
+ 	.under_line1{
+     border-bottom:2px solid black;
+     font-size:10px;
+}      
+	
+    td.under_line{
+     border-bottom:2px solid black;
+     font-size:10px;
+}
+   .under_line_gray{
+            border-bottom:2px;
+          	border-style:solid;
+			border-color:#C0C0C0;
+            font-size:10px;       
+}	
+          .list_table1 {
+border-color:#C0C0C0;
+text-align:center;
+font-size:8px;
+margin-top:2px;
+margin-bottom:2px;
+border-collapse: collapse;
+}
+.list_table1 td {
+border-color:gray;
+border-bottom:1px solid gray;
+text-align:left;
+font-size:10;
+padding-left:3px
+padding-right:3px
+padding-top:3px
+padding-bottom:3px
+}
+            	
+]]>
+            </field>
+            <field name="name">Account webkit Header</field>
+            </record>
+        <report 
+            id="account_analytic_account_crossovered_analytic"
+            string="Crossovered Analytic"
+            model="account.analytic.account"
+            name="account.analytic.account.crossovered.analytic.webkit"
+            file="account_analytic_plans_webkit/report/crossovered_analytic.mako"
+            auto="False"
+            menu="False"            
+        	report_type="webkit"
+        	header="True"          
+        	webkit_header="account_webkit_header" 
+        />
+
+    </data>
+</openerp>
+
 
=== added directory 'account_analytic_plans_webkit/report'
=== added file 'account_analytic_plans_webkit/report/__init__.py'
--- account_analytic_plans_webkit/report/__init__.py	1970-01-01 00:00:00 +0000
+++ account_analytic_plans_webkit/report/__init__.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+
+import crossovered_analytic
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
 
=== added file 'account_analytic_plans_webkit/report/crossovered_analytic.mako'
--- account_analytic_plans_webkit/report/crossovered_analytic.mako	1970-01-01 00:00:00 +0000
+++ account_analytic_plans_webkit/report/crossovered_analytic.mako	2013-10-10 09:47:29 +0000
@@ -0,0 +1,114 @@
+<html>
+<head>
+    <style type="text/css">
+        ${css}
+    </style>
+    <title>Crossoverred Analytic.pdf</title>
+    
+</head>
+<body>
+    <table  width="100%">
+            <tr>
+                <td style="text-align:center;">
+                    <h3><b> Crossovered Analytic</b></h3>
+                </td>
+            </tr>
+        </table>
+    <table  width="100%" class="cell_extended">
+        <tr>
+            <td style="text-align:center;" class="cell_extended"><b>${ _('From Date') }</b></td>
+            <td style="text-align:center;" class="cell_extended"><b>${ _('To Date') }</b></td>
+            <td style="text-align:center;" class="cell_extended"><b>${ _('Company') }</b></td>
+            <td style="text-align:center;" class="cell_extended"><b>${ _('Currency') }</b></td>
+            <td style="text-align:center;" class="cell_extended"><b>${ _('Printing date') }</b></td>
+        </tr>
+        <tr>
+            <td style="text-align:center;" class="cell_extended">${ data['form']['date1'] }</td>
+            <td style="text-align:center;" class="cell_extended">${ data['form']['date2'] } </td>
+            <td style="text-align:center;" class="cell_extended">${ company.name }</td>
+            <td style="text-align:center;" class="cell_extended">${ company.currency_id.name }</td>
+            <td style="text-align:center;" class="cell_extended">${ time.strftime('%Y-%m-%d')} at ${ time.strftime('%H:%M:%S') }</td>
+        </tr>        
+        </table>
+        <br/>
+   
+     <table width="100%" >
+        <tr>
+            <td>
+                <h4><b>Analytic Account Reference:</b></h4>
+            </td>
+        </tr>
+      </table>
+      <table width="100%" style="font-weight: bold ;font-size: 12px ;border-bottom:1px solid black;">  
+        <tr>
+            <td width="60%">
+                ${_('Account Name') }
+            </td>
+            <td width="10%">
+                ${_('Code') }
+            </td>
+            <td width="10%">
+                ${_('Quantity') }
+            </td>
+            <td width="10%">
+                ${_('Amount') }
+            </td>
+            <td width="10%">
+                ${_('Perc(%)') }
+            </td>            
+        </tr>
+        </table>
+        %for k in ref_lines(data['form']):     
+        <table width="100%" class="list_table1">
+            <tr>
+                <td width="60%">${k['ref_name']}</td>
+                <td width="10%" >${k['ref_code']}</td>
+                <td width="10%" style="text-align:right;">${k['ref_qty']}</td>
+                <td width="10%" style="text-align:right;">${k['ref_amt']}</td>
+                <td width="10%" style="text-align:right;">100.00%</td>
+            </tr>
+        </table>
+    %endfor
+    
+   <br/>
+     <table width="100%" >
+        <tr>
+            <td>
+                <h4><b>Analytic Account :</b></h4>
+            </td>
+        </tr>
+      </table>
+      <table width="100%" style="font-weight: bold ;font-size: 12px ;border-bottom:1px solid black;">  
+        <tr>
+            <td width="60%">
+                ${_('Account Name') }
+            </td>
+            <td width="10%">
+                ${_('Code') }
+            </td>
+            <td width="10%">
+                ${_('Quantity') }
+            </td>
+            <td width="10%" >
+                ${_('Amount') }
+            </td>
+            <td width="10%">
+                ${_('Percentage') }
+            </td>            
+        </tr>
+        </table>
+        %for account in lines(data['form']):
+        <table width="100%" class="list_table1">
+            <tr>
+                <td width="60%" >${account['acc_name']}</td>
+                <td width="10%" >${account['code']}</td>
+                <td width="10%" style="text-align:right;">${account['qty']}</td>
+                <td width="10%" style="text-align:right;">${account['amt']}</td>
+                <td width="10%" style="text-align:right;">${account['perc']}%</td>
+            </tr>
+        </table>
+        <p style="page-break-after:always">
+        </p>
+    %endfor    
+</body>
+</html>   
 \ No newline at end of file
 
=== added file 'account_analytic_plans_webkit/report/crossovered_analytic.py'
--- account_analytic_plans_webkit/report/crossovered_analytic.py	1970-01-01 00:00:00 +0000
+++ account_analytic_plans_webkit/report/crossovered_analytic.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,182 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+
+
+import time
+
+from openerp.report import report_sxw
+
+class crossovered_analytic(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(crossovered_analytic, self).__init__(cr, uid, name, context = context)
+        self.localcontext.update( {
+            'time': time,
+            'lines': self._lines,
+            'ref_lines': self._ref_lines,
+            'find_children': self.find_children,
+        })
+        self.base_amount = 0.00
+
+    def find_children(self, ref_ids):
+        if not ref_ids: return []
+        to_return_ids = []
+        final_list = []
+        parent_list = []
+        set_list = []
+        analytic_obj = self.pool.get('account.analytic.account')
+        for id in ref_ids:
+            # to avoid duplicate entries
+            if id not in to_return_ids:
+                to_return_ids.append(analytic_obj.search(self.cr,self.uid,[('parent_id','child_of',[id])]))
+        data_accnt = analytic_obj.browse(self.cr,self.uid,to_return_ids[0])
+        for data in data_accnt:
+            if data.parent_id and data.parent_id.id == ref_ids[0]:
+                parent_list.append(data.id)
+        final_list.append(ref_ids[0])
+        set_list = self.set_account(parent_list)
+        final_list.extend(set_list)
+        return final_list #to_return_ids[0]
+
+    def set_account(self, cats):
+        lst = []
+        category = self.pool.get('account.analytic.account').read(self.cr, self.uid, cats)
+        for cat in category:
+            lst.append(cat['id'])
+            if cat['child_ids']:
+                lst.extend(self.set_account(cat['child_ids']))
+        return lst
+
+    def _ref_lines(self, form):
+        result = []
+        res = {}
+        acc_pool = self.pool.get('account.analytic.account')
+        line_pool = self.pool.get('account.analytic.line')
+
+        self.dict_acc_ref = {}
+        if form['journal_ids']:
+            journal = " in (" + ','.join(map(lambda x: str(x), form['journal_ids'])) + ")"
+        else:
+            journal = 'is not null'
+
+        query_general = "SELECT id FROM account_analytic_line WHERE (journal_id " + journal +") AND date>='"+ str(form['date1']) +"'"" AND date<='" + str(form['date2']) + "'"
+
+        self.cr.execute(query_general)
+        l_ids = self.cr.fetchall()
+        line_ids = [x[0] for x in l_ids]
+
+        obj_line = line_pool.browse(self.cr,self.uid,line_ids)
+
+        #this structure will be usefull for easily knowing the account_analytic_line that are related to the reference account. At this purpose, we save the move_id of analytic lines.
+        self.dict_acc_ref[form['ref']] = []
+        children_list = acc_pool.search(self.cr, self.uid, [('parent_id', 'child_of', [form['ref']])])
+        for obj in obj_line:
+            if obj.account_id.id in children_list:
+                if obj.move_id and obj.move_id.id not in self.dict_acc_ref[form['ref']]:
+                    self.dict_acc_ref[form['ref']].append(obj.move_id.id)
+
+        res['ref_name'] = acc_pool.name_get(self.cr, self.uid, [form['ref']])[0][1]
+        res['ref_code'] = acc_pool.browse(self.cr, self.uid, form['ref']).code
+
+        self.final_list = children_list
+        selected_ids = line_pool.search(self.cr, self.uid, [('account_id', 'in' ,self.final_list)])
+        
+        res['ref_qty'] = 0.0
+        res['ref_amt'] = 0.0
+        self.base_amount = 0.0
+        
+        if selected_ids:
+            query = "SELECT SUM(aal.amount) AS amt, SUM(aal.unit_amount) AS qty FROM account_analytic_line AS aal, account_analytic_account AS aaa \
+                    WHERE aal.account_id = aaa.id AND aal.id IN ("+','.join(map(str,selected_ids))+") AND (aal.journal_id " + journal +") AND aal.date>='"+ str(form['date1']) +"'"" AND aal.date<='" + str(form['date2']) + "'"
+
+            self.cr.execute(query)
+            info=self.cr.dictfetchall()
+            res['ref_qty'] = info[0]['qty']
+            res['ref_amt'] = info[0]['amt']
+            self.base_amount = info[0]['amt']
+        result.append(res)
+        return result
+
+    def _lines(self, form, ids=None):
+        print "\n\n :::::::lines",form
+        if ids is None:
+            ids = {}
+        if not ids:
+            ids = self.ids
+
+        if form['journal_ids']:
+            journal=" in (" + ','.join(map(lambda x: str(x), form['journal_ids'])) + ")"
+        else:
+            journal= 'is not null'
+
+        acc_pool = self.pool.get('account.analytic.account')
+        line_pool = self.pool.get('account.analytic.line')
+        acc_id = []
+        final = []
+        self.list_ids = []
+
+        self.final_list = self.find_children(ids)
+
+        for acc_id in self.final_list:
+            selected_ids = line_pool.search(self.cr, self.uid, [('account_id','=',acc_id), ('move_id', 'in', self.dict_acc_ref[form['ref']])])
+            if selected_ids:
+                query="SELECT aaa.code AS code, SUM(aal.amount) AS amt, SUM(aal.unit_amount) AS qty, aaa.name AS acc_name, aal.account_id AS id FROM account_analytic_line AS aal, account_analytic_account AS aaa \
+                WHERE aal.account_id=aaa.id AND aal.id IN ("+','.join(map(str,selected_ids))+") AND (aal.journal_id " + journal +") AND aal.date>='"+ str(form['date1']) +"'"" AND aal.date<='" + str(form['date2']) + "'"" GROUP BY aal.account_id,aaa.name,aaa.code ORDER BY aal.account_id"
+
+                self.cr.execute(query)
+                res = self.cr.dictfetchall()
+                if res:
+                    for element in res:
+                        if self.base_amount <> 0.00:
+                            element['perc'] = (element['amt'] / self.base_amount) * 100.00
+                        else:
+                            element['perc'] = 0.00
+                else:
+                    result = {}
+                    res = []
+                    result['id'] = acc_id
+                    data_account = acc_pool.browse(self.cr, self.uid, acc_id)
+                    result['acc_name'] = data_account.name
+                    result['code'] = data_account.code
+                    result['amt'] = result['qty'] = result['perc'] = 0.00
+                    if not form['empty_line']:
+                        res.append(result)
+            else:
+                result = {}
+                res = []
+                result['id'] = acc_id
+                data_account = acc_pool.browse(self.cr, self.uid, acc_id)
+                result['acc_name'] = data_account.name
+                result['code'] = data_account.code
+                result['amt'] = result['qty'] = result['perc'] = 0.00
+                if not form['empty_line']:
+                    res.append(result)
+
+            for item in res:
+                obj_acc = acc_pool.name_get(self.cr,self.uid,[item['id']])
+                item['acc_name'] = obj_acc[0][1]
+                final.append(item)
+        print final
+        return final
+
+report_sxw.report_sxw('report.account.analytic.account.crossovered.analytic.webkit', 'account.analytic.account', 'addons/account_analytic_plans_webkit/report/crossovered_analytic.rml',parser = crossovered_analytic, header='internal')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
 
=== added directory 'account_analytic_plans_webkit/wizard'
=== added file 'account_analytic_plans_webkit/wizard/__init__.py'
--- account_analytic_plans_webkit/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ account_analytic_plans_webkit/wizard/__init__.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+
+
+import account_crossovered_analytic
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
 
=== added file 'account_analytic_plans_webkit/wizard/account_crossovered_analytic.py'
--- account_analytic_plans_webkit/wizard/account_crossovered_analytic.py	1970-01-01 00:00:00 +0000
+++ account_analytic_plans_webkit/wizard/account_crossovered_analytic.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+
+import time
+
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+
+class account_crossovered_analytic(osv.osv_memory):
+    _inherit = "account.crossovered.analytic"
+
+
+
+    def print_report(self, cr, uid, ids, context=None):
+        
+        res = super(account_crossovered_analytic,self).print_report( cr, uid, ids, context=context)
+        res['report_name']= 'account.analytic.account.crossovered.analytic.webkit'
+        return res
+#        cr.execute('SELECT account_id FROM account_analytic_line')
+#        res = cr.fetchall()
+#        acc_ids = [x[0] for x in res]
+#
+#        data = self.read(cr, uid, ids, [], context=context)[0]
+#        data['ref'] = data['ref'][0]
+#
+#        obj_acc = self.pool.get('account.analytic.account').browse(cr, uid, data['ref'], context=context)
+#        name = obj_acc.name
+#
+#        account_ids = self.pool.get('account.analytic.account').search(cr, uid, [('parent_id', 'child_of', [data['ref']])], context=context)
+#
+#        flag = True
+#        for acc in account_ids:
+#            if acc in acc_ids:
+#                flag = False
+#                break
+#        if flag:
+#            raise osv.except_osv(_('User Error!'),_('There are no analytic lines related to account %s.' % name))
+#
+#        datas = {
+#             'ids': [],
+#             'model': 'account.analytic.account',
+#             'form': data
+#        }
+#        return {
+#            'type': 'ir.actions.report.xml',
+#            'report_name': 'account.analytic.account.crossovered.analytic',
+#            'datas': datas,
+#        }
+
+account_crossovered_analytic()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added directory 'account_bank_statement_extensions_webkit'
=== added file 'account_bank_statement_extensions_webkit/__init__.py'
--- account_bank_statement_extensions_webkit/__init__.py	1970-01-01 00:00:00 +0000
+++ account_bank_statement_extensions_webkit/__init__.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+
+import report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'account_bank_statement_extensions_webkit/__openerp__.py'
--- account_bank_statement_extensions_webkit/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_bank_statement_extensions_webkit/__openerp__.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+{
+    'name': 'Bank Statement Extensions to Support e-banking Webkit',
+    'version': '1.1',
+    'author': 'Serpent Consulting Services',
+    'category': 'Generic Modules/Accounting',
+    'description': '''
+Module that extends the standard account_bank_statement_line object for improved e-banking support.
+===================================================================================================
+
+ It is conversion of rml report to Webkit Report.
+
+    ''',
+    'depends': ['account_bank_statement_extensions','report_webkit'],
+    'data' : [
+        'account_bank_statement_report.xml',
+    ],
+    'auto_install': False,
+    'installable': True,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'account_bank_statement_extensions_webkit/account_bank_statement_report.xml'
--- account_bank_statement_extensions_webkit/account_bank_statement_report.xml	1970-01-01 00:00:00 +0000
+++ account_bank_statement_extensions_webkit/account_bank_statement_report.xml	2013-10-10 09:47:29 +0000
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+            <record id="account_bank_statement_webkit_header" model="ir.header_webkit">
+            <field name="footer_html"><![CDATA[]]></field>
+            <field name="orientation">Portrait</field>
+            <field name="format">A4</field>
+            <field name="html"><![CDATA[
+			<html>
+			   <head>
+			       <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
+			       <script>
+			           function subst() {
+			           var vars={};
+			           var x=document.location.search.substring(1).split('&');
+			           for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
+			           var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
+			           for(var i in x) {
+			           var y = document.getElementsByClassName(x[i]);
+			           for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
+			               }
+			           }
+			       </script>
+			       <style type="text/css">
+			       
+			           ${css}
+			       </style>
+			   </head>
+			   <body style="border:0; margin: 0;" onload="subst()">
+			       <table class="header" style="border-bottom: 1px solid black; width: 100%">
+			           <tr >
+			               <td style="text-align:right;font-size:12;" width="15%">${time.strftime('%m/%d/%Y %I:%M')}</td>
+			               <td style="text-align:center;font-size:16;" width="78%">${company.partner_id.name |entity}</td>
+			               <td style="text-align:left;font-size:12;" width="3%"><span class="page"/>  </td>
+			               <td style="text-align:left;font-size:12;" width="1%"> /</td>
+			               <td style="text-align:right;font-size:12;" width="3%"><span class="topage"/></td>
+			           </tr>
+			       </table> ${_debug or ''|n} </body>
+			</html>]]>
+			            </field>
+			            <field eval="15.0" name="margin_top"/>
+			            <field eval="5.0" name="margin_bottom"/>
+			            <field name="css"><![CDATA[
+			
+			body, table, td, span, div {
+			    font-family: Helvetica, Arial;
+			}
+			
+			body {
+			font-family:Arial;
+			font-size:12px;
+		
+			}		            		
+		   
+			.tr_bottom_line_dark_grey{
+			    border-bottom: thin solid grey;
+			    width:100%;
+			    font-size:12px;
+			   
+			}
+			.tr_bottom_line_dark_black{
+			    border-bottom: thin solid black;
+			    width:100%;
+			    font-size:12px;
+			    font-weight:bold;
+			}  
+			tr.report_header{
+				
+				caption-side: top;
+				font-family: Helvetica-Bold
+				padding: 5px;
+				border-bottom: 15px solid black;
+				align: center;			 
+			} 
+		    
+		 
+			.header {
+				margin-left:0;
+				text-align:left;
+				width:300px;
+			    font-size:12;
+			}
+			.title {
+			font-size:16;
+			font-weight: bold;
+			
+			}	
+			
+			.list_table {
+			border-bottom:black;
+			text-align:center;
+			border-collapse: collapse;
+			
+			}	
+						
+			]]>
+            </field>
+            <field name="name">Account Bank Statment Webkit Header</field>
+        </record>
+ 
+    <report
+        auto="False"
+        id="bank_statement_balance_report"
+        model="account.bank.statement"
+        name="bank.statement.balance.report.webkit"
+        file="account_bank_statement_extensions_webkit/report/bank_statement_balance_report.mako"
+        report_type="webkit" 
+	    webkit_header="account_bank_statement_webkit_header"
+        string="Bank Statement Balances Report"
+        multi="True"/>
+
+  </data>
+</openerp>
 
=== added directory 'account_bank_statement_extensions_webkit/report'
=== added file 'account_bank_statement_extensions_webkit/report/__init__.py'
--- account_bank_statement_extensions_webkit/report/__init__.py	1970-01-01 00:00:00 +0000
+++ account_bank_statement_extensions_webkit/report/__init__.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+
+
+import bank_statement_balance_report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'account_bank_statement_extensions_webkit/report/bank_statement_balance_report.mako'
--- account_bank_statement_extensions_webkit/report/bank_statement_balance_report.mako	1970-01-01 00:00:00 +0000
+++ account_bank_statement_extensions_webkit/report/bank_statement_balance_report.mako	2013-10-10 09:47:29 +0000
@@ -0,0 +1,56 @@
+<html>
+    <head>
+         <style type="text/css">
+            ${css}
+        </style>
+    </head>
+<body>
+    <br/>
+    <table width="100%">
+        <tr class ="report_header">
+            <td align="center">
+                <h4><b>
+                  Bank Statement Balances Report
+                  </b></h4>
+             </td>
+        </tr>
+    </table>
+     <br/>        <br/>   
+     
+    <table  border="0" class="tr_bottom_line_dark_black" >
+        <tr>
+            <td width="30%"> 
+                ${_('Name')}
+            </td>
+            <td width="30%">
+                ${_('Date')}
+            </td>
+            <td width="20%">
+                ${_('Journal')}
+            </td>
+            <td width="20%" align="right">
+                ${_('Closing Balance')}
+            </td>
+        </tr>
+     </table>
+     %for l in lines:
+     <table border="0" class="tr_bottom_line_dark_grey">
+        <tr >
+            <td width="30%">
+                ${ l['s_name'] }
+            </td>
+            <td width="30%">
+                ${ l['s_date'] }
+            </td>
+            <td width="20%">
+                ${ l['j_code'] }
+            </td>
+            <td width="20%" align="right">
+                ${ (l['s_balance']) }
+            </td>
+        </tr>
+   %endfor
+   </table>
+   <p style="page-break-after:always"></p>
+</body>
+</html>
 \ No newline at end of file
 
=== added file 'account_bank_statement_extensions_webkit/report/bank_statement_balance_report.py'
--- account_bank_statement_extensions_webkit/report/bank_statement_balance_report.py	1970-01-01 00:00:00 +0000
+++ account_bank_statement_extensions_webkit/report/bank_statement_balance_report.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+
+
+import time
+from openerp.report import report_sxw
+from openerp import pooler
+import logging
+_logger = logging.getLogger(__name__)
+
+class bank_statement_balance_report(report_sxw.rml_parse):
+
+    def set_context(self, objects, data, ids, report_type=None):
+        #_logger.warning('addons.'+__name__, 'set_context, objects = %s, data = %s, ids = %s' % (objects, data, ids))
+        cr = self.cr
+        uid = self.uid
+        context = self.context
+
+        cr.execute('SELECT s.name as s_name, s.date AS s_date, j.code as j_code, s.balance_end_real as s_balance ' \
+                        'FROM account_bank_statement s ' \
+                        'INNER JOIN account_journal j on s.journal_id = j.id ' \
+                        'INNER JOIN ' \
+                            '(SELECT journal_id, max(date) as max_date FROM account_bank_statement ' \
+                                'GROUP BY journal_id) d ' \
+                                'ON (s.journal_id = d.journal_id AND s.date = d.max_date) ' \
+                        'ORDER BY j.code')
+        lines = cr.dictfetchall()
+
+        self.localcontext.update( {
+            'lines': lines,
+        })
+        super(bank_statement_balance_report, self).set_context(objects, data, ids, report_type=report_type)
+
+
+    def __init__(self, cr, uid, name, context):
+        if context is None:
+            context = {}
+        super(bank_statement_balance_report, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update( {
+            'time': time,
+        })
+        self.context = context
+
+report_sxw.report_sxw(
+    'report.bank.statement.balance.report.webkit',
+    'account.bank.statement',
+    'addons/account_bank_statement_extensions_webkit/report/bank_statement_balance_report.mako',
+    parser=bank_statement_balance_report,
+    header='internal'
+)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added directory 'account_budget_webkit'
=== added file 'account_budget_webkit/__init__.py'
--- account_budget_webkit/__init__.py	1970-01-01 00:00:00 +0000
+++ account_budget_webkit/__init__.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+
+import report
+import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
 
=== added file 'account_budget_webkit/__openerp__.py'
--- account_budget_webkit/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_budget_webkit/__openerp__.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+
+{
+    'name': 'Budgets Management',
+    'version': '1.0',
+    'category': 'Accounting & Finance',
+    'description': """
+This module allows accountants to manage analytic and crossovered budgets.
+==========================================================================
+
+It is conversion of rml report to Webkit Report.
+
+""",
+    'author': 'Serpent Consulting Services',
+    'website': 'http://www.serpentcs.com',
+    'depends': ['account_budget','report_webkit'],
+    'data': [
+        'account_budget_report.xml',
+    ],
+    'installable': True,
+    'auto_install': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'account_budget_webkit/account_budget_report.xml'
--- account_budget_webkit/account_budget_report.xml	1970-01-01 00:00:00 +0000
+++ account_budget_webkit/account_budget_report.xml	2013-10-10 09:47:29 +0000
@@ -0,0 +1,234 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record id="account_budget_webkit_header" model="ir.header_webkit">
+            <field name="footer_html"><![CDATA[]]></field>
+            <field name="orientation">Portrait</field>
+            <field name="format">A4</field>
+            <field name="html"><![CDATA[
+			<html>
+			   <head>
+			       <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
+			       <script>
+			           function subst() {
+			           var vars={};
+			           var x=document.location.search.substring(1).split('&');
+			           for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
+			           var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
+			           for(var i in x) {
+			           var y = document.getElementsByClassName(x[i]);
+			           for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
+			               }
+			           }
+			       </script>
+			       <style type="text/css">
+			       
+			           ${css}
+			       </style>
+			   </head>
+			   <body style="border:0; margin: 0;" onload="subst()">
+			       <table class="header" style="border-bottom: 1px solid black; width: 100%">
+			           <tr >
+			               <td style="text-align:right;font-size:12;" width="15%">${time.strftime('%m/%d/%Y %I:%M')}</td>
+			               <td style="text-align:center;font-size:16;" width="78%">${company.partner_id.name |entity}</td>
+			               <td style="text-align:left;font-size:12;" width="3%"><span class="page"/>  </td>
+			               <td style="text-align:left;font-size:12;" width="1%"> /</td>
+			               <td style="text-align:right;font-size:12;" width="3%"><span class="topage"/></td>
+			           </tr>
+			       </table> ${_debug or ''|n} </body>
+			</html>]]>
+			            </field>
+			            <field eval="15.0" name="margin_top"/>
+			            <field eval="5.0" name="margin_bottom"/>
+			            <field name="css"><![CDATA[
+			
+			body, table, td, span, div {
+			    font-family: Helvetica, Arial;
+			}
+			
+			body {
+			font-family:Arial;
+			font-size:12;
+		
+			}
+			
+			
+			.header {
+				margin-left:0;
+				text-align:left;
+				width:300px;
+			    font-size:12;
+			}
+			.title {
+			font-size:16;
+			font-weight: bold;
+			
+			}
+			
+			.basic_table td 
+			{
+			border:1px solid lightGrey;
+			font-size:12;
+						
+			}
+			            		
+			.list_table {
+				border-bottom:1px solid black; 
+			    border-right:border-bottom:1px solid #E5E4E2"
+				text-align:left; 	
+				font-size:12;				
+			}
+			.list_table_grey{
+			            font-size:12;		
+			            }		
+			.list_table_grey tr{  
+			            border-bottom:1px solid #E5E4E2";
+			          
+			            text-align:left; 	
+			            font-size:12;				
+			            }
+			.basic_table{
+	            text-align:center;
+	            border:1px solid lightGrey;
+	            border-collapse: collapse;
+            }
+			 
+			.list_tabe thead {
+			    display:table-header-group;
+			}			
+			
+			.line{
+			          font-size:12px; 
+			          border-top: 1px solid grey;  
+			          border-bottom: 1px solid  #E5E4E2; 
+			               
+			   }
+			
+			.tbl_header{
+			    width:100%;
+			    font-size:10px;
+			}
+			.tr_bottom_line{
+			    border-bottom: thin solid black;
+			    width:100%;
+			}
+			.tr_bottom_line_dark_grey{
+			    border-bottom: thin solid grey;
+			    width:100%;
+			}
+			.tr_bottom_line_light_grey{
+			    border-bottom: thin solid #CCCCCC;
+			    width:100%;
+			}
+			.td_f12{
+			    font-size:12px;
+			}
+			.td_f10{
+			    font-size:10px;
+			}
+			.td_f10_right{
+			    font-size:10px;
+			    text-align:right;
+			}
+			.td_f12{
+			    font-size:12px;
+			}
+			.td_f12_right{
+			    font-size:12px;
+			    text-align:right;
+			}
+			table.head_border_style{
+					    	border:1px solid; 
+					    	color: #cccccc;
+			}
+			tr.head_border_style{
+			   	border:1px solid; 
+			   	color: #cccccc;
+			}
+			tr.table_header{
+				font-weight: bold;
+				font-family: sans-serif, serif;
+				font-size: 14px;
+				caption-side: top;
+				padding: 5px;
+			}
+			tr.table_parent_data{
+				font-family: Helvetica-Bold;
+				font-size: 12px;
+				caption-side: top;
+				font-weight: bold;
+			}
+			tr.table_child_data{
+				font-family: Helvetica;
+				font-size: 12px;
+				caption-side: top;
+			}
+			tr.report_header{
+				font-size: 30px;
+				caption-side: top;
+				font-family: Helvetica-Bold
+				padding: 5px;
+				border-bottom: 15px solid black;
+				align: center
+			}
+			
+			.top{
+				    border-top: thin solid black;
+			            				   
+			}
+			.bottom {
+				    border-bottom:thin solid;
+				    border-color:#cccccc;
+			}
+			.head_bottom_border{
+				    border-bottom:thin solid;
+				    border-color:black;
+			}
+			.left {
+			    border-left:thin solid;
+			    border-color:#cccccc;
+			}
+			.right {
+			    border-right:thin solid;
+			    border-color:#cccccc;
+			}
+						
+			]]>
+            </field>
+            <field name="name">Account Tax Webkit Header</field>
+        </record>
+ 
+    <!-- Reports on crossovered.budget -->
+        <report id="report_crossovered_budget"
+                string="Budgets"
+                model="crossovered.budget"
+                name="crossovered.budget.report.webkit"
+                file="account_budget_webkit/report/crossovered_budget_report.mako"
+                auto="False"
+                menu="False" 
+        		report_type="webkit"
+        		webkit_header="account_budget_webkit_header"/>
+
+    <!-- moved from account module -->
+        <report auto="False"
+            id="account_budget"
+            menu="False"
+            model="account.budget.post"
+            name="account.budget.webkit"
+            file="account_budget_webkit/report/budget_report.mako"
+            string="Budget"
+        	report_type="webkit"
+        	webkit_header="account_budget_webkit_header"/>
+        
+	<report 
+        	auto="False" 
+        	id="account_analytic_budget" 
+        	menu="False" 
+        	model="account.analytic.account" 
+        	name="account.analytic.account.budget.webkit" 
+			file="account_budget_webkit/report/analytic_account_budget_report.mako" 
+        	string="Print Budget"
+        	report_type="webkit"
+        	webkit_header="account_budget_webkit_header" />
+    </data>
+</openerp>
 \ No newline at end of file
 
=== added directory 'account_budget_webkit/report'
=== added file 'account_budget_webkit/report/__init__.py'
--- account_budget_webkit/report/__init__.py	1970-01-01 00:00:00 +0000
+++ account_budget_webkit/report/__init__.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+
+import crossovered_budget_report
+import analytic_account_budget_report
+import budget_report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
 
=== added file 'account_budget_webkit/report/analytic_account_budget_report.mako'
--- account_budget_webkit/report/analytic_account_budget_report.mako	1970-01-01 00:00:00 +0000
+++ account_budget_webkit/report/analytic_account_budget_report.mako	2013-10-10 09:47:29 +0000
@@ -0,0 +1,119 @@
+<html>
+    <head>
+        <style type="text/css">
+             ${css}
+         .basic_table{
+            text-align:center;
+            border:1px solid lightGrey;
+            border-collapse: collapse;
+            }
+         </style>       
+    </head>
+<body>
+</br>
+</br>
+</br>
+      %for o in objects: 
+      </br>
+    <table width="100%">
+             <tr>
+                 <td align="center">
+                    <h4>
+                     <b>Analytic Budget </b></h4>
+                 </td>
+             </tr>
+    </table>
+<br/>
+    <table width="100%" class="basic_table">
+        <tr >
+            <td width="40%"><b>
+                ${_('Analysis from')}   
+            </td></b>
+            <td width="40%"><b>
+                ${_('Analytic Account')}</b>                
+            </td>
+            <td width="20%">
+                <b>
+                ${_('Currency')} </b>
+            </td></b>
+        </tr>
+  
+        <tr>
+            <td>
+                ${formatLang(data['form']['date_from'],date=True)} to ${formatLang(data['form']['date_to'],date=True)}
+            </td>
+            <td>
+                ${o.name}
+            </td>
+            <td>
+                ${company.currency_id.name}
+            </td>
+        </tr>
+
+    </table>
+    <br/>
+    <table width="100%" class="list_table">
+        <tr >
+            <td width="40%"><b>
+                ${_('Description')}</b>
+            </td>
+            <td width="15%"><b>
+                ${_('Theoretical Amt')}</b>
+            </td>
+            <td width="12%"><b>
+                ${_('Planned Amt')}</b>
+            </td>
+            <td width="13%"><b>
+                ${_('Practical Amt')}</b>
+            </td>
+            <td width="10%" align="right"><b>
+                ${_('Perc(%)')}</b>
+            </td>
+        </tr>
+        %for a in funct(o,data['form']):
+        <tr>
+            <td>
+                   ${a['name']}
+            </td>
+            <td>    
+                   ${formatLang(a['theo'], currency_obj=company.currency_id) }
+            </td>
+            <td>
+                ${ formatLang(a['pln'], currency_obj=company.currency_id) }
+            </td>
+            <td>
+               ${ formatLang(a['prac'], currency_obj=company.currency_id) }
+            </td>
+            <td>
+              ${ formatLang(a['perc']) }%
+            </td>            
+        </tr>
+         %endfor
+        </table> 
+        %for b in funct_total(data['form']):
+         <table width="100%">
+         
+         <tr>
+            <td width="40%"><b><h5>
+            ${ } Total:</h5></b>
+        </td>
+        <td width="15%" align="right"><h5>
+            <b>${ formatLang(b['tot_theo'], currency_obj=company.currency_id) }</b></h5>
+        </td>
+        <td width="12%" align="right"><b><h5>
+          ${ formatLang(b['tot_pln'], currency_obj=company.currency_id) }</b></h5>
+        </td>
+        <td width="13%" align="right"><b><h5>
+          ${ formatLang(b['tot_prac'], currency_obj=company.currency_id) }</h5></b>
+        <td width="10%" align="right"><b><h5>
+          ${ formatLang(b['tot_perc']) }%</h5></b>
+        </td>
+         </tr></h5>
+         %endfor
+    </table>
+    <p style="page-break-after:always">
+        </p> 
+    
+%endfor
+</body>
+</html>
 \ No newline at end of file
 
=== added file 'account_budget_webkit/report/analytic_account_budget_report.py'
--- account_budget_webkit/report/analytic_account_budget_report.py	1970-01-01 00:00:00 +0000
+++ account_budget_webkit/report/analytic_account_budget_report.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,173 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+
+import time
+import datetime
+
+from openerp import pooler
+from openerp.report import report_sxw
+
+class analytic_account_budget_report(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(analytic_account_budget_report, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update( {
+            'funct': self.funct,
+            'funct_total': self.funct_total,
+            'time': time,
+        })
+        self.context = context
+
+    def funct(self, object, form, ids=None, done=None, level=1):
+        if ids is None:
+            ids = {}
+        if not ids:
+            ids = self.ids
+        if not done:
+            done = {}
+
+        global tot
+        tot = {
+            'theo':0.00,
+            'pln':0.00,
+            'prac':0.00,
+            'perc':0.00
+        }
+        result = []
+        accounts = self.pool.get('account.analytic.account').browse(self.cr, self.uid, [object.id], self.context.copy())
+        c_b_lines_obj = self.pool.get('crossovered.budget.lines')
+        obj_c_budget = self.pool.get('crossovered.budget')
+
+        for account_id in accounts:
+            res = {}
+            b_line_ids = []
+            for line in account_id.crossovered_budget_line:
+                b_line_ids.append(line.id)
+            if not b_line_ids:
+                return []
+            d_from = form['date_from']
+            d_to = form['date_to']
+
+            self.cr.execute('SELECT DISTINCT(crossovered_budget_id) FROM crossovered_budget_lines WHERE id =ANY(%s)',(b_line_ids,))
+            budget_ids = self.cr.fetchall()
+
+            context = {'wizard_date_from':d_from,'wizard_date_to':d_to}
+            for i in range(0, len(budget_ids)):
+                budget_name = obj_c_budget.browse(self.cr, self.uid, [budget_ids[i][0]])
+                res= {
+                     'b_id':'-1',
+                     'a_id':'-1',
+                     'name':budget_name[0].name,
+                     'status':1,
+                     'theo':0.00,
+                     'pln':0.00,
+                     'prac':0.00,
+                     'perc':0.00
+                }
+                result.append(res)
+
+                line_ids = c_b_lines_obj.search(self.cr, self.uid, [('id', 'in', b_line_ids), ('crossovered_budget_id','=',budget_ids[i][0])])
+                line_id = c_b_lines_obj.browse(self.cr, self.uid, line_ids)
+                tot_theo = tot_pln = tot_prac = tot_perc = 0
+
+                done_budget = []
+                for line in line_id:
+                    if line.id in b_line_ids:
+                        theo = pract = 0.00
+                        theo = c_b_lines_obj._theo_amt(self.cr, self.uid, [line.id], context)[line.id]
+                        pract = c_b_lines_obj._prac_amt(self.cr, self.uid, [line.id], context)[line.id]
+                        if line.general_budget_id.id in done_budget:
+                            for record in result:
+                               if record['b_id'] == line.general_budget_id.id  and record['a_id'] == line.analytic_account_id.id:
+                                    record['theo'] += theo
+                                    record['pln'] += line.planned_amount
+                                    record['prac'] += pract
+                                    record['perc'] += line.percentage
+                                    tot_theo += theo
+                                    tot_pln += line.planned_amount
+                                    tot_prac += pract
+                                    tot_perc += line.percentage
+                        else:
+                            res1 = {
+                                 'b_id': line.general_budget_id.id,
+                                 'a_id': line.analytic_account_id.id,
+                                 'name': line.general_budget_id.name,
+                                 'status': 2,
+                                 'theo': theo,
+                                 'pln': line.planned_amount,
+                                 'prac': pract,
+                                 'perc': line.percentage
+                            }
+                            tot_theo += theo
+                            tot_pln += line.planned_amount
+                            tot_prac += pract
+                            tot_perc += line.percentage
+                            result.append(res1)
+                            done_budget.append(line.general_budget_id.id)
+                    else:
+                       if line.general_budget_id.id in done_budget:
+                            continue
+                       else:
+                            res1={
+                                    'b_id': line.general_budget_id.id,
+                                    'a_id': line.analytic_account_id.id,
+                                     'name': line.general_budget_id.name,
+                                     'status': 2,
+                                     'theo': 0.00,
+                                     'pln': 0.00,
+                                     'prac': 0.00,
+                                     'perc': 0.00
+                            }
+                            result.append(res1)
+                            done_budget.append(line.general_budget_id.id)
+                if tot_theo == 0.00:
+                    tot_perc = 0.00
+                else:
+                    tot_perc = float(tot_prac / tot_theo) * 100
+
+                result[-(len(done_budget) +1)]['theo'] = tot_theo
+                tot['theo'] +=tot_theo
+                result[-(len(done_budget) +1)]['pln'] = tot_pln
+                tot['pln'] +=tot_pln
+                result[-(len(done_budget) +1)]['prac'] = tot_prac
+                tot['prac'] +=tot_prac
+                result[-(len(done_budget) +1)]['perc'] = tot_perc
+            if tot['theo'] == 0.00:
+                tot['perc'] = 0.00
+            else:
+                tot['perc'] = float(tot['prac'] / tot['theo']) * 100
+        return result
+
+    def funct_total(self, form):
+        result = []
+        res = {}
+        res = {
+             'tot_theo': tot['theo'],
+             'tot_pln': tot['pln'],
+             'tot_prac': tot['prac'],
+             'tot_perc': tot['perc']
+        }
+        result.append(res)
+        return result
+
+report_sxw.report_sxw('report.account.analytic.account.budget.webkit', 'account.analytic.account', 'account_budget_webkit/report/analytic_account_budget_report.mako',parser=analytic_account_budget_report,header='internal')
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'account_budget_webkit/report/budget_report.mako'
--- account_budget_webkit/report/budget_report.mako	1970-01-01 00:00:00 +0000
+++ account_budget_webkit/report/budget_report.mako	2013-10-10 09:47:29 +0000
@@ -0,0 +1,131 @@
+<html>
+    <head>
+        <style type="text/css">
+             ${css}
+         </style>       
+    </head>
+<body>
+</br>
+</br>
+</br>
+ %for o in objects: 
+    <br/>
+    <table width="100%">
+             <tr>
+                 <td align="center">
+                    <h4>
+                     <b> Budget </b></h4>
+                 </td>
+             </tr>
+    </table>
+    <table width="100%" class="line">
+        <tr>
+            <td width="1%"></td>
+            <td width="49%">
+              <b>Currency:</b>${ company.currency_id.name }
+            </td>
+            <td width="49%" align="right">
+            Printed at: ${ formatLang(time.strftime('%Y-%m-%d'),date=True) } at ${ time.strftime('%H:%M:%S') }
+            </td>
+            <td width="1%"></td>
+      </tr>
+      <tr>
+            <td></td>
+            <td>
+            <b>Analysis from</b> ${ formatLang(data['form']['date_from'],date=True) } to ${ formatLang(data['form']['date_to'],date=True) }
+            </td>
+            <td align="right">
+              <b>Budget :</b> <font color="Blue">${ o.name }</font>
+              
+            </td>
+             <td></td>
+      </tr>
+    </table>
+    <br/>
+    <br/>
+    <table width="100%" class="list_table">
+        
+        <tr >
+            <td width="40%" >
+                <b>
+                    ${_('Description')}
+                </b>
+            </td>
+            <td width="15%" align="right">
+                <b>
+                    ${_('Theoretical Amt')}
+                </b>
+            </td>
+            <td width="12%" align="right">
+                <b>
+                    ${_('Planned Amt')}
+                </b>
+            </td>
+            <td width="13%" align="right">
+                <b>
+                    ${_('Practical Amt')}
+                 </b>
+            </td>
+            <td width="10%"  align="right">
+               <b>
+                    ${_('Perc(%)')}
+               </b>
+            </td>
+        </tr>
+       </table>
+        
+        %for a in funct(o,data['form']):
+        <table width="100%" style="border-bottom: 1px solid #ccc !important;text-align:left;font-size:12;">
+        <tr>           
+            <td width="40%">
+                 %if  a['status'] == 1 :                 
+                    ${a['name']}                
+                 %endif
+                 %if a['status'] == 2:
+                    <p style="padding-left:12px;">${a['name']} </p>
+                 %endif
+            </td>
+            <td align="right" width="15%">
+                ${formatLang(a['theo'], digits=get_digits(dp='Account'), currency_obj=company.currency_id)}
+            </td>
+            <td align="right" width="12%">
+                ${formatLang(a['pln'], digits=get_digits(dp='Account'), currency_obj=company.currency_id)}
+            </td>
+            <td align="right" width="13%">
+                ${formatLang(a['prac'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) }
+            </td>
+            <td width="10%" align="right">
+                ${formatLang(a['perc'], digits=2) }
+            </td>  
+           
+        </tr>
+       
+    </table>
+     %endfor
+    %for b in funct_total(data['form']):
+    <table width="100%" class="top">
+        <tr>
+          <td width="40%">
+                Total:
+        </td>
+        <td width="15%" align="right">
+                ${ formatLang(b['tot_theo'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) }
+        </td>
+        <td width="12%" align="right">
+                ${ formatLang(b['tot_pln'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) }
+        </td>
+        <td width="13%" align="right">
+                ${ formatLang(b['tot_prac'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) }
+        </td>
+        <td width="10%" align="right">
+                ${ formatLang(b['tot_perc'], digits=2) }%
+        </td>
+        </tr>
+   </table>
+    %endfor   
+    <p style="page-break-after:always">
+        </p> 
+    
+%endfor
+</body>
+</html>
 \ No newline at end of file
 
=== added file 'account_budget_webkit/report/budget_report.py'
--- account_budget_webkit/report/budget_report.py	1970-01-01 00:00:00 +0000
+++ account_budget_webkit/report/budget_report.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,192 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+
+import time
+from openerp.report import report_sxw
+
+tot = {}
+
+class budget_report(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(budget_report, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update({
+            'funct': self.funct,
+            'funct_total': self.funct_total,
+            'time': time,
+        })
+        self.context = context
+
+    def funct(self, object, form, ids=None, done=None, level=1):
+        if ids is None:
+            ids = {}
+        if not ids:
+            ids = self.ids
+        if not done:
+            done = {}
+        global tot
+        tot = {
+            'theo':0.00,
+            'pln':0.00,
+            'prac':0.00,
+            'perc':0.00
+        }
+        result = []
+
+        budgets = self.pool.get('account.budget.post').browse(self.cr, self.uid, [object.id], self.context.copy())
+        c_b_lines_obj = self.pool.get('crossovered.budget.lines')
+        acc_analytic_obj = self.pool.get('account.analytic.account')
+        for budget_id in budgets:
+            res = {}
+            budget_ids = []
+            d_from = form['date_from']
+            d_to = form['date_to']
+
+            for line in budget_id.crossovered_budget_line:
+                budget_ids.append(line.id)
+
+            if not budget_ids:
+                return []
+            self.cr.execute('SELECT DISTINCT(analytic_account_id) FROM crossovered_budget_lines WHERE id = ANY(%s)',(budget_ids,))
+            an_ids = self.cr.fetchall()
+
+            context = {'wizard_date_from': d_from, 'wizard_date_to': d_to}
+            for i in range(0, len(an_ids)):
+                if not an_ids[i][0]:
+                    continue
+                analytic_name = acc_analytic_obj.browse(self.cr, self.uid, [an_ids[i][0]])
+                res={
+                    'b_id': '-1',
+                    'a_id': '-1',
+                    'name': analytic_name[0].name,
+                    'status': 1,
+                    'theo': 0.00,
+                    'pln': 0.00,
+                    'prac': 0.00,
+                    'perc': 0.00
+                }
+                result.append(res)
+
+                line_ids = c_b_lines_obj.search(self.cr, self.uid, [('id', 'in', budget_ids), ('analytic_account_id','=',an_ids[i][0])])
+                line_id = c_b_lines_obj.browse(self.cr, self.uid, line_ids)
+                tot_theo = tot_pln = tot_prac = tot_perc = 0.00
+
+                done_budget = []
+                for line in line_id:
+                    if line.id in budget_ids:
+                        theo = pract = 0.00
+                        theo = c_b_lines_obj._theo_amt(self.cr, self.uid, [line.id], context)[line.id]
+                        pract = c_b_lines_obj._prac_amt(self.cr, self.uid, [line.id], context)[line.id]
+                        if line.general_budget_id.id in done_budget:
+                            for record in result:
+                                if record['b_id'] == line.general_budget_id.id  and record['a_id'] == line.analytic_account_id.id:
+                                    record['theo'] += theo
+                                    record['pln'] += line.planned_amount
+                                    record['prac'] += pract
+                                    if record['theo'] <> 0.00:
+                                        perc = (record['prac'] / record['theo']) * 100
+                                    else:
+                                        perc = 0.00
+                                    record['perc'] = perc
+                                    tot_theo += theo
+                                    tot_pln += line.planned_amount
+                                    tot_prac += pract
+                                    tot_perc += perc
+                        else:
+                            if theo <> 0.00:
+                                perc = (pract / theo) * 100
+                            else:
+                                perc = 0.00
+                            res1 = {
+                                    'a_id': line.analytic_account_id.id,
+                                    'b_id': line.general_budget_id.id,
+                                    'name': line.general_budget_id.name,
+                                    'status': 2,
+                                    'theo': theo,
+                                    'pln': line.planned_amount,
+                                    'prac': pract,
+                                    'perc': perc,
+                            }
+                            tot_theo += theo
+                            tot_pln += line.planned_amount
+                            tot_prac += pract
+                            tot_perc += perc
+                            if form['report'] == 'analytic-full':
+                                result.append(res1)
+                                done_budget.append(line.general_budget_id.id)
+                    else:
+
+                        if line.general_budget_id.id in done_budget:
+                            continue
+                        else:
+                            res1={
+                                    'a_id': line.analytic_account_id.id,
+                                    'b_id': line.general_budget_id.id,
+                                    'name': line.general_budget_id.name,
+                                    'status': 2,
+                                    'theo': 0.00,
+                                    'pln': 0.00,
+                                    'prac': 0.00,
+                                    'perc': 0.00
+                            }
+                            if form['report'] == 'analytic-full':
+                                result.append(res1)
+                                done_budget.append(line.general_budget_id.id)
+                if tot_theo == 0.00:
+                    tot_perc = 0.00
+                else:
+                    tot_perc = float(tot_prac / tot_theo) * 100
+                if form['report'] == 'analytic-full':
+                    result[-(len(done_budget) +1)]['theo'] = tot_theo
+                    tot['theo'] += tot_theo
+                    result[-(len(done_budget) +1)]['pln'] = tot_pln
+                    tot['pln'] += tot_pln
+                    result[-(len(done_budget) +1)]['prac'] = tot_prac
+                    tot['prac'] += tot_prac
+                    result[-(len(done_budget) +1)]['perc'] = tot_perc
+                else:
+                    result[-1]['theo'] = tot_theo
+                    tot['theo'] += tot_theo
+                    result[-1]['pln'] = tot_pln
+                    tot['pln'] += tot_pln
+                    result[-1]['prac'] = tot_prac
+                    tot['prac'] += tot_prac
+                    result[-1]['perc'] = tot_perc
+            if tot['theo'] == 0.00:
+                tot['perc'] = 0.00
+            else:
+                tot['perc'] = float(tot['prac'] / tot['theo']) * 100
+        return result
+
+    def funct_total(self, form):
+        result = []
+        res = {}
+        res = {
+             'tot_theo': tot['theo'],
+             'tot_pln': tot['pln'],
+             'tot_prac': tot['prac'],
+             'tot_perc': tot['perc']
+        }
+        result.append(res)
+        return result
+
+report_sxw.report_sxw('report.account.budget.webkit', 'account.budget.post', 'account_budget_webkit/report/budget_report.mako', parser=budget_report, header='internal')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'account_budget_webkit/report/crossovered_budget_report.mako'
--- account_budget_webkit/report/crossovered_budget_report.mako	1970-01-01 00:00:00 +0000
+++ account_budget_webkit/report/crossovered_budget_report.mako	2013-10-10 09:47:29 +0000
@@ -0,0 +1,128 @@
+<html>
+    <head>
+        <style type="text/css">
+             ${css}
+         </style>       
+    </head>
+<body>
+</br>
+</br>
+</br>
+ %for o in objects: 
+    <br/>
+    <table width="100%">
+             <tr>
+                 <td align="center">
+                    <h4>
+                     <b> Budget </b></h4>
+                 </td>
+             </tr>
+    </table>
+    <br/>
+    <table width="100%" class="basic_table">
+        <tr>
+            <td>
+                ${_('Analysis from')}
+            </td>
+            <td>
+                ${_('Budget')}
+            </td>
+            <td>
+                ${_('Currency')}
+            </td>
+      </tr>
+      <tr>
+        <td>
+            ${ formatLang(data['form']['date_from'],date=True) } to ${ formatLang(data['form']['date_to'],date=True) }
+        </td>
+        <td>
+            ${ o.name }
+        </td>
+        <td>
+            ${ company.currency_id.name }
+        </td>
+      </tr>
+    </table>
+    <br/>
+    <br/>
+     <table width="100%" class="list_table">
+        
+        <tr >
+            <td width="40%" >
+                <b>
+                    ${_('Description')}
+                </b>
+            </td>
+            <td width="15%" align="right">
+                <b>
+                    ${_('Theoretical Amt')}
+                </b>
+            </td>
+            <td width="12%" align="right">
+                <b>
+                    ${_('Planned Amt')}
+                </b>
+            </td>
+            <td width="13%" align="right">
+                <b>
+                    ${_('Practical Amt')}
+                 </b>
+            </td>
+            <td width="10%"  align="right">
+               <b>
+                    ${_('Perc(%)')}
+               </b>
+            </td>
+        </tr>
+       </table>
+      %for a in funct(o,data['form']):
+      <table width="100%" style="border-bottom: 1px solid #ccc !important;text-align:left;font-size:12;">
+        <tr>           
+            <td width="40%">
+                 %if  a['status'] == 1 :                 
+                    ${a['name']}                
+                 %endif
+                 %if a['status'] == 2:
+                    <p style="padding-left:12px;">${a['name']} </p>
+                 %endif
+            </td>
+            <td align="right" width="15%">
+                ${formatLang(a['theo'], digits=get_digits(dp='Account'), currency_obj=company.currency_id)}
+            </td>
+            <td align="right" width="12%">
+                ${formatLang(a['pln'], digits=get_digits(dp='Account'), currency_obj=company.currency_id)}
+            </td>
+            <td align="right" width="13%">
+                ${formatLang(a['prac'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) }
+            </td>
+            <td width="10%" align="right">
+                ${formatLang(a['perc'], digits=2) }
+            </td>  
+       </tr>
+    </table>
+    %endfor
+     %for b in funct_total(data['form']):
+    <table width="100%" class="top">
+        <tr>
+            <td width="40%">
+                    Total:
+            </td>
+            <td width="15%" align="right">
+                    ${ formatLang(b['tot_theo'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) }
+            </td>
+            <td width="12%" align="right">
+                    ${ formatLang(b['tot_pln'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) }
+            </td>
+            <td width="13%" align="right">
+                    ${ formatLang(b['tot_prac'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) }
+            </td>
+            <td width="10%" align="right">
+                    ${ formatLang(b['tot_perc'], digits=2) }%
+            </td>
+        </tr>
+   </table>
+    %endfor   
+    <p style="page-break-after:always">
+        </p> 
+%endfor
+</body>
 \ No newline at end of file
 
=== added file 'account_budget_webkit/report/crossovered_budget_report.py'
--- account_budget_webkit/report/crossovered_budget_report.py	1970-01-01 00:00:00 +0000
+++ account_budget_webkit/report/crossovered_budget_report.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,197 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+import time
+import datetime
+
+from openerp import pooler
+from openerp.report import report_sxw
+import operator
+from openerp import osv
+
+class budget_report(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(budget_report, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update({
+            'funct': self.funct,
+            'funct_total': self.funct_total,
+            'time': time,
+        })
+        self.context = context
+
+    def funct(self, object, form, ids=None, done=None, level=1):
+        if ids is None:
+            ids = {}
+        if not ids:
+            ids = self.ids
+        if not done:
+            done = {}
+        global tot
+        tot = {
+            'theo':0.00,
+            'pln':0.00,
+            'prac':0.00,
+            'perc':0.00
+        }
+        result = []
+
+        budgets = self.pool.get('crossovered.budget').browse(self.cr, self.uid, [object.id], self.context.copy())
+        c_b_lines_obj = self.pool.get('crossovered.budget.lines')
+        acc_analytic_obj = self.pool.get('account.analytic.account')
+        for budget_id in budgets:
+            res = {}
+            budget_lines = []
+            budget_ids = []
+            d_from = form['date_from']
+            d_to = form['date_to']
+
+            for line in budget_id.crossovered_budget_line:
+                budget_ids.append(line.id)
+
+            if not budget_ids:
+                return []
+
+            self.cr.execute('SELECT DISTINCT(analytic_account_id) FROM crossovered_budget_lines WHERE id = ANY(%s)',(budget_ids,))
+            an_ids = self.cr.fetchall()
+
+            context = {'wizard_date_from': d_from, 'wizard_date_to': d_to}
+            for i in range(0, len(an_ids)):
+                if not an_ids[i][0]:
+                    continue
+                analytic_name = acc_analytic_obj.browse(self.cr, self.uid, [an_ids[i][0]])
+                res={
+                    'b_id': '-1',
+                    'a_id': '-1',
+                    'name': analytic_name[0].name,
+                    'status': 1,
+                    'theo': 0.00,
+                    'pln': 0.00,
+                    'prac': 0.00,
+                    'perc': 0.00
+                }
+                result.append(res)
+
+                line_ids = c_b_lines_obj.search(self.cr, self.uid, [('id', 'in', budget_ids), ('analytic_account_id','=',an_ids[i][0])])
+                line_id = c_b_lines_obj.browse(self.cr, self.uid, line_ids)
+                tot_theo = tot_pln = tot_prac = tot_perc = 0.00
+
+                done_budget = []
+                for line in line_id:
+                    if line.id in budget_ids:
+                        theo = pract = 0.00
+                        theo = c_b_lines_obj._theo_amt(self.cr, self.uid, [line.id], context)[line.id]
+                        pract = c_b_lines_obj._prac_amt(self.cr, self.uid, [line.id], context)[line.id]
+                        if line.general_budget_id.id in done_budget:
+                            for record in result:
+                                if record['b_id'] == line.general_budget_id.id  and record['a_id'] == line.analytic_account_id.id:
+                                    record['theo'] += theo
+                                    record['pln'] += line.planned_amount
+                                    record['prac'] += pract
+                                    if record['theo'] <> 0.00:
+                                        perc = (record['prac'] / record['theo']) * 100
+                                    else:
+                                        perc = 0.00
+                                    record['perc'] = perc
+                                    tot_theo += theo
+                                    tot_pln += line.planned_amount
+                                    tot_prac += pract
+                                    tot_perc += perc
+                        else:
+                            if theo <> 0.00:
+                                perc = (pract / theo) * 100
+                            else:
+                                perc = 0.00
+                            res1 = {
+                                    'a_id': line.analytic_account_id.id,
+                                    'b_id': line.general_budget_id.id,
+                                    'name': line.general_budget_id.name,
+                                    'status': 2,
+                                    'theo': theo,
+                                    'pln': line.planned_amount,
+                                    'prac': pract,
+                                    'perc': perc,
+                            }
+                            tot_theo += theo
+                            tot_pln += line.planned_amount
+                            tot_prac += pract
+                            tot_perc += perc
+                            if form['report'] == 'analytic-full':
+                                result.append(res1)
+                                done_budget.append(line.general_budget_id.id)
+                    else:
+
+                        if line.general_budget_id.id in done_budget:
+                            continue
+                        else:
+                            res1={
+                                    'a_id': line.analytic_account_id.id,
+                                    'b_id': line.general_budget_id.id,
+                                    'name': line.general_budget_id.name,
+                                    'status': 2,
+                                    'theo': 0.00,
+                                    'pln': 0.00,
+                                    'prac': 0.00,
+                                    'perc': 0.00
+                            }
+                            if form['report'] == 'analytic-full':
+                                result.append(res1)
+                                done_budget.append(line.general_budget_id.id)
+                if tot_theo == 0.00:
+                    tot_perc = 0.00
+                else:
+                    tot_perc = float(tot_prac / tot_theo) * 100
+                if form['report'] == 'analytic-full':
+                    result[-(len(done_budget) +1)]['theo'] = tot_theo
+                    tot['theo'] += tot_theo
+                    result[-(len(done_budget) +1)]['pln'] = tot_pln
+                    tot['pln'] += tot_pln
+                    result[-(len(done_budget) +1)]['prac'] = tot_prac
+                    tot['prac'] += tot_prac
+                    result[-(len(done_budget) +1)]['perc'] = tot_perc
+                else:
+                    result[-1]['theo'] = tot_theo
+                    tot['theo'] += tot_theo
+                    result[-1]['pln'] = tot_pln
+                    tot['pln'] += tot_pln
+                    result[-1]['prac'] = tot_prac
+                    tot['prac'] += tot_prac
+                    result[-1]['perc'] = tot_perc
+            if tot['theo'] == 0.00:
+                tot['perc'] = 0.00
+            else:
+                tot['perc'] = float(tot['prac'] / tot['theo']) * 100
+        return result
+
+    def funct_total(self, form):
+        result = []
+        res = {}
+        res = {
+             'tot_theo': tot['theo'],
+             'tot_pln': tot['pln'],
+             'tot_prac': tot['prac'],
+             'tot_perc': tot['perc']
+        }
+        result.append(res)
+        return result
+
+report_sxw.report_sxw('report.crossovered.budget.report.webkit', 'crossovered.budget', 'account_budget_webkit/report/crossovered_budget_report.mako',parser=budget_report,header='internal')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
 
=== added directory 'account_budget_webkit/wizard'
=== added file 'account_budget_webkit/wizard/__init__.py'
--- account_budget_webkit/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ account_budget_webkit/wizard/__init__.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+
+import account_budget_crossovered_report
+import account_budget_analytic
+import account_budget_crossovered_summary_report
+import account_budget_report
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
 
=== added file 'account_budget_webkit/wizard/account_budget_analytic.py'
--- account_budget_webkit/wizard/account_budget_analytic.py	1970-01-01 00:00:00 +0000
+++ account_budget_webkit/wizard/account_budget_analytic.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+import time
+
+from openerp.osv import fields, osv
+
+class account_budget_analytic(osv.osv_memory):
+
+    _inherit = "account.budget.analytic"
+
+    def check_report(self, cr, uid, ids, context=None):
+        
+        res = super(account_budget_analytic,self).check_report( cr, uid, ids, context=context)
+        res['report_name']= 'account.analytic.account.budget.webkit'
+        return res
+
+account_budget_analytic()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'account_budget_webkit/wizard/account_budget_crossovered_report.py'
--- account_budget_webkit/wizard/account_budget_crossovered_report.py	1970-01-01 00:00:00 +0000
+++ account_budget_webkit/wizard/account_budget_crossovered_report.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+import time
+
+from openerp.osv import fields, osv
+
+class account_budget_crossvered_report(osv.osv_memory):
+
+    _inherit="account.budget.crossvered.report"
+
+    def check_report(self, cr, uid, ids, context=None):
+        
+        res = super(account_budget_crossvered_report,self).check_report( cr, uid, ids, context=context)
+        res['report_name']= 'crossovered.budget.report.webkit'
+        return res
+
+account_budget_crossvered_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'account_budget_webkit/wizard/account_budget_crossovered_summary_report.py'
--- account_budget_webkit/wizard/account_budget_crossovered_summary_report.py	1970-01-01 00:00:00 +0000
+++ account_budget_webkit/wizard/account_budget_crossovered_summary_report.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+import time
+
+from openerp.osv import fields, osv
+
+class account_budget_crossvered_summary_report(osv.osv_memory):
+    """
+    This wizard provides the crossovered budget summary report'
+    """
+    _inherit = "account.budget.crossvered.summary.report"
+
+    def check_report(self, cr, uid, ids, context=None):
+        
+        res = super(account_budget_crossvered_summary_report,self).check_report( cr, uid, ids, context=context)
+        res['report_name']= 'crossovered.budget.report.webkit'
+        return res
+
+account_budget_crossvered_summary_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
 
=== added file 'account_budget_webkit/wizard/account_budget_report.py'
--- account_budget_webkit/wizard/account_budget_report.py	1970-01-01 00:00:00 +0000
+++ account_budget_webkit/wizard/account_budget_report.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+import time
+
+from openerp.osv import fields, osv
+
+
+class account_budget_report(osv.osv_memory):
+    _inherit = "account.budget.report"
+
+    def check_report(self, cr, uid, ids, context=None):
+        
+        res = super(account_budget_report,self).check_report( cr, uid, ids, context=context)
+        res['report_name']= 'account.budget.webkit'
+        return res
+        
+
+account_budget_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added directory 'account_test_webkit'
=== added file 'account_test_webkit/__init__.py'
--- account_test_webkit/__init__.py	1970-01-01 00:00:00 +0000
+++ account_test_webkit/__init__.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+
+import report
 
=== added file 'account_test_webkit/__openerp__.py'
--- account_test_webkit/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_test_webkit/__openerp__.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+
+{
+    'name' : 'Accounting Consistency Tests',
+    'version' : '1.0',
+    'author' : 'Serpent Consulting Services',
+    'category' : 'Accounting & Finance',
+    'website': 'http://www.serpentcs.com',
+    'description': """
+Asserts on accounting.
+======================
+It is conversion of rml report to Webkit Report.
+    
+""",
+    'depends' : ['account_test','report_webkit'],
+    'data' : [
+        'account_test_report.xml',
+    ],
+    'active': False,
+    'installable': True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'account_test_webkit/account_test_report.xml'
--- account_test_webkit/account_test_report.xml	1970-01-01 00:00:00 +0000
+++ account_test_webkit/account_test_report.xml	2013-10-10 09:47:29 +0000
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+	  <record id="account_test_header" model="ir.header_webkit">
+            <field name="footer_html"><![CDATA[]]></field>
+            <field name="orientation">Portrait</field>
+            <field name="format">A4</field>
+            <field name="html"><![CDATA[]]>
+            </field>
+            <field eval="15.0" name="margin_top"/>
+            <field eval="5.0" name="margin_bottom"/>
+            <field name="css"><![CDATA[ ]]>
+            </field>
+            <field name="name">Account Test webkit header</field>
+        </record>
+		
+    <report
+        id="account_assert_test_report"
+        model="accounting.assert.test"
+        name="account.test.assert.print.webkit"
+        file="account_test_webkit/report/account_test.mako"
+        webkit_header="account_test_header"
+    	report_type="webkit"
+        string="Accounting Tests"/>
+</data>
+</openerp>
 
=== added directory 'account_test_webkit/report'
=== added file 'account_test_webkit/report/__init__.py'
--- account_test_webkit/report/__init__.py	1970-01-01 00:00:00 +0000
+++ account_test_webkit/report/__init__.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+
+import account_test_report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'account_test_webkit/report/account_test.mako'
--- account_test_webkit/report/account_test.mako	1970-01-01 00:00:00 +0000
+++ account_test_webkit/report/account_test.mako	2013-10-10 09:47:29 +0000
@@ -0,0 +1,53 @@
+<html>
+<head>
+     <style type="text/css">
+           .list_table2 {
+                text-align:left;
+                border-collapse: collapse;
+            }
+            .list_table2 td {
+                border:1px solid black;
+                border-collapse: collapse;
+                font-family:"Times New Roman";
+                font-size:12px;
+                padding: 5px 5px 5px 5px; 
+                }
+           
+        </style>
+    <title>Account_Test.pdf</title>
+</head>
+<body>
+<table width="100%" style="font-family: Times New Roman ;font-size:20px;">
+    <tr>
+        <td align="center">
+            Accouting tests on ${ datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") }
+        </td>
+    </tr>
+</table>
+</br>
+%for o in objects:
+    <table width="100%" class="list_table2">
+        <tr>
+            <td>
+               ${o.name} 
+            </td>
+        </tr>
+        <tr>
+            <td>
+              <i>${ o.desc or '' }</i>
+            </td>
+        </tr>
+    </table>
+    <table width="100%" style="font-family: Times New Roman;font-size:12px;">
+        %for test_result in execute_code(o.code_exec):
+        <tr>
+            <td>
+                ${ test_result } 
+            </td>
+        </tr>
+        %endfor  
+    </table>
+    </br>
+%endfor
+</body>
+</html>
 \ No newline at end of file
 
=== added file 'account_test_webkit/report/account_test_report.py'
--- account_test_webkit/report/account_test_report.py	1970-01-01 00:00:00 +0000
+++ account_test_webkit/report/account_test_report.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+
+
+import datetime
+import time
+from report import report_sxw
+from openerp.tools.translate import _
+#
+# Use period and Journal for selection or resources
+#
+class report_assert_account(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(report_assert_account, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update( {
+            'time': time,
+            'datetime': datetime,
+            'execute_code': self.execute_code,
+        })
+
+    def execute_code(self, code_exec):
+        def reconciled_inv():
+            """
+            returns the list of invoices that are set as reconciled = True
+            """
+            return self.pool.get('account.invoice').search(self.cr, self.uid, [('reconciled','=',True)])
+
+        def order_columns(item, cols=None):
+            """
+            This function is used to display a dictionary as a string, with its columns in the order chosen.
+
+            :param item: dict
+            :param cols: list of field names
+            :returns: a list of tuples (fieldname: value) in a similar way that would dict.items() do except that the
+                returned values are following the order given by cols
+            :rtype: [(key, value)]
+            """
+            if cols is None:
+                cols = item.keys()
+            return [(col, item.get(col)) for col in cols if col in item.keys()]
+
+        localdict = {
+            'cr': self.cr,
+            'uid': self.uid,
+            'reconciled_inv': reconciled_inv, #specific function used in different tests
+            'result': None, #used to store the result of the test
+            'column_order': None, #used to choose the display order of columns (in case you are returning a list of dict)
+        }
+        exec code_exec in localdict
+        result = localdict['result']
+        column_order = localdict.get('column_order', None)
+
+        if not isinstance(result, (tuple, list, set)):
+            result = [result]
+        if not result:
+            result = [_('The test was passed successfully')]
+        else:
+            def _format(item):
+                if isinstance(item, dict):
+                    return ', '.join(["%s: %s" % (tup[0], tup[1]) for tup in order_columns(item, column_order)])
+                else:
+                    return item
+            result = [_(_format(rec)) for rec in result]
+
+        return result
+
+report_sxw.report_sxw('report.account.test.assert.print.webkit', 'accounting.assert.test', 'addons/account_test_webkit/report/account_test.mako', parser=report_assert_account, header=False)
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added directory 'account_voucher_webkit'
=== added file 'account_voucher_webkit/__init__.py'
--- account_voucher_webkit/__init__.py	1970-01-01 00:00:00 +0000
+++ account_voucher_webkit/__init__.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+
+##############################################################################
+
+import report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'account_voucher_webkit/__openerp__.py'
--- account_voucher_webkit/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_voucher_webkit/__openerp__.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+
+##############################################################################
+
+{
+    'name' : 'eInvoicing & Payments',
+    'version' : '1.0',
+    'author' : 'Serpent Consulting Services',
+    'summary': 'Send Invoices and Track Payments',
+    'description': """
+Invoicing & Payments by Accounting Voucher & Receipts
+=====================================================
+    It is conversion of rml report to Webkit Report.
+    """,
+    'category': 'Accounting & Finance',
+    'sequence': 4,
+    'website' : 'http://serpentcs.com',
+    'depends' : ['account_voucher','report_webkit'],
+    'data' : [
+        'account_voucher_report.xml',
+    ],
+    'auto_install': False,
+    'application': True,
+    'installable': True,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'account_voucher_webkit/account_voucher_report.xml'
--- account_voucher_webkit/account_voucher_report.xml	1970-01-01 00:00:00 +0000
+++ account_voucher_webkit/account_voucher_report.xml	2013-10-10 09:47:29 +0000
@@ -0,0 +1,159 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        	<record id="voucher_header" model="ir.header_webkit">
+            <field name="footer_html"><![CDATA[
+			<html>
+			   <head>
+			       <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
+			       <script>
+			           function subst() {
+			           var vars={};
+			           var x=document.location.search.substring(1).split('&');
+			           for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
+			           var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
+			           for(var i in x) {
+			           var y = document.getElementsByClassName(x[i]);
+			           for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
+			               }
+			           }
+			       </script>
+			       <style type="text/css">
+			       
+			           ${css}
+			       </style>
+			   </head>
+			   <body style="border:0; margin: 0;" onload="subst()">
+			       <table class="header" style="border-top: 1px solid black; width: 100%">
+			           <tr >
+			               <td style="text-align:center;font-size:12;" >${ company.rml_footer }</td>
+			           </tr>
+			           <tr >
+			               <td style="text-align:center;font-size:12;" >Contact : ${ user.name }</td>
+			           </tr>
+			       </table> ${_debug or ''|n} </body>
+			</html>
+			            ]]></field>
+			            <field name="orientation">Portrait</field>
+			            <field name="format">A4</field>
+			            <field name="html"><![CDATA[
+			<html>
+			   <head>
+			       <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
+			       <script>
+			           function subst() {
+			           var vars={};
+			           var x=document.location.search.substring(1).split('&');
+			           for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
+			           var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
+			           for(var i in x) {
+			           var y = document.getElementsByClassName(x[i]);
+			           for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
+			               }
+			           }
+			       </script>
+			       <style type="text/css">
+			       
+			           ${css}
+			       </style>
+			   </head>
+			   <body style="border:0; margin: 0;" onload="subst()">
+			       
+			</html>]]>
+			            </field>
+			            <field eval="17.0" name="margin_top"/>
+			            <field eval="25.0" name="margin_bottom"/>
+			            <field name="css"><![CDATA[
+			
+			body, table, td, span, div {
+			    font-family: Helvetica;
+			}
+			 
+			body {
+			
+			font-size:9;
+			
+			}
+			
+			
+			.header {
+			    margin-left:0;
+			    text-align:left;
+			    width:300px;
+			    font-size:12;
+			}
+			.title {
+			font-size:16px;
+			width:100%;
+			font-weight: bold;
+			font-family: Helvetica;
+			text-align:center; 
+			padding-bottom:20px;
+			}
+			
+			.tbl_header{
+			    width:100%;
+			    font-size:12px; 
+			   	font-family: Helvetica;			   
+			}
+			.tbl_grey_line {
+			     width:100%;
+				border:1px solid Grey;
+				border-collapse: collapse;
+				font-family: Helvetica;
+				padding-bottom:20px;
+			            }
+			.tbl_grey_line td{
+					border:1px solid Grey;
+					font-size:11px;
+					font-family: Helvetica;	
+			            			            }
+			.tbl_line{
+			     width:100%;
+			     font-size:12px; 
+			   	 font-family: Helvetica;
+			     font-weight: bold; 
+			     border:1px solid grey; 
+			     border-left:0px;
+			     border-right:0px;      
+			            }
+			
+			.font{
+			            width:100%;
+			    font-size:12px;
+			   	font-family:Helvetica;	
+			            }
+			.font tr{
+			            padding-top:10px;
+			            }
+			.font td{
+			            padding-top:5px;
+			            }
+			]]>
+			            </field>
+			            <field name="name">Voucher Header</field>
+		</record>
+
+        <report id="report_account_voucher"
+            string="Voucher"
+            model="account.voucher"
+            name="voucher.cash_receipt.drcr.webkit"
+            file="account_voucher_webkit/report/account_voucher.mako"
+            auto="False"
+        	report_type="webkit"
+         	webkit_header="voucher_header"
+            menu="True"/> 
+
+<!-- This report is awfull so it's better to hide it -->
+
+       <report id="report_account_voucher_print" 
+            string="Voucher Print"
+            model="account.voucher"
+            name="voucher.print.webkit"
+            file="account_voucher_webkit/report/account_voucher_print.mako"
+            auto="False"
+            menu="True"
+       		report_type="webkit"
+         	webkit_header="voucher_header"/>
+    </data>
+</openerp>
 
=== added directory 'account_voucher_webkit/report'
=== added file 'account_voucher_webkit/report/.~lock.account_voucher_print.sxw#'
--- account_voucher_webkit/report/.~lock.account_voucher_print.sxw#	1970-01-01 00:00:00 +0000
+++ account_voucher_webkit/report/.~lock.account_voucher_print.sxw#	2013-10-10 09:47:29 +0000
@@ -0,0 +1,1 @@
+serpentcs ,serpentcs,serpentcs-desktop,17.09.2013 13:01,file:///home/serpentcs/.libreoffice/3;
 \ No newline at end of file
 
=== added file 'account_voucher_webkit/report/__init__.py'
--- account_voucher_webkit/report/__init__.py	1970-01-01 00:00:00 +0000
+++ account_voucher_webkit/report/__init__.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+
+##############################################################################
+
+import account_voucher
+import account_voucher_print
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'account_voucher_webkit/report/account_voucher.mako'
--- account_voucher_webkit/report/account_voucher.mako	1970-01-01 00:00:00 +0000
+++ account_voucher_webkit/report/account_voucher.mako	2013-10-10 09:47:29 +0000
@@ -0,0 +1,160 @@
+<html>
+    <head>
+        <style type="text/css">
+             ${css}
+         </style>
+    </head>
+    <body>
+        %for voucher in objects:
+            <table class="title">
+                <tr>
+                    <td>
+                        ${get_title(voucher.type)}
+                    </td>
+                </tr>
+            </table>
+            <table class="tbl_grey_line">
+                <tr>
+                    <td width="20%"><b>
+                        ${_('Journal:')}</b>
+                    </td>
+                    <td colspan="3" width="30%">
+                        ${ voucher.type} 
+                    </td>
+                    <td width="20%">
+                        <b>${_('Number:')}</b>
+                    </td>
+                    <td width="30%">
+                        ${ voucher.number }
+                    </td>
+                  </tr>
+                  <tr>
+                    <td>
+                        <b> ${_('Status:')} </b>
+                    </td>
+                    <td width="10%">
+                      %if voucher.state == 'proforma':
+                                PRO-FORMA 
+                      %endif
+                      %if voucher.state == 'draft':
+                                Draft      
+                      %endif
+                      %if voucher.state == 'cancel':
+                                Canceled
+                      %endif
+                      %if voucher.state == 'posted':
+                            Posted      
+                      %endif
+                    </td>
+                    <td width="10%">
+                        <b>${_('Ref. :')}</b>
+                    </td>
+                    <td width="10%">
+                       ${ voucher.reference or '' } 
+                    </td>
+                    <td>
+                        <b>${_('Date:')}</b>
+                    </td>
+                    <td>
+                        ${ formatLang(voucher.date , date=True) or '' }
+                    </td>
+                </tr>
+            </table>
+            </br>
+            <table class="tbl_line">
+                <tr>
+                    <td  width="50%">
+                        ${_('Particulars')}
+                    </td>
+                    <td width="25%" align="right">
+                        ${_('Debit')}
+                    </td>
+                    <td width="25%" align="right">
+                        ${_('Credit')}
+                    </td>
+                </tr>
+            </table>
+            <table class="font">
+                %for move_ids in voucher.move_ids:
+                    <tr>
+                        <td style="padding-left:5px" width="50%">
+                            <b> ${ (move_ids.partner_id and move_ids.partner_id.name) or 'Account' }</b>
+                        </td>
+                        <td style="padding-left:15px" width="25%" align="right">
+                            ${ formatLang(move_ids.debit) }
+                        </td>
+                        <td style="padding-left:15px" width="25%" align="right">
+                            ${ formatLang(move_ids.credit) }
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="3" style="padding-left:15px">
+                            ${ move_ids.account_id.name }
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="3" style="padding-left:15px" width="25%">
+                            <i>${ move_ids.name } - ${ get_ref(voucher.id,move_ids) }</i>
+                        </td>
+                    </tr>
+                 %endfor
+                    <tr>
+                        <td colspan="3">
+                            <b>${_('Through :')} 
+                        </td>
+                      </tr>
+                      <tr>
+                        <td colspan="3" style="padding-left:15px" >
+                            ${ voucher.narration or ''}
+                        </td>
+                      </tr>
+                      <tr>
+                        <td colspan="3" >
+                            <b>${_('On Account of : ')}</b>
+                        </td>
+                      </tr>
+                      <tr>
+                        <td colspan="3" style="padding-left:15px >
+                            ${  voucher.name or ''}
+                        </td>
+                      </tr>
+                      <tr >
+                        <td colspan="3">
+                           <b> ${_('Amount (in words) :') }</b>
+                        </td>
+                      </tr>
+                      <tr>
+                        <td style="padding-left:15px">
+                            ${  convert(voucher.amount,voucher.currency_id.name) or '' }
+                        </td>
+                        <td></td><td></td>
+                    </tr>
+            </table>
+            <table class="tbl_line">
+                <tr>
+                    <td width="50%">
+                     
+                    </td>
+                    <td width="25%" align="right" >
+                       ${ debit(voucher.move_ids)}
+                    </td>
+                    <td width="25%" align="right">
+                       ${ credit(voucher.move_ids)} 
+                    </td>
+                  </tr>
+            <table>
+            </br>
+            <table class="tbl_header">
+                <tr>
+                    <td width="50%">
+                        Receiver's Signature
+                </td>
+                <td align="right" width="50%">
+                    Authorised Signatory
+                </td>
+              </tr>
+            </table>
+            <p style="page-break-after:always"></p>
+        %endfor
+    </body>
+</html>
 \ No newline at end of file
 
=== added file 'account_voucher_webkit/report/account_voucher.py'
--- account_voucher_webkit/report/account_voucher.py	1970-01-01 00:00:00 +0000
+++ account_voucher_webkit/report/account_voucher.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+
+##############################################################################
+
+import time
+from openerp.report import report_sxw
+from openerp.tools import amount_to_text_en
+
+class report_voucher(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(report_voucher, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+            'convert':self.convert,
+            'get_title': self.get_title,
+            'debit':self.debit,
+            'credit':self.credit,
+            'get_ref': self._get_ref
+        })
+
+    def convert(self, amount, cur):
+        amt_en = amount_to_text_en.amount_to_text(amount, 'en', cur)
+        return amt_en
+
+    def get_title(self, type):
+        
+        title = ''
+        if type:
+            title = type[0].swapcase() + type[1:] + " Voucher"
+        return title
+    
+    def debit(self, move_ids):
+        debit = 0.0
+        for move in move_ids:
+            debit += move.debit
+        return debit
+
+    def credit(self, move_ids):
+        credit = 0.0
+        for move in move_ids:
+            credit += move.credit
+        return credit
+
+    def _get_ref(self, voucher_id, move_ids):
+        voucher_line_obj = self.pool.get('account.voucher.line')
+        voucher_line = voucher_line_obj.search(self.cr, self.uid, [('partner_id', '=', move_ids.partner_id.id), ('voucher_id', '=', voucher_id)])
+        if voucher_line:
+            voucher = voucher_line_obj.browse(self.cr, self.uid, voucher_line)[0]
+            return voucher.name
+        else:
+            return
+report_sxw.report_sxw(
+    'report.voucher.cash_receipt.drcr.webkit',
+    'account.voucher',
+    'addons/account_voucher_webkit/report/account_voucher.mako',
+    parser=report_voucher,header="external"
+)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'account_voucher_webkit/report/account_voucher_print.mako'
--- account_voucher_webkit/report/account_voucher_print.mako	1970-01-01 00:00:00 +0000
+++ account_voucher_webkit/report/account_voucher_print.mako	2013-10-10 09:47:29 +0000
@@ -0,0 +1,140 @@
+<html>
+    <head>
+        <style type="text/css">
+             ${css}
+         </style>
+    </head>
+    <body>
+        %for voucher in objects:
+            <table class="title">
+                <tr>
+                    <td>
+                        ${ get_title(voucher.type) }
+                    </td>
+                </tr>
+            </table>
+            <table class="tbl_header">
+                <tr>
+                    <td width="10%">
+                        <b>${_('Number:')}</b>
+                    </td>
+                    <td width="40%">
+                        ${_('voucher.number')} 
+                    <td align="right" width="40%">
+                        <b>${_('Date:')}</b>
+                    </td>
+                    <td align="right" width="10%">
+                        ${ formatLang(voucher.date , date=True) or '' }
+                    </td>
+               </tr>
+               <tr>
+                    <td  width="10%">
+                       <b> ${_('Status:')}</b>
+                    </td>
+                    <td width="40%">
+                      %if voucher.state == 'proforma':
+                                PRO-FORMA 
+                      %endif
+                      %if voucher.state == 'draft':
+                                Draft      
+                      %endif
+                      %if voucher.state == 'cancel':
+                                Canceled
+                      %endif
+                      %if voucher.state == 'posted':
+                            Posted      
+                      %endif
+                    </td>
+                    <td align="right" width="40%">
+                        <b>${_('Currency:')}</b> 
+                    </td>
+                    <td align="right"  width="10%">
+                        ${ voucher.currency_id.symbol }
+                    </td>
+              </tr>
+            </table>
+            </br>
+            <table class="tbl_line">
+                <tr width="70%">
+                    <td>
+                      ${_('Particulars')}
+                    </td>
+                    <td width="30%" align="right">
+                        ${_('Amount')}
+                    </td>
+                </tr>
+            </table>
+            
+            <table class="font">
+                %for p in get_lines(voucher):
+                <tr>
+                    <td width="70%" style="padding-left:5px"><b>
+                        ${_('Account :')}</b>
+                    </td>
+                </tr>
+                
+                <tr>
+                    <td style="padding-left:10px">
+                        ${ p['pname'] }
+                    </td>
+                    <td align="right">
+                        ${ formatLang(p['amount'], currency_obj=voucher.currency_id) }
+                    </td>
+                </tr>
+               
+                <tr>
+                    <td style="padding-left:10px">
+                            ${ p['ref'] }
+                    </td>
+                </tr>
+                <tr>
+                    <td style="padding-left:10px">
+                            ${_('Account :')} ${ p['aname']}     
+                    </td>
+                </tr>
+                %endfor
+                <tr>
+                    <td style="padding-left:5px">
+                            <b>${_('Through :')}</b>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="padding-left:10px">
+                        ${ voucher.journal_id.name or '' }
+                    </td>
+                </tr>
+                <tr>
+                    <td style="padding-left:5px">
+                        <b>${_('On Account of :')}</b>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="padding-left:10px">
+                        ${ get_on_account(voucher) }
+                    </td>
+                </tr>
+                <tr>
+                    <td style="padding-left:5px">
+                        <b>Amount (in words) :</b>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="padding-left:10px">
+                        ${ convert(voucher.amount,voucher.currency_id.name) }
+                    </td>
+                 </tr>
+            </table>
+            
+            <table class="tbl_line">
+                <tr>
+                    <td width="70%">
+                    </td>
+                    <td align="right" width="30%">
+                        ${ formatLang(voucher.amount, currency_obj=voucher.currency_id) }
+                    </td>
+                </tr>
+            </table>
+             <p style="page-break-after:always"></p>
+        %endfor
+    </body>
+</html>
 \ No newline at end of file
 
=== added file 'account_voucher_webkit/report/account_voucher_print.py'
--- account_voucher_webkit/report/account_voucher_print.py	1970-01-01 00:00:00 +0000
+++ account_voucher_webkit/report/account_voucher_print.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+
+##############################################################################
+
+import time
+from openerp.report import report_sxw
+from openerp.tools import amount_to_text_en
+
+class report_voucher_print(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(report_voucher_print, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+            'get_title': self.get_title,
+            'get_lines':self.get_lines,
+            'get_on_account':self.get_on_account,
+            'convert':self.convert
+        })
+
+    def convert(self, amount, cur):
+        amt_en = amount_to_text_en.amount_to_text(amount, 'en', cur)
+        return amt_en
+
+    def get_lines(self, voucher):
+        result = []
+        if voucher.type in ('payment','receipt'):
+            type = voucher.line_ids and voucher.line_ids[0].type or False
+            for move in voucher.move_ids:
+                res = {}
+                amount = move.credit
+                if type == 'dr':
+                    amount = move.debit
+                if amount > 0.0:
+                    res['pname'] = move.partner_id.name
+                    res['ref'] = 'Agst Ref'+" "+str(move.name)
+                    res['aname'] = move.account_id.name
+                    res['amount'] = amount
+                    result.append(res)
+        else:
+            type = voucher.line_ids and voucher.line_ids[0].type or False
+            for move in voucher.move_ids:
+                res = {}
+                amount = move.credit
+                if type == 'dr':
+                    amount = move.debit
+                if amount > 0.0:
+                    res['pname'] = move.partner_id.name
+                    res['ref'] =  move.name
+                    res['aname'] = move.account_id.name
+                    res['amount'] = amount
+                    result.append(res)
+        return result
+
+    def get_title(self, type):
+        print "type:::><><><><>",type
+        title = ''
+        if type:
+            title = type[0].swapcase() + type[1:] + " Voucher"
+        return title
+
+    def get_on_account(self, voucher):
+        name = ""
+        if voucher.type == 'receipt':
+            name = "Received cash from "+str(voucher.partner_id.name)
+        elif voucher.type == 'payment':
+            name = "Payment from "+str(voucher.partner_id.name)
+        elif voucher.type == 'sale':
+            name = "Sale to "+str(voucher.partner_id.name)
+        elif voucher.type == 'purchase':
+            name = "Purchase from "+str(voucher.partner_id.name)
+        return name
+
+report_sxw.report_sxw(
+    'report.voucher.print.webkit',
+    'account.voucher',
+    'addons/account_voucher_webkit/report/account_voucher_print.mako',
+    parser=report_voucher_print,header="external"
+)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added directory 'account_webkit'
=== added file 'account_webkit/__init__.py'
--- account_webkit/__init__.py	1970-01-01 00:00:00 +0000
+++ account_webkit/__init__.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+
+import report
+import wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'account_webkit/__openerp__.py'
--- account_webkit/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_webkit/__openerp__.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+
+{
+    'name' : 'eInvoicing Webkit',
+    'version' : '1.1',
+    'author' : 'Serpent Consulting Services',
+    'category' : 'Accounting & Finance',
+    'description' : """
+Accounting and Financial Management.
+====================================
+    It is conversion of rml report to Webkit Report.
+    """,
+    'website': 'http://www.serpentcs.com',
+    'depends' : ["account", "report_webkit"],
+    'init_xml': [],
+    'update_xml': [
+        'account_report.xml',
+    ],
+    'test': [
+    ],
+    'installable': True,
+    'auto_install': False,
+
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'account_webkit/account_report.xml'
--- account_webkit/account_report.xml	1970-01-01 00:00:00 +0000
+++ account_webkit/account_report.xml	2013-10-10 09:47:29 +0000
@@ -0,0 +1,658 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+		
+        <record id="account_tax_webkit_header" model="ir.header_webkit">
+            <field name="footer_html"><![CDATA[]]></field>
+            <field name="orientation">Portrait</field>
+            <field name="format">A4</field>
+            <field name="html"><![CDATA[
+			<html>
+			   <head>
+			       <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
+			       <script>
+			           function subst() {
+			           var vars={};
+			           var x=document.location.search.substring(1).split('&');
+			           for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
+			           var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
+			           for(var i in x) {
+			           var y = document.getElementsByClassName(x[i]);
+			           for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
+			               }
+			           }
+			       </script>
+			       <style type="text/css">
+			       
+			           ${css}
+			       </style>
+			   </head>
+			   <body style="border:0; margin: 0;" onload="subst()">
+			       <table class="header" style="border-bottom: 1px solid black; width: 100%">
+			           <tr >
+			               <td style="text-align:right;font-size:12;" width="15%">${time.strftime('%m/%d/%Y %I:%M')}</td>
+			               <td style="text-align:center;font-size:16;" width="78%">${company.partner_id.name |entity}</td>
+			               <td style="text-align:left;font-size:12;" width="3%"><span class="page"/>  </td>
+			               <td style="text-align:left;font-size:12;" width="1%"> /</td>
+			               <td style="text-align:right;font-size:12;" width="3%"><span class="topage"/></td>
+			           </tr>
+			       </table> ${_debug or ''|n} </body>
+			</html>]]>
+			            </field>
+			            <field eval="15.0" name="margin_top"/>
+			            <field eval="5.0" name="margin_bottom"/>
+			            <field name="css"><![CDATA[
+			
+			body, table, td, span, div {
+			    font-family: Helvetica, Arial;
+			}
+			
+			body {
+			font-family:Arial;
+			font-size:12;
+		
+			}
+			
+			
+			.header {
+				margin-left:0;
+				text-align:left;
+				width:300px;
+			    font-size:12;
+			}
+			.title {
+			font-size:16;
+			font-weight: bold;
+			
+			}
+			
+			
+			.basic_table{
+			text-align:center;
+			border:1px solid lightGrey;
+			border-collapse: collapse;
+			}
+			.basic_table td {
+			border:1px solid lightGrey;
+			font-size:12;
+			
+			
+			}
+			
+			.list_table {
+			border-color:black;
+			text-align:center;
+			border-collapse: collapse;
+			
+			}
+			.list_table td {
+			border-color:gray;
+			border-top:1px solid gray;
+			text-align:right;
+			font-size:12;
+			padding-left:3px
+			padding-right:3px
+			padding-top:3px
+			padding-bottom:3px
+			}
+			
+			.list_table th {
+			border-bottom:2px solid black;
+			text-align:right;
+			font-size:12;
+			font-weight:bold;
+			padding-left:3px
+			padding-right:3px
+			}
+			
+			.list_tabe thead {
+			    display:table-header-group;
+			}
+			
+			
+			.total {
+			width:100%;
+			}
+			.lib {
+			width:10.3%;
+			}
+			.tot {
+			text-align:left;
+			width:15%;
+			}
+			.righttot {
+			width:74%;
+			}
+			.tax {
+			width:50%;
+			} 
+			
+			.cell{
+			    border-spacing: 0;
+			    border-collapse: collapse;
+			    border-style:solid;
+			    border: 1px solid grey;
+			    font-size:10px;
+			    text-align:center;
+			}
+			
+			.tbl_header{
+			    width:100%;
+			    font-size:10px;
+			}
+			.tr_bottom_line{
+			    border-bottom: thin solid black;
+			    width:100%;
+			}
+			.tr_bottom_line_dark_grey{
+			    border-bottom: thin solid grey;
+			    width:100%;
+			}
+			.tr_bottom_line_light_grey{
+			    border-bottom: thin solid #CCCCCC;
+			    width:100%;
+			}
+			.td_f12{
+			    font-size:12px;
+			}
+			.td_f10{
+			    font-size:10px;
+			}
+			.td_f10_right{
+			    font-size:10px;
+			    text-align:right;
+			}
+			.td_f12{
+			    font-size:12px;
+			}
+			.td_f12_right{
+			    font-size:12px;
+			    text-align:right;
+			}
+			table.head_border_style{
+					    	border:1px solid; 
+					    	color: #cccccc;
+			}
+			tr.head_border_style{
+			   	border:1px solid; 
+			   	color: #cccccc;
+			}
+			tr.table_header{
+				font-weight: bold;
+				font-family: sans-serif, serif;
+				font-size: 14px;
+				caption-side: top;
+				padding: 5px;
+			}
+			tr.table_parent_data{
+				font-family: Helvetica-Bold;
+				font-size: 12px;
+				caption-side: top;
+				font-weight: bold;
+			}
+			tr.table_child_data{
+				font-family: Helvetica;
+				font-size: 12px;
+				caption-side: top;
+			}
+			tr.report_header{
+				font-size: 30px;
+				caption-side: top;
+				font-family: Helvetica-Bold
+				padding: 5px;
+				border-bottom: 15px solid black;
+				align: center
+			}
+			
+			.top{
+				    border-top:thin solid;
+				    border-color:#cccccc;
+			}
+			.bottom {
+				    border-bottom:thin solid;
+				    border-color:#cccccc;
+			}
+			.head_bottom_border{
+				    border-bottom:thin solid;
+				    border-color:black;
+			}
+			.left {
+			    border-left:thin solid;
+			    border-color:#cccccc;
+			}
+			.right {
+			    border-right:thin solid;
+			    border-color:#cccccc;account_wbkit
+			}
+						
+			]]>
+            </field>
+            <field name="name">Account Tax Webkit Header</field>
+        </record>
+       	<record id="account_print_invoice_header" model="ir.header_webkit">
+            <field name="footer_html"><![CDATA[
+			<html>
+			   <head>
+			       <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
+			       <script>
+			           function subst() {
+			           var vars={};
+			           var x=document.location.search.substring(1).split('&');
+			           for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
+			           var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
+			           for(var i in x) {
+			           var y = document.getElementsByClassName(x[i]);
+			           for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
+			               }
+			           }
+			       </script>
+			       <style type="text/css">
+			       
+			           ${css}
+			       </style>
+			   </head>
+			   <body style="border:0; margin: 0;" onload="subst()">
+			       <table class="header" style="border-top: 1px solid black; width: 100%">
+			           <tr >
+			               <td style="text-align:center;font-size:12;" >${ company.rml_footer }</td>
+			           </tr>
+			           <tr >
+			               <td style="text-align:center;font-size:12;" >Contact : ${ user.name }</td>
+			           </tr>
+			       </table> ${_debug or ''|n} </body>
+			</html>
+			            ]]></field>
+			            <field name="orientation">Portrait</field>
+			            <field name="format">A4</field>
+			            <field name="html"><![CDATA[
+			<html>
+			   <head>
+			       <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
+			       <script>
+			           function subst() {
+			           var vars={};
+			           var x=document.location.search.substring(1).split('&');
+			           for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
+			           var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
+			           for(var i in x) {account_wbkit
+			           var y = document.getElementsByClassName(x[i]);
+			           for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
+			               }
+			           }
+			       </script>
+			       <style type="text/css">
+			       
+			           ${css}
+			       </style>
+			   </head>
+			   <body style="border:0; margin: 0;" onload="subst()">
+			       <table class="header" style="border-bottom: 1px solid black; width: 100%">
+			           <tr >
+			               <td style="text-align:left;font-size:12;" width="20%">${ helper.embed_image('png',company.logo,200,50)|n }</td>
+			               <td style="text-align:right;font-size:12;" width="80%"></br></br>${ company.rml_header1 }</td>
+			           </tr>
+			       </table> ${_debug or ''|n} </body>
+			       <p style="text-align:left;font-size:12;">${company.name}</p>
+			</html>]]>
+			            </field>
+			            <field eval="25.0" name="margin_top"/>
+			            <field eval="25.0" name="margin_bottom"/>
+			            <field name="css"><![CDATA[
+			
+			body, table, td, span, div {
+			    font-family: Helvetica, Arial;
+			}
+			
+			body {
+			font-family:Arial;
+			font-size:9;
+			
+			}
+			
+			
+			.header {
+			    margin-left:0;
+			    text-align:left;
+			    width:300px;
+			    font-size:12;
+			}
+			.title {
+			font-size:16;
+			font-weight: bold;
+			
+			}
+			
+			
+			.basic_table{
+			text-align:center;
+			border:1px solid lightGrey;
+			border-collapse: collapse;
+			}
+			.basic_table td {
+			border:1px solid lightGrey;
+			font-size:12;
+			
+			
+			}
+			
+			.list_table {
+			border-color:black;
+			text-align:center;
+			border-collapse: collapse;
+			
+			}
+			.list_table td {
+			border-color:gray;
+			border-top:1px solid gray;
+			text-align:right;
+			font-size:12;
+			padding-left:3px
+			padding-right:3px
+			padding-top:3px
+			padding-bottom:3px
+			}
+			
+			.list_table th {
+			border-bottom:2px solid black;
+			text-align:right;
+			font-size:12;
+			font-weight:bold;
+			padding-left:3px
+			padding-right:3px
+			}
+			
+			.list_tabe thead {
+			    display:table-header-group;
+			}
+			
+			
+			.total {
+			width:100%;
+			}
+			.lib {
+			width:10.3%;
+			}
+			.tot {
+			text-align:left;
+			width:15%;
+			}
+			.righttot {
+			width:74%;
+			}
+			.tax {
+			width:50%;
+			} 
+			
+			.cell{
+			    border-spacing: 0;
+			    border-collapse: collapse;
+			    border-style:solid;
+			    border: 1px solid grey;
+			    font-size:10px;
+			    text-align:center;
+			}
+			
+			.tbl_header{
+			    width:100%;
+			    font-size:10px;
+			}
+			.tr_bottom_line{
+			    border-bottom: thin solid black;
+			    width:100%;
+			}
+			.tr_bottom_line_dark_grey{
+			    border-bottom: thin solid grey;
+			    width:100%;
+			}
+			.tr_bottom_line_light_grey{
+			    border-bottom: thin solid #CCCCCC;
+			    width:100%;
+			}
+			.td_f12{
+			    font-size:12px;
+			}
+			.td_f10{
+			    font-size:10px;
+			}
+			.td_f10_right{
+			    font-size:10px;
+			    text-align:right;
+			}
+			.td_f12{
+			    font-size:12px;
+			}
+			.td_f12_right{
+			    font-size:12px;
+			    text-align:right;
+			}
+			table.head_border_style{
+			                border:1px solid; 
+			                color: #cccccc;
+			}
+			tr.head_border_style{
+			    border:1px solid; 
+			    color: #cccccc;
+			}
+			tr.table_header{
+			    font-weight: bold;
+			    font-family: sans-serif, serif;
+			    font-size: 14px;
+			    caption-side: top;
+			    padding: 5px;
+			}
+			tr.table_parent_data{
+			    font-family: Helvetica-Bold;
+			    font-size: 12px;
+			    caption-side: top;
+			    font-weight: bold;
+			}
+			tr.table_child_data{
+			    font-family: Helvetica;
+			    font-size: 12px;
+			    caption-side: top;
+			}
+			tr.report_header{
+			    font-size: 30px;
+			    caption-side: top;
+			    font-family: Helvetica-Bold
+			    padding: 5px;
+			    border-bottom: 15px solid black;
+			    align: center
+			}
+			
+			.top{
+			        border-top:thin solid;
+			        border-color:#cccccc;
+			}
+			.bottom {
+			        border-bottom:thin solid;
+			        border-color:#cccccc;
+			}
+			.head_bottom_border{
+			        border-bottom:thin solid;
+			        border-color:black;
+			}
+			.left {
+			    border-left:thin solid;
+			    border-color:#cccccc;
+			}
+			.right {
+			    border-right:thin solid;
+			    border-color:#cccccc;
+			}
+			            
+			]]>
+			            </field>
+			            <field name="name">Invoice Webkit Header</field>
+		</record>
+		
+        <report  
+        	auto="False" 
+        	id="account_general_ledger" 
+        	menu="False" 
+        	model="account.account" 
+        	name="account.general.ledger.webkit" 
+			file="account_webkit/report/account_general_ledger.mako" 
+        	string="General Ledger"
+        	report_type="webkit"
+        	webkit_header="account_tax_webkit_header" />
+        
+        <report 
+        	auto="False" 
+        	id="account_general_ledger_landscape" 
+        	menu="False" 
+        	model="account.account" 
+        	name="account.general.ledger_landscape.webkit" 
+  			file="account_webkit/report/account_general_ledger_landscape.mako" 
+        	string="General Ledger" 
+        	report_type="webkit" 
+			webkit_header="account_tax_webkit_header"/>
+        
+        <report 
+        	auto="False" 
+        	id="account_3rdparty_ledger" 
+        	menu="False" 
+        	model="res.partner" 
+        	name="account.third_party_ledger.webkit" 
+        	file="account_webkit/report/account_partner_ledger.mako" 
+        	string="Partner Ledger" 
+        	report_type="webkit" 
+			webkit_header="account_tax_webkit_header" />
+        
+        <report 
+        	auto="False" 
+        	id="account_3rdparty_ledger_other" 
+        	menu="False" 
+        	model="res.partner" 
+        	name="account.third_party_ledger_other.webkit" 
+        	file="account_webkit/report/account_partner_ledger_other.mako" 
+        	string="Partner Ledger"
+        	report_type="webkit" 
+			webkit_header="account_tax_webkit_header"  />
+        
+		<report	 
+        		auto="False" 
+        		id="account_account_balance" 
+        		menu="False" 
+        		model="account.account" 
+        		name="account.account.balance.webkit" 
+        		file="account_webkit/report/account_balance.mako" 
+        		string="Trial Balance"
+        		report_type="webkit" 
+				webkit_header="account_tax_webkit_header"  />
+        
+        		
+        <report 
+        		auto="False" 
+        		id="account_3rdparty_account_balance" 
+        		menu="False"
+        		model="account.account" 
+        		name="account.partner.balance.webkit" 
+        		file="account_webkit/report/account_partner_balance.mako" 
+        		string="Partner Balance"
+        		report_type="webkit" 
+				webkit_header="account_tax_webkit_header" />
+        
+        <report 
+	        auto= "False" 
+	        id="account_central_journal" 
+	        model="account.journal.period" 
+	        name="account.central.journal.webkit" 
+	        file="account_webkit/report/account_central_journal.mako" 
+        	menu="False" 
+	        string="Central Journal" 
+        	report_type="webkit" 
+	        webkit_header="account_tax_webkit_header"  />
+        	
+        
+        <report 
+        		auto="False" 
+        		id="account.account_general_journal" 
+        		model="account.journal.period" 
+        		name="account.general.journal.webkit" 
+        		rml="account_webkit/report/account_general_journal.mako" 
+        		string="General Journal" 
+        		report_type="webkit" 
+				webkit_header="account_tax_webkit_header" />
+        
+        <report 
+        	auto="False" 
+        	id="account.account_journal" 
+        	model="account.journal.period" 
+        	name="account.journal.period.print.webkit" 
+        	file="account_webkit/report/account_journal.mako"
+        	string="Journal" 
+        	report_type="webkit" 
+			webkit_header="account_tax_webkit_header" />
+        
+        <report  
+        	auto="False" 
+        	id="account.webkit_account_journal_sale_purchase" 
+        	model="account.journal.period" 
+        	name="account.journal.period.print.sale.purchase.webkit" 
+        	file="account_webkit/report/account_journal_sale_purchase.mako" 
+        	string="Sale/Purchase Journal" 
+        	report_type="webkit" 
+			webkit_header="account_tax_webkit_header" />
+        
+        <report  
+        	auto="False" 
+        	id="account.account_overdue" 
+        	model="res.partner" 
+        	name="account.overdue.webkit" 
+        	file="account_webkit/report/account_print_overdue.mako"
+        	string="Overdue Payments"
+        	report_type="webkit" 
+			webkit_header="account_print_invoice_header" />
+
+		      
+        <report 
+            auto="False"
+            id="account.account_invoices"
+            model="account.invoice"
+            name="account.invoice.webkit"
+            file="account_webkit/report/account_print_invoice.mako"
+            string="Invoices"
+            attachment="(object.state in ('open','paid')) and ('INV'+(object.number or '').replace('/','')+'.pdf')"
+            attachment_use="True"
+            usage="default"
+        	report_type="webkit" 
+        	webkit_header="account_print_invoice_header" />
+
+
+
+        <report
+            auto="False"
+            id="account_vat_declaration"
+            menu="False"
+            model="account.tax.code"
+            name="account.vat.declaration.webkit"
+            file="account_webkit/report/account_tax_report.mako"
+            string="Taxes Report"
+        	report_type="webkit" 
+			webkit_header="account_tax_webkit_header"/>
+		
+	<report  
+				auto="False" 
+				menu="False" 
+				id="report_webkit_central_journal_id" 
+				model="res.partner" 
+				name="account.aged_trial_balance.webkit" 
+				file="account_webkit/report/account_aged_partner_balance.mako"  
+				string="Account aged partner Balance" 
+				report_type="webkit" 
+				webkit_header="account_tax_webkit_header" />
+		
+		<report 
+		auto="False" 
+		menu="False" 
+		id="account_financial_report" 
+		model="account.account" 
+		name="account.financial.report.webkit" 
+		file="account_webkit/report/account_financial_report.mako" 
+		string="Account Financial Report" 
+		report_type="webkit"
+		webkit_header="account_tax_webkit_header"/>        
+
+    </data>
+</openerp>
 
=== added directory 'account_webkit/report'
=== added file 'account_webkit/report/__init__.py'
--- account_webkit/report/__init__.py	1970-01-01 00:00:00 +0000
+++ account_webkit/report/__init__.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+
+
+import account_central_journal
+import account_general_journal
+import account_journal
+import account_balance
+import account_partner_balance
+import account_general_ledger
+import account_partner_ledger
+#import invoice
+import account_print_invoice
+#import overdue
+import account_print_overdue
+import account_aged_partner_balance
+#import tax_report
+import account_tax_report
+import account_financial_report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
 
=== added file 'account_webkit/report/account_aged_partner_balance.mako'
--- account_webkit/report/account_aged_partner_balance.mako	1970-01-01 00:00:00 +0000
+++ account_webkit/report/account_aged_partner_balance.mako	2013-10-10 09:47:29 +0000
@@ -0,0 +1,220 @@
+<html>
+	<head>
+		<style type="text/css">
+		
+			table.mystyle{border-width: 0 0 0 0;
+				border-spacing: 0;
+				border-collapse: collapse;
+				border-style: solid;
+				border: 1px solid grey;
+				font-size: 100%;}
+
+			.mystyle td, .mystyle th{
+				margin: 0;
+				padding: 4px;
+				border-width: 1px 1px 1px 1px;
+				border-style: solid;
+				border: 1px solid grey;
+				font-size: 60%;}
+				
+			table.mystyleone{border-width: 0 0 0 0;
+				border-spacing: 0;
+				border-collapse: collapse;
+				border-color: black;
+				font-weight:bold;
+				border-style: solid;
+				font-size: 100%;}
+
+			.mystyleone tr{
+				margin: 0;
+				padding: 4px;
+				border-width: 0 0 1px 0;
+				border-color: black;
+				font-weight:bold;
+				border-style: solid;
+				font-size: 60%;}
+		</style>
+	</head>
+
+	<body>
+
+		%for o in objects:
+			</br>
+            <center><h2>Aged Trial Balance</h2></center>
+	
+			<table  width="100%" class="mystyle">
+				<tr class="table_parent_data_header">
+					<td width="16%" class="cell">
+						<b>Chart of Accounts</b>
+					</td>
+					<td width="14%" class="cell">
+						<b>Fiscal Year</b>
+					</td>
+					<td width="14%" class="cell">
+						<b>Start Date</b>
+					</td>
+					<td width="14%" class="cell">
+						<b>Period Length(days)</b>
+					</td>
+					<td width="14%" class="cell">
+						<b>Partner's</b>
+					</td>	
+					<td width="16%" class="cell">
+						<b>Analysis Direction</b>
+					</td>
+					<td width="14%" class="cell">	
+						<b>Target Moves</b>
+					</td>
+				</tr>
+	
+				<tr class="table_child_data_header">
+					<td width="16%" class="cell">
+						${get_account(data) or ''}
+					</td>
+					<td width="14%" class="cell">
+						${get_fiscalyear(data) or ''}
+					</td>
+					<td width="14%" class="cell">
+						${formatLang(data['form']['date_from'],date=True)}
+					</td>
+					<td width="14%" class="cell">
+						${data['form']['period_length'] }
+					</td>
+					<td width="14%" class="cell">
+						${get_partners(data)}
+					</td>	
+					<td width="16%" class="cell">
+						${data['form']['direction_selection']}
+					</td>
+					<td width="14%" class="cell"> 	
+						${get_target_move(data)}
+					</td>
+				</tr>
+			</table>
+			</br></br>
+	
+	  <table width="100%" class="mystyleone">
+			<tr class="table_parent_data">
+				<td width="23%">
+					Partners
+				</td>
+				<%
+					direction = ''
+					if data['form']['direction_selection'] == 'future':
+						direction = 'Due'
+					else:
+						direction = 'Not due'
+				%>
+				<td width="11%" >
+					${direction}
+				</td>
+				<td width="11%" >
+					${ data['form']['4']['name']}
+				</td><td width="11%" >
+					${ data['form']['3']['name']}
+				</td>
+				<td width="11%" >
+					${ data['form']['2']['name']}
+				</td>
+				<td width="11%" >
+					${ data['form']['1']['name']}
+				</td>
+				<td width="11%" >
+					${ data['form']['0']['name']}
+				</td>
+				<td width="11%" >
+					${_('Total')}
+				</td>
+			</tr>	
+			
+	
+			%if get_lines(data['form']) != False or get_lines_with_out_partner(data['form']) != False:
+				<tr class="table_parent_data">
+					<td width="23%">
+						${_('Account Total')}
+					</td>
+					<td width="11%" >
+						${formatLang(get_direction('6'), currency_obj=company.currency_id)}
+					</td>
+					<td width="11%" >
+						${ formatLang(get_for_period('4'), currency_obj=company.currency_id)}
+					</td><td width="11%" >
+						${ formatLang(get_for_period('3'), currency_obj=company.currency_id)}
+					</td>
+					<td width="11%" >
+						${ formatLang(get_for_period('2'), currency_obj=company.currency_id)}
+					</td>
+					<td width="11%" >
+						${ formatLang(get_for_period('1'), currency_obj=company.currency_id)}
+					</td>
+					<td width="11%" >
+						${ formatLang(get_for_period('0'), currency_obj=company.currency_id)}
+					</td>
+					<td width="11%" >
+						${formatLang(get_total('5'), currency_obj=company.currency_id)}
+					</td>
+				</tr>	
+
+		
+					%for partner in get_lines(data['form']):
+						<tr class="table_child_data">
+							<td width="23%">
+								${partner['name']}
+							</td>
+							<td width="11%" >
+								${formatLang(partner['direction'], currency_obj=company.currency_id)}
+							</td>
+							<td width="11%" >
+								${ formatLang(partner['4'], currency_obj=company.currency_id)}
+							</td><td width="11%" >
+								${ formatLang(partner['3'], currency_obj=company.currency_id)}
+							</td>
+							<td width="11%" >
+								${ formatLang(partner['2'], currency_obj=company.currency_id)}
+							</td>
+							<td width="11%" >
+								${ formatLang(partner['1'], currency_obj=company.currency_id)}
+							</td>
+							<td width="11%" >
+								${ formatLang(partner['0'], currency_obj=company.currency_id)}
+							</td>
+							<td width="11%" >
+								${formatLang(partner['total'], currency_obj=company.currency_id)}
+							</td>
+						</tr>
+					%endfor
+
+				%for not_partner in get_lines_with_out_partner(data['form']):
+					<tr class="table_child_data">
+						<td width="23%">
+							${not_partner['name']}
+						</td>
+						<td width="11%" >
+							${formatLang(not_partner['direction'], currency_obj=company.currency_id)}
+						</td>
+						<td width="11%" >
+							${ formatLang(not_partner['4'], currency_obj=company.currency_id)}
+						</td><td width="11%" >
+							${ formatLang(not_partner['3'], currency_obj=company.currency_id)}
+						</td>
+						<td width="11%" >
+							${ formatLang(not_partner['2'], currency_obj=company.currency_id)}
+						</td>
+						<td width="11%" >
+							${ formatLang(not_partner['1'], currency_obj=company.currency_id)}
+						</td>
+						<td width="11%" >
+							${ formatLang(not_partner['0'], currency_obj=company.currency_id)}
+						</td>
+						<td width="11%" >
+							${formatLang(not_partner['total'], currency_obj=company.currency_id)}
+						</td>
+					</tr>
+				%endfor
+			%endif 
+
+	  </table >
+		%endfor
+
+	</body>
+</html>
 \ No newline at end of file
 
=== added file 'account_webkit/report/account_aged_partner_balance.py'
--- account_webkit/report/account_aged_partner_balance.py	1970-01-01 00:00:00 +0000
+++ account_webkit/report/account_aged_partner_balance.py	2013-10-10 09:47:29 +0000
@@ -0,0 +1,383 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2013 Serpent Consulting Services (<http://www.serpentcs.com>)
+#
+#    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/>.
+#
+############################################################################
+
+import time
+from openerp.report import report_sxw
+from openerp.osv import osv
+from account.report.common_report_header import common_report_header
+
+class aged_trial_report(report_sxw.rml_parse, common_report_header):
+
+    def __init__(self, cr, uid, name, context):
+        super(aged_trial_report, self).__init__(cr, uid, name, context=context)
+        self.total_account = []
+        self.localcontext.update({
+            'time': time,
+            'get_lines_with_out_partner': self._get_lines_with_out_partner,
+            'get_lines': self._get_lines,
+            'get_total': self._get_total,
+            'get_direction': self._get_direction,
+            'get_for_period': self._get_for_period,
+            'get_company': self._get_company,
+            'get_currency': self._get_currency,
+            'get_partners':self._get_partners,
+            'get_account': self._get_account,
+            'get_fiscalyear': self._get_fiscalyear,
+            'get_target_move': self._get_target_move,
+        })
+
+    def set_context(self, objects, data, ids, report_type=None):
+        obj_move = self.pool.get('account.move.line')
+        ctx = data['form'].get('used_context', {})
+        ctx.update({'fiscalyear': False, 'all_fiscalyear': True})
+        self.query = obj_move._query_get(self.cr, self.uid, obj='l', context=ctx)
+        self.direction_selection = data['form'].get('direction_selection', 'past')
+        self.target_move = data['form'].get('target_move', 'all')
+        self.date_from = data['form'].get('date_from', time.strftime('%Y-%m-%d'))
+        if (data['form']['result_selection'] == 'customer' ):
+            self.ACCOUNT_TYPE = ['receivable']
+        elif (data['form']['result_selection'] == 'supplier'):
+            self.ACCOUNT_TYPE = ['payable']
+        else:
+            self.ACCOUNT_TYPE = ['payable','receivable']
+        return super(aged_trial_report, self).set_context(objects, data, ids, report_type=report_type)
+
+    def _get_lines(self, form):
+        res = []
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted']
+        self.cr.execute('SELECT DISTINCT res_partner.id AS id,\
+                    res_partner.name AS name \
+                FROM res_partner,account_move_line AS l, account_account, account_move am\
+                WHERE (l.account_id=account_account.id) \
+                    AND (l.move_id=am.id) \
+                    AND (am.state IN %s)\
+                    AND (account_account.type IN %s)\
+                    AND account_account.active\
+                    AND ((reconcile_id IS NULL)\
+                       OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+                    AND (l.partner_id=res_partner.id)\
+                    AND (l.date <= %s)\
+                    AND ' + self.query + ' \
+                ORDER BY res_partner.name', (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from,))
+        partners = self.cr.dictfetchall()
+        ## mise a 0 du total
+        for i in range(7):
+            self.total_account.append(0)
+        #
+        # Build a string like (1,2,3) for easy use in SQL query
+        partner_ids = [x['id'] for x in partners]
+        if not partner_ids:
+            return []
+        # This dictionary will store the debit-credit for all partners, using partner_id as key.
+
+        totals = {}
+        self.cr.execute('SELECT l.partner_id, SUM(l.debit-l.credit) \
+                    FROM account_move_line AS l, account_account, account_move am \
+                    WHERE (l.account_id = account_account.id) AND (l.move_id=am.id) \
+                    AND (am.state IN %s)\
+                    AND (account_account.type IN %s)\
+                    AND (l.partner_id IN %s)\
+                    AND ((l.reconcile_id IS NULL)\
+                    OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+                    AND ' + self.query + '\
+                    AND account_account.active\
+                    AND (l.date <= %s)\
+                    GROUP BY l.partner_id ', (tuple(move_state), tuple(self.ACCOUNT_TYPE), tuple(partner_ids), self.date_from, self.date_from,))
+        t = self.cr.fetchall()
+        for i in t:
+            totals[i[0]] = i[1]
+
+        # This dictionary will store the future or past of all partners
+        future_past = {}
+        if self.direction_selection == 'future':
+            self.cr.execute('SELECT l.partner_id, SUM(l.debit-l.credit) \
+                        FROM account_move_line AS l, account_account, account_move am \
+                        WHERE (l.account_id=account_account.id) AND (l.move_id=am.id) \
+                        AND (am.state IN %s)\
+                        AND (account_account.type IN %s)\
+                        AND (COALESCE(l.date_maturity, l.date) < %s)\
+                        AND (l.partner_id IN %s)\
+                        AND ((l.reconcile_id IS NULL)\
+                        OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+                        AND '+ self.query + '\
+                        AND account_account.active\
+                    AND (l.date <= %s)\
+                        GROUP BY l.partner_id', (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, tuple(partner_ids),self.date_from, self.date_from,))
+            t = self.cr.fetchall()
+            for i in t:
+                future_past[i[0]] = i[1]
+        elif self.direction_selection == 'past': # Using elif so people could extend without this breaking
+            self.cr.execute('SELECT l.partner_id, SUM(l.debit-l.credit) \
+                    FROM account_move_line AS l, account_account, account_move am \
+                    WHERE (l.account_id=account_account.id) AND (l.move_id=am.id)\
+                        AND (am.state IN %s)\
+                        AND (account_account.type IN %s)\
+                        AND (COALESCE(l.date_maturity,l.date) > %s)\
+                        AND (l.partner_id IN %s)\
+                        AND ((l.reconcile_id IS NULL)\
+                        OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+                        AND '+ self.query + '\
+                        AND account_account.active\
+                    AND (l.date <= %s)\
+                        GROUP BY l.partner_id', (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, tuple(partner_ids), self.date_from, self.date_from,))
+            t = self.cr.fetchall()
+            for i in t:
+                future_past[i[0]] = i[1]
+
+        # Use one query per period and store results in history (a list variable)
+        # Each history will contain: history[1] = {'<partner_id>': <partner_debit-credit>}
+        history = []
+        for i in range(5):
+            args_list = (tuple(move_state), tuple(self.ACCOUNT_TYPE), tuple(partner_ids),self.date_from,)
+            dates_query = '(COALESCE(l.date_maturity,l.date)'
+            if form[str(i)]['start'] and form[str(i)]['stop']:
+                dates_query += ' BETWEEN %s AND %s)'
+                args_list += (form[str(i)]['start'], form[str(i)]['stop'])
+            elif form[str(i)]['start']:
+                dates_query += ' > %s)'
+                args_list += (form[str(i)]['start'],)
+            else:
+                dates_query += ' < %s)'
+                args_list += (form[str(i)]['stop'],)
+            args_list += (self.date_from,)
+            self.cr.execute('''SELECT l.partner_id, SUM(l.debit-l.credit)
+                    FROM account_move_line AS l, account_account, account_move am 
+                    WHERE (l.account_id = account_account.id) AND (l.move_id=am.id)
+                        AND (am.state IN %s)
+                        AND (account_account.type IN %s)
+                        AND (l.partner_id IN %s)
+                        AND ((l.reconcile_id IS NULL)
+                          OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))
+                        AND ''' + self.query + '''
+                        AND account_account.active
+                        AND ''' + dates_query + '''
+                    AND (l.date <= %s)
+                    GROUP BY l.partner_id''', args_list)
+            t = self.cr.fetchall()
+            d = {}
+            for i in t:
+                d[i[0]] = i[1]
+            history.append(d)
+
+        for partner in partners:
+            values = {}
+            ## If choise selection is in the future
+            if self.direction_selection == 'future':
+                # Query here is replaced by one query which gets the all the partners their 'before' value
+                before = False
+                if future_past.has_key(partner['id']):
+                    before = [ future_past[partner['id']] ]
+                self.total_account[6] = self.total_account[6] + (before and before[0] or 0.0)
+                values['direction'] = before and before[0] or 0.0
+            elif self.direction_selection == 'past': # Changed this so people could in the future create new direction_selections
+                # Query here is replaced by one query which gets the all the partners their 'after' value
+                after = False
+                if future_past.has_key(partner['id']): # Making sure this partner actually was found by the query
+                    after = [ future_past[partner['id']] ]
+
+                self.total_account[6] = self.total_account[6] + (after and after[0] or 0.0)
+                values['direction'] = after and after[0] or 0.0
+
+            for i in range(5):
+                during = False
+                if history[i].has_key(partner['id']):
+                    during = [ history[i][partner['id']] ]
+                # Ajout du compteur
+                self.total_account[(i)] = self.total_account[(i)] + (during and during[0] or 0)
+                values[str(i)] = during and during[0] or 0.0
+            total = False
+            if totals.has_key( partner['id'] ):
+                total = [ totals[partner['id']] ]
+            values['total'] = total and total[0] or 0.0
+            ## Add for total
+            self.total_account[(i+1)] = self.total_account[(i+1)] + (total and total[0] or 0.0)
+            values['name'] = partner['name']
+
+            res.append(values)
+
+        total = 0.0
+        totals = {}
+        for r in res:
+            total += float(r['total'] or 0.0)
+            for i in range(5)+['direction']:
+                totals.setdefault(str(i), 0.0)
+                totals[str(i)] += float(r[str(i)] or 0.0)
+        return res
+
+    def _get_lines_with_out_partner(self, form):
+        res = []
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted']
+
+        ## mise a 0 du total
+        for i in range(7):
+            self.total_account.append(0)
+        totals = {}
+        self.cr.execute('SELECT SUM(l.debit-l.credit) \
+                    FROM account_move_line AS l, account_account, account_move am \
+                    WHERE (l.account_id = account_account.id) AND (l.move_id=am.id)\
+                    AND (am.state IN %s)\
+                    AND (l.partner_id IS NULL)\
+                    AND (account_account.type IN %s)\
+                    AND ((l.reconcile_id IS NULL) \
+                    OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+                    AND ' + self.query + '\
+                    AND (l.date <= %s)\
+                    AND account_account.active ',(tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from,))
+        t = self.cr.fetchall()
+        for i in t:
+            totals['Unknown Partner'] = i[0]
+        future_past = {}
+        if self.direction_selection == 'future':
+            self.cr.execute('SELECT SUM(l.debit-l.credit) \
+                        FROM account_move_line AS l, account_account, account_move am\
+                        WHERE (l.account_id=account_account.id) AND (l.move_id=am.id)\
+                        AND (am.state IN %s)\
+                        AND (l.partner_id IS NULL)\
+                        AND (account_account.type IN %s)\
+                        AND (COALESCE(l.date_maturity, l.date) < %s)\
+                        AND ((l.reconcile_id IS NULL)\
+                        OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+                        AND '+ self.query + '\
+                        AND account_account.active ', (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from))
+            t = self.cr.fetchall()
+            for i in t:
+                future_past['Unknown Partner'] = i[0]
+        elif self.direction_selection == 'past': # Using elif so people could extend without this breaking
+            self.cr.execute('SELECT SUM(l.debit-l.credit) \
+                    FROM account_move_line AS l, account_account, account_move am \
+                    WHERE (l.account_id=account_account.id) AND (l.move_id=am.id)\
+                        AND (am.state IN %s)\
+                        AND (l.partner_id IS NULL)\
+                        AND (account_account.type IN %s)\
+                        AND (COALESCE(l.date_maturity,l.date) > %s)\
+                        AND ((l.reconcile_id IS NULL)\
+                        OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+                        AND '+ self.query + '\
+                        AND account_account.active ', (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from))
+            t = self.cr.fetchall()
+            for i in t:
+                future_past['Unknown Partner'] = i[0]
+        history = []
+
+        for i in range(5):
+            args_list = (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from,)
+            dates_query = '(COALESCE(l.date_maturity,l.date)'
+            if form[str(i)]['start'] and form[str(i)]['stop']:
+                dates_query += ' BETWEEN %s AND %s)'
+                args_list += (form[str(i)]['start'], form[str(i)]['stop'])
+            elif form[str(i)]['start']:
+                dates_query += ' > %s)'
+                args_list += (form[str(i)]['start'],)
+            else:
+                dates_query += ' < %s)'
+                args_list += (form[str(i)]['stop'],)
+            args_list += (self.date_from,)
+            self.cr.execute('SELECT SUM(l.debit-l.credit)\
+                    FROM account_move_line AS l, account_account, account_move am \
+                    WHERE (l.account_id = account_account.id) AND (l.move_id=am.id)\
+                        AND (am.state IN %s)\
+                        AND (account_account.type IN %s)\
+                        AND (l.partner_id IS NULL)\
+                        AND ((l.reconcile_id IS NULL)\
+                        OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+                        AND '+ self.query + '\
+                        AND account_account.active\
+                        AND ' + dates_query + '\
+                    AND (l.date <= %s)\
+                    GROUP BY l.partner_id', args_list)
+            t = self.cr.fetchall()
+            d = {}
+            for i in t:
+                d['Unknown Partner'] = i[0]
+            history.append(d)
+
+        values = {}
+        if self.direction_selection == 'future':
+            before = False
+            if future_past.has_key('Unknown Partner'):
+                before = [ future_past['Unknown Partner'] ]
+            self.total_account[6] = self.total_account[6] + (before and before[0] or 0.0)
+            values['direction'] = before and before[0] or 0.0
+        elif self.direction_selection == 'past':
+            after = False
+            if future_past.has_key('Unknown Partner'):
+                after = [ future_past['Unknown Partner'] ]
+            self.total_account[6] = self.total_account[6] + (after and after[0] or 0.0)
+            values['direction'] = after and after[0] or 0.0
+
+        for i in range(5):
+            during = False
+            if history[i].has_key('Unknown Partner'):
+                during = [ history[i]['Unknown Partner'] ]
+            self.total_account[(i)] = self.total_account[(i)] + (during and during[0] or 0)
+            values[str(i)] = during and during[0] or 0.0
+
+        total = False
+        if totals.has_key( 'Unknown Partner' ):
+            total = [ totals['Unknown Partner'] ]
+        values['total'] = total and total[0] or 0.0
+        ## Add for total
+        self.total_account[(i+1)] = self.total_account[(i+1)] + (total and total[0] or 0.0)
+        values['name'] = 'Unknown Partner'
+
+        if values['total']:
+            res.append(values)