From f7fe753d074160e6c21cc5b26f0d21bafb07db82 Mon Sep 17 00:00:00 2001
From: tpa-odoo <tpa@tinyerp.com>
Date: Tue, 20 May 2014 17:00:15 +0530
Subject: [PATCH 01/36] [IMP] unlink ir.action.todo which are related to
 actions which will be deleted.

---
 openerp/addons/base/ir/ir_actions.py |  7 +++++++
 openerp/addons/base/ir/ir_ui_menu.py | 10 +++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index 57f24c8864a..3fb42ac75c8 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -57,6 +57,13 @@ class actions(osv.osv):
         'usage': lambda *a: False,
     }
 
+    def unlink(self, cr, uid, ids, context=None):
+        """unlink ir.action.todo which are related to actions which will be deleted.
+           NOTE: ondelete cascade will not work on ir.actions.actions so we will need to do it manually."""
+        todo_obj = self.pool.get('ir.actions.todo')
+        todo_ids = todo_obj.search(cr, uid, [('action_id', 'in', ids)], context=context)
+        todo_obj.unlink(cr, uid, todo_ids, context=context)
+        return super(actions, self).unlink(cr, uid, ids, context=context)
 
 class ir_actions_report_xml(osv.osv):
 
diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py
index f01ce54bfc2..957e0903013 100644
--- a/openerp/addons/base/ir/ir_ui_menu.py
+++ b/openerp/addons/base/ir/ir_ui_menu.py
@@ -312,9 +312,13 @@ class ir_ui_menu(osv.osv):
                     menu_ref = [menu_ref]
                 model_data_obj = self.pool.get('ir.model.data')
                 for menu_data in menu_ref:
-                    model, id = model_data_obj.get_object_reference(cr, uid, menu_data.split('.')[0], menu_data.split('.')[1])
-                    if (model == 'ir.ui.menu'):
-                        menu_ids.add(id)
+                    try:
+                        model, id = model_data_obj.get_object_reference(cr, uid, menu_data.split('.')[0], menu_data.split('.')[1])
+                        if (model == 'ir.ui.menu'):
+                            menu_ids.add(id)
+                    except Exception:
+                        pass
+
         menu_ids = list(menu_ids)
 
         for menu in self.browse(cr, uid, menu_ids, context=context):

From 93f66e98e2ba94ae63d7b2f6d23e523a31519f38 Mon Sep 17 00:00:00 2001
From: Rucha Dave <rda@openerp.com>
Date: Fri, 30 May 2014 16:02:35 +0530
Subject: [PATCH 02/36] [IMP] update value

---
 addons/crm/crm_lead.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index a209bba4890..6afc87f4b82 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -305,7 +305,8 @@ class crm_lead(format_address, osv.osv):
         if partner_id:
             partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
             values = {
-                'partner_name': partner.name,
+                'partner_name': partner.parent_id.name if partner.parent_id else partner.name,
+                'contact_name': partner.name if partner.parent_id else False,
                 'street': partner.street,
                 'street2': partner.street2,
                 'city': partner.city,

From d1857e0f28ce9a93c205098bea77529ba79d32d2 Mon Sep 17 00:00:00 2001
From: Rucha Dave <rda@openerp.com>
Date: Fri, 30 May 2014 17:27:37 +0530
Subject: [PATCH 03/36] [IMP] claim form

---
 addons/crm_claim/crm_claim_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index b6d43c4b140..fe9f39df41c 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -151,7 +151,7 @@
                                 <group colspan="2" col="2">
                                     <separator colspan="2" string="Resolution Actions"/>
                                     <field name="type_action"/>
-                                    <field name="resolution" colspan="2" nolabel="1"/>
+                                    <field name="resolution" colspan="2" nolabel="1" placeholder="Action Description..."/>
                                 </group>
                             </page>
                         </notebook>

From 34097b4f88f6a0f8fb374cccebd4bfeed2e61f84 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 5 Jun 2014 11:46:56 +0200
Subject: [PATCH 04/36] [IMP] mandate a variable name in foreach

---
 openerp/addons/base/ir/ir_qweb.py | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py
index 11c2432a874..01ed5bc32e4 100644
--- a/openerp/addons/base/ir/ir_qweb.py
+++ b/openerp/addons/base/ir/ir_qweb.py
@@ -355,32 +355,29 @@ class QWeb(orm.AbstractModel):
         expr = template_attributes["foreach"]
         enum = self.eval_object(expr, qwebcontext)
         if enum is not None:
-            var = template_attributes.get('as', expr).replace('.', '_')
+            varname = template_attributes['as'].replace('.', '_')
             copy_qwebcontext = qwebcontext.copy()
             size = -1
             if isinstance(enum, (list, tuple)):
                 size = len(enum)
             elif hasattr(enum, 'count'):
                 size = enum.count()
-            copy_qwebcontext["%s_size" % var] = size
-            copy_qwebcontext["%s_all" % var] = enum
+            copy_qwebcontext["%s_size" % varname] = size
+            copy_qwebcontext["%s_all" % varname] = enum
             index = 0
             ru = []
             for i in enum:
-                copy_qwebcontext["%s_value" % var] = i
-                copy_qwebcontext["%s_index" % var] = index
-                copy_qwebcontext["%s_first" % var] = index == 0
-                copy_qwebcontext["%s_even" % var] = index % 2
-                copy_qwebcontext["%s_odd" % var] = (index + 1) % 2
-                copy_qwebcontext["%s_last" % var] = index + 1 == size
+                copy_qwebcontext[varname] = i
+                copy_qwebcontext["%s_value" % varname] = i
+                copy_qwebcontext["%s_index" % varname] = index
+                copy_qwebcontext["%s_first" % varname] = index == 0
+                copy_qwebcontext["%s_even" % varname] = index % 2
+                copy_qwebcontext["%s_odd" % varname] = (index + 1) % 2
+                copy_qwebcontext["%s_last" % varname] = index + 1 == size
                 if index % 2:
-                    copy_qwebcontext["%s_parity" % var] = 'odd'
+                    copy_qwebcontext["%s_parity" % varname] = 'odd'
                 else:
-                    copy_qwebcontext["%s_parity" % var] = 'even'
-                if 'as' in template_attributes:
-                    copy_qwebcontext[var] = i
-                elif isinstance(i, dict):
-                    copy_qwebcontext.update(i)
+                    copy_qwebcontext["%s_parity" % varname] = 'even'
                 ru.append(self.render_element(element, template_attributes, generated_attributes, copy_qwebcontext))
                 index += 1
             return "".join(ru)

From 0b3abaf4ceb6ef73d8d63205a66baaf15d05fa90 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 5 Jun 2014 12:01:04 +0200
Subject: [PATCH 05/36] [FIX] _even/_odd were reversed, also some reformatting
 thing

---
 openerp/addons/base/ir/ir_qweb.py | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py
index 01ed5bc32e4..38ad5c19393 100644
--- a/openerp/addons/base/ir/ir_qweb.py
+++ b/openerp/addons/base/ir/ir_qweb.py
@@ -366,18 +366,26 @@ class QWeb(orm.AbstractModel):
             copy_qwebcontext["%s_all" % varname] = enum
             index = 0
             ru = []
-            for i in enum:
-                copy_qwebcontext[varname] = i
-                copy_qwebcontext["%s_value" % varname] = i
-                copy_qwebcontext["%s_index" % varname] = index
-                copy_qwebcontext["%s_first" % varname] = index == 0
-                copy_qwebcontext["%s_even" % varname] = index % 2
-                copy_qwebcontext["%s_odd" % varname] = (index + 1) % 2
-                copy_qwebcontext["%s_last" % varname] = index + 1 == size
+            for item in enum:
+                copy_qwebcontext.update({
+                    varname: item,
+                    '%s_value' % varname: item,
+                    '%s_index' % varname: index,
+                    '%s_first' % varname: index == 0,
+                    '%s_last' % varname: index + 1 == size,
+                })
                 if index % 2:
-                    copy_qwebcontext["%s_parity" % varname] = 'odd'
+                    copy_qwebcontext.update({
+                        '%s_parity' % varname: 'odd',
+                        '%s_even' % varname: False,
+                        '%s_odd' % varname: True,
+                    })
                 else:
-                    copy_qwebcontext["%s_parity" % varname] = 'even'
+                    copy_qwebcontext.update({
+                        '%s_parity' % varname: 'even',
+                        '%s_even' % varname: True,
+                        '%s_odd' % varname: False,
+                    })
                 ru.append(self.render_element(element, template_attributes, generated_attributes, copy_qwebcontext))
                 index += 1
             return "".join(ru)

From 03b75477ecc342c31ad3de3b1a719560243befcb Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 5 Jun 2014 12:01:44 +0200
Subject: [PATCH 06/36] [IMP] use enumerate instead of explicit index thing

---
 openerp/addons/base/ir/ir_qweb.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py
index 38ad5c19393..1fe1abd35eb 100644
--- a/openerp/addons/base/ir/ir_qweb.py
+++ b/openerp/addons/base/ir/ir_qweb.py
@@ -364,9 +364,8 @@ class QWeb(orm.AbstractModel):
                 size = enum.count()
             copy_qwebcontext["%s_size" % varname] = size
             copy_qwebcontext["%s_all" % varname] = enum
-            index = 0
             ru = []
-            for item in enum:
+            for index, item in enumerate(enum):
                 copy_qwebcontext.update({
                     varname: item,
                     '%s_value' % varname: item,
@@ -387,7 +386,6 @@ class QWeb(orm.AbstractModel):
                         '%s_odd' % varname: False,
                     })
                 ru.append(self.render_element(element, template_attributes, generated_attributes, copy_qwebcontext))
-                index += 1
             return "".join(ru)
         else:
             template = qwebcontext.get('__template__')

From 7f0db3c257e097c36ae9c8d32c69bf3d5c3ca795 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 5 Jun 2014 12:03:16 +0200
Subject: [PATCH 07/36] [IMP] use Sized for iterable size and remove support
 for count

---
 openerp/addons/base/ir/ir_qweb.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py
index 1fe1abd35eb..d74ba0566f0 100644
--- a/openerp/addons/base/ir/ir_qweb.py
+++ b/openerp/addons/base/ir/ir_qweb.py
@@ -358,10 +358,8 @@ class QWeb(orm.AbstractModel):
             varname = template_attributes['as'].replace('.', '_')
             copy_qwebcontext = qwebcontext.copy()
             size = -1
-            if isinstance(enum, (list, tuple)):
+            if isinstance(enum, collections.Sized):
                 size = len(enum)
-            elif hasattr(enum, 'count'):
-                size = enum.count()
             copy_qwebcontext["%s_size" % varname] = size
             copy_qwebcontext["%s_all" % varname] = enum
             ru = []

From 0de6710c3c43db55aad94bfb4a59a1f87f4436b4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 5 Jun 2014 12:05:24 +0200
Subject: [PATCH 08/36] [IMP] guard for None enum, remove 1 level of indent

---
 openerp/addons/base/ir/ir_qweb.py | 64 +++++++++++++++----------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py
index d74ba0566f0..a7183eacc7a 100644
--- a/openerp/addons/base/ir/ir_qweb.py
+++ b/openerp/addons/base/ir/ir_qweb.py
@@ -354,41 +354,41 @@ class QWeb(orm.AbstractModel):
     def render_tag_foreach(self, element, template_attributes, generated_attributes, qwebcontext):
         expr = template_attributes["foreach"]
         enum = self.eval_object(expr, qwebcontext)
-        if enum is not None:
-            varname = template_attributes['as'].replace('.', '_')
-            copy_qwebcontext = qwebcontext.copy()
-            size = -1
-            if isinstance(enum, collections.Sized):
-                size = len(enum)
-            copy_qwebcontext["%s_size" % varname] = size
-            copy_qwebcontext["%s_all" % varname] = enum
-            ru = []
-            for index, item in enumerate(enum):
-                copy_qwebcontext.update({
-                    varname: item,
-                    '%s_value' % varname: item,
-                    '%s_index' % varname: index,
-                    '%s_first' % varname: index == 0,
-                    '%s_last' % varname: index + 1 == size,
-                })
-                if index % 2:
-                    copy_qwebcontext.update({
-                        '%s_parity' % varname: 'odd',
-                        '%s_even' % varname: False,
-                        '%s_odd' % varname: True,
-                    })
-                else:
-                    copy_qwebcontext.update({
-                        '%s_parity' % varname: 'even',
-                        '%s_even' % varname: True,
-                        '%s_odd' % varname: False,
-                    })
-                ru.append(self.render_element(element, template_attributes, generated_attributes, copy_qwebcontext))
-            return "".join(ru)
-        else:
+        if enum is None:
             template = qwebcontext.get('__template__')
             raise QWebException("foreach enumerator %r is not defined while rendering template %r" % (expr, template), template=template)
 
+        varname = template_attributes['as'].replace('.', '_')
+        copy_qwebcontext = qwebcontext.copy()
+        size = -1
+        if isinstance(enum, collections.Sized):
+            size = len(enum)
+        copy_qwebcontext["%s_size" % varname] = size
+        copy_qwebcontext["%s_all" % varname] = enum
+        ru = []
+        for index, item in enumerate(enum):
+            copy_qwebcontext.update({
+                varname: item,
+                '%s_value' % varname: item,
+                '%s_index' % varname: index,
+                '%s_first' % varname: index == 0,
+                '%s_last' % varname: index + 1 == size,
+            })
+            if index % 2:
+                copy_qwebcontext.update({
+                    '%s_parity' % varname: 'odd',
+                    '%s_even' % varname: False,
+                    '%s_odd' % varname: True,
+                })
+            else:
+                copy_qwebcontext.update({
+                    '%s_parity' % varname: 'even',
+                    '%s_even' % varname: True,
+                    '%s_odd' % varname: False,
+                })
+            ru.append(self.render_element(element, template_attributes, generated_attributes, copy_qwebcontext))
+        return "".join(ru)
+
     def render_tag_if(self, element, template_attributes, generated_attributes, qwebcontext):
         if self.eval_bool(template_attributes["if"], qwebcontext):
             return self.render_element(element, template_attributes, generated_attributes, qwebcontext)

From fcb82dc5f1cc4c81dabd2f0be318d4774a630e54 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 5 Jun 2014 13:10:48 +0200
Subject: [PATCH 09/36] [IMP] add XID to view name in Ace editor dropdown

When looking for template bit to override or alter (in-core) through the Ace
editor, displaying only the name is a pain:

- the name generally sucks diseased donkey balls
- having to go through the code to find out what the template's XID is is a
  waste of time
---
 addons/website/static/src/js/website.ace.js | 25 ++++++++++-----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/website.ace.js
index 27e5cd60e62..e1c45065c33 100644
--- a/addons/website/static/src/js/website.ace.js
+++ b/addons/website/static/src/js/website.ace.js
@@ -65,12 +65,13 @@
     website.ace.ViewOption = openerp.Widget.extend({
         template: 'website.ace_view_option',
         init: function (parent, options) {
-            var indent = "- ";
             this.view_id = options.id;
             this.view_name = options.name;
-            for (var i = 0; i<options.level; i++) {
-                this.view_name = indent + this.view_name;
-            }
+
+            var indent = _.str.repeat("- ", options.level);
+            this.view_name = _.str.sprintf(
+                "%s%s (%s)",
+                indent, options.name, options.xml_id);
             this._super(parent);
         },
     });
@@ -162,15 +163,13 @@
             resizeEditorHeight(this.getParent().get('height'));
         },
         loadViews: function (views) {
-            var self = this;
-            var $viewList = self.$('#ace-view-list');
-            var views = this.buildViewGraph(views);
-            _.each(views, function (view) {
-                if (view.id) {
-                    new website.ace.ViewOption(self, view).appendTo($viewList);
-                    self.loadView(view.id);
-                }
-            });
+            var $viewList = this.$('#ace-view-list');
+            _(this.buildViewGraph(views)).each(function (view) {
+                if (!view.id) { return; }
+
+                new website.ace.ViewOption(this, view).appendTo($viewList);
+                this.loadView(view.id);
+            }.bind(this));
         },
         buildViewGraph: function (views) {
             var activeViews = _.uniq(_.filter(views, function (view) {

From a9a83d00c94331a02ee400fc06c5915d60e803be Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 5 Jun 2014 17:49:08 +0200
Subject: [PATCH 10/36] [REM] python-qweb support for as-less foreach

---
 addons/website/views/website_templates.xml    | 30 ++++++++++++-------
 addons/website_event/views/website_event.xml  | 17 ++++++-----
 .../views/website_membership.xml              |  8 ++---
 3 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index f6f9c475f57..253424b9401 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -428,29 +428,37 @@
     <table class="table js_kanban">
         <thead>
             <tr>
-                <t t-set="width" t-value="str(round(100.0 / len(objects), 2)) + '%'"/>
-                <t t-foreach="objects">
+                <t t-set="width" t-valuef="{{ round(100.0 / len(objects), 2) }}%"/>
+                <t t-foreach="objects" t-as="obj">
                     <th t-att-width="width">
-                        <div t-field="column_id.name" class="text-center"></div>
+                        <div t-field="obj['column_id'].name" class="text-center"></div>
                     </th>
                 </t>
             </tr>
         </thead>
         <tbody>
             <tr>
-                <t t-foreach="objects">
-                    <td class="js_kanban_col" t-att-data-template="template" t-att-data-domain="domain" t-att-data-page_count="page_count" t-att-data-model="model" t-att-data-step="step" t-att-data-orderby="orderby">
-                        <t t-foreach="object_ids" t-as="object_id">
+                <t t-foreach="objects" t-as="obj">
+                    <td class="js_kanban_col" t-att-data-template="template"
+                            t-att-data-domain="obj['domain']"
+                            t-att-data-page_count="obj['page_count']"
+                            t-att-data-model="obj['model']"
+                            t-att-data-step="obj['step']"
+                            t-att-data-orderby="obj['orderby']">
+                        <t t-foreach="obj['object_ids']" t-as="object_id">
                             <t t-call="#{ template }"></t>
                         </t>
                         <!-- pager -->
-                        <div t-if="1 != page_end" class="pagination pagination-centered">
+                        <div t-if="1 != obj['page_end']" class="pagination pagination-centered">
                             <ul>
-                                <li t-attf-class="prev #{'active' if page == 1 else '' }"> <a t-att-href=" '%s,%s-%s' % (kanban_url, column_id.id, (page &gt; 1 and page-1 or 1)) ">Prev</a></li>
-                                <t t-foreach="range(page_start, page_end+1)" t-as="p">
-                                    <li t-att-class=" 'active' if page == p else '' "> <a t-att-href=" '%s,%s-%s' % (kanban_url, column_id.id, p)" t-esc="p"></a></li>
+                                <li t-attf-class="prev #{'active' if obj['page'] == 1 else '' }">
+                                    <a t-att-href=" '%s,%s-%s' % (obj['kanban_url'], obj['column_id'].id, (obj['page'] &gt; 1 and obj['page']-1 or 1)) ">Prev</a></li>
+                                <t t-foreach="range(obj['page_start'], obj['page_end']+1)" t-as="p">
+                                    <li t-att-class=" 'active' if obj['page'] == p else '' ">
+                                        <a t-att-href=" '%s,%s-%s' % (obj['kanban_url'], obj['column_id'].id, p)" t-esc="p"></a></li>
                                 </t>
-                                <li t-attf-class="next #{'active' if page == page_end else '' }"> <a t-att-href=" '%s,%s-%s' % (kanban_url, column_id.id, (page &lt; page_end and page+1 or page_end) )">Next</a></li>
+                                <li t-attf-class="next #{'active' if obj['page'] == obj['page_end'] else '' }">
+                                    <a t-att-href=" '%s,%s-%s' % (obj['kanban_url'], obj['column_id'].id, (obj['page'] &lt; obj['page_end'] and obj['page']+1 or obj['page_end']) )">Next</a></li>
                             </ul>
                         </div>
                     </td>
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 15bb778ab0b..774d38381fb 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -162,10 +162,11 @@
 <template id="event_category" inherit_id="website_event.event_left_column" optional="disabled" name="Filter by Category">
     <xpath expr="//div[@id='left_column']" position="inside">
         <ul class="nav nav-pills nav-stacked mt32">
-            <t t-foreach="types">
-                <li t-if="type" t-att-class="searches.get('type') == str(type and type[0]) and 'active' or ''">
-                    <a t-attf-href="/event?{{ keep_query('country', 'date', type=type[0]) }}"><t t-esc="type[1]"/>
-                        <span class="badge pull-right"><t t-esc="type_count"/></span>
+            <t t-foreach="types" t-as="type">
+                <li t-if="type['type']"
+                    t-att-class="searches.get('type') == str(type['type'] and type['type'][0]) and 'active' or ''">
+                    <a t-attf-href="/event?{{ keep_query('country', 'date', type=type['type'][0]) }}"><t t-esc="type['type'][1]"/>
+                        <span class="badge pull-right"><t t-esc="type['type_count']"/></span>
                     </a>
                 </li>
             </t>
@@ -176,10 +177,10 @@
 <template id="event_location" inherit_id="website_event.event_left_column" optional="disabled" name="Filter by Country">
     <xpath expr="//div[@id='left_column']" position="inside">
         <ul class="nav nav-pills nav-stacked mt32">
-            <t t-foreach="countries">
-                <li t-if="country_id" t-att-class="searches.get('country') == str(country_id and country_id[0]) and 'active' or ''">
-                    <a t-attf-href="/event?{{ keep_query('type', 'data', country=country_id[0]) }}"><t t-esc="country_id[1]"/>
-                        <span class="badge pull-right"><t t-esc="country_id_count"/></span>
+            <t t-foreach="countries" t-as="country">
+                <li t-if="country['country_id']" t-att-class="searches.get('country') == str(country['country_id'] and country['country_id'][0]) and 'active' or ''">
+                    <a t-attf-href="/event?{{ keep_query('type', 'data', country=country['country_id'][0]) }}"><t t-esc="country['country_id'][1]"/>
+                        <span class="badge pull-right"><t t-esc="country['country_id_count']"/></span>
                     </a>
                 </li>
             </t>
diff --git a/addons/website_membership/views/website_membership.xml b/addons/website_membership/views/website_membership.xml
index 516b4b9c5a6..c7145e6be79 100644
--- a/addons/website_membership/views/website_membership.xml
+++ b/addons/website_membership/views/website_membership.xml
@@ -88,10 +88,10 @@
     <xpath expr="//div[@id='left_column']/ul[1]" position="after">
         <ul class="nav nav-pills nav-stacked mt16">
             <li class="nav-header"><h3>Location</h3></li>
-            <t t-foreach="countries">
-                <li t-if="country_id" t-att-class="country_id[0] == current_country_id and 'active' or ''">
-                    <a t-attf-href="/members#{ membership and '/association/%s' % membership.id or '' }#{ country_id[0] and '/country/%s' % slug(country_id) or '' }#{ search }"><t t-esc="country_id[1]"/>
-                        <span class="badge pull-right"><t t-esc="country_id_count or '0'"/></span>
+            <t t-foreach="countries" t-as="country">
+                <li t-if="country['country_id']" t-att-class="country['country_id'][0] == current_country_id and 'active' or ''">
+                    <a t-attf-href="/members#{ membership and '/association/%s' % membership.id or '' }#{ country['country_id'][0] and '/country/%s' % slug(country['country_id']) or '' }#{ search }"><t t-esc="country['country_id'][1]"/>
+                        <span class="badge pull-right"><t t-esc="country['country_id_count'] or '0'"/></span>
                     </a>
                 </li>
             </t>

From cedae1fba7d6a1431ed7ef7515f1a4a5626e884b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= <ged@odoo.com>
Date: Fri, 13 Jun 2014 13:32:24 +0200
Subject: [PATCH 11/36] [FIX] removes non stored fields from measures

Non stored functional fields cannot be grouped by read_group, so it is
useless, and even harmful, to display them in the measure list (in
graph view).
---
 addons/web_graph/static/src/js/graph_widget.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/web_graph/static/src/js/graph_widget.js b/addons/web_graph/static/src/js/graph_widget.js
index bbf27daffb0..59f0af95882 100644
--- a/addons/web_graph/static/src/js/graph_widget.js
+++ b/addons/web_graph/static/src/js/graph_widget.js
@@ -114,7 +114,9 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({
     // Extracts the integer/float fields which are not 'id'
     get_measures: function() {
         return _.compact(_.map(this.fields, function (f, id) {
-            if (((f.type === 'integer') || (f.type === 'float')) && (id !== 'id')) {
+            if (((f.type === 'integer') || (f.type === 'float')) && 
+                (id !== 'id') &&
+                (f.store !== false)) {
                 return {field:id, type: f.type, string: f.string};
             }
         }));

From 5eac9b669ac6b83e7279c610a7eee9e5f46d3835 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 13 Jun 2014 16:07:56 +0200
Subject: [PATCH 12/36] [IMP] better and shorter contribution guidelines
 (detailed one are now on the wiki)

---
 CONTRIBUTING.md                  | 68 +++-----------------------------
 doc/_templates/issue_template.md | 19 +++++++++
 2 files changed, 24 insertions(+), 63 deletions(-)
 create mode 100644 doc/_templates/issue_template.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0575bebb52d..67d4c5e7f58 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,68 +1,10 @@
 Contributing to Odoo
 ====================
 
-Reporting Issues
-----------------
-If possible, always attach a pull request when creating an issue (GitHub will automatically create an issue when submitting the changes). The issues not linked to a pull request or an internal request on odoo.com will be handled with a lower priority.
+[Full contribution guidelines](https://github.com/odoo/odoo/wiki/Contributing)
 
-If later on you create a pull request solving an opened issue, do not forget to reference to it in your pull request (e.g.: "This patch fixes issue #42").
+TL;DR
 
-When reporting an issue or creating a pull request, use the following structure:
-
-> **Quantity field is ignored in a sale order**
->
-> Impacted versions:
-> 
->  - 7.0 and above
-> 
-> Steps to reproduce:
-> 
->  1. create a new sale order
->  2. add a line with product 'Service', quantity 2, unit price 10.0
->  3. validate the sale order
-> 
-> Current behavior:
-> 
->  - Total price of 10.0
-> 
-> Expected behavior:
-> 
->  - Total price of 20.0 (2 * 10 = 20)
-
-For web or rendering issues, do not forget to specify the operating system and browser you are using.
-
-Against which version should I submit a patch?
-----------------------------------------------
-Periodically, we forward port the fixes realized in the latest stable version to master and intermediate saas repositories. This means that you should submit your pull request against the lowest supported version. If applying, you should always submit your code against `odoo/7.0`. The `saas-x` versions are intermediate versions between stable versions.
-
-![Submiting against the right version](/doc/_static/pull-request-version.png)
-
-However your change **must** be submitted against `odoo/master` if
-
-* it modifies the database structure (e.g.: adding a new field)
-* it adds a new feature
-
-Why was my fix labeled as blocked?
-----------------------------------
-The label *blocked* is used when an action is required from the submitter. The typical reasons are:
-
-* the fix is incomplete/incorrect and a change is required
-* more information is required
-
-Pull requests with the blocked label will not be processed as long as the label remains. Once the correction done, we will review it and eventually remove the label.
-
-Why was my issue closed without merging?
-----------------------------------------
-A pull request is closed when it will not be merged into odoo. This will typically happens if the fix/issue:
-
-* is not relevant to odoo development (label *invalid*)
-* is not considered as a bug or we have no plan to change the current behavior (label *wontfix*)
-* is a duplicated of another opened issue (label *duplicate*)
-* the pull request should be resubmitted against another version
-
-What is this odoo-dev repository? Should I use it?
---------------------------------------------------
-
-The `odoo-dev/odoo` repository is an internal repository used by the R&D of Odoo to keep the main repository clean. If you are coming from Launchpad, this is the equivalent of the `~openerp-dev` repository.
-
-When forking odoo to submit a patch, always use the `github.com/odoo/odoo` repository. Be also careful of the version you are branching as it will determine the history once the pull request will be realized (e.g.: `git checkout -b 7.0-my-branch odoo/7.0`).
+* Use the [template structure](https://raw.githubusercontent.com/odoo/odoo/master/doc/_templates/issue_template.md)?
+* Pull requests made against the [correct version](https://github.com/odoo/odoo/wiki/Contributing#against-which-version-should-i-submit-a-patch)?
+* Read the restrictions for [changes in stable](https://github.com/odoo/odoo/wiki/Contributing#what-does-stable-mean)
\ No newline at end of file
diff --git a/doc/_templates/issue_template.md b/doc/_templates/issue_template.md
new file mode 100644
index 00000000000..7ede783f5d7
--- /dev/null
+++ b/doc/_templates/issue_template.md
@@ -0,0 +1,19 @@
+Short description of the issue
+
+***Impacted versions:***
+
+ -
+
+***Steps to reproduce:***
+
+ 1. 
+ 2. 
+ 3. 
+
+***Current behavior:***
+
+ - 
+
+***Expected behavior:***
+
+ - 

From 5e7485abb9d3d3730f92ab4f55532f19e15a1d6a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mart-e@users.noreply.github.com>
Date: Fri, 13 Jun 2014 16:09:43 +0200
Subject: [PATCH 13/36] remove useless quotation marks

---
 CONTRIBUTING.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 67d4c5e7f58..0677b630051 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,6 +5,6 @@ Contributing to Odoo
 
 TL;DR
 
-* Use the [template structure](https://raw.githubusercontent.com/odoo/odoo/master/doc/_templates/issue_template.md)?
-* Pull requests made against the [correct version](https://github.com/odoo/odoo/wiki/Contributing#against-which-version-should-i-submit-a-patch)?
-* Read the restrictions for [changes in stable](https://github.com/odoo/odoo/wiki/Contributing#what-does-stable-mean)
\ No newline at end of file
+* Use the [template structure](https://raw.githubusercontent.com/odoo/odoo/master/doc/_templates/issue_template.md)
+* Pull requests made against the [correct version](https://github.com/odoo/odoo/wiki/Contributing#against-which-version-should-i-submit-a-patch)
+* Read the restrictions for [changes in stable](https://github.com/odoo/odoo/wiki/Contributing#what-does-stable-mean)

From 1587663fd2f8d70e87f7b34afda4f1b665c1e13b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 13 Jun 2014 16:11:56 +0200
Subject: [PATCH 14/36] [FIX] postprocessing of request arguments in website

If website is installed but not used/enabled for the current controller,
overridden methods like _get_converters will *still run* for the controller's
dispatch.

This means a ModelConverter used in a controller with website installed but
not enabled will use website.models.ir_http.ModelConverter, not
base.ir.ir_http.ModelConverter, and base's args postprocessing will *not* be
able to convert the placeholder object to a real UID, only website's
postprocessing can do so.

And as far as I can see there's no reason to skip the URL building validation
either, only the multilang stuff relies on and requires that the controller be
website enabled (and in fact that it be multilang enabled), so only *that*
should be gated behind a flag.

Also always call super(), there's no reason not to and others might add args
to postprocess on base rather than website, ending up after website in the
MRO.
---
 addons/website/models/ir_http.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index 44b3f771f62..8e6846dd7a8 100644
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -93,8 +93,7 @@ class ir_http(orm.AbstractModel):
         return self._dispatch()
 
     def _postprocess_args(self, arguments, rule):
-        if not getattr(request, 'website_enabled', False):
-            return super(ir_http, self)._postprocess_args(arguments, rule)
+        super(ir_http, self)._postprocess_args(arguments, rule)
 
         for arg, val in arguments.items():
             # Replace uid placeholder by the current request.uid
@@ -106,7 +105,7 @@ class ir_http(orm.AbstractModel):
         except Exception:
             return self._handle_exception(werkzeug.exceptions.NotFound())
 
-        if request.httprequest.method in ('GET', 'HEAD'):
+        if getattr(request, 'website_multilang', False) and request.httprequest.method in ('GET', 'HEAD'):
             generated_path = werkzeug.url_unquote_plus(path)
             current_path = werkzeug.url_unquote_plus(request.httprequest.path)
             if generated_path != current_path:

From ea4def7de90b5d486cb37112f58b4fa9b5ea98a2 Mon Sep 17 00:00:00 2001
From: Mansi Kariya <mka@openerp.com>
Date: Mon, 16 Jun 2014 10:24:35 +0200
Subject: [PATCH 15/36] [FIX] l10n_in: refactor indian chart of accounts

Added standard and Schedule-vi chart with taxes
removed private and public chart with taxes files
---
 addons/l10n_in/__openerp__.py                 |   18 +-
 addons/l10n_in/l10n_in_private_chart.xml      |  558 -----
 .../l10n_in/l10n_in_private_tax_template.xml  |  404 ---
 addons/l10n_in/l10n_in_public_chart.xml       |  995 --------
 .../l10n_in/l10n_in_public_tax_template.xml   |  865 -------
 addons/l10n_in/l10n_in_schedule6_chart.xml    | 2216 +++++++++++++++++
 .../l10n_in_schedule6_tax_template.xml        |  381 +++
 addons/l10n_in/l10n_in_standard_chart.xml     |  934 +++++++
 .../l10n_in/l10n_in_standard_tax_template.xml |  405 +++
 addons/l10n_in/l10n_in_tax_code_template.xml  |  927 ++++---
 10 files changed, 4410 insertions(+), 3293 deletions(-)
 delete mode 100644 addons/l10n_in/l10n_in_private_chart.xml
 delete mode 100644 addons/l10n_in/l10n_in_private_tax_template.xml
 delete mode 100644 addons/l10n_in/l10n_in_public_chart.xml
 delete mode 100644 addons/l10n_in/l10n_in_public_tax_template.xml
 create mode 100644 addons/l10n_in/l10n_in_schedule6_chart.xml
 create mode 100644 addons/l10n_in/l10n_in_schedule6_tax_template.xml
 create mode 100644 addons/l10n_in/l10n_in_standard_chart.xml
 create mode 100644 addons/l10n_in/l10n_in_standard_tax_template.xml

diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py
index b3dab229201..8dd815022dd 100644
--- a/addons/l10n_in/__openerp__.py
+++ b/addons/l10n_in/__openerp__.py
@@ -27,8 +27,14 @@ Indian Accounting: Chart of Account.
 ====================================
 
 Indian accounting chart and localization.
-    """,
-    'author': ['OpenERP SA', 'Axelor'],
+
+OpenERP allows to manage Indian Accounting by providing Two Formats Of Chart of Accounts i.e Indian Chart Of Accounts - Standard and Indian Chart Of Accounts - Schedule VI.
+
+Note: The Schedule VI has been revised by MCA and is applicable for all Balance Sheet made after
+31st March, 2011. The Format has done away with earlier two options of format of Balance
+Sheet, now only Vertical format has been permitted Which is Supported By OpenERP.
+  """,
+    'author': ['OpenERP SA'],
     'category': 'Localization/Account Charts',
     'depends': [
         'account',
@@ -37,10 +43,10 @@ Indian accounting chart and localization.
     'demo': [],
     'data': [
         'l10n_in_tax_code_template.xml',
-        'l10n_in_public_chart.xml',
-        'l10n_in_public_tax_template.xml',
-        'l10n_in_private_chart.xml',
-        'l10n_in_private_tax_template.xml',
+        'l10n_in_standard_chart.xml',
+        'l10n_in_standard_tax_template.xml',
+        'l10n_in_schedule6_chart.xml',
+        'l10n_in_schedule6_tax_template.xml',
         'l10n_in_wizard.xml',
     ],
     'auto_install': False,
diff --git a/addons/l10n_in/l10n_in_private_chart.xml b/addons/l10n_in/l10n_in_private_chart.xml
deleted file mode 100644
index efaa9844416..00000000000
--- a/addons/l10n_in/l10n_in_private_chart.xml
+++ /dev/null
@@ -1,558 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-    
-        <!-- Partnership/Private account chart -->
-        
-        <record model="account.account.template" id="a0">
-            <field name="name">Partnership/Private Firm Chart of Account</field>
-            <field name="code">0</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_view"/>
-            <field name="reconcile" eval="False"/>
-        </record>
-        
-        <record model="account.account.template" id="a1">
-            <field name="name">Balance Sheet</field>
-            <field name="code">1</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_view"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a0"/>
-        </record>
-        
-        <!-- Assets -->
-        
-        <record model="account.account.template" id="a10">
-            <field name="name">Assets</field>
-            <field name="code">10</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_asset"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a1"/>
-        </record>
-        
-       <record model="account.account.template" id="a101">
-            <field name="name">Cash</field>
-            <field name="code">101</field>
-            <field name="type">liquidity</field>
-            <field name="user_type" ref="account.data_account_type_cash"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a10"/>
-            <field name="note">Checking account balance (as shown in company records), currency, coins, checks received from customers but not yet deposited.</field>
-        </record>
-        
-        <record model="account.account.template" id="a120">
-            <field name="name">Accounts Receivable</field>
-            <field name="code">120</field>
-            <field name="type">receivable</field>
-            <field name="user_type" ref="account.data_account_type_receivable"/>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="a10"/>
-            <field name="note">Amounts owed to the company for services performed or products sold but not yet paid for.</field>
-        </record>
-        
-        <record model="account.account.template" id="a140">
-            <field name="name">Merchandise Inventory</field>
-            <field name="code">140</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_asset"/>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="a10"/>
-            <field name="note">Cost of merchandise purchased but has not yet been sold.</field>
-        </record>
-        
-        <record model="account.account.template" id="a150">
-            <field name="name">Supplies</field>
-            <field name="code">150</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_asset"/>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="a10"/>
-            <field name="note">Cost of supplies that have not yet been used. Supplies that have been used are recorded in Supplies Expense.</field>
-        </record>
-        
-        <record model="account.account.template" id="a160">
-            <field name="name">Prepaid Insurance</field>
-            <field name="code">160</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_asset"/>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="a10"/>
-            <field name="note">Cost of insurance that is paid in advance and includes a future accounting period.</field>
-        </record>
-        
-        <record model="account.account.template" id="a170">
-            <field name="name">Land</field>
-            <field name="code">170</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_asset"/>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="a10"/>
-            <field name="note">Cost to acquire and prepare land for use by the company.</field>
-        </record>
-        
-        <record model="account.account.template" id="a175">
-            <field name="name">Buildings</field>
-            <field name="code">175</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_asset"/>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="a10"/>
-            <field name="note">Cost to purchase or construct buildings for use by the company.</field>
-        </record>
-        
-        <record model="account.account.template" id="a178">
-            <field name="name">Accumulated Depreciation - Buildings</field>
-            <field name="code">178</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_asset"/>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="a10"/>
-            <field name="note">Amount of the buildings' cost that has been allocated to Depreciation Expense since the time the building was acquired.</field>
-        </record>
-        
-        <record model="account.account.template" id="a180">
-            <field name="name">Equipment</field>
-            <field name="code">180</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_asset"/>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="a10"/>
-            <field name="note">Cost to acquire and prepare equipment for use by the company.</field>
-        </record>
-        
-        <record model="account.account.template" id="a188">
-            <field name="name">Accumulated Depreciation - Equipment</field>
-            <field name="code">188</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_asset"/>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="a10"/>
-            <field name="note">Amount of equipment's cost that has been allocated to Depreciation Expense since the time the equipment was acquired.</field>
-        </record>
-        
-        <record model="account.account.template" id="a189">
-            <field name="name">Tax Receivable</field>
-            <field name="code">189</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_asset"/>
-            <field name="parent_id" ref="a10"/>
-        </record>
-
-        <record model="account.account.template" id="a189100">
-            <field name="name">Purchase Tax Receivable</field>
-            <field name="code">189100</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="a189"/>
-        </record>
-
-        <record model="account.account.template" id="a189200">
-            <field name="name">VAT Receivable</field>
-            <field name="code">189200</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="a189"/>
-        </record>
-
-        <record model="account.account.template" id="a189300">
-            <field name="name">Service Tax Receivable</field>
-            <field name="code">189300</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="a189"/>
-        </record>
-
-        <record model="account.account.template" id="a189400">
-            <field name="name">Exice Duty Receivable</field>
-            <field name="code">189400</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="a189"/>
-        </record>
-
-        <!-- Liabilities -->
-        
-        <record model="account.account.template" id="a20">
-            <field name="name">Liabilities</field>
-            <field name="code">20</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a1"/>
-        </record>
-        
-        <record model="account.account.template" id="a210">
-            <field name="name">Notes Payable</field>
-            <field name="code">210</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a20"/>
-            <field name="note">The amount of principal due on a formal written promise to pay. Loans from banks are included in this account.</field>
-        </record>
-        
-        <record model="account.account.template" id="a215">
-            <field name="name">Accounts Payable</field>
-            <field name="code">215</field>
-            <field name="type">payable</field>
-            <field name="user_type" ref="account.data_account_type_payable"/>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="a20"/>
-            <field name="note">Amount owed to suppliers who provided goods and services to the company but did not require immediate payment in cash.</field>
-        </record>
-        
-        <record model="account.account.template" id="a220">
-            <field name="name">Wages Payable</field>
-            <field name="code">220</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a20"/>
-            <field name="note">Amount owed to employees for hours worked but not yet paid.</field>
-        </record>
-        
-        <record model="account.account.template" id="a230">
-            <field name="name">Interest Payable</field>
-            <field name="code">230</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a20"/>
-            <field name="note">Amount owed for interest on Notes Payable up until the date of the balance sheet. This is computed by multiplying the amount of the note times the effective interest rate times the time period.</field>
-        </record>
-        
-        <record model="account.account.template" id="a240">
-            <field name="name">Unearned Revenues</field>
-            <field name="code">240</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a20"/>
-            <field name="note">Amounts received in advance of delivering goods or providing services. When the goods are delivered or services are provided, this liability amount decreases.</field>
-        </record>
-        
-        <record model="account.account.template" id="a250">
-            <field name="name">Mortgage Loan Payable</field>
-            <field name="code">250</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a20"/>
-            <field name="note">A formal loan that involves a lien on real estate until the loan is repaid.</field>
-        </record>
-        
-        <record model="account.account.template" id="a260">
-            <field name="name">Reserve and Surplus Account</field>
-            <field name="code">260</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a20"/>
-            <field name="note">A Reserve and Surplus Account.</field>
-        </record>
-        
-        
-    <!-- Tax Account -->
-    
-    <record model="account.account.template" id="a216">
-        <field name="name">Tax payable</field>
-        <field name="code">216</field>
-        <field name="type">view</field>
-        <field name="user_type" ref="account.data_account_type_liability"/>
-        <field name="reconcile" eval="False"/>
-        <field name="parent_id" ref="a20"/>
-    </record>
-    
-    <record model="account.account.template" id="a2161">
-        <field name="name">Sales Tax Payable</field>
-        <field name="code">2161</field>
-        <field name="type">other</field>
-        <field name="user_type" ref="account.data_account_type_liability"/>
-        <field name="reconcile" eval="True"/>
-        <field name="parent_id" ref="a216"/>
-    </record>
-    
-    <record model="account.account.template" id="a2162">
-        <field name="name">VAT Payable</field>
-        <field name="code">2162</field>
-        <field name="type">other</field>
-        <field name="user_type" ref="account.data_account_type_liability"/>
-        <field name="reconcile" eval="True"/>
-        <field name="parent_id" ref="a216"/>
-    </record>
-    
-    <record model="account.account.template" id="a2163">
-        <field name="name">Service Tax Payable</field>
-        <field name="code">2163</field>
-        <field name="type">other</field>
-        <field name="user_type" ref="account.data_account_type_liability"/>
-        <field name="reconcile" eval="True"/>
-        <field name="parent_id" ref="a216"/>
-    </record>
-    
-    <record model="account.account.template" id="a2164">
-        <field name="name">Exice Duty Payable</field>
-        <field name="code">2164</field>
-        <field name="type">other</field>
-        <field name="user_type" ref="account.data_account_type_liability"/>
-        <field name="reconcile" eval="True"/>
-        <field name="parent_id" ref="a216"/>
-    </record>
-    
-    <!--  Owner's Equity Accounts -->
-    
-        <record model="account.account.template" id="29">
-            <field name="name">Owner's Equity Accounts</field>
-            <field name="code">29</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a20"/>
-        </record>
-        
-      <!--  <record model="account.account.template" id="290">
-            <field name="name">Mary Smith, Capital</field>
-            <field name="code">290</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="29"/>
-            <field name="note">Amount the owner invested in the company (through cash or other assets) plus earnings of the company not withdrawn by the owner.</field>
-        </record>
-        
-        <record model="account.account.template" id="295">
-            <field name="name">Mary Smith, Drawing</field>
-            <field name="code">295</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="29"/>
-            <field name="note">Amount that the owner of the sole proprietorship has withdrawn for personal use during the current accounting year. At the end of the year, the amount in this account will be transferred into Mary Smith, Capital (account 290). </field>
-        </record>
-        -->
-        <!-- Profit And Loss Account -->
-        
-        <record model="account.account.template" id="a3">
-            <field name="name">Profit And Loss</field>
-            <field name="code">3</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_view"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a0"/>
-        </record>
-        
-        <!-- Income -->
-        
-        <record model="account.account.template" id="a30">
-            <field name="name">Income</field>
-            <field name="code">30</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_income"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a3"/>
-        </record>
-        
-        <!-- Income Operating Revenues -->
-        
-        <record model="account.account.template" id="a31">
-            <field name="name">Operating Revenue Accounts</field>
-            <field name="code">31</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_income"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a30"/>
-        </record>
-        
-        <record model="account.account.template" id="a310">
-            <field name="name">Service Revenues</field>
-            <field name="code">310</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_income"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a31"/>
-            <field name="note">Amounts earned from providing services to clients, either for cash or on credit. When a service is provided on credit, both this account and Accounts Receivable will increase. When a service is provided for immediate cash, both this account and Cash will increase.</field>
-        </record>
-        
-        <record model="account.account.template" id="a311">
-            <field name="name">Product Sales</field>
-            <field name="code">311</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_income"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a31"/>
-            <field name="note">Sales of product account</field>
-        </record>
-        
-        <record model="account.account.template" id="a80">
-            <field name="name">Non-Operating Revenue and Gains</field>
-            <field name="code">80</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_income"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a30"/>
-        </record>
-        
-        <record model="account.account.template" id="a810">
-            <field name="name">Interest Revenues</field>
-            <field name="code">810</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_income"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a80"/>
-            <field name="note">Interest and dividends earned on bank accounts, investments or notes receivable. This account is increased when the interest is earned and either Cash or Interest Receivable is also increased.</field>
-        </record>
-        
-        <record model="account.account.template" id="a811">
-            <field name="name">Gain on Sale of Assets</field>
-            <field name="code">811</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_income"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a80"/>
-            <field name="note">Occurs when the company sells one of its assets (other than inventory) for more than the asset's book value.</field>
-        </record>
-        
-        <!-- Expenses -->
-        
-        <record model="account.account.template" id="a50">
-            <field name="name">Expense</field>
-            <field name="code">50</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a3"/>
-        </record>
-        
-        <record model="account.account.template" id="a51">
-            <field name="name">Operating Expense Accounts</field>
-            <field name="code">51</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a50"/>
-        </record>
-        
-        <record model="account.account.template" id="a500">
-            <field name="name">Salaries Expense</field>
-            <field name="code">500</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a51"/>
-            <field name="note">Expenses incurred for the work performed by salaried employees during the accounting period. These employees normally receive a fixed amount on a weekly, monthly, or annual basis.</field>
-        </record>
-        
-        <record model="account.account.template" id="a510">
-            <field name="name">Wages Expense</field>
-            <field name="code">510</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a51"/>
-            <field name="note">Expenses incurred for the work performed by non-salaried employees during the accounting period. These employees receive an hourly rate of pay.</field>
-        </record>
-        
-        <record model="account.account.template" id="a540">
-            <field name="name">Supplies Expense</field>
-            <field name="code">540</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a51"/>
-            <field name="note">Cost of supplies used up during the accounting period.</field>
-        </record>
-        
-        <record model="account.account.template" id="a560">
-            <field name="name">Rent Expense</field>
-            <field name="code">560</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a51"/>
-            <field name="note">Cost of occupying rented facilities during the accounting period.</field>
-        </record>
-        
-        <record model="account.account.template" id="a570">
-            <field name="name">Utilities Expense</field>
-            <field name="code">570</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a51"/>
-            <field name="note">Costs for electricity, heat, water, and sewer that were used during the accounting period.</field>
-        </record>
-        
-        <record model="account.account.template" id="a576">
-            <field name="name">Telephone Expense</field>
-            <field name="code">576</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a51"/>
-            <field name="note">Cost of telephone used during the current accounting period.</field>
-        </record>
-        
-        <record model="account.account.template" id="a610">
-            <field name="name">Advertising Expense</field>
-            <field name="code">610</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a51"/>
-            <field name="note">Costs incurred by the company during the accounting period for ads, promotions, and other selling and expenses (other than salaries).</field>
-        </record>
-        
-        <record model="account.account.template" id="a750">
-            <field name="name">Depreciation Expense</field>
-            <field name="code">750</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a51"/>
-            <field name="note">Cost of long-term assets allocated to expense during the current accounting period.</field>
-        </record>
-        
-        <!-- Other -->
-        
-        <record model="account.account.template" id="a90">
-            <field name="name">Non-Operating Expenses and Losses</field>
-            <field name="code">90</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a3"/>
-        </record>
-        
-        <record model="account.account.template" id="a960">
-            <field name="name">Loss on Sale of Assets</field>
-            <field name="code">960</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a90"/>
-            <field name="note">Occurs when the company sells one of its assets (other than inventory) for less than the asset's book value.</field>
-        </record>
-        
-        <!-- Chart template -->
-        
-        <record id="indian_chart_template_private" model="account.chart.template">
-            <field name="name">India - Chart of Accounts for Private Ltd/Partnership</field>
-            <field name="account_root_id" ref="a0"/>
-            <field name="tax_code_root_id" ref="vat_code_tax"/>
-            <field name="bank_account_view_id" ref="a101"/>
-            <field name="property_account_receivable" ref="a120"/>
-            <field name="property_account_payable" ref="a215"/>
-            <field name="property_account_expense_categ" ref="a540"/>
-            <field name="property_account_income_categ" ref="a311"/>
-            <field name="currency_id" ref="base.INR"/>
-        </record>
-        
-        
-    </data>
-</openerp>
diff --git a/addons/l10n_in/l10n_in_private_tax_template.xml b/addons/l10n_in/l10n_in_private_tax_template.xml
deleted file mode 100644
index 5cb835d950c..00000000000
--- a/addons/l10n_in/l10n_in_private_tax_template.xml
+++ /dev/null
@@ -1,404 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-    <!-- Taxes Sale Tax -->
-
-    <record id="sales_private" model="account.tax.template">
-        <field name="name">Sales Tax 15%</field>
-        <field name="description">Sales Tax 15%</field>
-        <field name="amount">0.15</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="account_collected_id" ref="a2161"/>
-        <field name="account_paid_id" ref="a2161"/>
-        <field name="base_code_id" ref="vat_code_base_tax_sale15"/>
-        <field name="tax_code_id" ref="vat_code_rec_sale15"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale15"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_rec_sale15"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
-    </record>
-
-    <record id="sales_private_main" model="account.tax.template">
-        <field name="name">Sales Tax 12%</field>
-        <field name="description">Sales Tax 12%</field>
-        <field name="amount">0.12</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="account_collected_id" ref="a2161"/>
-        <field name="account_paid_id" ref="a2161"/>
-        <field name="base_code_id" ref="vat_code_base_tax_sale12"/>
-        <field name="tax_code_id" ref="vat_code_rec_sale12"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale12"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_rec_sale12"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
-    </record>
-
-    <record id="sales_private_main_4" model="account.tax.template">
-        <field name="name">Sales Tax 4%</field>
-        <field name="description">Sales Tax 4%</field>
-        <field name="amount">0.04</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="account_collected_id" ref="a2161"/>
-        <field name="account_paid_id" ref="a2161"/>
-        <field name="base_code_id" ref="vat_code_base_tax_sale4"/>
-        <field name="tax_code_id" ref="vat_code_rec_sale4"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale4"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_rec_sale4"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
-    </record>
-
-    <!-- Purchase tax -->
-
-    <record id="purchase_tax_private" model="account.tax.template">
-        <field name="name">Purchase Tax 15%</field>
-        <field name="description">Purchase Tax 15%</field>
-        <field name="account_collected_id" ref="a189"/>
-        <field name="account_paid_id" ref="a189"/>
-        <field name="amount">0.15</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="base_code_id" ref="vat_code_base_tax_pur15"/>
-        <field name="tax_code_id" ref="vat_code_pay_pur4"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_pur15"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_pay_pur4"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
-    </record>
-
-    <!-- vat -->
-
-    <record id="vat_private_out_vat5" model="account.tax.template">
-        <field name="name">Output VAT 5% (VAT 4% + Add. VAT 1%)</field>
-        <field name="description">Output VAT 5%</field>
-        <field name="type_tax_use">sale</field>
-        <field name="type">percent</field>
-        <field name="amount">0.04</field>
-        <field name="account_collected_id" ref="a2162"/>
-        <field name="account_paid_id" ref="a2162"/>
-        <field name="base_code_id" ref="vat_code_tax_sal_vat5"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_vat5"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_sal_vat5"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_vat5"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
-    </record>
-
-    <record id="vat_private_in_vat5" model="account.tax.template">
-        <field name="name">Input VAT 5% (VAT 4% + Add. VAT 1%)</field>
-        <field name="description">Input VAT 5%</field>
-        <field name="amount">0.05</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="account_collected_id" ref="a189200"/>
-        <field name="account_paid_id" ref="a189200"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_vat5"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_vat5"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat5"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat5"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
-    </record>
-
-    <record id="vat_private_in_vat15" model="account.tax.template">
-        <field name="name">Input VAT 15% (VAT 12.5% + Add. VAT 2.5%)</field>
-        <field name="description">Input VAT 15%</field>
-        <field name="amount">0.15</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="account_collected_id" ref="a189200"/>
-        <field name="account_paid_id" ref="a189200"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_vat15"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_vat15"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat15"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat15"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
-    </record>
-
-    <record id="vat_private_out_vat15" model="account.tax.template">
-        <field name="name">Output VAT 15% (VAT 12.5% + Add. VAT 2.5%)</field>
-        <field name="description">Output VAT 15%</field>
-        <field name="amount">0.15</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="account_collected_id" ref="a2162"/>
-        <field name="account_paid_id" ref="a2162"/>
-        <field name="base_code_id" ref="vat_code_tax_sal_vat15"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_vat15"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_sal_vat15"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_vat15"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
-    </record>
-
-    <record id="vat_private_in_vat8" model="account.tax.template">
-        <field name="name">Input VAT 8%</field>
-        <field name="description">Input VAT 8%</field>
-        <field name="amount">0.08</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="account_collected_id" ref="a189200"/>
-        <field name="account_paid_id" ref="a189200"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_vat8"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_vat8"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat8"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat8"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
-    </record>
-
-    <record id="vat_private_out_vat8" model="account.tax.template">
-        <field name="name">Output VAT 8%</field>
-        <field name="description">Output VAT 8%</field>
-        <field name="amount">0.08</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="account_collected_id" ref="a2162"/>
-        <field name="account_paid_id" ref="a2162"/>
-        <field name="base_code_id" ref="vat_code_tax_sal_vat8"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_vat8"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_sal_vat8"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_vat8"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
-    </record>
-
-    <record id="vat_private_in_vat10" model="account.tax.template">
-        <field name="name">Input VAT 10%</field>
-        <field name="description">Input VAT 10%</field>
-        <field name="amount">0.10</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="account_collected_id" ref="a189200"/>
-        <field name="account_paid_id" ref="a189200"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_vat10"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_vat10"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat10"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat10"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
-    </record>
-
-    <record id="vat_private_out_vat10" model="account.tax.template">
-        <field name="name">Output VAT 10%</field>
-        <field name="description">Output VAT 10%</field>
-        <field name="amount">0.10</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="account_collected_id" ref="a2162"/>
-        <field name="account_paid_id" ref="a2162"/>         
-        <field name="base_code_id" ref="vat_code_tax_sal_vat10"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_vat10"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_sal_vat10"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_vat10"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
-    </record>
-
-    <record id="vat_private_in_vat12" model="account.tax.template">
-        <field name="name">Input VAT 12.5%</field>
-        <field name="description">Input VAT 12.5%</field>
-        <field name="amount">0.125</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="account_collected_id" ref="a189200"/>
-        <field name="account_paid_id" ref="a189200"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_vat12"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_vat12"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat12"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat12"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
-    </record>
-
-    <record id="vat_private_out_vat12" model="account.tax.template">
-        <field name="name">Output VAT 12.5%</field>
-        <field name="description">Output VAT 12.5%</field>
-        <field name="amount">0.125</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="account_collected_id" ref="a2162"/>
-        <field name="account_paid_id" ref="a2162"/>
-        <field name="base_code_id" ref="vat_code_tax_sal_vat12"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_vat12"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_sal_vat12"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_vat12"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
-    </record>
-
-    <!-- Exice Duty -->
-
-    <record id="exice_duty_private_sale12" model="account.tax.template">
-        <field name="name">Excise Duty 12% - Sales</field>
-        <field name="description">Excise Duty 12% - Sales</field>
-        <field name="type_tax_use">sale</field>
-        <field name="type">percent</field>
-        <field name="amount">0.1200</field>
-        <field name="account_collected_id" ref="a2164"/>
-        <field name="account_paid_id" ref="a2164"/>
-        <field name="base_code_id" ref="vat_code_tax_sales_excise"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_exice12"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_sales_excise"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_exice12"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
-    </record>
-
-    <record id="exice_duty_private_sale2" model="account.tax.template">
-        <field name="name">Excise Duty 2% - Sales</field>
-        <field name="description">Excise Duty 2% - Sales</field>
-        <field name="type_tax_use">sale</field>
-        <field name="type">percent</field>
-        <field name="amount">0.020</field>
-        <field name="account_collected_id" ref="a2164"/>
-        <field name="account_paid_id" ref="a2164"/>
-        <field name="base_code_id" ref="vat_code_tax_sales_excise"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_exice2"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_sales_excise"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_exice2"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
-    </record>
-
-    <record id="exice_duty_private_sale1" model="account.tax.template">
-        <field name="name">Output Excise Duty 1%</field>
-        <field name="description">Output Excise Duty 1%</field>
-        <field name="type_tax_use">sale</field>
-        <field name="type">percent</field>
-        <field name="amount">0.0100</field>
-        <field name="account_collected_id" ref="a2164"/>
-        <field name="account_paid_id" ref="a2164"/>
-        <field name="base_code_id" ref="vat_code_tax_sales_excise"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_exice1"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_sales_excise"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_exice1"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
-    </record>
-
-    <!-- Service Tax -->
-
-    <record id="service_private_ser12_sale" model="account.tax.template">
-        <field name="name">Output Service Tax 12%</field>
-        <field name="description">Output Service Tax 12%</field>
-        <field name="type_tax_use">sale</field>
-        <field name="type">percent</field>
-        <field name="amount">0.12</field>
-        <field name="sequence">1</field>
-        <field name="account_collected_id" ref="a2163"/>
-        <field name="account_paid_id" ref="a2163"/>
-        <field name="base_code_id" ref="vat_code_tax_sale_ser12"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_st12"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_sale_ser12"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_st12"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
-    </record>
-
-    <record id="service_private_ser2_sale" model="account.tax.template">
-        <field name="name">Output Sales Service Tax 2%</field>
-        <field name="description">Output Sales Service Tax 2%</field>
-        <field name="type_tax_use">sale</field>
-        <field name="type">percent</field>
-        <field name="amount">0.02</field>
-        <field name="sequence">3</field>
-        <field name="account_collected_id" ref="a2163"/>
-        <field name="account_paid_id" ref="a2163"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_st2"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_st2"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="parent_id" ref="service_private_ser12_sale"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
-    </record>
-
-    <record id="service_private_ser1_sale" model="account.tax.template">
-        <field name="name">Output Service Tax 1%</field>
-        <field name="description">Output Service Tax 1%</field>
-        <field name="type_tax_use">sale</field>
-        <field name="type">percent</field>
-        <field name="amount">0.01</field>
-        <field name="sequence">5</field>
-        <field name="account_collected_id" ref="a2163"/>
-        <field name="account_paid_id" ref="a2163"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_st1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_st1"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="parent_id" ref="service_private_ser12_sale"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
-    </record>
-
-    <record id="service_private_ser12_purchase" model="account.tax.template">
-        <field name="name">Input Service Tax 12%</field>
-        <field name="description">Input Service Tax 12%</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.1200</field>
-        <field name="sequence">1</field>
-        <field name="account_collected_id" ref="a189300"/>
-        <field name="account_paid_id" ref="a189300"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_ser12"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_ic_st"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_ser12"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_ic_st"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
-    </record>
-
-    <record id="service_private_ser2_purchase" model="account.tax.template">
-        <field name="name">Input Service Tax Edu. Cess. 2%</field>
-        <field name="description">Input Service Tax Edu. Cess. 2%</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.0200</field>
-        <field name="sequence">3</field>
-        <field name="account_collected_id" ref="a189300"/>
-        <field name="account_paid_id" ref="a189300"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_ic_edu_cess"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pur_PCST5"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="parent_id" ref="service_private_ser12_purchase"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
-    </record>
-
-    <record id="service_private_ser1_purchase" model="account.tax.template">
-        <field name="name">Input Service Tax Seco. &amp; HEC 1%</field>
-        <field name="description">Input Service Tax Seco. &amp; HEC 1%</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.0100</field>
-        <field name="sequence">5</field>
-        <field name="account_collected_id" ref="a189300"/>
-        <field name="account_paid_id" ref="a189300"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_ic_seco_hec"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_ic_seco_hec"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="parent_id" ref="service_private_ser12_purchase"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
-    </record>
-
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml
deleted file mode 100644
index 18633af054f..00000000000
--- a/addons/l10n_in/l10n_in_public_chart.xml
+++ /dev/null
@@ -1,995 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-    
-        <!-- public firm account chart -->
-        
-        
-        <record model="account.account.template" id="p0">
-            <field name="name">Public Firm Chart of Account</field>
-            <field name="code">0</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_view"/>
-            <field name="reconcile" eval="False"/>
-        </record>
-        
-       <record model="account.account.template" id="p1">
-            <field name="name">Balance Sheet</field>
-            <field name="code">1</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_view"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p0"/>
-        </record>  
-        <!-- Assets -->
-        
-        <record model="account.account.template" id="p10">
-            <field name="name">Assets</field>
-            <field name="code">10</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_asset"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p1"/>
-        </record>
-        
-        <record model="account.account.template" id="p10000">
-            <field name="name">Current Assets</field>
-            <field name="code">10000</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_asset"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p10"/>
-        </record>
-        
-        <record model="account.account.template" id="p10100">
-            <field name="name">Cash - Regular Checking</field>
-            <field name="code">10100</field>
-            <field name="type">liquidity</field>
-            <field name="user_type" ref="account.data_account_type_cash"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p10000"/>
-        </record>   
-        
-        <record model="account.account.template" id="p10200">
-            <field name="name">Cash - Payroll Checking</field>
-            <field name="code">10200</field>
-            <field name="type">liquidity</field>
-            <field name="user_type" ref="account.data_account_type_cash"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p10000"/>
-        </record>
-        
-        <record model="account.account.template" id="p10600">
-            <field name="name">Petty Cash Fund</field>
-            <field name="code">10600</field>
-            <field name="type">liquidity</field>
-            <field name="user_type" ref="account.data_account_type_cash"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p10000"/>
-        </record>
-        
-        <record model="account.account.template" id="p12100">
-            <field name="name">Accounts Receivable</field>
-            <field name="code">12100</field>
-            <field name="type">receivable</field>
-            <field name="user_type" ref="account.data_account_type_receivable"/>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="p10000"/>
-        </record>
-        
-        <record model="account.account.template" id="p12500">
-            <field name="name">Allowance for Doubtful Accounts</field>
-            <field name="code">12500</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_asset"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p10000"/>
-        </record>
-        
-        <record model="account.account.template" id="p13100">
-            <field name="name">Inventory</field>
-            <field name="code">13100</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_asset"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p10000"/>
-        </record>
-        
-        <record model="account.account.template" id="p14100">
-            <field name="name">Supplies</field>
-            <field name="code">14100</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_asset"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p10000"/>
-        </record>
-        
-        <record model="account.account.template" id="p15300">
-            <field name="name">Prepaid Insurance</field>
-            <field name="code">15300</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_asset"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p10000"/>
-        </record>
-        
-        <record model="account.account.template" id="p15400">
-            <field name="name">Tax Receivable</field>
-            <field name="code">15400</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_asset"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p10000"/>
-        </record>
-        
-        <!--Land and Property -->
-        
-        <record model="account.account.template" id="p17000">
-            <field name="name">Property, Plant, and Equipment</field>
-            <field name="code">17000</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_asset"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p10"/>
-        </record>
-        
-        <record model="account.account.template" id="p17200">
-            <field name="name">Land</field>
-            <field name="code">17200</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_asset"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p17000"/>
-        </record>
-        
-        <record model="account.account.template" id="p17100">
-            <field name="name">Buildings</field>
-            <field name="code">17100</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_asset"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p17000"/>
-        </record>
-        
-        <record model="account.account.template" id="p17300">
-            <field name="name">Equipment</field>
-            <field name="code">17300</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_asset"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p17000"/>
-        </record>
-        
-        <record model="account.account.template" id="p17800">
-            <field name="name">Vehicles</field>
-            <field name="code">17800</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_asset"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p17000"/>
-        </record>
-        
-        <record model="account.account.template" id="p18100">
-            <field name="name">Accumulated Depreciation - Buildings</field>
-            <field name="code">18100</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_asset"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p17000"/>
-        </record>
-        
-        <record model="account.account.template" id="p18300">
-            <field name="name">Accumulated Depreciation - Equipment</field>
-            <field name="code">18300</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_asset"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p17000"/>
-        </record>
-        
-        <record model="account.account.template" id="p18800">
-            <field name="name">Accumulated Depreciation - Vehicles</field>
-            <field name="code">18800</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_asset"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p17000"/>
-        </record>
-        
-        <!-- Liabilities -->
-        
-        <record model="account.account.template" id="p20">
-            <field name="name">Liabilities</field>
-            <field name="code">20</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p1"/>
-        </record>
-        
-        <record model="account.account.template" id="p20000">
-            <field name="name">Current Liabilities</field>
-            <field name="code">20000</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p20"/>
-        </record>
-        
-        <record model="account.account.template" id="p20100">
-            <field name="name">Notes Payable - Credit Line #1</field>
-            <field name="code">20100</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p20000"/>
-        </record>
-        
-        <record model="account.account.template" id="p20200">
-            <field name="name">Notes Payable - Credit Line #2</field>
-            <field name="code">20200</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="p20000"/>
-        </record>
-        
-       <record model="account.account.template" id="p21000">
-            <field name="name">Accounts Payable</field>
-            <field name="code">21000</field>
-            <field name="type">payable</field>
-            <field name="user_type" ref="account.data_account_type_payable"/>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="p20000"/>
-        </record> 
-        
-        <record model="account.account.template" id="p22100">
-            <field name="name">Wages Payable</field>
-            <field name="code">22100</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p20000"/>
-        </record>
-        
-        <record model="account.account.template" id="p23100">
-            <field name="name">Interest Payable</field>
-            <field name="code">23100</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p20000"/>
-        </record>
-        
-        <record model="account.account.template" id="p24500">
-            <field name="name">Unearned Revenues</field>
-            <field name="code">24500</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p20000"/>
-        </record>
-        
-        <record model="account.account.template" id="p25000">
-            <field name="name">Long-term Liabilities</field>
-            <field name="code">25000</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p20"/>
-        </record>
-        
-        <record model="account.account.template" id="p25100">
-            <field name="name">Mortgage Loan Payable</field>
-            <field name="code">25100</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p25000"/>
-        </record>
-        
-        <record model="account.account.template" id="p25600">
-            <field name="name">Bonds Payable</field>
-            <field name="code">25600</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p25000"/>
-        </record>
-        
-        <record model="account.account.template" id="p25650">
-            <field name="name">Discount on Bonds Payable</field>
-            <field name="code">25650</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p25000"/>
-        </record>
-        
-        <record model="account.account.template" id="p27000">
-            <field name="name">Stockholders' Equity</field>
-            <field name="code">27000</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p20"/>
-        </record>
-        
-        <record model="account.account.template" id="p27100">
-            <field name="name">Common Stock, No Par</field>
-            <field name="code">27100</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p27000"/>
-        </record>
-        
-        <record model="account.account.template" id="p27500">
-            <field name="name">Retained Earnings</field>
-            <field name="code">27500</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p27000"/>
-        </record>
-        
-        <record model="account.account.template" id="p29500">
-            <field name="name">Treasury Stock</field>
-            <field name="code">29500</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p27000"/>
-        </record>
-        
-        <record model="account.account.template" id="p24600">
-            <field name="name">Reserve and Surplus Account</field>
-            <field name="code">24600</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p20000"/>
-         </record>
-         
-    <!-- Tax Account -->
-    
-    <record model="account.account.template" id="p24700">
-        <field name="name">Tax payable</field>
-        <field name="code">24700</field>
-        <field name="type">view</field>
-        <field name="user_type" ref="account.data_account_type_liability"/>
-        <field name="reconcile" eval="False"/>
-        <field name="parent_id" ref="p20000"/>
-    </record>
-    
-    <record model="account.account.template" id="p24710">
-        <field name="name">Sales Tax Payable</field>
-        <field name="code">24710</field>
-        <field name="type">other</field>
-        <field name="user_type" ref="account.data_account_type_liability"/>
-        <field name="reconcile" eval="False"/>
-        <field name="parent_id" ref="p24700"/>
-    </record>
-    
-    <record model="account.account.template" id="p24720">
-        <field name="name">VAT Payable</field>
-        <field name="code">24720</field>
-        <field name="type">other</field>
-        <field name="user_type" ref="account.data_account_type_liability"/>
-        <field name="reconcile" eval="False"/>
-        <field name="parent_id" ref="p24700"/>
-    </record>
-    
-    <record model="account.account.template" id="p24730">
-        <field name="name">Exice Duty Payable</field>
-        <field name="code">24730</field>
-        <field name="type">other</field>
-        <field name="user_type" ref="account.data_account_type_liability"/>
-        <field name="reconcile" eval="False"/>
-        <field name="parent_id" ref="p24700"/>
-    </record>
-    
-    <record model="account.account.template" id="p24740">
-        <field name="name">Service Tax Payable</field>
-        <field name="code">24740</field>
-        <field name="type">other</field>
-        <field name="user_type" ref="account.data_account_type_liability"/>
-        <field name="reconcile" eval="False"/>
-        <field name="parent_id" ref="p24700"/>
-    </record>
-    
-    <!-- Profit And Loss Account -->
-    
-        <record model="account.account.template" id="p3">
-            <field name="name">Profit And Loss</field>
-            <field name="code">3</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_view"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p0"/>
-        </record>
-        
-        <!-- Income -->		
-        
-        <record model="account.account.template" id="p30">
-            <field name="name">Income</field>
-            <field name="code">30</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_income"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p3"/>
-        </record>
-        
-        <!-- Income Operating Revenues -->
-        
-        <record model="account.account.template" id="p30000">
-            <field name="name">Operating Revenues</field>
-            <field name="code">30000</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_income"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p30"/>
-        </record>
-        
-        <record model="account.account.template" id="p31010">
-            <field name="name">Sales - Division #1, Product Line 010</field>
-            <field name="code">31010</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_income"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p30000"/>
-        </record>
-        
-        <record model="account.account.template" id="p31022">
-            <field name="name">Sales - Division #1, Product Line 022</field>
-            <field name="code">31022</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_income"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p30000"/>
-        </record>
-        
-        <record model="account.account.template" id="p32015">
-            <field name="name">Sales - Division #2, Product Line 015</field>
-            <field name="code">32015</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_income"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p30000"/>
-        </record>
-        
-        <record model="account.account.template" id="p33110">
-            <field name="name">Sales - Division #3, Product Line 110</field>
-            <field name="code">33110</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_income"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p30000"/>
-        </record>
-        
-        <record model="account.account.template" id="p90000">
-            <field name="name">Non-Operating Revenue and Gains</field>
-            <field name="code">90000</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_income"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p30"/>
-        </record>
-        
-        <record model="account.account.template" id="p91800">
-            <field name="name">Gain on Sale of Assets</field>
-            <field name="code">91800</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_income"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p90000"/>
-        </record>
-        
-         <!-- Expenses -->		
-         
-        <record model="account.account.template" id="p40">
-            <field name="name">Expense</field>
-            <field name="code">40</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p3"/>
-        </record>
-        
-        
-        <!-- Income Cost of Goods Sold -->
-        
-        <record model="account.account.template" id="p40000">
-            <field name="name">Cost of Goods Sold</field>
-            <field name="code">40000</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p40"/>
-        </record>
-        
-        
-        <record model="account.account.template" id="p41010">
-            <field name="name">COGS - Division #1, Product Line 010</field>
-            <field name="code">41010</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p40000"/>
-        </record>
-        
-        <record model="account.account.template" id="p41022">
-            <field name="name">COGS - Division #1, Product Line 022</field>
-            <field name="code">41022</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p40000"/>
-        </record>
-        
-        <record model="account.account.template" id="p42015">
-            <field name="name">COGS - Division #2, Product Line 015</field>
-            <field name="code">42015</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p40000"/>
-        </record>
-        
-        <record model="account.account.template" id="p43110">
-            <field name="name">COGS - Division #3, Product Line 110</field>
-            <field name="code">43110</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p40000"/>
-        </record>
-        
-        <!-- Marketing Expenses -->
-        
-        <record model="account.account.template" id="p50000">
-            <field name="name">Marketing Expenses</field>
-            <field name="code">50000</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p40"/>
-        </record>
-        
-        <record model="account.account.template" id="p50100">
-            <field name="name">Marketing Dept. Salaries</field>
-            <field name="code">50100</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p50000"/>
-        </record>
-        
-        <record model="account.account.template" id="p50150">
-            <field name="name">Marketing Dept. Payroll Taxes</field>
-            <field name="code">50150</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p50000"/>
-        </record>
-        
-        <record model="account.account.template" id="p50200">
-            <field name="name">Marketing Dept. Supplies</field>
-            <field name="code">50200</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p50000"/>
-        </record>
-        
-        <record model="account.account.template" id="p50600">
-            <field name="name">Marketing Dept. Telephone</field>
-            <field name="code">50600</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p50000"/>
-        </record>
-        
-        <!-- Payroll Dept. Expenses -->	
-        
-        <record model="account.account.template" id="p59000">
-            <field name="name">Payroll Dept. Expenses</field>
-            <field name="code">59000</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p40"/>
-        </record>
-        
-        <record model="account.account.template" id="p59100">
-            <field name="name">Payroll Dept. Salaries</field>
-            <field name="code">59100</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p59000"/>
-        </record>
-        
-        <record model="account.account.template" id="p59150">
-            <field name="name">Payroll Dept. Payroll Taxes</field>
-            <field name="code">59150</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p59000"/>
-        </record>
-        
-        <record model="account.account.template" id="p59200">
-            <field name="name">Payroll Dept. Supplies</field>
-            <field name="code">59200</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p59000"/>
-        </record>
-        
-        <record model="account.account.template" id="p59600">
-            <field name="name">Payroll Dept. Telephone</field>
-            <field name="code">59600</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p59000"/>
-        </record>
-        
-        <!-- Other -->
-        
-        <record model="account.account.template" id="p96000">
-            <field name="name">Non-Operating Expenses and Losses</field>
-            <field name="code">96000</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p40"/>
-        </record>
-        
-        <record model="account.account.template" id="p96100">
-            <field name="name">Loss on Sale of Assets</field>
-            <field name="code">96100</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="p96000"/>
-        </record>
-
-        <record model="account.account.template" id="p154001">
-            <field name="name">Input CST 5%</field>
-            <field name="code">154001</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p154002">
-            <field name="name">Input Service Tax Seco. &amp; HEC 1%</field>
-            <field name="code">154002</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p154003">
-            <field name="name">Input Credit - URD</field>
-            <field name="code">154003</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p154004">
-            <field name="name">TDS on Audit Fees - 94J</field>
-            <field name="code">154004</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p154005">
-            <field name="name">TDS on Commission Or Brokerage - 94H</field>
-            <field name="code">154005</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p154006">
-            <field name="name">Input Credit - Import Duty</field>
-            <field name="code">154006</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p154007">
-            <field name="name">Additional Duty (Imports) 4%</field>
-            <field name="code">154007</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p154008">
-            <field name="name">Input Service Tax 12%</field>
-            <field name="code">154008</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p154009">
-            <field name="name">Input Service Tax Edu. Cess. 2%</field>
-            <field name="code">154009</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p154010">
-            <field name="name">TDS on Salary - 92B</field>
-            <field name="code">154010</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p154011">
-            <field name="name">Input Excise Duty 6%</field>
-            <field name="code">154011</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p154012">
-            <field name="name">Input Excise Duty 5%</field>
-            <field name="code">154012</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p154013">
-            <field name="name">Input Excise Duty 12%</field>
-            <field name="code">154013</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p154014">
-            <field name="name">Education Cess 2% - Purchase</field>
-            <field name="code">154014</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p154015">
-            <field name="name">Seco. &amp; Higher Edu. Cess 1% - Purchase</field>
-            <field name="code">154015</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p247001">
-            <field name="name">Excise Duty 12% - Sales</field>
-            <field name="code">247001</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p24700"/>
-        </record>
-
-        <record model="account.account.template" id="p247010">
-            <field name="name">Education Cess 2% - Sales</field>
-            <field name="code">247010</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p24700"/>
-        </record>
-
-        <record model="account.account.template" id="p247002">
-            <field name="name">Seco. &amp; Higher Edu. Cess 1% - Sales</field>
-            <field name="code">247002</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p24700"/>
-        </record>
-
-        <record model="account.account.template" id="p154016">
-            <field name="name">Input Sec. &amp; HEC - Capital Goods</field>
-            <field name="code">154016</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p154017">
-            <field name="name">TDS on Contractor - 94C</field>
-            <field name="code">154017</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p154018">
-            <field name="name">TDS on Director's Interest</field>
-            <field name="code">154018</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p154019">
-            <field name="name">TDS on Director's Remuneration - 92B</field>
-            <field name="code">154019</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p154020">
-            <field name="name">TDS on Interest</field>
-            <field name="code">154020</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p154021">
-            <field name="name">TDS on Professional Fees - 94J</field>
-            <field name="code">154021</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p154022">
-            <field name="name">TDS on Rent - 94I</field>
-            <field name="code">154022</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p154023">
-            <field name="name">Input Edu. Cess - Capital Goods</field>
-            <field name="code">154023</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p154024">
-            <field name="name">Input Excise Duty 12% - Capital Goods</field>
-            <field name="code">154024</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p154025">
-            <field name="name">Input VAT 4%</field>
-            <field name="code">154025</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p154026">
-            <field name="name">Input Additional VAT 1%</field>
-            <field name="code">154026</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p154027">
-            <field name="name">Input VAT 15%</field>
-            <field name="code">154027</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p247003">
-            <field name="name">Output VAT 4%</field>
-            <field name="code">247003</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p24700"/>
-        </record>
-
-        <record model="account.account.template" id="p247004">
-            <field name="name">Output Adi. VAT 1%</field>
-            <field name="code">247004</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p24700"/>
-        </record>
-
-        <record model="account.account.template" id="p247005">
-            <field name="name">CST 2% on Sales - Against Form - C</field>
-            <field name="code">247005</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p24700"/>
-        </record>
-
-        <record model="account.account.template" id="p247006">
-            <field name="name">CST 5% on Sales</field>
-            <field name="code">247006</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p24700"/>
-        </record>
-
-        <record model="account.account.template" id="p154028">
-            <field name="name">Input VAT 12.5%</field>
-            <field name="code">154028</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p154029">
-            <field name="name">Input Additional VAT 2.5%</field>
-            <field name="code">154029</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p154030">
-            <field name="name">Input CST 2%</field>
-            <field name="code">154030</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="parent_id" ref="p15400"/>
-        </record>
-
-        <record model="account.account.template" id="p247007">
-            <field name="name">CST 2% on Sales - CT3 Against Form C</field>
-            <field name="code">247007</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p24700"/>
-        </record>
-
-        <record model="account.account.template" id="p247008">
-            <field name="name">Output VAT 4% on Sales - CT3</field>
-            <field name="code">247008</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p24700"/>
-        </record>
-
-        <record model="account.account.template" id="p247009">
-            <field name="name">Output Adi. VAT 1% Sales CT3</field>
-            <field name="code">247009</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref="p24700"/>
-        </record>
-
-        <record id="indian_chart_template_public" model="account.chart.template">
-            <field name="name">India - Chart of Accounts for Public Ltd</field>
-            <field name="account_root_id" ref="p0"/>
-            <field name="tax_code_root_id" ref="vat_code_tax"/> 
-            <field name="bank_account_view_id" ref="p10100"/> 
-            <field name="property_account_receivable" ref="p12100"/>
-            <field name="property_account_payable" ref="p21000"/>
-            <field name="property_account_expense_categ" ref="p41010"/>
-            <field name="property_account_income_categ" ref="p31010"/>
-            <field name="currency_id" ref="base.INR"/>
-        </record>
-        
-    </data>
-</openerp>
diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml
deleted file mode 100644
index 887e051121a..00000000000
--- a/addons/l10n_in/l10n_in_public_tax_template.xml
+++ /dev/null
@@ -1,865 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-
-    <record id="account_tax_cst_pur5" model="account.tax.template">
-        <field name="name">Input CST 5%</field>
-        <field name="description">Input CST 5%</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.01</field>
-        <field name="account_collected_id" ref="p154001"/>
-        <field name="account_paid_id" ref="p154001"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_PCST5"/>
-        <field name="tax_code_id" ref="vat_code_tax_pur_CSTP5"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_PCST5"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pur_CSTP5"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_in_cradit_urd" model="account.tax.template">
-        <field name="name">Input Credit - URD</field>
-        <field name="description">Input Credit - URD</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.0400</field>
-        <field name="account_collected_id" ref="p154003"/>
-        <field name="account_paid_id" ref="p154003"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_urd"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_urd"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_urd"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_urd"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_tds_audit_fee" model="account.tax.template">
-        <field name="name">TDS on Audit Fees - 94J</field>
-        <field name="description">TDS on Audit Fees - 94J</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.1000</field>
-        <field name="account_collected_id" ref="p154004"/>
-        <field name="account_paid_id" ref="p154004"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_tds_audit_fee"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_base_tds"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_tds_audit_fee"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_tds_brok" model="account.tax.template">
-        <field name="name">TDS on Commission Or Brokerage- 94H</field>
-        <field name="description">TDS on Commission Or Brokerage- 94H</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.1000</field>
-        <field name="account_collected_id" ref="p154005"/>
-        <field name="account_paid_id" ref="p154005"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_tds_brokerage"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_base_tds"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_tds_brokerage"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_ic_import_duty" model="account.tax.template">
-        <field name="name">Input Credit - Import Duty</field>
-        <field name="description">Input Credit - Import Duty</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.0750</field>
-        <field name="sequence">1</field>
-        <field name="account_collected_id" ref="p154006"/>
-        <field name="account_paid_id" ref="p154006"/>
-        <field name="base_code_id" ref="vat_code_tax_tds_pur_import"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_import_duty"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_tds_pur_import"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_import_duty"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_add_duty4" model="account.tax.template">
-        <field name="name">Additional Duty (Imports) 4%</field>
-        <field name="description">Additional Duty (Imports) 4%</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.0400</field>
-        <field name="sequence">1</field>
-        <field name="account_collected_id" ref="p154007"/>
-        <field name="account_paid_id" ref="p154007"/>
-        <field name="base_code_id" ref="vat_code_tax_tds_pur_import"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_add_imp_duty"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_tds_pur_import"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_add_imp_duty"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_ic_st" model="account.tax.template">
-        <field name="name">Service Tax 12% - Purchase</field>
-        <field name="description">Service Tax 12% - Purchase</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.1200</field>
-        <field name="sequence">1</field>
-        <field name="account_collected_id" ref="p154008"/>
-        <field name="account_paid_id" ref="p154008"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_ser12"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_ic_st"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_ser12"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_ic_st"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_in_edu_cess_st" model="account.tax.template">
-        <field name="name">Service Tax Edu. Cess. 2% - Purchase</field>
-        <field name="description">Service Tax Edu. Cess. 2% - Purchase</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.0200</field>
-        <field name="sequence">3</field>
-        <field name="account_collected_id" ref="p154009"/>
-        <field name="account_paid_id" ref="p154009"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_ic_edu_cess"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_ic_edu_cess"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="parent_id" ref="account_tax_ic_st"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_in_credit_ser_tax_seco_hec" model="account.tax.template">
-        <field name="name">Service Tax Seco. &amp; HEC 1% - Purchase</field>
-        <field name="description">Service Tax Seco. &amp; HEC 1% - Purchase</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.0100</field>
-        <field name="sequence">5</field>
-        <field name="account_collected_id" ref="p154002"/>
-        <field name="account_paid_id" ref="p154002"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_ic_seco_hec"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_ic_seco_hec"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="parent_id" ref="account_tax_ic_st"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_tds_sal" model="account.tax.template">
-        <field name="name">TDS on Salary - 92B</field>
-        <field name="description">TDS on Salary - 92B</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.3000</field>
-        <field name="account_collected_id" ref="p154010"/>
-        <field name="account_paid_id" ref="p154010"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_tds_sal"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_base_tds"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_tds_sal"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_exic5_pur" model="account.tax.template">
-        <field name="name">Input Excise Duty 5%</field>
-        <field name="description">Input Excise Duty 5%</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.0500</field>
-        <field name="account_collected_id" ref="p154012"/>
-        <field name="account_paid_id" ref="p154012"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_exice5"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_exice5"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_exice12_pur" model="account.tax.template">
-        <field name="name">Input Excise Duty 12%</field>
-        <field name="description">Input Excise Duty 12%</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.1200</field>
-        <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="p154013"/>
-        <field name="account_paid_id" ref="p154013"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_exice12"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_exice12"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_edu_cess2_pur" model="account.tax.template">
-        <field name="name">Education Cess 2% - Purchase</field>
-        <field name="description">Education Cess 2% - Purchase</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.0200</field>
-        <field name="sequence">21</field>
-        <field name="account_collected_id" ref="p154014"/>
-        <field name="account_paid_id" ref="p154014"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_cess2"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_cess2"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="parent_id" ref="account_tax_exice12_pur"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_seco_high_cess_pur" model="account.tax.template">
-        <field name="name">Seco. &amp; Higher Edu. Cess 1% - Purchase</field>
-        <field name="description">Seco. &amp; Higher Edu. Cess 1% - Purchase</field>
-        <field name="type_tax_use">all</field>
-        <field name="type">percent</field>
-        <field name="amount">0.0100</field>
-        <field name="sequence">22</field>
-        <field name="account_collected_id" ref="p154015"/>
-        <field name="account_paid_id" ref="p154015"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_sec_hig_edu"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_sec_hig_edu"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="parent_id" ref="account_tax_exice12_pur"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_exice12_sale" model="account.tax.template">
-        <field name="name">Excise Duty 12% - Sales</field>
-        <field name="description">Excise Duty 12% - Sales</field>
-        <field name="type_tax_use">sale</field>
-        <field name="type">percent</field>
-        <field name="amount">0.1200</field>
-        <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="p247001"/>
-        <field name="account_paid_id" ref="p247001"/>
-        <field name="base_code_id" ref="vat_code_tax_sales_excise"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_exice12"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_sales_excise"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_exice12"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_edu_cess2" model="account.tax.template">
-        <field name="name">Education Cess 2% - Sales</field>
-        <field name="description">Education Cess 2% - Sales</field>
-        <field name="type_tax_use">sale</field>
-        <field name="type">percent</field>
-        <field name="amount">0.0200</field>
-        <field name="sequence">3</field>
-        <field name="account_collected_id" ref="p247010"/>
-        <field name="account_paid_id" ref="p247010"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_cess2"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_cess2"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="parent_id" ref="account_tax_exice12_sale"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_seco_high_cess1" model="account.tax.template">
-        <field name="name">Seco. &amp; Higher Edu. Cess 1% - Sales</field>
-        <field name="description">Seco. &amp; Higher Edu. Cess 1% - Sales</field>
-        <field name="type_tax_use">sale</field>
-        <field name="type">percent</field>
-        <field name="amount">0.0100</field>
-        <field name="sequence">5</field>
-        <field name="account_collected_id" ref="p247002"/>
-        <field name="account_paid_id" ref="p247002"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_sec_hig_cess"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_sec_hig_cess"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="parent_id" ref="account_tax_exice12_sale"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_in_sec_high_cap_good" model="account.tax.template">
-        <field name="name">Input Sec. &amp; HEC - Capital Goods</field>
-        <field name="description">Input Sec. &amp; HEC - Capital Goods</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.01</field>
-        <field name="account_collected_id" ref="p154016"/>
-        <field name="account_paid_id" ref="p154016"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_seco_hec"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_seco_hec"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_tds_contr" model="account.tax.template">
-        <field name="name">TDS on Contractor - 94C</field>
-        <field name="description">TDS on Contractor - 94C</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.0200</field>
-        <field name="account_collected_id" ref="p154017"/>
-        <field name="account_paid_id" ref="p154017"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_tds_contractor"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_base_tds"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_tds_contractor"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_tds_dir_intrest" model="account.tax.template">
-        <field name="name">TDS on Director's Interest</field>
-        <field name="description">TDS on Director's Interest</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.1</field>
-        <field name="account_collected_id" ref="p154018"/>
-        <field name="account_paid_id" ref="p154018"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_tds_dir_intrest"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_base_tds"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_tds_dir_intrest"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_tds_dir_renum" model="account.tax.template">
-        <field name="name">TDS on Director's Remuneration - 92B</field>
-        <field name="description">TDS on Director's Remuneration - 92B</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.3</field>
-        <field name="account_collected_id" ref="p154019"/>
-        <field name="account_paid_id" ref="p154019"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_tds_dir_ren"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_base_tds"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_tds_dir_ren"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_tds_intrest" model="account.tax.template">
-        <field name="name">TDS on Interest</field>
-        <field name="description">TDS on Interest</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.1</field>
-        <field name="account_collected_id" ref="p154020"/>
-        <field name="account_paid_id" ref="p154020"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_tds_intrest"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_base_tds"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_tds_intrest"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_tds_prof_fee" model="account.tax.template">
-        <field name="name">TDS on Professional Fees - 94J</field>
-        <field name="description">TDS on Professional Fees - 94J</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.1</field>
-        <field name="sequence">1</field>
-        <field name="account_collected_id" ref="p154021"/>
-        <field name="account_paid_id" ref="p154021"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_tds_prof_fee"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_base_tds"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_tds_prof_fee"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_tds_rent" model="account.tax.template">
-        <field name="name">TDS on Rent - 94I</field>
-        <field name="description">TDS on Rent-94I</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.1</field>
-        <field name="account_collected_id" ref="p154022"/>
-        <field name="account_paid_id" ref="p154022"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_tds_rent"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_base_tds"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_tds_rent"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_ic_cap_edu_cess" model="account.tax.template">
-        <field name="name">Input Edu. Cess - Capital Goods</field>
-        <field name="description">Input Edu. Cess - Capital Goods</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.02</field>
-        <field name="account_collected_id" ref="p154023"/>
-        <field name="account_paid_id" ref="p154023"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_edu_cess"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_edu_cess"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_ie12_cap_goods" model="account.tax.template">
-        <field name="name">Input Excise Duty 12% - Capital Goods</field>
-        <field name="description">Input Excise Duty 12% - Capital Goods</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.12</field>
-        <field name="account_collected_id" ref="p154024"/>
-        <field name="account_paid_id" ref="p154024"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_cap_goods"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_cap_goods"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_in_vat4" model="account.tax.template">
-        <field name="name">Input VAT 4%</field>
-        <field name="description">Input VAT 4%</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.04</field>
-        <field name="sequence">4</field>
-        <field name="account_collected_id" ref="p154025"/>
-        <field name="account_paid_id" ref="p154025"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_vat4"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_vat4"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat4"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat4"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_in_add_vat1" model="account.tax.template">
-        <field name="name">Input Additional VAT 1%</field>
-        <field name="description">Input Additional VAT 1%</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.01</field>
-        <field name="sequence">5</field>
-        <field name="account_collected_id" ref="p154026"/>
-        <field name="account_paid_id" ref="p154026"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_vat4"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_add_vat1"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat4"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_add_vat1"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_in_vat15" model="account.tax.template">
-        <field name="name">Input VAT 15%</field>
-        <field name="description">Input VAT 15%</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.15</field>
-        <field name="sequence">7</field>
-        <field name="account_collected_id" ref="p154027"/>
-        <field name="account_paid_id" ref="p154027"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_vat15"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_vat15"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat15"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat15"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_out_vat4" model="account.tax.template">
-        <field name="name">Output VAT 4%</field>
-        <field name="description">Output VAT 4%</field>
-        <field name="type_tax_use">sale</field>
-        <field name="type">percent</field>
-        <field name="amount">0.04</field>
-        <field name="sequence">11</field>
-        <field name="account_collected_id" ref="p247003"/>
-        <field name="account_paid_id" ref="p247003"/>
-        <field name="base_code_id" ref="vat_code_tax_sal_vat4"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_vat4"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_sal_vat4"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_vat4"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_out_adi_vat1" model="account.tax.template">
-        <field name="name">Output Adi. VAT 1%</field>
-        <field name="description">Output Adi. VAT 1%</field>
-        <field name="type_tax_use">sale</field>
-        <field name="type">percent</field>
-        <field name="amount">0.01</field>
-        <field name="sequence">12</field>
-        <field name="account_collected_id" ref="p247004"/>
-        <field name="account_paid_id" ref="p247004"/>
-        <field name="base_code_id" ref="vat_code_tax_sal_vat4"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_add_vat1"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_sal_vat4"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_add_vat1"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_cst2_sale" model="account.tax.template">
-        <field name="name">CST 2% on Sales - Against Form - C</field>
-        <field name="description">CST 2% on Sales - Against Form - C</field>
-        <field name="type_tax_use">sale</field>
-        <field name="type">percent</field>
-        <field name="amount">0.02</field>
-        <field name="sequence">13</field>
-        <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="p247005"/>
-        <field name="account_paid_id" ref="p247005"/>
-        <field name="base_code_id" ref="vat_code_tax_sale_cst2"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_cst2"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_sale_cst2"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_cst2"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_cst5_sale" model="account.tax.template">
-        <field name="name">CST 5% on Sales</field>
-        <field name="description">CST 5% on Sales</field>
-        <field name="type_tax_use">sale</field>
-        <field name="type">percent</field>
-        <field name="amount">0.05</field>
-        <field name="sequence">14</field>
-        <field name="account_collected_id" ref="p247006"/>
-        <field name="account_paid_id" ref="p247006"/>
-        <field name="base_code_id" ref="vat_code_tax_sale_cst15"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_cst5"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_sale_cst15"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_cst5"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_in_vat12" model="account.tax.template">
-        <field name="name">Input VAT 12.5%</field>
-        <field name="description">Input VAT 12.5%</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.1250</field>
-        <field name="sequence">60</field>
-        <field name="account_collected_id" ref="p154028"/>
-        <field name="account_paid_id" ref="p154028"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_vat12"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_vat12"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat12"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat12"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_in_add_vat25" model="account.tax.template">
-        <field name="name">Input Additional VAT 2.5%</field>
-        <field name="description">Input Additional VAT 2.5%</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.0250</field>
-        <field name="sequence">80</field>
-        <field name="account_collected_id" ref="p154029"/>
-        <field name="account_paid_id" ref="p154029"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_vat25"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_add_vat2"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat25"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_add_vat2"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_cst2_pur" model="account.tax.template">
-        <field name="name">Input CST 2%</field>
-        <field name="description">Input CST 2%</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.02</field>
-        <field name="sequence">9333</field>
-        <field name="account_collected_id" ref="p154030"/>
-        <field name="account_paid_id" ref="p154030"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_cst2"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_cst2"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_cst2"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_cst2"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_no_form_h" model="account.tax.template">
-        <field name="name">No Tax Form H</field>
-        <field name="description">No Tax Form H</field>
-        <field name="type_tax_use">sale</field>
-        <field name="type">percent</field>
-        <field name="amount">0.02</field>
-        <field name="base_code_id" ref="vat_code_tax_sal_exp_ct1"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_fomh"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_sal_exp_ct1"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_fomh"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_cst2_sale_cst3_against_c" model="account.tax.template">
-        <field name="name">CST 2% on Sales - CT3  Against Form - C</field>
-        <field name="description">CST 2% on Sales - CT3  Against Form - C</field>
-        <field name="type_tax_use">sale</field>
-        <field name="type">percent</field>
-        <field name="amount">0.02</field>
-        <field name="account_collected_id" ref="p247007"/>
-        <field name="account_paid_id" ref="p247007"/>
-        <field name="base_code_id" ref="vat_code_tax_sal_ct3_cst"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_cst2_on_sal_cst3"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_sal_ct3_cst"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_cst2_on_sal_cst3"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_out_vat4_sal_ct3" model="account.tax.template">
-        <field name="name">Output VAT 4% on Sales - CT3</field>
-        <field name="description">Output VAT 4% on Sales - CT3</field>
-        <field name="type_tax_use">sale</field>
-        <field name="type">percent</field>
-        <field name="amount">0.04</field>
-        <field name="account_collected_id" ref="p247008"/>
-        <field name="account_paid_id" ref="p247008"/>
-        <field name="base_code_id" ref="vat_code_tax_sal_cst3"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_out4_sal_cst3"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_sal_cst3"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_out4_sal_cst3"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_out_add1_sal_ct3" model="account.tax.template">
-        <field name="name">Output Adi. VAT 1% on Sales - CT3</field>
-        <field name="description">Output Adi. VAT 1% on Sales - CT3</field>
-        <field name="type_tax_use">sale</field>
-        <field name="type">percent</field>
-        <field name="amount">0.01</field>
-        <field name="account_collected_id" ref="p247009"/>
-        <field name="account_paid_id" ref="p247009"/>
-        <field name="base_code_id" ref="vat_code_tax_sal_cst3"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_out_add1_sale_cst3"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_sal_cst3"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_out_add1_sale_cst3"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_no_tax_sez_ogs" model="account.tax.template">
-        <field name="name">No Tax SEZ OGS</field>
-        <field name="description">No Tax SEZ OGS</field>
-        <field name="type_tax_use">sale</field>
-        <field name="type">fixed</field>
-        <field name="base_code_id" ref="vat_code_tax_sal_sez_out_guj"/>
-        <field name="tax_code_id" ref="vat_code_tax_no_saz_ogs"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_sal_sez_out_guj"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_no_saz_ogs"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_no_tax_sez_guj" model="account.tax.template">
-        <field name="name">No Tax SEZ Gujarat</field>
-        <field name="description">No Tax SEZ Gujarat</field>
-        <field name="type_tax_use">sale</field>
-        <field name="type">percent</field>
-        <field name="base_code_id" ref="vat_code_tax_sal_sez_in_guj"/>
-        <field name="tax_code_id" ref="vat_code_tax_no_sez_guj"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_sal_sez_in_guj"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_no_sez_guj"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_no_tax_h_with_bed" model="account.tax.template">
-        <field name="name">No Tax Form H with BED</field>
-        <field name="description">No Tax Form H with BED</field>
-        <field name="type_tax_use">sale</field>
-        <field name="type">percent</field>
-        <field name="base_code_id" ref="vat_code_tax_sal_formh_tax"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_formh_bed"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_sal_formh_tax"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_formh_bed"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_no_tax_export_out_country" model="account.tax.template">
-        <field name="name">No Tax Exports - Out of Country</field>
-        <field name="description">No Tax Exports - Out of Country</field>
-        <field name="type_tax_use">sale</field>
-        <field name="type">percent</field>
-        <field name="base_code_id" ref="vat_code_tax_sal_out_country"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_no_out_country"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_sal_out_country"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_no_out_country"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_no_tax_proj" model="account.tax.template">
-        <field name="name">No Tax Projects</field>
-        <field name="description">No Tax Projects</field>
-        <field name="type_tax_use">sale</field>
-        <field name="type">percent</field>
-        <field name="base_code_id" ref="vat_code_tax_sal_proj"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_no_proj"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_sal_proj"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_no_proj"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_exic6_pur" model="account.tax.template">
-        <field name="name">Input Excise Duty 6%</field>
-        <field name="description">Input Excise Duty 6%</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.0600</field>
-        <field name="sequence">1</field>
-        <field name="account_collected_id" ref="p154011"/>
-        <field name="account_paid_id" ref="p154011"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_exice6"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_exice6"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_exice6_edu_cess2_pur" model="account.tax.template">
-        <field name="name">Education Cess 2% Purchase</field>
-        <field name="description">Education Cess 2% Purchase</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.0200</field>
-        <field name="sequence">21</field>
-        <field name="account_collected_id" ref="p154014"/>
-        <field name="account_paid_id" ref="p154014"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_cess2"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_cess2"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="parent_id" ref="account_tax_exic6_pur"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_exice6_seco_high_cess_pur" model="account.tax.template">
-        <field name="name">Seco. &amp; Higher Edu. Cess 1% Purchase</field>
-        <field name="description">Seco. &amp; Higher Edu. Cess 1% Purchase</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.0100</field>
-        <field name="sequence">22</field>
-        <field name="account_collected_id" ref="p154015"/>
-        <field name="account_paid_id" ref="p154015"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_sec_hig_edu"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_sec_hig_edu"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="parent_id" ref="account_tax_exic6_pur"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_ser12_sale" model="account.tax.template">
-        <field name="name">Service Tax 12% - Sales</field>
-        <field name="description">Service Tax 12% - Sales</field>
-        <field name="type_tax_use">sale</field>
-        <field name="type">percent</field>
-        <field name="amount">0.12</field>
-        <field name="sequence">1</field>
-        <field name="account_collected_id" ref="p24740"/>
-        <field name="account_paid_id" ref="p24740"/>
-        <field name="base_code_id" ref="vat_code_tax_sale_ser12"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_st12"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_sale_ser12"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_st12"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_ser2_sale" model="account.tax.template">
-        <field name="name">Service Tax 2% - Sales</field>
-        <field name="description">Service Tax 2% - Sales</field>
-        <field name="type_tax_use">sale</field>
-        <field name="type">percent</field>
-        <field name="amount">0.02</field>
-        <field name="sequence">3</field>
-        <field name="account_collected_id" ref="p24740"/>
-        <field name="account_paid_id" ref="p24740"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_st2"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_st2"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="parent_id" ref="account_tax_ser12_sale"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_ser1_sale" model="account.tax.template">
-        <field name="name">Service Tax 1% - Sales</field>
-        <field name="description">Service Tax 1% - Sales</field>
-        <field name="type_tax_use">sale</field>
-        <field name="type">percent</field>
-        <field name="amount">0.01</field>
-        <field name="sequence">5</field>
-        <field name="account_collected_id" ref="p24740"/>
-        <field name="account_paid_id" ref="p24740"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_st1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_st1"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="parent_id" ref="account_tax_ser12_sale"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/l10n_in/l10n_in_schedule6_chart.xml b/addons/l10n_in/l10n_in_schedule6_chart.xml
new file mode 100644
index 00000000000..3efc59f1161
--- /dev/null
+++ b/addons/l10n_in/l10n_in_schedule6_chart.xml
@@ -0,0 +1,2216 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- India - Standard Accounting Chart -->
+
+        <record model="account.account.template" id="c0">
+            <field name="name">Indian Chart of Accounts - Schedule VI</field>
+            <field name="code">0</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.data_account_type_view"/>
+            <field name="reconcile" eval="False"/>
+        </record>
+
+       <record model="account.account.template" id="c1">
+            <field name="name">Balance Sheet</field>
+            <field name="code">1</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.data_account_type_view"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c0"/>
+        </record>
+
+        <!-- Liabilities -->
+        <record model="account.account.template" id="c11">
+            <field name="name">Equity And Liabilities</field>
+            <field name="code">11</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1"/>
+        </record>
+        <!-- Shareholder's Funds -->
+        <record model="account.account.template" id="c111">
+            <field name="name">Shareholder's Funds</field>
+            <field name="code">111</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c11"/>
+        </record>
+        <record model="account.account.template" id="c1110">
+            <field name="name">Share Capital</field>
+            <field name="code">1110</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c111"/>
+        </record>
+        <record model="account.account.template" id="c11101">
+            <field name="name">Authorised Share Capital</field>
+            <field name="code">11101</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1110"/>
+        </record>
+        <record model="account.account.template" id="c11102">
+            <field name="name">Issued, Subscribed And Paid Up Capital</field>
+            <field name="code">11102</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1110"/>
+        </record>
+        <record model="account.account.template" id="c1111">
+            <field name="name">Reserve And Surplus</field>
+            <field name="code">1111</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c111"/>
+        </record>
+        <record model="account.account.template" id="c11110">
+            <field name="name">Capital Reserve</field>
+            <field name="code">11110</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1111"/>
+        </record>
+        <record model="account.account.template" id="c11111">
+            <field name="name">Capital Redemption Reserve</field>
+            <field name="code">11111</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1111"/>
+        </record>
+        <record model="account.account.template" id="c11112">
+            <field name="name">Securities Premium Reserve</field>
+            <field name="code">11112</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1111"/>
+        </record>
+        <record model="account.account.template" id="c11113">
+            <field name="name">Debenture Redeemption Reserve</field>
+            <field name="code">11113</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1111"/>
+        </record>
+        <record model="account.account.template" id="c11114">
+            <field name="name">Revaluation Reserve</field>
+            <field name="code">11114</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1111"/>
+        </record>
+        <record model="account.account.template" id="c11115">
+            <field name="name">Shares Option Outstanding Account</field>
+            <field name="code">11115</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1111"/>
+        </record>
+        <record model="account.account.template" id="c11116">
+            <field name="name">Other Reserve</field>
+            <field name="code">11116</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1111"/>
+        </record>
+        <record model="account.account.template" id="c11117">
+            <field name="name">Surplus (Profit and Loss Account)</field>
+            <field name="code">11117</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1111"/>
+        </record>
+        <record model="account.account.template" id="c1112">
+            <field name="name">Money Received Against Share Warrants</field>
+            <field name="code">1112</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c111"/>
+        </record>
+
+        <!-- Share application money pending allotment -->
+        <record model="account.account.template" id="c112">
+            <field name="name">Share Application Money Pending Allotment</field>
+            <field name="code">112</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c11"/>
+        </record>
+        <record model="account.account.template" id="c1121">
+            <field name="name">Share Application Money Pending Allotment</field>
+            <field name="code">1121</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c112"/>
+        </record>
+        <!-- Non-Current Liabilities -->
+        <record model="account.account.template" id="c113">
+            <field name="name">Non-Current Liabilities</field>
+            <field name="code">113</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c11"/>
+        </record>
+        <record model="account.account.template" id="c1130">
+            <field name="name">Long Term Borrowings</field>
+            <field name="code">1130</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c113"/>
+        </record>
+        <record model="account.account.template" id="c11301">
+            <field name="name">Secured Loans From Bank</field>
+            <field name="code">11301</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1130"/>
+        </record>
+        <record model="account.account.template" id="c113011">
+            <field name="name">Bank Loan (Long Term)</field>
+            <field name="code">113011</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c11301"/>
+        </record>
+        <record model="account.account.template" id="c11302">
+            <field name="name">Unsecured Loans</field>
+            <field name="code">11302</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1130"/>
+        </record>
+        <record model="account.account.template" id="c113021">
+            <field name="name">From Others</field>
+            <field name="code">113021</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="c11302"/>
+            <field name="reconcile" eval="False"/>
+        </record>
+        <record model="account.account.template" id="c1131">
+            <field name="name">Deferred Tax Liabilities (Net)</field>
+            <field name="code">1131</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c113"/>
+        </record>
+        <record model="account.account.template" id="c1132">
+            <field name="name">Other Long Term Liabilities</field>
+            <field name="code">1132</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c113"/>
+        </record>
+        <record model="account.account.template" id="c1133">
+            <field name="name">Long Term Provisions</field>
+            <field name="code">1133</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c113"/>
+        </record>
+        <!-- Current Liabilities -->
+        <record model="account.account.template" id="c114">
+            <field name="name">Current Liabilities</field>
+            <field name="code">114</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c11"/>
+        </record>
+        <!-- Short Term Borrowings -->
+        <record model="account.account.template" id="c1140">
+            <field name="name">Short Term Borrowings</field>
+            <field name="code">1140</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c114"/>
+        </record>
+        <record model="account.account.template" id="c11401">
+            <field name="name">Secured Loans From Bank</field>
+            <field name="code">11401</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1140"/>
+        </record>
+        <record model="account.account.template" id="c114011">
+            <field name="name">Bank Loan (Short Term)</field>
+            <field name="code">114011</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c11401"/>
+        </record>
+        <record model="account.account.template" id="c11402">
+            <field name="name">Loans And Advances From Related Parties</field>
+            <field name="code">11402</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1140"/>
+        </record>
+        <record model="account.account.template" id="c11403">
+            <field name="name">Depsoits</field>
+            <field name="code">11403</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1140"/>
+        </record>
+        <record model="account.account.template" id="c11404">
+            <field name="name">Others</field>
+            <field name="code">11404</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1140"/>
+        </record>
+        <!-- Trade Payables -->
+        <record model="account.account.template" id="c1141">
+            <field name="name">Trade Payables</field>
+            <field name="code">1141</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c114"/>
+        </record>
+        <record model="account.account.template" id="c11411">
+            <field name="name">Sundry Creditors For Material/Supplies</field>
+            <field name="code">11411</field>
+            <field name="type">payable</field>
+            <field name="user_type" ref="account.data_account_type_payable"/>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="c1141"/>
+        </record>
+        <record model="account.account.template" id="c11412">
+            <field name="name">Sundry Creditors For Services</field>
+            <field name="code">11412</field>
+            <field name="type">payable</field>
+            <field name="user_type" ref="account.data_account_type_payable"/>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="c1141"/>
+        </record>
+        <!-- Other current liabilities -->
+        <record model="account.account.template" id="c1142">
+            <field name="name">Other Current Liabilities</field>
+            <field name="code">1142</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c114"/>
+        </record>
+        <record model="account.account.template" id="c11421">
+            <field name="name">Duties and Taxes</field>
+            <field name="code">11421</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1142"/>
+        </record>
+        <record model="account.account.template" id="c114211">
+            <field name="name">Excise Duty Payable</field>
+            <field name="code">114211</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c11421"/>
+        </record>
+        <record model="account.account.template" id="c1142111">
+            <field name="name">Excise Duty Payable</field>
+            <field name="code">1142111</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c114211"/>
+        </record>
+        <record model="account.account.template" id="c1142112">
+            <field name="name">Education Cess Payable On Excise Duty</field>
+            <field name="code">1142112</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c114211"/>
+        </record>
+        <record model="account.account.template" id="c1142113">
+            <field name="name">Higher Education Cess Payable On Excise Duty</field>
+            <field name="code">1142113</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c114211"/>
+        </record>
+        <record model="account.account.template" id="c114212">
+            <field name="name">Service Tax Payable</field>
+            <field name="code">114212</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c11421"/>
+        </record>
+        <record model="account.account.template" id="c1142121">
+            <field name="name">Service Tax Payable</field>
+            <field name="code">1142121</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c114212"/>
+        </record>
+        <record model="account.account.template" id="c1142122">
+            <field name="name">Education Cess Payable On Service Tax</field>
+            <field name="code">1142122</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c114212"/>
+        </record>
+        <record model="account.account.template" id="c1142123">
+            <field name="name">Higher Education Cess Payable On Service Tax</field>
+            <field name="code">1142123</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c114212"/>
+        </record>
+        <record model="account.account.template" id="c114213">
+            <field name="name">TDS Paybale</field>
+            <field name="code">114213</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c11421"/>
+        </record>
+        <record model="account.account.template" id="c114214">
+            <field name="name">Central Sales Tax Payable</field>
+            <field name="code">114214</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c11421"/>
+        </record>
+        <record model="account.account.template" id="c114215">
+            <field name="name">VAT Payable</field>
+            <field name="code">114215</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c11421"/>
+        </record>
+        <record model="account.account.template" id="c11422">
+            <field name="name">Out Standing Cheques for Clearance</field>
+            <field name="code">11422</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1142"/>
+        </record>
+        <record model="account.account.template" id="c11423">
+            <field name="name">Advance From Customers</field>
+            <field name="code">11423</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1142"/>
+        </record>
+        <!-- Short Term Provisions -->
+        <record model="account.account.template" id="c1143">
+            <field name="name">Short Term Provisions</field>
+            <field name="code">1143</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c114"/>
+        </record>
+        <record model="account.account.template" id="c11430">
+            <field name="name">Provision For Employees Benefit</field>
+            <field name="code">11430</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1143"/>
+        </record>
+        <record model="account.account.template" id="c114301">
+            <field name="name">EPF Payable</field>
+            <field name="code">114301</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c11430"/>
+        </record>
+        <record model="account.account.template" id="c114302">
+            <field name="name">Unpaid Remuneration</field>
+            <field name="code">114302</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c11430"/>
+        </record>
+        <record model="account.account.template" id="c11431">
+            <field name="name">Other Provisions</field>
+            <field name="code">11431</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1143"/>
+        </record>
+        <record model="account.account.template" id="c114311">
+            <field name="name">Electricity And Power Charges Payable</field>
+            <field name="code">114311</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c11431"/>
+        </record>
+        <record model="account.account.template" id="c114312">
+            <field name="name">Employee Insurance Payable</field>
+            <field name="code">114312</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c11431"/>
+        </record>
+        <record model="account.account.template" id="c114312">
+            <field name="name">Employee Providend Fund Payable</field>
+            <field name="code">114312</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c11431"/>
+        </record>
+        <record model="account.account.template" id="c114313">
+            <field name="name">Internet Expenses Payable</field>
+            <field name="code">114313</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c11431"/>
+        </record>
+        <record model="account.account.template" id="c114314">
+            <field name="name">Mobile Expenses Payable</field>
+            <field name="code">114314</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c11431"/>
+        </record>
+        <record model="account.account.template" id="c114315">
+            <field name="name">Secueity Expenses Payable</field>
+            <field name="code">114315</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c11431"/>
+        </record>
+        <record model="account.account.template" id="c114316">
+            <field name="name">Telephone Expenses Payable</field>
+            <field name="code">114316</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c11431"/>
+        </record>
+        <record model="account.account.template" id="c114317">
+            <field name="name">Wages Payable</field>
+            <field name="code">114317</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c11431"/>
+        </record>
+        <record model="account.account.template" id="c114318">
+            <field name="name">Provision For Taxation</field>
+            <field name="code">114318</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c11431"/>
+        </record>
+        <record model="account.account.template" id="c114319">
+            <field name="name">Provision For Expenses</field>
+            <field name="code">114319</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c11431"/>
+        </record>
+
+        <!-- Assets -->
+        <record model="account.account.template" id="c12">
+            <field name="name">Assets</field>
+            <field name="code">12</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1"/>
+        </record>
+        <!-- Non-Current Assets -->
+        <record model="account.account.template" id="c120">
+            <field name="name">Non-Current Assets</field>
+            <field name="code">120</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12"/>
+        </record>
+        <!--Fixed Assets-->
+        <record model="account.account.template" id="c1201">
+            <field name="name">Fixed Assets</field>
+            <field name="code">1201</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c120"/>
+        </record>
+        <!-- Tangible Assets -->
+        <record model="account.account.template" id="c12010">
+            <field name="name">Tangible Assets</field>
+            <field name="code">12010</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="parent_id" ref="c1201"/>
+            <field name="reconcile" eval="False"/>
+        </record>
+        <record model="account.account.template" id="c120101">
+            <field name="name">Land</field>
+            <field name="code">120101</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12010"/>
+        </record>
+        <record model="account.account.template" id="c120102">
+            <field name="name">Buildings</field>
+            <field name="code">120102</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12010"/>
+        </record>
+        <record model="account.account.template" id="c120103">
+            <field name="name">Plant And Equipments</field>
+            <field name="code">120103</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12010"/>
+        </record>
+        <record model="account.account.template" id="c120104">
+            <field name="name">Furnitures And Fixtures</field>
+            <field name="code">120104</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12010"/>
+        </record>
+        <record model="account.account.template" id="c120105">
+            <field name="name">Vehicles</field>
+            <field name="code">120105</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12010"/>
+        </record>
+        <record model="account.account.template" id="c120106">
+            <field name="name">Computer/Laptops</field>
+            <field name="code">120106</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12010"/>
+        </record>
+        <record model="account.account.template" id="c120107">
+            <field name="name">Office Equipments</field>
+            <field name="code">120107</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12010"/>
+        </record>
+        <!-- Intangible Assets -->
+        <record model="account.account.template" id="c12011">
+            <field name="name">Intangible Assets</field>
+            <field name="code">12011</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1201"/>
+        </record>
+        <record model="account.account.template" id="c120111">
+            <field name="name">Goodwill</field>
+            <field name="code">120111</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12011"/>
+        </record>
+        <!-- Capital Work-in-progress -->
+        <record model="account.account.template" id="c12012">
+            <field name="name">Capital Work-In-Progress</field>
+            <field name="code">12012</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="parent_id" ref="c1201"/>
+            <field name="reconcile" eval="False"/>
+        </record>
+        <record model="account.account.template" id="c120120">
+            <field name="name">Building Under Construction</field>
+            <field name="code">120120</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12012"/>
+        </record>
+        <!-- Intangible Assets Under Development -->
+        <record model="account.account.template" id="c12013">
+            <field name="name">Intangible Assets Under Development</field>
+            <field name="code">12013</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="parent_id" ref="c1201"/>
+            <field name="reconcile" eval="False"/>
+        </record>
+        <!--Non-current investments-->
+        <record model="account.account.template" id="c1202">
+            <field name="name">Non-Current Investments</field>
+            <field name="code">1202</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c120"/>
+        </record>
+        <record model="account.account.template" id="c12020">
+            <field name="name">Investment In Property</field>
+            <field name="code">12020</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1202"/>
+        </record>
+        <record model="account.account.template" id="c12021">
+            <field name="name">Investment In Equity Instrument</field>
+            <field name="code">12021</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1202"/>
+        </record>
+        <record model="account.account.template" id="c12022">
+            <field name="name">Investment In Preference Shares</field>
+            <field name="code">12022</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1202"/>
+        </record>
+        <record model="account.account.template" id="c12023">
+            <field name="name">Investment In Government Or Trust Securities</field>
+            <field name="code">12023</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1202"/>
+        </record>
+        <record model="account.account.template" id="c12024">
+            <field name="name">Investment In Debentures And Bonds</field>
+            <field name="code">12024</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1202"/>
+        </record>
+        <record model="account.account.template" id="c12025">
+            <field name="name">Investment In Mutual Fund</field>
+            <field name="code">12025</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1202"/>
+        </record>
+        <record model="account.account.template" id="c12026">
+            <field name="name">Investment In Partnership Firm</field>
+            <field name="code">12026</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1202"/>
+        </record>
+        <record model="account.account.template" id="c12027">
+            <field name="name">Other</field>
+            <field name="code">12027</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="parent_id" ref="c1202"/>
+            <field name="reconcile" eval="False"/>
+        </record>
+        <record model="account.account.template" id="c120270">
+            <field name="name">Gold</field>
+            <field name="code">120270</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12027"/>
+        </record>
+        <record model="account.account.template" id="c120271">
+            <field name="name">Fixed Deposit With Banks-Earmarked</field>
+            <field name="code">120271</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12027"/>
+        </record>
+        <!--Deferred tax assets (net)-->
+        <record model="account.account.template" id="c1203">
+            <field name="name">Deferred Tax Assets (Net)</field>
+            <field name="code">1203</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c120"/>
+        </record>
+        <!--Long Term Loans and Advances-->
+        <record model="account.account.template" id="c1204">
+            <field name="name">Long Term Loans And Advances</field>
+            <field name="code">1204</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c120"/>
+        </record>
+        <record model="account.account.template" id="c12041">
+            <field name="name">Capital Assets</field>
+            <field name="code">12041</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1204"/>
+        </record>
+        <record model="account.account.template" id="c120411">
+            <field name="name">Secured, Considered Good</field>
+            <field name="code">120411</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12041"/>
+        </record>
+        <record model="account.account.template" id="c120412">
+            <field name="name">Unsecured, Considered Good</field>
+            <field name="code">120412</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12041"/>
+        </record>
+        <record model="account.account.template" id="c120413">
+            <field name="name">Doubtful</field>
+            <field name="code">120413</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12041"/>
+        </record>
+        <record model="account.account.template" id="c12042">
+            <field name="name">Security Deposit</field>
+            <field name="code">12042</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1204"/>
+        </record>
+        <record model="account.account.template" id="c120421">
+            <field name="name">Secured, Considered Good</field>
+            <field name="code">120421</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12042"/>
+        </record>
+        <record model="account.account.template" id="c1204211">
+            <field name="name">Earnest Money Deposit</field>
+            <field name="code">1204211</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c120421"/>
+        </record>
+        <record model="account.account.template" id="c1204212">
+            <field name="name">Other Deposit</field>
+            <field name="code">1204212</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c120421"/>
+        </record>
+        <record model="account.account.template" id="c120422">
+            <field name="name">Unsecured, Considered Good</field>
+            <field name="code">120422</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12042"/>
+        </record>
+        <record model="account.account.template" id="c120423">
+            <field name="name">Doubtful</field>
+            <field name="code">120423</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12042"/>
+        </record>
+        <record model="account.account.template" id="c12043">
+            <field name="name">Loans And Advances To Related Parties</field>
+            <field name="code">12043</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1204"/>
+        </record>
+        <record model="account.account.template" id="c12044">
+            <field name="name">Other Loans And Advances</field>
+            <field name="code">12044</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1204"/>
+        </record>
+        <!--Other Non Current Assets-->
+        <record model="account.account.template" id="c1205">
+            <field name="name">Other Non Current Assets</field>
+            <field name="code">1205</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c120"/>
+        </record>
+        <record model="account.account.template" id="c12051">
+            <field name="name">Long Term Trade Recievables</field>
+            <field name="code">12051</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1205"/>
+        </record>
+        <record model="account.account.template" id="c120511">
+            <field name="name">Secured, Considered Good</field>
+            <field name="code">120511</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12051"/>
+        </record>
+        <record model="account.account.template" id="c120512">
+            <field name="name">Unsecured, Considered Good</field>
+            <field name="code">120512</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12051"/>
+        </record>
+        <record model="account.account.template" id="c120513">
+            <field name="name">Doubtful</field>
+            <field name="code">120513</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12051"/>
+        </record>
+        <record model="account.account.template" id="c12052">
+            <field name="name">Miscellaneous Exps to the Extent Not Written Off</field>
+            <field name="code">12052</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1205"/>
+        </record>
+        <record model="account.account.template" id="c120521">
+            <field name="name">Preliminery Expense</field>
+            <field name="code">120521</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12052"/>
+        </record>
+        <record model="account.account.template" id="c120522">
+            <field name="name">Software</field>
+            <field name="code">120522</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12052"/>
+        </record>
+        <record model="account.account.template" id="c12053">
+            <field name="name">Others</field>
+            <field name="code">12053</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1205"/>
+        </record>
+        <!-- Current Assets -->
+        <record model="account.account.template" id="c121">
+            <field name="name">Current Assets</field>
+            <field name="code">121</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12"/>
+        </record>
+        <!--Current Investment-->
+        <record model="account.account.template" id="c1211">
+            <field name="name">Current Investment</field>
+            <field name="code">1211</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c121"/>
+        </record>
+        <record model="account.account.template" id="c12110">
+            <field name="name">Investment In Equity</field>
+            <field name="code">12110</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1211"/>
+        </record>
+        <record model="account.account.template" id="c12111">
+            <field name="name">Investment In Preference Shares</field>
+            <field name="code">12111</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1211"/>
+        </record>
+        <record model="account.account.template" id="c12112">
+            <field name="name">Investment In Government Securities</field>
+            <field name="code">12112</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1211"/>
+        </record>
+        <record model="account.account.template" id="c12113">
+            <field name="name">Investment In Debentures And Bonds</field>
+            <field name="code">12113</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1211"/>
+        </record>
+        <record model="account.account.template" id="c12114">
+            <field name="name">Investment In Mutual Fund</field>
+            <field name="code">12114</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1211"/>
+        </record>
+        <record model="account.account.template" id="c12115">
+            <field name="name">Investment In Partnership Firm</field>
+            <field name="code">12115</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1211"/>
+        </record>
+        <record model="account.account.template" id="c12116">
+            <field name="name">In Short Term Fixed Deposits</field>
+            <field name="code">12116</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1211"/>
+        </record>
+        <!--Inventories-->
+        <record model="account.account.template" id="c1212">
+            <field name="name">Inventories</field>
+            <field name="code">1212</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c121"/>
+        </record>
+        <record model="account.account.template" id="c12120">
+            <field name="name">Raw Material</field>
+            <field name="code">12120</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1212"/>
+        </record>
+        <record model="account.account.template" id="c12121">
+            <field name="name">Work-In-Progress</field>
+            <field name="code">12121</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1212"/>
+        </record>
+        <record model="account.account.template" id="c12122">
+            <field name="name">Finished Goods</field>
+            <field name="code">12122</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1212"/>
+        </record>
+        <record model="account.account.template" id="c12123">
+            <field name="name">Stock-In-Trade</field>
+            <field name="code">12123</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1212"/>
+        </record>
+        <record model="account.account.template" id="c12124">
+            <field name="name">Stores And Spares</field>
+            <field name="code">12124</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1212"/>
+        </record>
+        <record model="account.account.template" id="c12125">
+            <field name="name">Loose Tools</field>
+            <field name="code">12125</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1212"/>
+        </record>
+        <record model="account.account.template" id="c12126">
+            <field name="name">Other With Job Worker</field>
+            <field name="code">12126</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1212"/>
+        </record>
+        <record model="account.account.template" id="c12127">
+            <field name="name">Goods-In-Transit</field>
+            <field name="code">12127</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1212"/>
+        </record>
+        <!--Trade Recievables-->
+        <record model="account.account.template" id="c1213">
+            <field name="name">Trade Recievables</field>
+            <field name="code">1213</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c121"/>
+        </record>
+        <record model="account.account.template" id="c12131">
+            <field name="name">Outstanding For More Than Six Months</field>
+            <field name="code">12131</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1213"/>
+        </record>
+        <record model="account.account.template" id="c121311">
+            <field name="name">Secured, Considered Good</field>
+            <field name="code">121311</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12131"/>
+        </record>
+        <record model="account.account.template" id="c121312">
+            <field name="name">Unsecured, Considered Good</field>
+            <field name="code">121312</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12131"/>
+        </record>
+        <record model="account.account.template" id="c121313">
+            <field name="name">Doubtful</field>
+            <field name="code">121313</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12131"/>
+        </record>
+        <record model="account.account.template" id="c12132">
+            <field name="name">Others</field>
+            <field name="code">12132</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1213"/>
+        </record>
+        <record model="account.account.template" id="c121321">
+            <field name="name">Secured, Considered Good</field>
+            <field name="code">121321</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12132"/>
+        </record>
+        <record model="account.account.template" id="c121322">
+            <field name="name">Unsecured, Considered Good</field>
+            <field name="code">121322</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12132"/>
+        </record>
+        <record model="account.account.template" id="c121323">
+            <field name="name">Doubtful</field>
+            <field name="code">121323</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12132"/>
+        </record>
+        <record model="account.account.template" id="c12133">
+            <field name="name">Sundry Debtors</field>
+            <field name="code">12133</field>
+            <field name="type">receivable</field>
+            <field name="user_type" ref="account.data_account_type_receivable"/>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="c1213"/>
+        </record>
+
+        <!--Cash & Cash Equivalent-->
+        <record model="account.account.template" id="c1214">
+            <field name="name">Cash And Cash Equivalent</field>
+            <field name="code">1214</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c121"/>
+        </record>
+        <record model="account.account.template" id="c12141">
+            <field name="name">Cash-In-Hand</field>
+            <field name="code">12141</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.data_account_type_cash"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1214"/>
+        </record>
+        <record model="account.account.template" id="c121411">
+            <field name="name">Cash Balance</field>
+            <field name="code">121411</field>
+            <field name="type">liquidity</field>
+            <field name="user_type" ref="account.data_account_type_cash"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12141"/>
+        </record>
+        <record model="account.account.template" id="c121412">
+            <field name="name">Petty Cash Balance</field>
+            <field name="code">121412</field>
+            <field name="type">liquidity</field>
+            <field name="user_type" ref="account.data_account_type_cash"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12141"/>
+        </record>
+        <record model="account.account.template" id="c12142">
+            <field name="name">Bank Balance</field>
+            <field name="code">12142</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1214"/>
+        </record>
+        <record model="account.account.template" id="c121421">
+            <field name="name">Balance Account</field>
+            <field name="code">121421</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12142"/>
+        </record>
+        <record model="account.account.template" id="c121422">
+            <field name="name">Balance Account 9876543211</field>
+            <field name="code">121422</field>
+            <field name="type">liquidity</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12142"/>
+        </record>
+        <record model="account.account.template" id="c12143">
+            <field name="name">Cheques On Hand</field>
+            <field name="code">12143</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1214"/>
+        </record>
+        <record model="account.account.template" id="c121431">
+            <field name="name">Cheque With Account</field>
+            <field name="code">121431</field>
+            <field name="type">liquidity</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12143"/>
+        </record>
+        <!--Short Terms Loans and Advances-->
+        <record model="account.account.template" id="c1215">
+            <field name="name">Short Terms Loans And Advances</field>
+            <field name="code">1215</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c121"/>
+        </record>
+        <record model="account.account.template" id="c12151">
+            <field name="name">Loans And Advances From Related Parties</field>
+            <field name="code">12151</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1215"/>
+        </record>
+        <record model="account.account.template" id="c121511">
+            <field name="name">Secured, Considered Good</field>
+            <field name="code">121511</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12151"/>
+        </record>
+        <record model="account.account.template" id="c1215111">
+            <field name="name">Advance To Associate Concerns</field>
+            <field name="code">1215111</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c121511"/>
+        </record>
+        <record model="account.account.template" id="c121512">
+            <field name="name">Other Advances Unsecured and Considered as Good</field>
+            <field name="code">121512</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12151"/>
+        </record>
+        <record model="account.account.template" id="c1215121">
+            <field name="name">Unsecured Recoverable in Cash or in Kind or for Value to be Received</field>
+            <field name="code">1215121</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c121512"/>
+        </record>
+        <record model="account.account.template" id="c121513">
+            <field name="name">Doubtful</field>
+            <field name="code">121513</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12151"/>
+        </record>
+        <record model="account.account.template" id="c12152">
+            <field name="name">Advances with Revenue Authority</field>
+            <field name="code">12152</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1215"/>
+        </record>
+        <record model="account.account.template" id="c121521">
+            <field name="name">Advance To Suppliers</field>
+            <field name="code">121521</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12152"/>
+        </record>
+        <record model="account.account.template" id="c121522">
+            <field name="name">Advance Income Tax/Refund Due</field>
+            <field name="code">121522</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12152"/>
+        </record>
+        <record model="account.account.template" id="c121523">
+            <field name="name">Balance With Revenue Authorities (Indirect Taxes)</field>
+            <field name="code">121523</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12152"/>
+        </record>
+        <record model="account.account.template" id="c121524">
+            <field name="name">Prepaid Expenses</field>
+            <field name="code">121524</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12152"/>
+        </record>
+        <!-- Other current assets -->
+        <record model="account.account.template" id="c1216">
+            <field name="name">Other Current Assets</field>
+            <field name="code">1216</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c121"/>
+        </record>
+        <record model="account.account.template" id="c12161">
+            <field name="name">Duties and Taxes</field>
+            <field name="code">12161</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1216"/>
+        </record>
+        <record model="account.account.template" id="c121610">
+            <field name="name">Sales Tax Receivable</field>
+            <field name="code">121610</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12161"/>
+        </record>
+        <record model="account.account.template" id="c121611">
+            <field name="name">VAT Receivable</field>
+            <field name="code">121611</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12161"/>
+        </record>
+        <record model="account.account.template" id="c121612">
+            <field name="name">Excise Duty Receivable</field>
+            <field name="code">121612</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12161"/>
+        </record>
+        <record model="account.account.template" id="c1216121">
+            <field name="name">Excise Duty Receivable</field>
+            <field name="code">1216121</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c121612"/>
+        </record>
+        <record model="account.account.template" id="c1216122">
+            <field name="name">Education Cess Receivable On Excise Duty</field>
+            <field name="code">1216122</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c121612"/>
+        </record>
+        <record model="account.account.template" id="c1216123">
+            <field name="name">Higher Education Cess Receivable On Excise Duty</field>
+            <field name="code">1216123</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c121612"/>
+        </record>
+        <record model="account.account.template" id="c121613">
+            <field name="name">Service Tax Receivable</field>
+            <field name="code">121613</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12161"/>
+        </record>
+        <record model="account.account.template" id="c1216131">
+            <field name="name">Service Tax Receivable</field>
+            <field name="code">1216131</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c121613"/>
+        </record>
+        <record model="account.account.template" id="c1216132">
+            <field name="name">Education Cess Receivable On Service Tax</field>
+            <field name="code">1216132</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c121613"/>
+        </record>
+        <record model="account.account.template" id="c1216133">
+            <field name="name">Higher Education Cess Receivable On Service Tax</field>
+            <field name="code">1216133</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c121613"/>
+        </record>
+        <record model="account.account.template" id="c121614">
+            <field name="name">TDS Receivable</field>
+            <field name="code">121614</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12161"/>
+        </record>
+        <record model="account.account.template" id="c12162">
+            <field name="name">Miscellaneous Expense to the Extent Not Written Off</field>
+            <field name="code">12162</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c1216"/>
+        </record>
+        <record model="account.account.template" id="c121621">
+            <field name="name">Preliminary Expense</field>
+            <field name="code">121621</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c12162"/>
+        </record>
+
+        <!-- Profit And Loss Account-->
+        <record model="account.account.template" id="c2">
+            <field name="name">Profit And Loss</field>
+            <field name="code">2</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.data_account_type_view"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c0"/>
+        </record>
+
+        <!-- Revenue -->
+        <record model="account.account.template" id="c20">
+            <field name="name">Total Revenue</field>
+            <field name="code">20</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_income_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2"/>
+        </record>
+        <!--Revenue from Operations-->
+        <record model="account.account.template" id="c201">
+            <field name="name">Revenue From Operations</field>
+            <field name="code">201</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_income_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c20"/>
+        </record>
+        <record model="account.account.template" id="c2011">
+            <field name="name">Central Sales(Exclusive of Excise Duty)</field>
+            <field name="code">2011</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c201"/>
+        </record>
+        <record model="account.account.template" id="c2012">
+            <field name="name">Export Sales</field>
+            <field name="code">2012</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c201"/>
+        </record>
+        <record model="account.account.template" id="c2013">
+            <field name="name">Sales of Services</field>
+            <field name="code">2013</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c201"/>
+        </record>
+        <record model="account.account.template" id="c2014">
+            <field name="name">Job Work Receipts</field>
+            <field name="code">2014</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c201"/>
+        </record>
+        <record model="account.account.template" id="c2015">
+            <field name="name">Product Sales</field>
+            <field name="code">2015</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c201"/>
+        </record>
+        <record model="account.account.template" id="c2016">
+            <field name="name">Other Operating Income</field>
+            <field name="code">2016</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c201"/>
+        </record>
+        <!--Other Income-->
+        <record model="account.account.template" id="c202">
+            <field name="name">Other Income</field>
+            <field name="code">202</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_income_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c20"/>
+        </record>
+        <record model="account.account.template" id="c2021">
+            <field name="name">Interest</field>
+            <field name="code">2021</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c202"/>
+        </record>
+        <record model="account.account.template" id="c2022">
+            <field name="name">Other Financial Services</field>
+            <field name="code">2022</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c202"/>
+        </record>
+        <record model="account.account.template" id="c2023">
+            <field name="name">Other Non Operating Income</field>
+            <field name="code">2023</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c202"/>
+        </record>
+         <!-- Expenses -->
+        <record model="account.account.template" id="c21">
+            <field name="name">Total Expenses</field>
+            <field name="code">21</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_expense_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2"/>
+        </record>
+        <!--Cost Of Materials Consumed-->
+        <record model="account.account.template" id="c210">
+            <field name="name">Cost of Materials Consumed</field>
+            <field name="code">210</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_expense_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c21"/>
+        </record>
+        <record model="account.account.template" id="c2101">
+            <field name="name">Opening Stock</field>
+            <field name="code">2101</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c210"/>
+        </record>
+        <record model="account.account.template" id="c2102">
+            <field name="name">Purchases of Raw Materials And Stores</field>
+            <field name="code">2102</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_expense_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c210"/>
+        </record>
+        <record model="account.account.template" id="c21021">
+            <field name="name">Raw Material</field>
+            <field name="code">21021</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2102"/>
+        </record>
+        <record model="account.account.template" id="c21022">
+            <field name="name">Stores And Consumables</field>
+            <field name="code">21022</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2102"/>
+        </record>
+        <record model="account.account.template" id="c2103">
+            <field name="name">Closing Stock</field>
+            <field name="code">2103</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c210"/>
+        </record>
+        <!-- Purchase of Stock-in-Trade -->
+        <record model="account.account.template" id="c211">
+            <field name="name">Purchase of Stock-In-Trade</field>
+            <field name="code">211</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_expense_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c21"/>
+        </record>
+        <record model="account.account.template" id="c2111">
+            <field name="name">Purchase of Stock-In-Trade</field>
+            <field name="code">2111</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c211"/>
+        </record>
+        <!--Changes in inventories of finished goods, work-in-progress and Stock-in-Trade-->
+        <record model="account.account.template" id="c212">
+            <field name="name">Changes In Inventories of Finished Goods, Work-In-Progress And Stock-In-Trade</field>
+            <field name="code">212</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c21"/>
+        </record>
+        <!--Employement Benefit Expenses-->
+        <record model="account.account.template" id="c213">
+            <field name="name">Employement Benefit Expenses</field>
+            <field name="code">213</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_expense_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c21"/>
+        </record>
+        <record model="account.account.template" id="c2131">
+            <field name="name">Salaries, Bonus, PF And ESIC</field>
+            <field name="code">2131</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c213"/>
+        </record>
+        <record model="account.account.template" id="c2132">
+            <field name="name">Directors Remuneration</field>
+            <field name="code">2132</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c213"/>
+        </record>
+        <record model="account.account.template" id="c2133">
+            <field name="name">Directors Setting Fees</field>
+            <field name="code">2133</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c213"/>
+        </record>
+        <record model="account.account.template" id="c2134">
+            <field name="name">Staff Welfare Expense</field>
+            <field name="code">2134</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c213"/>
+        </record>
+        <record model="account.account.template" id="c2135">
+            <field name="name">Commision To M.D</field>
+            <field name="code">2135</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c213"/>
+        </record>
+        <record model="account.account.template" id="c2136">
+            <field name="name">Commision To Joint M.D</field>
+            <field name="code">2136</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c213"/>
+        </record>
+        <!--Financial Cost-->
+        <record model="account.account.template" id="c214">
+            <field name="name">Financial Cost</field>
+            <field name="code">214</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_expense_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c21"/>
+        </record>
+        <record model="account.account.template" id="c2141">
+            <field name="name">Interest On Cash Credit Facality</field>
+            <field name="code">2141</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c214"/>
+        </record>
+        <record model="account.account.template" id="c2142">
+            <field name="name">Interest On Car Loan</field>
+            <field name="code">2142</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c214"/>
+        </record>
+        <record model="account.account.template" id="c2143">
+            <field name="name">Interest On Other Loans</field>
+            <field name="code">2143</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c214"/>
+        </record>
+        <record model="account.account.template" id="c2144">
+            <field name="name">Bank Charges</field>
+            <field name="code">2144</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c214"/>
+        </record>
+        <record model="account.account.template" id="c2145">
+            <field name="name">Bank Gurantee Charges</field>
+            <field name="code">2145</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c214"/>
+        </record>
+        <!--Depreciation and Amortization Expense-->
+        <record model="account.account.template" id="c215">
+            <field name="name">Depreciation And Amortization Expense</field>
+            <field name="code">215</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_expense_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c21"/>
+        </record>
+        <record model="account.account.template" id="c2151">
+            <field name="name">Depreciation</field>
+            <field name="code">2151</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c215"/>
+        </record>
+        <record model="account.account.template" id="c2152">
+            <field name="name">Preliminary Expenses</field>
+            <field name="code">2152</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c215"/>
+        </record>
+        <!--Other Administrative Expenses-->
+        <record model="account.account.template" id="c216">
+            <field name="name">Other Expenses</field>
+            <field name="code">216</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_expense_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c21"/>
+        </record>
+        <record model="account.account.template" id="c2160">
+            <field name="name">Direct Expenses</field>
+            <field name="code">2160</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_expense_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c216"/>
+        </record>
+        <record model="account.account.template" id="c21601">
+            <field name="name">Jobwork Charges</field>
+            <field name="code">21601</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2160"/>
+        </record>
+        <record model="account.account.template" id="c21602">
+            <field name="name">Stores and Spares</field>
+            <field name="code">21602</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2160"/>
+        </record>
+        <record model="account.account.template" id="c21603">
+            <field name="name">Workshop Expense</field>
+            <field name="code">21603</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2160"/>
+        </record>
+        <record model="account.account.template" id="c21604">
+            <field name="name">Centeral Sales Tax</field>
+            <field name="code">21604</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2160"/>
+        </record>
+        <record model="account.account.template" id="c21605">
+            <field name="name">Machinery Repair and Maintenance</field>
+            <field name="code">21605</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2160"/>
+        </record>
+        <record model="account.account.template" id="c21606">
+            <field name="name">Freight Forwarding and Octroi Expenses (Local)</field>
+            <field name="code">21606</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2160"/>
+        </record>
+        <record model="account.account.template" id="c21607">
+            <field name="name">Electrical Repairing Expense</field>
+            <field name="code">21607</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2160"/>
+        </record>
+        <record model="account.account.template" id="c21608">
+            <field name="name">Material Testing Expense</field>
+            <field name="code">21608</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2160"/>
+        </record>
+        <record model="account.account.template" id="c21609">
+            <field name="name">Power and Fuel Charges</field>
+            <field name="code">21609</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2160"/>
+        </record>
+        <record model="account.account.template" id="c216091">
+            <field name="name">Packing Material Expense</field>
+            <field name="code">216091</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2160"/>
+        </record>
+        <record model="account.account.template" id="c216092">
+            <field name="name">Measuring Expense</field>
+            <field name="code">216092</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2160"/>
+        </record>
+        <record model="account.account.template" id="c216093">
+            <field name="name">Processing Labour Charges</field>
+            <field name="code">216093</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2160"/>
+        </record>
+        <record model="account.account.template" id="c2161">
+            <field name="name">Administrative and Selling Expenses</field>
+            <field name="code">2161</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_expense_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c216"/>
+        </record>
+        <record model="account.account.template" id="c21611">
+            <field name="name">Car Expenses (Including Insurance)</field>
+            <field name="code">21611</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c21612">
+            <field name="name">Travelling Expenses (Including Foreign Travelling)</field>
+            <field name="code">21612</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c21613">
+            <field name="name">Repair And Maintenance Building</field>
+            <field name="code">21613</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c21614">
+            <field name="name">Computer Maintenace</field>
+            <field name="code">21614</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c21615">
+            <field name="name">General Expenses</field>
+            <field name="code">21615</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c21616">
+            <field name="name">Internet And Website Expenses</field>
+            <field name="code">21616</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c21617">
+            <field name="name">Insurance Expenses</field>
+            <field name="code">21617</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c21618">
+            <field name="name">Telephone Expense</field>
+            <field name="code">21618</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c21619">
+            <field name="name">Labour Welfare Expenses</field>
+            <field name="code">21619</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c216191">
+            <field name="name">Legal Expenses</field>
+            <field name="code">216191</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c216192">
+            <field name="name">Postage And Telegram</field>
+            <field name="code">216192</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c216193">
+            <field name="name">Professional Charges</field>
+            <field name="code">216193</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c216194">
+            <field name="name">Security Expesnes</field>
+            <field name="code">216194</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c216195">
+            <field name="name">Stationery Expenses</field>
+            <field name="code">216195</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c216196">
+            <field name="name">Auditors Remuneration</field>
+            <field name="code">216196</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c216197">
+            <field name="name">Rent Rates And Taxes</field>
+            <field name="code">216197</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c216198">
+            <field name="name">Tender Fee And Testing Charges</field>
+            <field name="code">216198</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c216199">
+            <field name="name">Interest On Delayed Payment of Taxes</field>
+            <field name="code">216199</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c2161991">
+            <field name="name">Excise/ Service Tax Expenses</field>
+            <field name="code">2161991</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c2161992">
+            <field name="name">Advertisement And Publicity</field>
+            <field name="code">2161992</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c2161993">
+            <field name="name">Donation</field>
+            <field name="code">2161993</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c2161994">
+            <field name="name">Export Expenses</field>
+            <field name="code">2161994</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c2161995">
+            <field name="name">Internal Audit Fee</field>
+            <field name="code">2161995</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c2161996">
+            <field name="name">Conveyance Expense</field>
+            <field name="code">2161996</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c2161997">
+            <field name="name">Packing and Forwarding Expense</field>
+            <field name="code">2161997</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c2161998">
+            <field name="name">Annual Service Fees</field>
+            <field name="code">2161998</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c2161999">
+            <field name="name">Loan Processing Fees</field>
+            <field name="code">2161999</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c21619991">
+            <field name="name">Office Cleaning Expense</field>
+            <field name="code">21619991</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c21619992">
+            <field name="name">Prelimenary Expense W/Off</field>
+            <field name="code">21619992</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c21619993">
+            <field name="name">Software Expense W/Off</field>
+            <field name="code">21619993</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c21619994">
+            <field name="name">Custom Duty</field>
+            <field name="code">21619994</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c21619995">
+            <field name="name">Stamping Charge</field>
+            <field name="code">21619995</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+        <record model="account.account.template" id="c21619996">
+            <field name="name">Post and Courrier Charges</field>
+            <field name="code">21619996</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="c2161"/>
+        </record>
+
+        <record id="indian_chart_template_schedule6" model="account.chart.template">
+            <field name="name">Indian Chart of Accounts - Schedule VI</field>
+            <field name="account_root_id" ref="c0"/>
+            <field name="tax_code_root_id" ref="vat_code_tax"/>
+            <field name="bank_account_view_id" ref="c121421"/>
+            <field name="property_account_receivable" ref="c12133"/>
+            <field name="property_account_payable" ref="c11411"/>
+            <field name="property_account_expense_categ" ref="c21021"/>
+            <field name="property_account_income_categ" ref="c2015"/>
+            <field name="currency_id" ref="base.INR"/>
+        </record>
+   </data>
+</openerp>
diff --git a/addons/l10n_in/l10n_in_schedule6_tax_template.xml b/addons/l10n_in/l10n_in_schedule6_tax_template.xml
new file mode 100644
index 00000000000..306d61e77cc
--- /dev/null
+++ b/addons/l10n_in/l10n_in_schedule6_tax_template.xml
@@ -0,0 +1,381 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+    <record id="schedule6_input_tax_15" model="account.tax.template">
+        <field name="name">Input Sales Tax @ 15%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.15</field>
+	    <field name="sequence">10</field>
+	    <field name="account_collected_id" ref="c114214"/>
+	    <field name="base_code_id" ref="15bases_vat_code_sales_tax_sale"/>
+	    <field name="tax_code_id" ref="15vat_code_sales_tax_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+
+    <record id="schedule6_input_tax_12" model="account.tax.template">
+        <field name="name">Input Sales Tax @ 12%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.12</field>
+	    <field name="sequence">10</field>
+	    <field name="account_collected_id" ref="c114214"/>
+	    <field name="base_code_id" ref="12bases_vat_code_sales_tax_sale"/>
+	    <field name="tax_code_id" ref="12vat_code_sales_tax_sale"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+    <record id="schedule6_input_tax_4" model="account.tax.template">
+        <field name="name">Input Sales Tax @ 4%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.04</field>
+	    <field name="sequence">10</field>
+	    <field name="account_collected_id" ref="c114214"/>
+	    <field name="base_code_id" ref="4bases_vat_code_sales_tax_sale"/>
+	    <field name="tax_code_id" ref="4vat_code_sales_tax_sale"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+    <record id="schedule6_add_input_vat_1" model="account.tax.template">
+        <field name="name">Additional Input VAT @ 1%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.01</field>
+	    <field name="sequence">15</field>
+	    <field name="account_collected_id" ref="c114215"/>
+	    <field name="base_code_id" ref="1bases_add_vat_on_sale"/>
+	    <field name="tax_code_id" ref="1add_vat_on_sale"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+    <record id="schedule6_input_vat_12" model="account.tax.template">
+        <field name="name">Input VAT @ 12.5%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.125</field>
+	    <field name="sequence">10</field>
+	    <field name="account_collected_id" ref="c114215"/>
+	    <field name="base_code_id" ref="12bases_vat_on_sale"/>
+	    <field name="tax_code_id" ref="12vat_on_sale"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+    <record id="schedule6_add_input_vat_2" model="account.tax.template">
+        <field name="name">Additional Input VAT @ 2.5%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.025</field>
+	    <field name="sequence">15</field>
+	    <field name="account_collected_id" ref="c114215"/>
+	    <field name="base_code_id" ref="2bases_add_vat_on_sale"/>
+	    <field name="tax_code_id" ref="2add_vat_on_sale"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+    <record id="schedule6_sale_vat_8" model="account.tax.template">
+        <field name="name">Input VAT @ 8%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.08</field>
+	    <field name="sequence">10</field>
+	    <field name="account_collected_id" ref="c114215"/>
+	    <field name="base_code_id" ref="8bases_vat_on_sale"/>
+	    <field name="tax_code_id" ref="8vat_on_sale"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+    <record id="schedule6_sale_vat_10" model="account.tax.template">
+        <field name="name">Input VAT @ 10%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.1</field>
+	    <field name="sequence">10</field>
+	    <field name="account_collected_id" ref="c114215"/>
+	    <field name="base_code_id" ref="10bases_vat_on_sale"/>
+	    <field name="tax_code_id" ref="10vat_on_sale"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+    <record id="schedule6_sale_Excise_Duty_12" model="account.tax.template">
+        <field name="name">Input Excise Duty @ 12.36%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.12</field>
+	    <field name="sequence">1</field>
+	    <field name="include_base_amount">True</field>
+	    <field name="account_collected_id" ref="c1142111"/>
+	    <field name="base_code_id" ref="bases_vat_code_tax_exice_sale"/>
+	    <field name="tax_code_id" ref="vat_code_tax_exice_sale"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+    <record id="schedule6_sale_edu_cess_Excise_Duty_2" model="account.tax.template">
+        <field name="name">Input Education Cess @ 2% On Excise Duty</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.02</field>
+	    <field name="sequence">2</field>
+	    <field name="account_collected_id" ref="c1142112"/>
+	    <field name="include_base_amount">True</field>
+	    <field name="parent_id" ref="schedule6_sale_Excise_Duty_12"/>
+	    <field name="tax_code_id" ref="edu_vat_code_tax_exice_sale"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+    <record id="schedule6_sale_edu_cess_Excise_Duty_1" model="account.tax.template">
+        <field name="name">Input Higher Education Cess @ 1% On Excise Duty</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.01</field>
+	    <field name="sequence">3</field>
+	    <field name="account_collected_id" ref="c1142113"/>
+	    <field name="parent_id" ref="schedule6_sale_Excise_Duty_12"/>
+	    <field name="include_base_amount">True</field>
+	    <field name="tax_code_id" ref="hedu_vat_code_tax_exice_sale"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+    <record id="schedule6_sale_service_tax_12" model="account.tax.template">
+        <field name="name">Input Service Tax @ 12.36%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.12</field>
+	    <field name="sequence">8</field>
+	    <field name="account_collected_id" ref="c1142121"/>
+	    <field name="include_base_amount">True</field>
+	    <field name="base_code_id" ref="bases_vat_code_service_tax_sale"/>
+	    <field name="tax_code_id" ref="vat_code_service_tax_sale"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+    <record id="schedule6_edu_cess_service_tax_2" model="account.tax.template">
+        <field name="name">Input Education Cess @ 2% On Service Tax</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.02</field>
+	    <field name="sequence">10</field>
+	    <field name="account_collected_id" ref="c1142122"/>
+	    <field name="include_base_amount">True</field>
+	    <field name="parent_id" ref="schedule6_sale_service_tax_12"/>
+	    <field name="tax_code_id" ref="edu_vat_code_service_tax_sale"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+    <record id="schedule6_high_edu_service_tax_1" model="account.tax.template">
+        <field name="name">Input Higher Education Cess @ 1% On Service Tax</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.01</field>
+	    <field name="sequence">10</field>
+	    <field name="include_base_amount">True</field>
+	    <field name="parent_id" ref="schedule6_sale_service_tax_12"/>
+	    <field name="account_collected_id" ref="c1142123"/>
+	    <field name="tax_code_id" ref="hedu_vat_code_service_tax_sale"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+    <record id="schedule6_input_vat_4" model="account.tax.template">
+        <field name="name">Input VAT @ 4%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.04</field>
+	    <field name="sequence">10</field>
+	    <field name="account_collected_id" ref="c114215"/>
+	    <field name="base_code_id" ref="4bases_vat_on_sale"/>
+	    <field name="tax_code_id" ref="4vat_on_sale"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+	<!--output purchase tax-->
+    <record id="schedule6_output_tax_15" model="account.tax.template">
+        <field name="name">Output Purchase Tax @ 15%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.15</field>
+	    <field name="sequence">10</field>
+	    <field name="account_collected_id" ref="c121610"/>
+	    <field name="base_code_id" ref="15bases_vat_code_sales_tax_purchase"/>
+	    <field name="tax_code_id" ref="15vat_code_sales_tax_purchase"/>
+        <field name="base_sign" eval="-1"/>
+	    <field name="tax_sign" eval="-1"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+    <record id="schedule6_output_tax_12" model="account.tax.template">
+        <field name="name">Output Purchase Tax @ 12%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.12</field>
+	    <field name="sequence">10</field>
+	    <field name="account_collected_id" ref="c121610"/>
+	    <field name="base_code_id" ref="12bases_vat_code_sales_tax_purchase"/>
+	    <field name="tax_code_id" ref="12vat_code_sales_tax_purchase"/>
+        <field name="base_sign" eval="-1"/>
+	    <field name="tax_sign" eval="-1"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+    <record id="schedule6_output_tax_4" model="account.tax.template">
+        <field name="name">Output Purchase Tax @ 4%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.04</field>
+	    <field name="sequence">10</field>
+	    <field name="account_collected_id" ref="c121610"/>
+	    <field name="base_code_id" ref="4bases_vat_code_sales_tax_purchase"/>
+	    <field name="tax_code_id" ref="4vat_code_sales_tax_purchase"/>
+        <field name="base_sign" eval="-1"/>
+	    <field name="tax_sign" eval="-1"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+    <record id="schedule6_add_output_vat_1" model="account.tax.template">
+        <field name="name">Additional Output VAT @ 1%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.01</field>
+	    <field name="sequence">15</field>
+	    <field name="account_collected_id" ref="c121611"/>
+	    <field name="base_code_id" ref="1bases_add_vat_on_purchase"/>
+	    <field name="tax_code_id" ref="1add_vat_on_purchase"/>
+        <field name="base_sign" eval="-1"/>
+	    <field name="tax_sign" eval="-1"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+    <record id="schedule6_output_vat_12" model="account.tax.template">
+        <field name="name">Output VAT @ 12.5%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.125</field>
+	    <field name="sequence">10</field>
+	    <field name="account_collected_id" ref="c121611"/>
+	    <field name="base_code_id" ref="12bases_vat_on_purchase"/>
+	    <field name="tax_code_id" ref="12vat_on_purchase"/>
+        <field name="base_sign" eval="-1"/>
+	    <field name="tax_sign" eval="-1"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+    <record id="schedule6_add_output_vat_2" model="account.tax.template">
+        <field name="name">Additional Output VAT @ 2.5%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.025</field>
+	    <field name="sequence">15</field>
+	    <field name="account_collected_id" ref="c121611"/>
+	    <field name="base_code_id" ref="2bases_add_vat_on_purchase"/>
+	    <field name="tax_code_id" ref="2add_vat_on_purchase"/>
+        <field name="base_sign" eval="-1"/>
+	    <field name="tax_sign" eval="-1"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+    <record id="schedule6_purchase_vat_8" model="account.tax.template">
+        <field name="name">Output VAT @ 8%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.08</field>
+	    <field name="sequence">10</field>
+	    <field name="account_collected_id" ref="c121611"/>
+	    <field name="base_code_id" ref="8bases_vat_on_purchase"/>
+	    <field name="tax_code_id" ref="8vat_on_purchase"/>
+        <field name="base_sign" eval="-1"/>
+	    <field name="tax_sign" eval="-1"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+    <record id="schedule6_purchase_vat_10" model="account.tax.template">
+        <field name="name">Output VAT @ 10%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.1</field>
+	    <field name="sequence">10</field>
+	    <field name="account_collected_id" ref="c121611"/>
+	    <field name="base_code_id" ref="10bases_vat_on_purchase"/>
+	    <field name="tax_code_id" ref="10vat_on_purchase"/>
+        <field name="base_sign" eval="-1"/>
+	    <field name="tax_sign" eval="-1"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+    <record id="schedule6_purchase_Excise_Duty_12" model="account.tax.template">
+        <field name="name">Output Excise Duty @ 12.36%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.12</field>
+	    <field name="include_base_amount">True</field>
+	    <field name="sequence">1</field>
+	    <field name="account_collected_id" ref="c1216121"/>
+	    <field name="base_code_id" ref="bases_vat_code_tax_exice_purchase"/>
+	    <field name="tax_code_id" ref="vat_code_tax_exice_purchase"/>
+        <field name="base_sign" eval="-1"/>
+	    <field name="tax_sign" eval="-1"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+    <record id="schedule6_purchase_edu_cess_Excise_Duty_2" model="account.tax.template">
+        <field name="name">Output Education Cess @ 2% On Excise Duty</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.02</field>
+	    <field name="include_base_amount">True</field>
+	    <field name="parent_id" ref="schedule6_purchase_Excise_Duty_12"/>
+	    <field name="sequence">2</field>
+	    <field name="account_collected_id" ref="c1216122"/>
+	    <field name="tax_code_id" ref="edu_vat_code_tax_exice_purchase"/>
+        <field name="base_sign" eval="-1"/>
+	    <field name="tax_sign" eval="-1"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+    <record id="schedule6_purchase_edu_cess_Excise_Duty_1" model="account.tax.template">
+        <field name="name">Output Higher Education Cess @ 1% On Excise Duty</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.01</field>
+	    <field name="include_base_amount">True</field>
+	    <field name="parent_id" ref="schedule6_purchase_Excise_Duty_12"/>
+	    <field name="sequence">3</field>
+	    <field name="account_collected_id" ref="c1216123"/>
+	    <field name="tax_code_id" ref="hedu_vat_code_tax_exice_purchase"/>
+        <field name="base_sign" eval="-1"/>
+	    <field name="tax_sign" eval="-1"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+    <record id="schedule6_purchase_service_tax_12" model="account.tax.template">
+        <field name="name">Output Service Tax @ 12.36%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.12</field>
+	    <field name="include_base_amount">True</field>
+	    <field name="sequence">8</field>
+	    <field name="account_collected_id" ref="c1216131"/>
+	    <field name="base_code_id" ref="bases_vat_code_service_tax_pur"/>
+	    <field name="tax_code_id" ref="vat_code_service_tax_pur"/>
+        <field name="base_sign" eval="-1"/>
+	    <field name="tax_sign" eval="-1"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+    <record id="schedule6_purchase_edu_cess_service_tax_2" model="account.tax.template">
+        <field name="name">Output Education Cess @ 2% On Service Tax</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.02</field>
+	    <field name="include_base_amount">True</field>
+	    <field name="parent_id" ref="schedule6_purchase_service_tax_12"/>
+	    <field name="sequence">10</field>
+	    <field name="account_collected_id" ref="c1216132"/>
+	    <field name="tax_code_id" ref="edu_vat_code_service_tax_pur"/>
+        <field name="base_sign" eval="-1"/>
+	    <field name="tax_sign" eval="-1"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+    <record id="schedule6_purchase_high_edu_service_tax_1" model="account.tax.template">
+        <field name="name">Output Higher Education Cess @ 1% On Service Tax</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.01</field>
+	    <field name="include_base_amount">True</field>
+	    <field name="parent_id" ref="schedule6_purchase_service_tax_12"/>
+	    <field name="sequence">10</field>
+	    <field name="account_collected_id" ref="c1216133"/>
+	    <field name="tax_code_id" ref="hedu_vat_code_service_tax_pur"/>
+        <field name="base_sign" eval="-1"/>
+	    <field name="tax_sign" eval="-1"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+    <record id="schedule6_output_vat_4" model="account.tax.template">
+        <field name="name">Output VAT @ 4%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.04</field>
+	    <field name="sequence">10</field>
+	    <field name="account_collected_id" ref="c121611"/>
+	    <field name="base_code_id" ref="4bases_vat_on_purchase"/>
+	    <field name="tax_code_id" ref="4vat_on_purchase"/>
+        <field name="base_sign" eval="-1"/>
+	    <field name="tax_sign" eval="-1"/>
+	    <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
+    </record>
+
+    </data>
+</openerp>
diff --git a/addons/l10n_in/l10n_in_standard_chart.xml b/addons/l10n_in/l10n_in_standard_chart.xml
new file mode 100644
index 00000000000..c78467f0700
--- /dev/null
+++ b/addons/l10n_in/l10n_in_standard_chart.xml
@@ -0,0 +1,934 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- India - Standard Accounting Chart -->
+        <record model="account.account.template" id="p0">
+            <field name="name">Indian Chart of Accounts - Standard</field>
+            <field name="code">0</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.data_account_type_view"/>
+            <field name="reconcile" eval="False"/>
+        </record>
+
+        <record model="account.account.template" id="p1">
+            <field name="name">Balance Sheet</field>
+            <field name="code">1</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.data_account_type_view"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p0"/>
+        </record>
+        <!-- Assets -->
+        <record model="account.account.template" id="p10">
+            <field name="name">Assets</field>
+            <field name="code">10</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p1"/>
+        </record>
+        <!-- Current Assets -->
+        <record model="account.account.template" id="p100">
+            <field name="name">Current Assets</field>
+            <field name="code">100</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p10"/>
+        </record>
+        <record model="account.account.template" id="p1001">
+            <field name="name">Cash In Hand</field>
+            <field name="code">1001</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p100"/>
+        </record>   
+        <record model="account.account.template" id="p10011">
+            <field name="name">Cash - Regular Checking</field>
+            <field name="code">10011</field>
+            <field name="type">liquidity</field>
+            <field name="user_type" ref="account.data_account_type_cash"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p1001"/>
+        </record>
+        <record model="account.account.template" id="p10012">
+            <field name="name">Cash - Payroll Checking</field>
+            <field name="code">10012</field>
+            <field name="type">liquidity</field>
+            <field name="user_type" ref="account.data_account_type_cash"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p1001"/>
+        </record>
+        <record model="account.account.template" id="p10013">
+            <field name="name">Petty Cash Fund</field>
+            <field name="code">10013</field>
+            <field name="type">liquidity</field>
+            <field name="user_type" ref="account.data_account_type_cash"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p1001"/>
+        </record>
+        <record model="account.account.template" id="p10014">
+            <field name="name">Cash Account</field>
+            <field name="code">10014</field>
+            <field name="type">liquidity</field>
+            <field name="user_type" ref="account.data_account_type_cash"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p1001"/>
+        </record>
+        <record model="account.account.template" id="p1002">
+            <field name="name">Bank Accounts</field>
+            <field name="code">1002</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p100"/>
+        </record>   
+        <record model="account.account.template" id="p1003">
+            <field name="name">Inventories</field>
+            <field name="code">1003</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p100"/>
+        </record>
+        <record model="account.account.template" id="p10031">
+            <field name="name">Inventories</field>
+            <field name="code">10031</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p1003"/>
+        </record>
+        <record model="account.account.template" id="p1004">
+            <field name="name">Accounts Receivable</field>
+            <field name="code">1004</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p100"/>
+        </record>
+        <record model="account.account.template" id="p10040">
+            <field name="name">Debtors</field>
+            <field name="code">10040</field>
+            <field name="type">receivable</field>
+            <field name="user_type" ref="account.data_account_type_receivable"/>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="p1004"/>
+        </record>
+        <record model="account.account.template" id="p1005">
+            <field name="name">Tax Receivable</field>
+            <field name="code">1005</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p100"/>
+        </record>
+        <record model="account.account.template" id="p10050">
+            <field name="name">Sales Tax Receivable</field>
+            <field name="code">10050</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p1005"/>
+        </record>
+        <record model="account.account.template" id="p10051">
+            <field name="name">VAT Receivable</field>
+            <field name="code">10051</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p1005"/>
+        </record>
+        <record model="account.account.template" id="p10052">
+            <field name="name">Excise Duty Receivable</field>
+            <field name="code">10052</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p1005"/>
+        </record>
+        <record model="account.account.template" id="p100521">
+            <field name="name">Excise Duty Receivable</field>
+            <field name="code">100521</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p10052"/>
+        </record>
+        <record model="account.account.template" id="p100522">
+            <field name="name">Education Cess Receivable On Excise Duty</field>
+            <field name="code">100522</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p10052"/>
+        </record>
+        <record model="account.account.template" id="p100523">
+            <field name="name">Higher Education Cess Receivable On Excise Duty</field>
+            <field name="code">100523</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p10052"/>
+        </record>
+        <record model="account.account.template" id="p10053">
+            <field name="name">Service Tax Receivable</field>
+            <field name="code">10053</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p1005"/>
+        </record>
+        <record model="account.account.template" id="p100531">
+            <field name="name">Service Tax Receivable</field>
+            <field name="code">100531</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p10053"/>
+        </record>
+        <record model="account.account.template" id="p100532">
+            <field name="name">Education Cess Receivable On Service Tax</field>
+            <field name="code">100532</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p10053"/>
+        </record>
+        <record model="account.account.template" id="p100533">
+            <field name="name">Higher Education Cess Receivable On Service Tax</field>
+            <field name="code">100533</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p10053"/>
+        </record>
+        <record model="account.account.template" id="p10054">
+            <field name="name">TDS Receivable</field>
+            <field name="code">10058</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p1005"/>
+        </record>
+        <record model="account.account.template" id="p1006">
+            <field name="name">Deposit Account</field>
+            <field name="code">1006</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p100"/>
+        </record>
+        <record model="account.account.template" id="p10061">
+            <field name="name">Deposit Account</field>
+            <field name="code">10061</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p1006"/>
+        </record>
+        <record model="account.account.template" id="p1007">
+            <field name="name">Other Current Assets</field>
+            <field name="code">1007</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p100"/>
+        </record>
+        <record model="account.account.template" id="p10071">
+            <field name="name">Prepaid Insurance</field>
+            <field name="code">10071</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p1007"/>
+        </record>
+        <!-- Fixed Assets -->
+        <record model="account.account.template" id="p101">
+            <field name="name">Fixed Assets</field>
+            <field name="code">101</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_asset_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p10"/>
+        </record>
+        <record model="account.account.template" id="p1011">
+            <field name="name">Buildings</field>
+            <field name="code">1011</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p101"/>
+        </record>
+        <record model="account.account.template" id="p1012">
+            <field name="name">Land</field>
+            <field name="code">1012</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p101"/>
+        </record>
+        <record model="account.account.template" id="p1013">
+            <field name="name">Equipments</field>
+            <field name="code">1013</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p101"/>
+        </record>
+        <record model="account.account.template" id="p1014">
+            <field name="name">Vehicle</field>
+            <field name="code">1014</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p101"/>
+        </record>
+        <record model="account.account.template" id="p1015">
+            <field name="name">Computer/Laptops (Assets)</field>
+            <field name="code">1015</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p101"/>
+        </record>
+        <record model="account.account.template" id="p1016">
+            <field name="name">Furniture</field>
+            <field name="code">1016</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p101"/>
+        </record>
+        <record model="account.account.template" id="p1017">
+            <field name="name">Air Conditionar</field>
+            <field name="code">1017</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p101"/>
+        </record>
+        <record model="account.account.template" id="p1018">
+            <field name="name">Misc Assets</field>
+            <field name="code">1018</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p101"/>
+        </record>
+
+
+        <!-- Liabilities -->
+        <record model="account.account.template" id="p11">
+            <field name="name">Liabilities</field>
+            <field name="code">11</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p1"/>
+        </record>
+        <record model="account.account.template" id="p111">
+            <field name="name">Share Holder/Owners Fund</field>
+            <field name="code">111</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p11"/>
+        </record>
+        <record model="account.account.template" id="p1111">
+            <field name="name">Capital Account</field>
+            <field name="code">1111</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p111"/>
+        </record>
+        <record model="account.account.template" id="p1112">
+            <field name="name">Reserve And Surplus Account</field>
+            <field name="code">1112</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p111"/>
+        </record>
+        <record model="account.account.template" id="p112">
+            <field name="name">Current Liabilities</field>
+            <field name="code">112</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p11"/>
+        </record>
+        <record model="account.account.template" id="p1121">
+            <field name="name">Accounts Payable</field>
+            <field name="code">1121</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p112"/>
+        </record>
+        <record model="account.account.template" id="p11211">
+            <field name="name">Creditors</field>
+            <field name="code">11211</field>
+            <field name="type">payable</field>
+            <field name="user_type" ref="account.data_account_type_payable"/>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="p1121"/>
+        </record> 
+        <record model="account.account.template" id="p1122">
+            <field name="name">Loan Liabilities</field>
+            <field name="code">1122</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p112"/>
+        </record>
+        <record model="account.account.template" id="p11221">
+            <field name="name">Bank OD Account</field>
+            <field name="code">11221</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p1122"/>
+        </record>
+        <record model="account.account.template" id="p11222">
+            <field name="name">Secured Loan Account</field>
+            <field name="code">11222</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p1122"/>
+        </record>
+        <record model="account.account.template" id="p11223">
+            <field name="name">Unsecured Loan Account</field>
+            <field name="code">11223</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p1122"/>
+        </record>
+        <record model="account.account.template" id="p1123">
+            <field name="name">Duties And Taxes Payable</field>
+            <field name="code">1123</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p112"/>
+        </record>
+        <record model="account.account.template" id="p11231">
+            <field name="name">TDS Payable</field>
+            <field name="code">11231</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p1123"/>
+        </record>
+        <record model="account.account.template" id="p11232">
+            <field name="name">VAT Payable</field>
+            <field name="code">11232</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p1123"/>
+        </record>
+        <record model="account.account.template" id="p11233">
+            <field name="name">Excise Duty Payable</field>
+            <field name="code">11233</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p1123"/>
+        </record>
+        <record model="account.account.template" id="p112331">
+            <field name="name">Excise Duty Payable</field>
+            <field name="code">112331</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p11233"/>
+        </record>
+        <record model="account.account.template" id="p112332">
+            <field name="name">Education Cess Payable On Excise Duty</field>
+            <field name="code">112332</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p11233"/>
+        </record>
+        <record model="account.account.template" id="p112333">
+            <field name="name">Higher Education Cess Payable On Excise Duty</field>
+            <field name="code">112333</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p11233"/>
+        </record>
+        <record model="account.account.template" id="p11234">
+            <field name="name">Service Tax Payable</field>
+            <field name="code">11234</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p1123"/>
+        </record>
+        <record model="account.account.template" id="p112341">
+            <field name="name">Service Tax Payable</field>
+            <field name="code">112341</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p11234"/>
+        </record>
+        <record model="account.account.template" id="p112342">
+            <field name="name">Education Cess Payable On Service Tax</field>
+            <field name="code">112342</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p11234"/>
+        </record>
+        <record model="account.account.template" id="p112343">
+            <field name="name">Higher Education Cess Payable On Service Tax</field>
+            <field name="code">112343</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p11234"/>
+        </record>
+        <record model="account.account.template" id="p11235">
+            <field name="name">Sales Tax Payable</field>
+            <field name="code">11235</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p1123"/>
+        </record>
+        <record model="account.account.template" id="p1124">
+            <field name="name">Others Payable</field>
+            <field name="code">1124</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_liability_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p112"/>
+        </record>
+        <record model="account.account.template" id="p11241">
+            <field name="name">Wages Payable</field>
+            <field name="code">11241</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p1124"/>
+        </record>
+        <record model="account.account.template" id="p11242">
+            <field name="name">Interest Payable</field>
+            <field name="code">11242</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p1124"/>
+        </record>
+        <record model="account.account.template" id="p11243">
+            <field name="name">Notes Payable</field>
+            <field name="code">11243</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p1124"/>
+        </record>
+
+        <!-- Profit And Loss Account -->
+        <record model="account.account.template" id="p2">
+            <field name="name">Profit And Loss</field>
+            <field name="code">2</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.data_account_type_view"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p0"/>
+        </record>
+        
+        <!-- Income -->
+        <record model="account.account.template" id="p20">
+            <field name="name">Income</field>
+            <field name="code">20</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_income_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p2"/>
+        </record>
+        <record model="account.account.template" id="p200">
+            <field name="name">Operating Revenues</field>
+            <field name="code">200</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_income_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p20"/>
+        </record>
+        <record model="account.account.template" id="p2001">
+            <field name="name">Sales of Goods</field>
+            <field name="code">2001</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_income_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p200"/>
+        </record>
+        <record model="account.account.template" id="p20011">
+            <field name="name">Local Sales</field>
+            <field name="code">20011</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p2001"/>
+        </record>
+        <record model="account.account.template" id="p20012">
+            <field name="name">Retail Sales</field>
+            <field name="code">20012</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p2001"/>
+        </record>
+        <record model="account.account.template" id="p20013">
+            <field name="name">Export Sales</field>
+            <field name="code">20013</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p2001"/>
+        </record>
+        <record model="account.account.template" id="p2002">
+            <field name="name">Sales of Services</field>
+            <field name="code">2002</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_income_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p200"/>
+        </record>
+        <record model="account.account.template" id="p20021">
+            <field name="name">Local Services</field>
+            <field name="code">20021</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p2002"/>
+        </record>
+        <record model="account.account.template" id="p20022">
+            <field name="name">Export Services</field>
+            <field name="code">20022</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p2002"/>
+        </record>
+        <record model="account.account.template" id="p201">
+            <field name="name">Non Operating Revenues And Gains</field>
+            <field name="code">201</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_income_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p20"/>
+        </record>
+        <record model="account.account.template" id="p2010">
+            <field name="name">Interest Revenues</field>
+            <field name="code">2010</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p201"/>
+        </record>
+        <record model="account.account.template" id="p2011">
+            <field name="name">Gain on Sale of Assets</field>
+            <field name="code">2011</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p201"/>
+        </record>
+        <record model="account.account.template" id="2012">
+            <field name="name">Write off Income</field>
+            <field name="code">2012</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p201"/>
+        </record>
+        <record model="account.account.template" id="p2013">
+            <field name="name">Foreign Exchange Profit</field>
+            <field name="code">2013</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p201"/>
+        </record>
+
+         <!-- Expenses -->
+        <record model="account.account.template" id="p21">
+            <field name="name">Expense</field>
+            <field name="code">21</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_expense_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p2"/>
+        </record>
+        <record model="account.account.template" id="p210">
+            <field name="name">Direct Expense</field>
+            <field name="code">210</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_expense_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p21"/>
+        </record>
+        <record model="account.account.template" id="p2100">
+            <field name="name">Electricity Expense</field>
+            <field name="code">2100</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p210"/>
+        </record>
+        <record model="account.account.template" id="p2101">
+            <field name="name">Salary Expense</field>
+            <field name="code">2101</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p210"/>
+        </record>
+        <record model="account.account.template" id="p2102">
+            <field name="name">Office Rent</field>
+            <field name="code">2102</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p210"/>
+        </record>
+        <record model="account.account.template" id="p2103">
+            <field name="name">House Keeping Expense</field>
+            <field name="code">2103</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p210"/>
+        </record>
+        <record model="account.account.template" id="p2104">
+            <field name="name">Postage And Courier Expense</field>
+            <field name="code">2104</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p210"/>
+        </record>
+        <record model="account.account.template" id="p2105">
+            <field name="name">Internet Expense</field>
+            <field name="code">2105</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p210"/>
+        </record>
+        <record model="account.account.template" id="p2106">
+            <field name="name">Telephone Expense</field>
+            <field name="code">2106</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p210"/>
+        </record>
+        <record model="account.account.template" id="p2107">
+            <field name="name">Purchase Expense</field>
+            <field name="code">2107</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p210"/>
+        </record>
+        <record model="account.account.template" id="p2108">
+            <field name="name">Computer/Laptop Accessories</field>
+            <field name="code">2108</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p210"/>
+        </record>
+        <record model="account.account.template" id="p2109">
+            <field name="name">News Paper And Magazine</field>
+            <field name="code">2109</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p210"/>
+        </record>
+        <record model="account.account.template" id="p211">
+            <field name="name">Indirect Expense</field>
+            <field name="code">211</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_expense_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p21"/>
+        </record>
+        <record model="account.account.template" id="p2110">
+            <field name="name">Business Promotion</field>
+            <field name="code">2110</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p211"/>
+        </record>
+        <record model="account.account.template" id="p2111">
+            <field name="name">Entertainment Expense</field>
+            <field name="code">2111</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p211"/>
+        </record>
+        <record model="account.account.template" id="p2112">
+            <field name="name">Professional Services</field>
+            <field name="code">2112</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p211"/>
+        </record>
+        <record model="account.account.template" id="p2113">
+            <field name="name">Bank Charges</field>
+            <field name="code">2113</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_bank"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p211"/>
+        </record>
+        <record model="account.account.template" id="p2114">
+            <field name="name">Diwali Bonus/Gift</field>
+            <field name="code">2114</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p211"/>
+        </record>
+        <record model="account.account.template" id="p2115">
+            <field name="name">Parts Purchase</field>
+            <field name="code">2115</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p211"/>
+        </record>
+        <record model="account.account.template" id="p2116">
+            <field name="name">Repairing Expense</field>
+            <field name="code">2116</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p211"/>
+        </record>
+        <record model="account.account.template" id="p2117">
+            <field name="name">Foreign Exchange Loss</field>
+            <field name="code">2117</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p211"/>
+        </record>
+        <record model="account.account.template" id="p2118">
+            <field name="name">Other Expense</field>
+            <field name="code">2118</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_expense_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p211"/>
+        </record>
+        <record model="account.account.template" id="p21181">
+            <field name="name">Sales Commission Expense</field>
+            <field name="code">21181</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p2118"/>
+        </record>
+        <record model="account.account.template" id="p21182">
+            <field name="name">Stationary Expense</field>
+            <field name="code">21182</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p2118"/>
+        </record>
+        <record model="account.account.template" id="p21183">
+            <field name="name">Travelling Expense</field>
+            <field name="code">21183</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p2118"/>
+        </record>
+        <record model="account.account.template" id="p212">
+            <field name="name">Cost of Goods Sold</field>
+            <field name="code">212</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_expense_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p21"/>
+        </record>
+        <record model="account.account.template" id="p2121">
+            <field name="name">Opening Stock</field>
+            <field name="code">2121</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p212"/>
+        </record>
+        <record model="account.account.template" id="p2122">
+            <field name="name">Purchase Stock</field>
+            <field name="code">2122</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p212"/>
+        </record>
+        <record model="account.account.template" id="p2123">
+            <field name="name">Closing Stock</field>
+            <field name="code">2123</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p212"/>
+        </record>
+        <record model="account.account.template" id="p213">
+            <field name="name">Non Operating Expenses And Loss</field>
+            <field name="code">213</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.account_type_expense_view1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p21"/>
+        </record>
+        <record model="account.account.template" id="p2131">
+            <field name="name">Loss on Sale of Assets</field>
+            <field name="code">2131</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p213"/>
+        </record>
+        <record model="account.account.template" id="p2132">
+            <field name="name">Write Off Expense</field>
+            <field name="code">2132</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="p213"/>
+        </record>
+        <record id="indian_chart_template_standard" model="account.chart.template">
+            <field name="name">Indian Chart of Accounts - Standard</field>
+            <field name="account_root_id" ref="p0"/>
+            <field name="tax_code_root_id" ref="vat_code_tax"/> 
+            <field name="bank_account_view_id" ref="p1002"/> 
+            <field name="property_account_receivable" ref="p10040"/>
+            <field name="property_account_payable" ref="p11211"/>
+            <field name="property_account_expense_categ" ref="p2107"/>
+            <field name="property_account_income_categ" ref="p20011"/>
+            <field name="currency_id" ref="base.INR"/>
+        </record>
+
+   </data>
+</openerp>
diff --git a/addons/l10n_in/l10n_in_standard_tax_template.xml b/addons/l10n_in/l10n_in_standard_tax_template.xml
new file mode 100644
index 00000000000..a4e91b3884a
--- /dev/null
+++ b/addons/l10n_in/l10n_in_standard_tax_template.xml
@@ -0,0 +1,405 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+    <record id="input_tax_15" model="account.tax.template">
+        <field name="name">Input Sales Tax @ 15%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.15</field>
+        <field name="sequence">10</field>
+        <field name="account_collected_id" ref="p11235"/>
+        <field name="base_code_id" ref="15bases_vat_code_sales_tax_sale"/>
+        <field name="tax_code_id" ref="15vat_code_sales_tax_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="input_tax_12" model="account.tax.template">
+        <field name="name">Input Sales Tax @ 12%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.12</field>
+        <field name="sequence">10</field>
+        <field name="account_collected_id" ref="p11235"/>
+        <field name="base_code_id" ref="12bases_vat_code_sales_tax_sale"/>
+        <field name="tax_code_id" ref="12vat_code_sales_tax_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="input_tax_4" model="account.tax.template">
+        <field name="name">Input Sales Tax @ 4%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.04</field>
+        <field name="sequence">10</field>
+        <field name="account_collected_id" ref="p11235"/>
+        <field name="base_code_id" ref="4bases_vat_code_sales_tax_sale"/>
+        <field name="tax_code_id" ref="4vat_code_sales_tax_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="add_input_vat_1" model="account.tax.template">
+        <field name="name">Additional Input VAT @ 1%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.01</field>
+        <field name="sequence">15</field>
+        <field name="account_collected_id" ref="p11232"/>
+        <field name="base_code_id" ref="1bases_add_vat_on_sale"/>
+        <field name="tax_code_id" ref="1add_vat_on_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="input_vat_12" model="account.tax.template">
+        <field name="name">Input VAT @ 12.5%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.125</field>
+        <field name="sequence">10</field>
+        <field name="account_collected_id" ref="p11232"/>
+        <field name="base_code_id" ref="12bases_vat_on_sale"/>
+        <field name="tax_code_id" ref="12vat_on_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="add_input_vat_2" model="account.tax.template">
+        <field name="name">Additional Input VAT @ 2.5%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.025</field>
+        <field name="sequence">15</field>
+        <field name="account_collected_id" ref="p11232"/>
+        <field name="base_code_id" ref="2bases_add_vat_on_sale"/>
+        <field name="tax_code_id" ref="2add_vat_on_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="sale_vat_8" model="account.tax.template">
+        <field name="name">Input VAT @ 8%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.08</field>
+        <field name="sequence">10</field>
+        <field name="account_collected_id" ref="p11232"/>
+        <field name="base_code_id" ref="8bases_vat_on_sale"/>
+        <field name="tax_code_id" ref="8vat_on_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="sale_vat_10" model="account.tax.template">
+        <field name="name">Input VAT @ 10%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.1</field>
+        <field name="sequence">10</field>
+        <field name="account_collected_id" ref="p11232"/>
+        <field name="base_code_id" ref="10bases_vat_on_sale"/>
+        <field name="tax_code_id" ref="10vat_on_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="sale_Excise_Duty_12" model="account.tax.template">
+        <field name="name">Input Excise Duty @ 12.36%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.12</field>
+        <field name="include_base_amount">True</field>
+        <field name="sequence">1</field>
+        <field name="account_collected_id" ref="p112331"/>
+        <field name="base_code_id" ref="bases_vat_code_tax_exice_sale"/>
+        <field name="tax_code_id" ref="vat_code_tax_exice_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="sale_edu_cess_Excise_Duty_2" model="account.tax.template">
+        <field name="name">Input Education Cess @ 2% On Excise Duty</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.02</field>
+        <field name="include_base_amount">True</field>
+        <field name="parent_id" ref="sale_Excise_Duty_12"/>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="p112332"/>
+        <field name="tax_code_id" ref="edu_vat_code_tax_exice_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="sale_hedu_cess_Excise_Duty_1" model="account.tax.template">
+        <field name="name">Input Higher Education Cess @ 1% On Excise Duty</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.01</field>
+        <field name="include_base_amount">True</field>
+        <field name="parent_id" ref="sale_Excise_Duty_12"/>
+        <field name="sequence">3</field>
+        <field name="account_collected_id" ref="p112333"/>
+        <field name="tax_code_id" ref="hedu_vat_code_tax_exice_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="sale_service_tax_12" model="account.tax.template">
+        <field name="name">Input Service Tax @ 12.36%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.12</field>
+        <field name="include_base_amount">True</field>
+        <field name="sequence">8</field>
+        <field name="account_collected_id" ref="p112341"/>
+        <field name="base_code_id" ref="bases_vat_code_service_tax_sale"/>
+        <field name="tax_code_id" ref="vat_code_service_tax_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="sale_edu_cess_service_tax_2" model="account.tax.template">
+        <field name="name">Input Education Cess @ 2% On Service Tax</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.02</field>
+        <field name="include_base_amount">True</field>
+        <field name="parent_id" ref="sale_service_tax_12"/>
+        <field name="sequence">10</field>
+        <field name="account_collected_id" ref="p112342"/>
+        <field name="tax_code_id" ref="edu_vat_code_service_tax_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="sale_high_edu_service_tax_1" model="account.tax.template">
+        <field name="name">Input Higher Education Cess @ 1% On Service Tax</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.01</field>
+        <field name="parent_id" ref="sale_service_tax_12"/>
+        <field name="include_base_amount">True</field>
+        <field name="sequence">10</field>
+        <field name="account_collected_id" ref="p112343"/>
+        <field name="tax_code_id" ref="hedu_vat_code_service_tax_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="sale_tax_2" model="account.tax.template">
+        <field name="name">Input Sales Tax @ 2% Against C Form</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.02</field>
+        <field name="sequence">10</field>
+        <field name="account_collected_id" ref="p11235"/>
+        <field name="base_code_id" ref="bases_vat_code_tax_c_forms_sale"/>
+        <field name="tax_code_id" ref="vat_code_tax_c_forms_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="input_vat_4" model="account.tax.template">
+        <field name="name">Input VAT @ 4%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.04</field>
+        <field name="sequence">10</field>
+        <field name="account_collected_id" ref="p11232"/>
+        <field name="base_code_id" ref="4bases_vat_on_sale"/>
+        <field name="tax_code_id" ref="4vat_on_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+
+    <!--output purchase tax-->
+    <record id="output_tax_15" model="account.tax.template">
+        <field name="name">Output Purchase Tax @ 15%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.15</field>
+        <field name="sequence">10</field>
+        <field name="account_collected_id" ref="p10050"/>
+        <field name="base_code_id" ref="15bases_vat_code_sales_tax_purchase"/>
+        <field name="tax_code_id" ref="15vat_code_sales_tax_purchase"/>
+        <field name="base_sign" eval="-1"/>
+        <field name="tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="output_tax_12" model="account.tax.template">
+        <field name="name">Output Purchase Tax @ 12%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.12</field>
+        <field name="sequence">10</field>
+        <field name="account_collected_id" ref="p10050"/>
+        <field name="base_code_id" ref="12bases_vat_code_sales_tax_purchase"/>
+        <field name="tax_code_id" ref="12vat_code_sales_tax_purchase"/>
+        <field name="base_sign" eval="-1"/>
+        <field name="tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="output_tax_4" model="account.tax.template">
+        <field name="name">Output Purchase Tax @ 4%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.04</field>
+        <field name="sequence">10</field>
+        <field name="account_collected_id" ref="p10050"/>
+        <field name="base_code_id" ref="4bases_vat_code_sales_tax_purchase"/>
+        <field name="tax_code_id" ref="4vat_code_sales_tax_purchase"/>
+        <field name="base_sign" eval="-1"/>
+        <field name="tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="add_output_vat_1" model="account.tax.template">
+        <field name="name">Additional Output VAT @ 1%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.01</field>
+        <field name="sequence">15</field>
+        <field name="account_collected_id" ref="p10051"/>
+        <field name="base_code_id" ref="1bases_add_vat_on_purchase"/>
+        <field name="tax_code_id" ref="1add_vat_on_purchase"/>
+        <field name="base_sign" eval="-1"/>
+        <field name="tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="output_vat_12" model="account.tax.template">
+        <field name="name">Output VAT @ 12.5%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.125</field>
+        <field name="sequence">10</field>
+        <field name="account_collected_id" ref="p10051"/>
+        <field name="base_code_id" ref="12bases_vat_on_purchase"/>
+        <field name="tax_code_id" ref="12vat_on_purchase"/>
+        <field name="base_sign" eval="-1"/>
+        <field name="tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="add_output_vat_2" model="account.tax.template">
+        <field name="name">Additional Output VAT @ 2.5%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.025</field>
+        <field name="sequence">15</field>
+        <field name="account_collected_id" ref="p10051"/>
+        <field name="base_code_id" ref="2bases_add_vat_on_purchase"/>
+        <field name="tax_code_id" ref="2add_vat_on_purchase"/>
+        <field name="base_sign" eval="-1"/>
+        <field name="tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="purchase_vat_8" model="account.tax.template">
+        <field name="name">Output VAT @ 8%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.08</field>
+        <field name="sequence">10</field>
+        <field name="account_collected_id" ref="p10051"/>
+        <field name="base_code_id" ref="8bases_vat_on_purchase"/>
+        <field name="tax_code_id" ref="8vat_on_purchase"/>
+        <field name="base_sign" eval="-1"/>
+        <field name="tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="purchase_vat_10" model="account.tax.template">
+        <field name="name">Output VAT @ 10%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.1</field>
+        <field name="sequence">10</field>
+        <field name="account_collected_id" ref="p10051"/>
+        <field name="base_code_id" ref="10bases_vat_on_purchase"/>
+        <field name="tax_code_id" ref="10vat_on_purchase"/>
+        <field name="base_sign" eval="-1"/>
+        <field name="tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="purchase_Excise_Duty_12" model="account.tax.template">
+        <field name="name">Output Excise Duty @ 12.36%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.12</field>
+        <field name="include_base_amount">True</field>
+        <field name="sequence">1</field>
+        <field name="account_collected_id" ref="p100521"/>
+        <field name="base_code_id" ref="bases_vat_code_tax_exice_purchase"/>
+        <field name="tax_code_id" ref="vat_code_tax_exice_purchase"/>
+        <field name="base_sign" eval="-1"/>
+        <field name="tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="purchase_edu_cess_Excise_Duty_2" model="account.tax.template">
+        <field name="name">Output Education Cess @ 2% Excise Duty</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.02</field>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="p100522"/>
+        <field name="parent_id" ref="purchase_Excise_Duty_12"/>
+        <field name="include_base_amount">True</field>
+        <field name="tax_code_id" ref="edu_vat_code_tax_exice_purchase"/>
+        <field name="base_sign" eval="-1"/>
+        <field name="tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="purchase_hedu_cess_Excise_Duty_1" model="account.tax.template">
+        <field name="name">Output Higher Education Cess @ 1% Excise Duty</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.01</field>
+        <field name="parent_id" ref="purchase_Excise_Duty_12"/>
+        <field name="include_base_amount">True</field>
+        <field name="sequence">3</field>
+        <field name="account_collected_id" ref="p100523"/>
+        <field name="tax_code_id" ref="hedu_vat_code_tax_exice_purchase"/>
+        <field name="base_sign" eval="-1"/>
+        <field name="tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="st_purchase_service_tax_12" model="account.tax.template">
+        <field name="name">Output Service Tax @ 12.36%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="include_base_amount">True</field>
+        <field name="type">percent</field>
+        <field name="amount">0.12</field>
+        <field name="sequence">8</field>
+        <field name="account_collected_id" ref="p100531"/>
+        <field name="base_code_id" ref="bases_vat_code_service_tax_pur"/>
+        <field name="tax_code_id" ref="vat_code_service_tax_pur"/>
+        <field name="base_sign" eval="-1"/>
+        <field name="tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="purchase_edu_cess_service_tax_2" model="account.tax.template">
+        <field name="name">Output Education Cess @ 2% On Service Tax</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.02</field>
+        <field name="include_base_amount">True</field>
+        <field name="parent_id" ref="st_purchase_service_tax_12"/>  
+        <field name="sequence">10</field>
+        <field name="account_collected_id" ref="p100532"/>
+        <field name="tax_code_id" ref="edu_vat_code_service_tax_pur"/>
+        <field name="base_sign" eval="-1"/>
+        <field name="tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="purchase_high_edu_service_tax_1" model="account.tax.template">
+        <field name="name">Output Higher Education Cess @ 1% On Service Tax</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.01</field>
+        <field name="sequence">10</field>
+        <field name="account_collected_id" ref="p100533"/>
+        <field name="include_base_amount">True</field>
+        <field name="parent_id" ref="st_purchase_service_tax_12"/>
+        <field name="tax_code_id" ref="hedu_vat_code_service_tax_pur"/>
+        <field name="base_sign" eval="-1"/>
+        <field name="tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="output_vat_4" model="account.tax.template">
+        <field name="name">Output VAT @ 4%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.04</field>
+        <field name="sequence">10</field>
+        <field name="account_collected_id" ref="p10051"/>
+        <field name="base_code_id" ref="4bases_vat_on_purchase"/>
+        <field name="tax_code_id" ref="4vat_on_purchase"/>
+        <field name="base_sign" eval="-1"/>
+        <field name="tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+    <record id="output_pur_tax_2" model="account.tax.template">
+        <field name="name">Output Sales Tax @ 2% Against C Form</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.02</field>
+        <field name="sequence">10</field>
+        <field name="account_collected_id" ref="p10050"/>
+        <field name="base_code_id" ref="bases_vat_code_tax_c_forms_purchase"/>
+        <field name="tax_code_id" ref="vat_code_tax_c_forms_purchase"/>
+        <field name="base_sign" eval="-1"/>
+        <field name="tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_standard"/>
+    </record>
+
+    </data>
+</openerp>
diff --git a/addons/l10n_in/l10n_in_tax_code_template.xml b/addons/l10n_in/l10n_in_tax_code_template.xml
index 983d2fa4910..6568f5b774e 100644
--- a/addons/l10n_in/l10n_in_tax_code_template.xml
+++ b/addons/l10n_in/l10n_in_tax_code_template.xml
@@ -5,562 +5,559 @@
 
         <record model="account.tax.code.template" id="vat_code_tax">
             <field name="name">Tax</field>
+            <field name="code"> I </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_balance_net">
-            <field name="name">Tax Balance to Pay</field>
+     <!--tax to pay-->
+        <record model="account.tax.code.template" id="vat_code_Tax_to_pay">
+            <field name="name">Tax to Pay</field>
             <field name="parent_id" ref="vat_code_tax"/>
+            <field name="code"> II </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec">
-            <field name="name">Tax Received</field>
-            <field name="parent_id" ref="vat_code_balance_net"/>
+     <!-- C Forms -->
+        <record model="account.tax.code.template" id="vat_code_tax_c_forms">
+            <field name="name">C Forms</field>
+            <field name="parent_id" ref="vat_code_Tax_to_pay"/>
+            <field name="code"> II - A </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_payable">
-            <field name="name">Tax Paid</field>
-            <field name="sign">-1</field>
-            <field name="parent_id" ref="vat_code_balance_net"/>
+        <record model="account.tax.code.template" id="vat_code_tax_c_forms_sale">
+            <field name="name">C Forms Tax Collected on Sale</field>
+            <field name="parent_id" ref="vat_code_tax_c_forms"/>
+            <field name="code"> II - Aa </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_base_net">
+        <record model="account.tax.code.template" id="vat_code_tax_c_forms_purchase">
+            <field name="name">C Forms Tax Paid on Purchase</field>
+            <field name="parent_id" ref="vat_code_tax_c_forms"/>
+            <field name="code"> II - Ab </field>
+        </record>
+
+     <!-- Excise Duty -->
+        <record model="account.tax.code.template" id="vat_code_tax_exice1">
+            <field name="name">Excise Duty</field>
+            <field name="parent_id" ref="vat_code_Tax_to_pay"/>
+            <field name="code"> II - B </field>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_exice">
+            <field name="name">Excise Duty 12.36%</field>
+            <field name="parent_id" ref="vat_code_tax_exice1"/>
+            <field name="code"> II - Ba </field>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_exice_sale">
+            <field name="name">Excise Duty Collected on Sales</field>
+            <field name="parent_id" ref="vat_code_tax_exice"/>
+            <field name="code"> II - BaA </field>
+        </record>
+
+        <record model="account.tax.code.template" id="edu_vat_code_tax_exice_sale">
+            <field name="name">Education Cess 2% Excise Duty Collected on Sales</field>
+            <field name="parent_id" ref="vat_code_tax_exice"/>
+            <field name="code"> II - BaB </field>
+        </record>
+
+        <record model="account.tax.code.template" id="hedu_vat_code_tax_exice_sale">
+            <field name="name">Higher Education Cess 1% Excise Duty Collected on Sales</field>
+            <field name="parent_id" ref="vat_code_tax_exice"/>
+            <field name="code"> II - BaC </field>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_exice_purchase">
+            <field name="name">Excise Duty Paid on Purchase</field>
+            <field name="parent_id" ref="vat_code_tax_exice"/>
+            <field name="code"> II - BaD </field>
+        </record>
+
+        <record model="account.tax.code.template" id="edu_vat_code_tax_exice_purchase">
+            <field name="name">Education Cess 2% Excise Duty Paid on Purchase</field>
+            <field name="parent_id" ref="vat_code_tax_exice"/>
+            <field name="code"> II - BaE </field>
+        </record>
+
+        <record model="account.tax.code.template" id="hedu_vat_code_tax_exice_purchase">
+            <field name="name">Higher Education Cess 1% Excise Duty Paid on Purchase</field>
+            <field name="parent_id" ref="vat_code_tax_exice"/>
+           <field name="code"> II - BaF </field>
+        </record>
+
+     <!-- Sales Tax -->
+        <record model="account.tax.code.template" id="code_sales_tax">
+            <field name="name">Sales Tax</field>
+            <field name="parent_id" ref="vat_code_Tax_to_pay"/>
+           <field name="code"> II - C </field>
+        </record>
+
+        <record model="account.tax.code.template" id="4vat_code_sales_tax">
+            <field name="name">Sales Tax 4%</field>
+            <field name="parent_id" ref="code_sales_tax"/>
+           <field name="code"> II - Ca </field>
+        </record>
+
+        <record model="account.tax.code.template" id="4vat_code_sales_tax_sale">
+            <field name="name">Sales Tax 4% Collected on Sale</field>
+            <field name="parent_id" ref="4vat_code_sales_tax"/>
+            <field name="code"> II - CaA </field>
+        </record>
+
+        <record model="account.tax.code.template" id="4vat_code_sales_tax_purchase">
+            <field name="name">Sales Tax 4% Paid on Purchase</field>
+            <field name="parent_id" ref="4vat_code_sales_tax"/>
+            <field name="code"> II - Cab </field>
+        </record>
+
+        <record model="account.tax.code.template" id="12vat_code_sales_tax">
+            <field name="name">Sales Tax 12%</field>
+            <field name="parent_id" ref="code_sales_tax"/>
+            <field name="code"> II - Cb </field>
+        </record>
+
+        <record model="account.tax.code.template" id="12vat_code_sales_tax_sale">
+            <field name="name">Sales Tax 12% Collected on Sale</field>
+            <field name="parent_id" ref="12vat_code_sales_tax"/>
+            <field name="code"> II - CbA </field>
+        </record>
+
+        <record model="account.tax.code.template" id="12vat_code_sales_tax_purchase">
+            <field name="name">Sales Tax 12% Paid on Purchase</field>
+            <field name="parent_id" ref="12vat_code_sales_tax"/>
+            <field name="code"> II - CbB </field>
+        </record>
+
+        <record model="account.tax.code.template" id="15vat_code_sales_tax">
+            <field name="name">Sales Tax 15%</field>
+            <field name="parent_id" ref="code_sales_tax"/>
+            <field name="code"> II - Cc </field>
+        </record>
+
+        <record model="account.tax.code.template" id="15vat_code_sales_tax_sale">
+            <field name="name">Sales Tax 15% Collected on Sale</field>
+            <field name="parent_id" ref="15vat_code_sales_tax"/>
+            <field name="code"> II - CcA </field>
+        </record>
+
+        <record model="account.tax.code.template" id="15vat_code_sales_tax_purchase">
+            <field name="name">Sales Tax 15% Paid on Purchase</field>
+            <field name="parent_id" ref="15vat_code_sales_tax"/>
+            <field name="code"> II - CcB </field>
+        </record>
+
+     <!-- Service Tax -->
+        <record model="account.tax.code.template" id="vat_service_tax1">
+            <field name="name">Service Tax</field>
+            <field name="parent_id" ref="vat_code_Tax_to_pay"/>
+            <field name="code"> II - D </field>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_service_tax">
+            <field name="name">Service Tax 12.36%</field>
+            <field name="parent_id" ref="vat_service_tax1"/>
+            <field name="code"> II - Da </field>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_service_tax_sale">
+            <field name="name">Service Tax Collected on Sales of Services</field>
+            <field name="parent_id" ref="vat_service_tax"/>
+            <field name="code"> II - DaA </field>
+        </record>
+
+        <record model="account.tax.code.template" id="edu_vat_code_service_tax_sale">
+            <field name="name">Education Cess 2% Service Tax Collected on Sales of Services</field>
+            <field name="parent_id" ref="vat_service_tax"/>
+            <field name="code"> II - DaB </field>
+        </record>
+
+        <record model="account.tax.code.template" id="hedu_vat_code_service_tax_sale">
+            <field name="name">Higher Education Cess 1% Service Tax Collected on Sales of Services</field>
+            <field name="parent_id" ref="vat_service_tax"/>
+            <field name="code"> II - DaC </field>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_service_tax_pur">
+            <field name="name">Service Tax Paid on Purchase of Services</field>
+            <field name="parent_id" ref="vat_service_tax"/>
+            <field name="code"> II - DaD </field>
+        </record>
+
+        <record model="account.tax.code.template" id="edu_vat_code_service_tax_pur">
+            <field name="name">Education Cess 2% Service Tax Paid on Purchase of Services</field>
+            <field name="parent_id" ref="vat_service_tax"/>
+            <field name="code"> II - DaE </field>
+        </record>
+
+        <record model="account.tax.code.template" id="hedu_vat_code_service_tax_pur">
+            <field name="name">Higher Education Cess 1% Service Tax Paid on Purchase of Services</field>
+            <field name="parent_id" ref="vat_service_tax"/>
+            <field name="code"> II - DaF </field>
+        </record>
+
+     <!-- VAT -->
+        <record model="account.tax.code.template" id="vat_code">
+            <field name="name">VAT</field>
+            <field name="parent_id" ref="vat_code_Tax_to_pay"/>
+            <field name="code"> II - E </field>
+        </record>
+
+        <record model="account.tax.code.template" id="4vat_code">
+            <field name="name">VAT 4%</field>
+            <field name="parent_id" ref="vat_code"/>
+            <field name="code"> II - Ea </field>
+        </record>
+
+        <record model="account.tax.code.template" id="4vat_on_sale">
+            <field name="name">VAT 4% Collected on Sale</field>
+            <field name="parent_id" ref="4vat_code"/>
+            <field name="code"> II - EaA </field>
+        </record>
+
+        <record model="account.tax.code.template" id="4vat_on_purchase">
+            <field name="name">VAT 4% Paid on Purchase</field>
+            <field name="parent_id" ref="4vat_code"/>
+            <field name="code"> II - EaB </field>
+        </record>
+
+        <record model="account.tax.code.template" id="8vat_code">
+            <field name="name">VAT 8%</field>
+            <field name="parent_id" ref="vat_code"/>
+            <field name="code"> II - Eb </field>
+        </record>
+
+        <record model="account.tax.code.template" id="8vat_on_sale">
+            <field name="name">VAT 8% Collected on Sale</field>
+            <field name="parent_id" ref="8vat_code"/>
+            <field name="code"> II - EbA </field>
+        </record>
+
+        <record model="account.tax.code.template" id="8vat_on_purchase">
+            <field name="name">VAT 8% Paid on Purchase</field>
+            <field name="parent_id" ref="8vat_code"/>
+            <field name="code"> II - EbB </field>
+        </record>
+
+        <record model="account.tax.code.template" id="10vat_code">
+            <field name="name">VAT 10%</field>
+            <field name="parent_id" ref="vat_code"/>
+            <field name="code"> II - Ec </field>
+        </record>
+
+        <record model="account.tax.code.template" id="10vat_on_sale">
+            <field name="name">VAT 10% Collected on Sale</field>
+            <field name="parent_id" ref="10vat_code"/>
+            <field name="code"> II - EcA </field>
+        </record>
+
+        <record model="account.tax.code.template" id="10vat_on_purchase">
+            <field name="name">VAT 10% Paid on Purchase</field>
+            <field name="parent_id" ref="10vat_code"/>
+            <field name="code"> II - EcB </field>
+        </record>
+
+        <record model="account.tax.code.template" id="12vat_code">
+            <field name="name">VAT 12.5%</field>
+            <field name="parent_id" ref="vat_code"/>
+            <field name="code"> II - Ed </field>
+        </record>
+
+        <record model="account.tax.code.template" id="12vat_on_sale">
+            <field name="name">VAT 12.5% Collected on Sale</field>
+            <field name="parent_id" ref="12vat_code"/>
+            <field name="code"> II - EdA </field>
+        </record>
+
+        <record model="account.tax.code.template" id="12vat_on_purchase">
+            <field name="name">VAT 12.5% Paid on Purchase</field>
+            <field name="parent_id" ref="12vat_code"/>
+            <field name="code"> II - EdB </field>
+        </record>
+
+        <record model="account.tax.code.template" id="1add_vat_code">
+            <field name="name">Additional VAT 1%</field>
+            <field name="parent_id" ref="vat_code"/>
+            <field name="code"> II - Ee </field>
+        </record>
+
+        <record model="account.tax.code.template" id="1add_vat_on_sale">
+            <field name="name">Additional VAT 1% Collected on Sale</field>
+            <field name="parent_id" ref="1add_vat_code"/>
+            <field name="code"> II - EeA </field>
+        </record>
+
+        <record model="account.tax.code.template" id="1add_vat_on_purchase">
+            <field name="name">Additional VAT 1% Paid on Purchase</field>
+            <field name="parent_id" ref="1add_vat_code"/>
+            <field name="code"> II - EeB </field>
+        </record>
+
+        <record model="account.tax.code.template" id="2add_vat_code">
+            <field name="name">Additional VAT 2.5%</field>
+            <field name="parent_id" ref="vat_code"/>
+            <field name="code"> II - Ef </field>
+        </record>
+
+        <record model="account.tax.code.template" id="2add_vat_on_sale">
+            <field name="name">Additional VAT 2.5% Collected on Sale</field>
+            <field name="parent_id" ref="2add_vat_code"/>
+            <field name="code"> II - EfA </field>
+        </record>
+
+        <record model="account.tax.code.template" id="2add_vat_on_purchase">
+            <field name="name">Additional VAT 2.5% Paid on Purchase</field>
+            <field name="parent_id" ref="2add_vat_code"/>
+            <field name="code"> II - EfB </field>
+        </record>
+
+     <!-- Tax Bases -->
+        <record model="account.tax.code.template" id="vat_code_Tax_Bases">
             <field name="name">Tax Bases</field>
             <field name="parent_id" ref="vat_code_tax"/>
+            <field name="code"> III </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_base_tax_sale">
-            <field name="name">Taxable Sale Bases</field>
-            <field name="parent_id" ref="vat_code_base_net"/>
+     <!-- Base C Forms -->
+        <record model="account.tax.code.template" id="bases_vat_code_tax_c_forms">
+            <field name="name">Base C Forms</field>
+            <field name="parent_id" ref="vat_code_Tax_Bases"/>
+            <field name="code"> III - A </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_base_tax_purchase">
-            <field name="name">Taxable Purchase Bases</field>
-            <field name="parent_id" ref="vat_code_base_net"/>
+        <record model="account.tax.code.template" id="bases_vat_code_tax_c_forms_sale">
+            <field name="name">Base of Sale</field>
+            <field name="parent_id" ref="bases_vat_code_tax_c_forms"/>
+            <field name="code"> III - Aa </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pur_CSTP5">
-            <field name="name">Input CST 5%</field>
-            <field name="parent_id" ref="vat_code_payable"/>
+        <record model="account.tax.code.template" id="bases_vat_code_tax_c_forms_purchase">
+            <field name="name">Base of  Purchase</field>
+            <field name="parent_id" ref="bases_vat_code_tax_c_forms"/>
+            <field name="code"> III - Ab </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pur_PCST5">
-            <field name="name">Purchase CST 5%</field>
-            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+    <!-- Base Excise Duty -->
+        <record model="account.tax.code.template" id="bases_exc_vat_code_tax_exice">
+            <field name="name">Base Excise Duty</field>
+            <field name="parent_id" ref="vat_code_Tax_Bases"/>
+            <field name="code"> III - B </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pur_ser12">
-            <field name="name">Purchase Service Tax 12%</field>
-            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        <record model="account.tax.code.template" id="bases_vat_code_tax_exice">
+            <field name="name">Base Excise Duty 12.36%</field>
+            <field name="parent_id" ref="bases_exc_vat_code_tax_exice"/>
+            <field name="code"> III - Ba </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_sale_ser12">
-            <field name="name">Sales Service Tax 12%</field>
-            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        <record model="account.tax.code.template" id="bases_vat_code_tax_exice_sale">
+            <field name="name">Base of Sale</field>
+            <field name="parent_id" ref="bases_vat_code_tax_exice"/>
+            <field name="code"> III - BaA </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_exice_salebase">
-            <field name="name">Excise Duty 12.36% - Sales</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+        <record model="account.tax.code.template" id="bases_vat_code_tax_exice_purchase">
+            <field name="name">Base of  Purchase</field>
+            <field name="parent_id" ref="bases_vat_code_tax_exice"/>
+            <field name="code"> III - BaB </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_exice12">
-            <field name="name">Excise Duty 12% - Sales</field>
-            <field name="parent_id" ref="vat_code_tax_rec_exice_salebase"/>
+     <!-- Base Sales Tax -->
+        <record model="account.tax.code.template" id="base_vat_code_sales_tax">
+            <field name="name">Base Sales Tax</field>
+            <field name="parent_id" ref="vat_code_Tax_Bases"/>
+            <field name="code"> III - C </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_exice2">
-            <field name="name">Excise Duty 2% - Sales</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+        <record model="account.tax.code.template" id="4bases_vat_code_sales_tax">
+            <field name="name">Base Sales Tax 4%</field>
+            <field name="parent_id" ref="base_vat_code_sales_tax"/>
+            <field name="code"> III - Ca </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_exice1">
-            <field name="name">Excise Duty 1% - Sales</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+        <record model="account.tax.code.template" id="4bases_vat_code_sales_tax_sale">
+            <field name="name">Base of Sale</field>
+            <field name="parent_id" ref="4bases_vat_code_sales_tax"/>
+            <field name="code"> III - CaA </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pay_ic_st_purbase">
-            <field name="name">Excise Duty 12.36% - Purchase</field>
-            <field name="parent_id" ref="vat_code_payable"/>
+        <record model="account.tax.code.template" id="4bases_vat_code_sales_tax_purchase">
+            <field name="name">Base of  Purchase</field>
+            <field name="parent_id" ref="4bases_vat_code_sales_tax"/>
+            <field name="code"> III - CaB </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pay_exice12">
-            <field name="name">Excise Duty 12% - Purchase</field>
-            <field name="parent_id" ref="vat_code_tax_pay_ic_st_purbase"/>
+        <record model="account.tax.code.template" id="12bases_vat_code_sales_tax">
+            <field name="name">Base Sales Tax 12%</field>
+            <field name="parent_id" ref="base_vat_code_sales_tax"/>
+            <field name="code"> III - Cb </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_cess2">
-            <field name="name">Education Cess 2% - Sales</field>
-            <field name="parent_id" ref="vat_code_tax_rec_exice_salebase"/>
+        <record model="account.tax.code.template" id="12bases_vat_code_sales_tax_sale">
+            <field name="name">Base of Sale</field>
+            <field name="parent_id" ref="12bases_vat_code_sales_tax"/>
+            <field name="code"> III - CbA </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pay_cess2">
-            <field name="name">Education Cess 2% - Purchase</field>
-            <field name="parent_id" ref="vat_code_tax_pay_ic_st_purbase"/>
+        <record model="account.tax.code.template" id="12bases_vat_code_sales_tax_purchase">
+            <field name="name">Base of  Purchase</field>
+            <field name="parent_id" ref="12bases_vat_code_sales_tax"/>
+            <field name="code"> III - CbB </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pay_import_duty">
-            <field name="name">Input Credit - Import Duty</field>
-            <field name="parent_id" ref="vat_code_payable"/>
+        <record model="account.tax.code.template" id="15bases_vat_code_sales_tax">
+            <field name="name">Base Sales Tax 15%</field>
+            <field name="parent_id" ref="base_vat_code_sales_tax"/>
+            <field name="code"> III - Cc </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pay_edu_cess">
-            <field name="name">Input Credit On Capital Goods - Edu. Cess</field>
-            <field name="parent_id" ref="vat_code_payable"/>
+        <record model="account.tax.code.template" id="15bases_vat_code_sales_tax_sale">
+            <field name="name">Base of Sale</field>
+            <field name="parent_id" ref="15bases_vat_code_sales_tax"/>
+            <field name="code"> III - CcA </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pay_cap_goods">
-            <field name="name">Input Excise Duty 12% - Capital Goods</field>
-            <field name="parent_id" ref="vat_code_payable"/>
+        <record model="account.tax.code.template" id="15bases_vat_code_sales_tax_purchase">
+            <field name="name">Base of  Purchase</field>
+            <field name="parent_id" ref="15bases_vat_code_sales_tax"/>
+            <field name="code"> III - CcB </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pay_seco_hec">
-            <field name="name">Input Credit on Capital Goods - Seco. &amp; HEC</field>
-            <field name="parent_id" ref="vat_code_payable"/>
+     <!-- Base Service Tax -->
+        <record model="account.tax.code.template" id="bases_vat_service_tax1">
+            <field name="name">Base Service Tax</field>
+            <field name="parent_id" ref="vat_code_Tax_Bases"/>
+            <field name="code"> III - D </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pay_ic_st_base">
-            <field name="name">Input Service Tax 12.36%</field>
-            <field name="parent_id" ref="vat_code_payable"/>
+        <record model="account.tax.code.template" id="bases_vat_service_tax">
+            <field name="name">Base Service Tax 12.36%</field>
+            <field name="parent_id" ref="bases_vat_service_tax1"/>
+            <field name="code"> III - Da </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pay_ic_st">
-            <field name="name">Input Service Tax 12%</field>
-            <field name="parent_id" ref="vat_code_tax_pay_ic_st_base"/>
+        <record model="account.tax.code.template" id="bases_vat_code_service_tax_sale">
+            <field name="name">Base of Sale</field>
+            <field name="parent_id" ref="bases_vat_service_tax"/>
+            <field name="code"> III - DaA </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pay_ic_edu_cess">
-            <field name="name">Input Service Tax Edu. Cess. 2%</field>
-            <field name="parent_id" ref="vat_code_tax_pay_ic_st_base"/>
+        <record model="account.tax.code.template" id="bases_vat_code_service_tax_pur">
+            <field name="name">Base of  Purchase</field>
+            <field name="parent_id" ref="bases_vat_service_tax"/>
+            <field name="code"> III - DaB </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pay_ic_seco_hec">
-            <field name="name">Input Service Tax Seco. &amp; HEC 1%</field>
-            <field name="parent_id" ref="vat_code_tax_pay_ic_st_base"/>
+     <!-- Base VAT -->
+        <record model="account.tax.code.template" id="bases_vat_code">
+            <field name="name">Base VAT</field>
+            <field name="parent_id" ref="vat_code_Tax_Bases"/>
+            <field name="code"> III - E </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pay_sec_hig_edu">
-            <field name="name">Seco. &amp; Higher Edu. Cess 1% - Purchase</field>
-            <field name="parent_id" ref="vat_code_tax_pay_ic_st_purbase"/>
+        <record model="account.tax.code.template" id="4bases_vat_code">
+            <field name="name">Base VAT 4%</field>
+            <field name="parent_id" ref="bases_vat_code"/>
+            <field name="code"> III - Ea </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_sec_hig_cess">
-            <field name="name">Seco. &amp; Higher Edu. Cess 1% - Sales</field>
-            <field name="parent_id" ref="vat_code_tax_rec_exice_salebase"/>
+        <record model="account.tax.code.template" id="4bases_vat_on_sale">
+            <field name="name">Base of Sale</field>
+            <field name="parent_id" ref="4bases_vat_code"/>
+            <field name="code"> III - EaA </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_cst2">
-            <field name="name">CST 2% on Sales</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+        <record model="account.tax.code.template" id="4bases_vat_on_purchase">
+            <field name="name">Base of  Purchase</field>
+            <field name="parent_id" ref="4bases_vat_code"/>
+            <field name="code"> III - EaB </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_cst5">
-            <field name="name">CST 5% on Sales</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+        <record model="account.tax.code.template" id="8bases_vat_code">
+            <field name="name">Base VAT 8%</field>
+            <field name="parent_id" ref="bases_vat_code"/>
+            <field name="code"> III - Eb </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pay_add_vat1">
-            <field name="name">Input Additional VAT 1%</field>
-            <field name="parent_id" ref="vat_code_payable"/>
+        <record model="account.tax.code.template" id="8bases_vat_on_sale">
+            <field name="name">Base of Sale</field>
+            <field name="parent_id" ref="8bases_vat_code"/>
+            <field name="code"> III - EbA </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pay_add_vat2">
-            <field name="name">Input Additional Vat 2.5%</field>
-            <field name="parent_id" ref="vat_code_payable"/>
+        <record model="account.tax.code.template" id="8bases_vat_on_purchase">
+            <field name="name">Base of  Purchase</field>
+            <field name="parent_id" ref="8bases_vat_code"/>
+            <field name="code"> III - EbB </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pay_vat12">
-            <field name="name">Input VAT 12.5%</field>
-            <field name="parent_id" ref="vat_code_payable"/>
+        <record model="account.tax.code.template" id="10bases_vat_code">
+            <field name="name">Base VAT 10%</field>
+            <field name="parent_id" ref="bases_vat_code"/>
+            <field name="code"> III - Ec </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pay_vat15">
-            <field name="name">Input VAT 15%</field>
-            <field name="parent_id" ref="vat_code_payable"/>
+        <record model="account.tax.code.template" id="10bases_vat_on_sale">
+            <field name="name">Base of Sale</field>
+            <field name="parent_id" ref="10bases_vat_code"/>
+            <field name="code"> III - EcA </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pay_vat10">
-            <field name="name">Input VAT 10%</field>
-            <field name="parent_id" ref="vat_code_payable"/>
+        <record model="account.tax.code.template" id="10bases_vat_on_purchase">
+            <field name="name">Base of  Purchase</field>
+            <field name="parent_id" ref="10bases_vat_code"/>
+            <field name="code"> III - EcB </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pay_vat8">
-            <field name="name">Input VAT 8%</field>
-            <field name="parent_id" ref="vat_code_payable"/>
+        <record model="account.tax.code.template" id="12bases_vat_code">
+            <field name="name">Base VAT 12.5%</field>
+            <field name="parent_id" ref="bases_vat_code"/>
+            <field name="code"> III - Ed </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pay_vat5">
-            <field name="name">Input VAT 5%</field>
-            <field name="parent_id" ref="vat_code_payable"/>
+        <record model="account.tax.code.template" id="12bases_vat_on_sale">
+            <field name="name">Base of Sale</field>
+            <field name="parent_id" ref="12bases_vat_code"/>
+            <field name="code"> III - EdA </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pay_vat4">
-            <field name="name">Input VAT 4%</field>
-            <field name="parent_id" ref="vat_code_payable"/>
+        <record model="account.tax.code.template" id="12bases_vat_on_purchase">
+            <field name="name">Base of  Purchase</field>
+            <field name="parent_id" ref="12bases_vat_code"/>
+            <field name="code"> III - EdB </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_vat15">
-            <field name="name">Output VAT 15%</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+        <record model="account.tax.code.template" id="1bases_add_vat_code">
+            <field name="name">Base Additional VAT 1%</field>
+            <field name="parent_id" ref="bases_vat_code"/>
+            <field name="code"> III - Fe </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_vat12">
-            <field name="name">Output VAT 12.5%</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+        <record model="account.tax.code.template" id="1bases_add_vat_on_sale">
+            <field name="name">Base of Sale</field>
+            <field name="parent_id" ref="1bases_add_vat_code"/>
+            <field name="code"> III - EeA </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_vat10">
-            <field name="name">Output VAT 10%</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+        <record model="account.tax.code.template" id="1bases_add_vat_on_purchase">
+            <field name="name">Base of  Purchase</field>
+            <field name="parent_id" ref="1bases_add_vat_code"/>
+            <field name="code"> III - EeB </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_vat8">
-            <field name="name">Output VAT 8%</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+        <record model="account.tax.code.template" id="2bases_add_vat_code">
+            <field name="name">Base Additional VAT 2.5%</field>
+            <field name="parent_id" ref="bases_vat_code"/>
+            <field name="code"> III - Ef </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_vat5">
-            <field name="name">Output VAT 5%</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+        <record model="account.tax.code.template" id="2bases_add_vat_on_sale">
+            <field name="name">Base of Sale</field>
+            <field name="parent_id" ref="2bases_add_vat_code"/>
+            <field name="code"> III - EfA </field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_vat4">
-            <field name="name">Output VAT 4%</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_rec_add_vat1">
-            <field name="name">Output Adi. VAT 1%</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pay_cst2">
-            <field name="name">CST 2% on Purchase</field>
-            <field name="parent_id" ref="vat_code_payable"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pay_exice5">
-            <field name="name">Input Excise Duty 5%</field>
-            <field name="parent_id" ref="vat_code_payable"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pay_exice6">
-            <field name="name">Input Excise Duty 6%</field>
-            <field name="parent_id" ref="vat_code_payable"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pay_urd">
-            <field name="name">Input Credit - URD</field>
-            <field name="parent_id" ref="vat_code_payable"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pay_tds_audit_fee">
-            <field name="name">TDS on Audit Fees - 94J</field>
-            <field name="parent_id" ref="vat_code_payable"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pay_tds_brokerage">
-            <field name="name">TDS on Commission Or Brokerage- 94H</field>
-            <field name="parent_id" ref="vat_code_payable"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pay_tds_contractor">
-            <field name="name">TDS on Contractor-94C</field>
-            <field name="parent_id" ref="vat_code_payable"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pay_tds_dir_intrest">
-            <field name="name">TDS on Director's Interest</field>
-            <field name="parent_id" ref="vat_code_payable"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pay_tds_dir_ren">
-            <field name="name">TDS on Director's Remuneration - 92B</field>
-            <field name="parent_id" ref="vat_code_payable"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pay_tds_intrest">
-            <field name="name">TDS on Interest</field>
-            <field name="parent_id" ref="vat_code_payable"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pay_tds_prof_fee">
-            <field name="name">TDS on Professional Fees - 94J</field>
-            <field name="parent_id" ref="vat_code_payable"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pay_tds_rent">
-            <field name="name">TDS on Rent - 94I</field>
-            <field name="parent_id" ref="vat_code_payable"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pay_tds_sal">
-            <field name="name">TDS on Salary - 92B</field>
-            <field name="parent_id" ref="vat_code_payable"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_tds_pur_import">
-            <field name="name">Import Purchase</field>
-            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pur_vat">
-            <field name="name">Purchase VAT 4% / VAT 12.5% / VAT 15% / CST 2% / CST 5%</field>
-            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pur_plant_machinery">
-            <field name="name">Plant &amp; Machinery</field>
-            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pur_exp_act">
-            <field name="name">Expense Accounts</field>
-            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_sales_excise">
-            <field name="name">Sales Excise</field>
-            <field name="parent_id" ref="vat_code_base_tax_sale"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_sale_cst2">
-            <field name="name">Sales CST 2%</field>
-            <field name="parent_id" ref="vat_code_base_tax_sale"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_sale_cst15">
-            <field name="name">Sales CST 5%</field>
-            <field name="parent_id" ref="vat_code_base_tax_sale"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pur_vat15">
-            <field name="name">Purchase VAT 15%</field>
-            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pur_vat12">
-            <field name="name">Purchase VAT 12.5%</field>
-            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pur_vat10">
-            <field name="name">Purchase VAT 10%</field>
-            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pur_vat8">
-            <field name="name">Purchase VAT 8%</field>
-            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pur_vat5">
-            <field name="name">Purchase VAT 5%</field>
-            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pur_vat4">
-            <field name="name">Purchase VAT 4%</field>
-            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pur_vat25">
-            <field name="name">Purchase VAT 2.5%</field>
-            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_sal_vat15">
-            <field name="name">Sales VAT 15%</field>
-            <field name="parent_id" ref="vat_code_base_tax_sale"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_sal_vat12">
-            <field name="name">Sales VAT 12.5%</field>
-            <field name="parent_id" ref="vat_code_base_tax_sale"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_sal_vat10">
-            <field name="name">Sales VAT 10%</field>
-            <field name="parent_id" ref="vat_code_base_tax_sale"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_sal_vat8">
-            <field name="name">Sales VAT 8%</field>
-            <field name="parent_id" ref="vat_code_base_tax_sale"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_sal_vat5">
-            <field name="name">Sales VAT 5%</field>
-            <field name="parent_id" ref="vat_code_base_tax_sale"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_sal_vat4">
-            <field name="name">Sales VAT 4%</field>
-            <field name="parent_id" ref="vat_code_base_tax_sale"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pur_cst2">
-            <field name="name">Input CST 2%</field>
-            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pur_urd">
-            <field name="name">Purchase URD</field>
-            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pur_base_tds">
-            <field name="name">Base Expenses for TDS</field>
-            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pay_add_imp_duty">
-            <field name="name">Additional Duty (Imports) 4%</field>
-            <field name="parent_id" ref="vat_code_payable"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_sal_formh_tax">
-            <field name="name">Sales Export - Form H - With Tax</field>
-            <field name="parent_id" ref="vat_code_base_tax_sale"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_rec_cst2_on_sal_cst3">
-            <field name="name">CST 2% on Sales CT3</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_sal_cst3">
-            <field name="name">Sales CT3 VAT</field>
-            <field name="parent_id" ref="vat_code_base_tax_sale"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_rec_out4_sal_cst3">
-            <field name="name">Output VAT 4% on Sales CT3</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_rec_out_add1_sale_cst3">
-            <field name="name">Output Adi. VAT 1% on Sales CT3</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_sal_ct3_cst">
-            <field name="name">Sales CT3 CST</field>
-            <field name="parent_id" ref="vat_code_base_tax_sale"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_sal_exp_ct1">
-            <field name="name">Sales Export - Form H - With CT1</field>
-            <field name="parent_id" ref="vat_code_base_tax_sale"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_sal_sez_out_guj">
-            <field name="name">Sales Export - SEZ - Out of Gujarat</field>
-            <field name="parent_id" ref="vat_code_base_tax_sale"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_sal_sez_in_guj">
-            <field name="name">Sales Export - SEZ - In Gujarat</field>
-            <field name="parent_id" ref="vat_code_base_tax_sale"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_no_saz_ogs">
-            <field name="name">No Tax SEZ OGS</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_no_sez_guj">
-            <field name="name">No Tax SEZ Gujarat</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_sal_out_country">
-            <field name="name">Sales Export - Out of Country</field>
-            <field name="parent_id" ref="vat_code_base_tax_sale"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_sal_proj">
-            <field name="name">Sales Others (Projects)</field>
-            <field name="parent_id" ref="vat_code_base_tax_sale"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_rec_formh_bed">
-            <field name="name">No Tax Form H with BED</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_rec_fomh">
-            <field name="name">No Tax Form H</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_rec_no_out_country">
-            <field name="name">No Tax Export Out of Country</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_rec_no_proj">
-            <field name="name">No Tax Projects</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_rec_st_salebase">
-            <field name="name">Service Tax 12.36% - Sales</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_rec_st12">
-            <field name="name">Service Tax 12% - Sales</field>
-            <field name="parent_id" ref="vat_code_tax_rec_st_salebase"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_rec_st2">
-            <field name="name">Service Tax 2% - Sales</field>
-            <field name="parent_id" ref="vat_code_tax_rec_st_salebase"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_rec_st1">
-            <field name="name">Service Tax 1% - Sales</field>
-            <field name="parent_id" ref="vat_code_tax_rec_st_salebase"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_base_tax_sale15">
-            <field name="name">Sales Tax 15%</field>
-            <field name="parent_id" ref="vat_code_base_tax_sale"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_rec_sale15">
-            <field name="name">Sales Tax - 15%</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_base_tax_sale12">
-            <field name="name">Sales Tax 12%</field>
-            <field name="parent_id" ref="vat_code_base_tax_sale"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_rec_sale12">
-            <field name="name">Sales Tax - 12%</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_base_tax_sale4">
-            <field name="name">Sales Tax 4%</field>
-            <field name="parent_id" ref="vat_code_base_tax_sale"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_rec_sale4">
-            <field name="name">Sales Tax - 4%</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_base_tax_pur15">
-            <field name="name">Purchase Tax 15%</field>
-            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_pay_pur4">
-            <field name="name">Purchase Tax - 15%</field>
-            <field name="parent_id" ref="vat_code_payable"/>
+        <record model="account.tax.code.template" id="2bases_add_vat_on_purchase">
+            <field name="name">Base of  Purchase</field>
+            <field name="parent_id" ref="2bases_add_vat_code"/>
+            <field name="code"> III - EfB </field>
         </record>
 
     </data>

From 3d66fff4d4964d25e221dc1b5db9b57117920cbb Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Mon, 16 Jun 2014 11:47:28 +0200
Subject: [PATCH 16/36] [FIX] website: clean for save of snippet editor don't
 remove conteneteditable attributes

---
 addons/website/static/src/js/website.snippets.editor.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 7e94895c515..64854442af7 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -362,10 +362,6 @@
         },
         clean_for_save: function () {
             var self = this;
-            $("*[contentEditable], *[attributeEditable]")
-                .removeAttr('contentEditable')
-                .removeAttr('attributeEditable');
-
             var options = website.snippet.options;
             var template = website.snippet.templateOptions;
             for (var k in options) {
@@ -376,6 +372,9 @@
                     });
                 }
             }
+            $("*[contentEditable], *[attributeEditable]")
+                .removeAttr('contentEditable')
+                .removeAttr('attributeEditable');
         },
         make_active: function ($snippet) {
             if ($snippet && this.$active_snipped_id && this.$active_snipped_id.get(0) === $snippet.get(0)) {

From a8497e07c97fc89ba2bc1296616dfeb301f80b81 Mon Sep 17 00:00:00 2001
From: Dharmraj Jhala <dja@openerp.com>
Date: Mon, 16 Jun 2014 16:00:06 +0530
Subject: [PATCH 17/36] [ADD] added instantclick library to load data faster in
 anonymous mode

---
 addons/website_instantclick/__init__.py       |   0
 addons/website_instantclick/__openerp__.py    |  17 +
 .../static/lib/instantclick/instantclick.js   | 430 ++++++++++++++++++
 .../views/website_instantclick.xml            |  18 +
 addons/website_sale/views/templates.xml       |   4 +-
 5 files changed, 467 insertions(+), 2 deletions(-)
 create mode 100644 addons/website_instantclick/__init__.py
 create mode 100644 addons/website_instantclick/__openerp__.py
 create mode 100644 addons/website_instantclick/static/lib/instantclick/instantclick.js
 create mode 100644 addons/website_instantclick/views/website_instantclick.xml

diff --git a/addons/website_instantclick/__init__.py b/addons/website_instantclick/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/website_instantclick/__openerp__.py b/addons/website_instantclick/__openerp__.py
new file mode 100644
index 00000000000..5047bdd0979
--- /dev/null
+++ b/addons/website_instantclick/__openerp__.py
@@ -0,0 +1,17 @@
+{
+    'name': 'Website Instantclick',
+    'category': 'Website',
+    'summary': 'Preloads and speeds up website on public browsing of the website using Instantclick.',
+    'version': '1.0',
+    'description': """
+Preloads data on anonymous mode of website
+==========================================
+
+        """,
+    'author': 'OpenERP SA',
+    'depends': ['website'],
+    'installable': True,
+    'data': [
+        'views/website_instantclick.xml',
+    ],
+}
diff --git a/addons/website_instantclick/static/lib/instantclick/instantclick.js b/addons/website_instantclick/static/lib/instantclick/instantclick.js
new file mode 100644
index 00000000000..e5e4e3447d3
--- /dev/null
+++ b/addons/website_instantclick/static/lib/instantclick/instantclick.js
@@ -0,0 +1,430 @@
+/* InstantClick 2.1 | (C) 2014 Alexandre Dieulot | http://instantclick.io/license.html */
+var InstantClick = function(document, location) {
+	// Internal variables
+	var $currentLocationWithoutHash
+	var $urlToPreload
+	var $preloadTimer
+
+	// Preloading-related variables
+	var $history = {}
+	var $xhr
+	var $url = false
+	var $title = false
+	var $hasBody = true
+	var $body = false
+	var $timing = {}
+	var $isPreloading = false
+	var $isWaitingForCompletion = false
+
+	// Variables defined by public functions
+	var $useWhitelist
+	var $preloadOnMousedown
+	var $delayBeforePreload
+	var $eventsCallbacks = {
+		change: []
+	}
+
+
+	////////// HELPERS //////////
+
+
+	function removeHash(url) {
+		var index = url.indexOf('#')
+		if (index < 0) {
+			return url
+		}
+		return url.substr(0, index)
+	}
+
+	function getLinkTarget(target) {
+		while (target.nodeName != 'A') {
+			target = target.parentNode
+		}
+		return target
+	}
+
+	function triggerPageEvent(eventType) {
+		for (var i = 0; i < $eventsCallbacks[eventType].length; i++) {
+			$eventsCallbacks[eventType][i]()
+		}
+	}
+
+	function changePage(title, body, newUrl, scrollY_) {
+		var doc = document.implementation.createHTMLDocument('')
+		doc.documentElement.innerHTML = body
+		document.documentElement.replaceChild(doc.body, document.body)
+		/* We cannot just use `document.body = doc.body` as it causes Safari 5.1, 6.0,
+		   and Mobile 7.0 to execute script tags directly.
+		*/
+
+		var elem = document.createElement('i')
+		elem.innerHTML = title
+		document.title = elem.textContent
+
+		if (newUrl) {
+			history.pushState(null, null, newUrl)
+
+			var hashIndex = newUrl.indexOf('#')
+			var hashElem = hashIndex > -1 && document.getElementById(newUrl.substr(hashIndex + 1))
+			var offset = 0
+			if (hashElem) {
+				for (; hashElem.offsetParent; hashElem = hashElem.offsetParent) {
+					offset += hashElem.offsetTop
+				}
+			}
+			scrollTo(0, offset)
+
+			$currentLocationWithoutHash = removeHash(newUrl)
+		}
+		else {
+			scrollTo(0, scrollY_)
+		}
+
+		instantanize()
+
+		triggerPageEvent('change')
+	}
+
+	function setPreloadingAsHalted() {
+		$isPreloading = false
+		$isWaitingForCompletion = false
+	}
+
+
+	////////// EVENT HANDLERS //////////
+
+
+	function mousedown(e) {
+		preload(getLinkTarget(e.target).href)
+	}
+
+	function mouseover(e) {
+		var a = getLinkTarget(e.target)
+		a.addEventListener('mouseout', mouseout)
+		if (!$delayBeforePreload) {
+			preload(a.href)
+		}
+		else {
+			$urlToPreload = a.href
+			$preloadTimer = setTimeout(preload, $delayBeforePreload)
+		}
+	}
+
+	function click(e) {
+		if (e.which > 1 || e.metaKey || e.ctrlKey) { // Opening in new tab
+			return
+		}
+		e.preventDefault()
+		display(getLinkTarget(e.target).href)
+	}
+
+	function mouseout() {
+		if ($preloadTimer) {
+			clearTimeout($preloadTimer)
+			$preloadTimer = false
+			return
+		}
+
+		if (!$isPreloading || $isWaitingForCompletion) {
+			return
+		}
+		$xhr.abort()
+		setPreloadingAsHalted()
+	}
+
+	function readystatechange() {
+		if ($xhr.readyState < 4) {
+			return
+		}
+		if ($xhr.status == 0) {
+			/* Request aborted */
+			return
+		}
+
+		$timing.ready = +new Date - $timing.start
+
+		var text = $xhr.responseText
+
+		var titleIndex = text.indexOf('<title')
+		if (titleIndex > -1) {
+			$title = text.substr(text.indexOf('>', titleIndex) + 1)
+			$title = $title.substr(0, $title.indexOf('</title'))
+		}
+
+		var bodyIndex = text.indexOf('<body')
+		if (bodyIndex > -1) {
+			$body = text.substr(bodyIndex)
+			var closingIndex = $body.indexOf('</body')
+			if (closingIndex > -1) {
+				$body = $body.substr(0, closingIndex)
+			}
+
+			var urlWithoutHash = removeHash($url)
+			$history[urlWithoutHash] = {
+				body: $body,
+				title: $title,
+				scrollY: urlWithoutHash in $history ? $history[urlWithoutHash].scrollY : 0
+			}
+		}
+		else {
+			$hasBody = false
+		}
+
+		if ($isWaitingForCompletion) {
+			$isWaitingForCompletion = false
+			display($url)
+		}
+	}
+
+
+	////////// MAIN FUNCTIONS //////////
+
+
+	function instantanize(isInitializing) {
+		var as = document.getElementsByTagName('a'), a, domain = location.protocol + '//' + location.host
+		for (var i = as.length - 1; i >= 0; i--) {
+			a = as[i]
+			if (a.target || // target="_blank" etc.
+				a.hasAttribute('download') ||
+				a.href.indexOf(domain + '/') != 0 || // another domain (or no href attribute)
+				a.href.indexOf('#') > -1 && removeHash(a.href) == $currentLocationWithoutHash || // link to an anchor
+				($useWhitelist ? !a.hasAttribute('data-instant') : a.hasAttribute('data-no-instant'))) {
+				continue
+			}
+			if ($preloadOnMousedown) {
+				a.addEventListener('mousedown', mousedown)
+			}
+			else {
+				a.addEventListener('mouseover', mouseover)
+			}
+			a.addEventListener('click', click)
+		}
+		if (!isInitializing) {
+			var scripts = document.getElementsByTagName('script'), script, copy, parentNode, nextSibling
+			for (i = 0, j = scripts.length; i < j; i++) {
+				script = scripts[i]
+				if (script.hasAttribute('data-no-instant')) {
+					continue
+				}
+				copy = document.createElement('script')
+				if (script.src) {
+					copy.src = script.src
+				}
+				if (script.innerHTML) {
+					copy.innerHTML = script.innerHTML
+				}
+				parentNode = script.parentNode
+				nextSibling = script.nextSibling
+				parentNode.removeChild(script)
+				parentNode.insertBefore(copy, nextSibling)
+			}
+		}
+	}
+
+	function preload(url) {
+		if (!$preloadOnMousedown && 'display' in $timing && +new Date - ($timing.start + $timing.display) < 100) {
+			/* After a page is displayed, if the user's cursor happens to be above a link
+			   a mouseover event will be in most browsers triggered automatically, and in
+			   other browsers it will be triggered when the user moves his mouse by 1px.
+
+			   Here are the behavior I noticed, all on Windows:
+			   - Safari 5.1: auto-triggers after 0 ms
+			   - IE 11: auto-triggers after 30-80 ms (looks like it depends on page's size)
+			   - Firefox: auto-triggers after 10 ms
+			   - Opera 18: auto-triggers after 10 ms
+
+			   - Chrome: triggers when cursor moved
+			   - Opera 12.16: triggers when cursor moved
+
+			   To remedy to this, we do not start preloading if last display occurred less than
+			   100 ms ago. If they happen to click on the link, they will be redirected.
+			*/
+
+			return
+		}
+		if ($preloadTimer) {
+			$clearTimeout($preloadTimer)
+			$preloadTimer = false
+		}
+
+		if (!url) {
+			url = $urlToPreload
+		}
+
+		if ($isPreloading && (url == $url || $isWaitingForCompletion)) {
+			return
+		}
+		$isPreloading = true
+		$isWaitingForCompletion = false
+
+		$url = url
+		$body = false
+		$hasBody = true
+		$timing = {
+			start: +new Date
+		}
+		$xhr.open('GET', url)
+		$xhr.send()
+	}
+
+	function display(url) {
+		if (!('display' in $timing)) {
+			$timing.display = +new Date - $timing.start
+		}
+		if ($preloadTimer) {
+			/* Happens when there’s a delay before preloading and that delay
+			   hasn't expired (preloading didn't kick in).
+			*/
+
+			if ($url && $url != url) {
+				/* Happens when the user clicks on a link before preloading
+				   kicks in while another link is already preloading.
+				*/
+
+				location.href = url
+				return
+			}
+			preload(url)
+			$isWaitingForCompletion = true
+			return
+		}
+		if (!$isPreloading || $isWaitingForCompletion) {
+			/* If the page isn't preloaded, it likely means
+			   the user has focused on a link (with his Tab
+			   key) and then pressed Return, which triggered a click.
+			   Because very few people do this, it isn't worth handling this
+			   case and preloading on focus (also, focusing on a link
+			   doesn't mean it's likely that you'll "click" on it), so we just
+			   redirect them when they "click".
+			   It could also mean the user hovered over a link less than 100 ms
+			   after a page display, thus we didn't start the preload (see
+			   comments in `preload()` for the rationale behind this.)
+
+			   If the page is waiting for completion, the user clicked twice
+			   while the page was preloading.
+			   Two possibilities:
+			   1) He clicks on the same link again, either because it's slow
+			      to load (there's no browser loading indicator with
+			      InstantClick, so he might think his click hasn't registered
+			      if the page isn't loading fast enough) or because he has
+			      a habit of double clicking on the web;
+			   2) He clicks on another link.
+
+			   In the first case, we redirect him (send him to the page the old
+			   way) so that he can have the browser's loading indicator back.
+			   In the second case, we redirect him because we haven't preloaded
+			   that link, since we were already preloading the last one.
+
+			   Determining if it's a double click might be overkill as there is
+			   (hopefully) not that many people that double click on the web.
+			   Fighting against the perception that the page is stuck is
+			   interesting though, a seemingly good way to do that would be to
+			   later incorporate a progress bar.
+			*/
+
+			location.href = url
+			return
+		}
+		if (!$hasBody) {
+			location.href = $url
+			return
+		}
+		if (!$body) {
+			$isWaitingForCompletion = true
+			return
+		}
+		$history[$currentLocationWithoutHash].scrollY = pageYOffset
+		setPreloadingAsHalted()
+		changePage($title, $body, $url)
+	}
+
+
+	////////// PUBLIC VARIABLE AND FUNCTIONS //////////
+
+
+	var supported = 'pushState' in history
+
+	function init() {
+		if ($currentLocationWithoutHash) {
+			/* Already initialized */
+			return
+		}
+		if (!supported) {
+			triggerPageEvent('change')
+			return
+		}
+		for (var i = arguments.length - 1; i >= 0; i--) {
+			var arg = arguments[i]
+			if (arg === true) {
+				$useWhitelist = true
+			}
+			else if (arg == 'mousedown') {
+				$preloadOnMousedown = true
+			}
+			else if (typeof arg == 'number') {
+				$delayBeforePreload = arg
+			}
+		}
+		$currentLocationWithoutHash = removeHash(location.href)
+		$history[$currentLocationWithoutHash] = {
+			body: document.body.outerHTML,
+			title: document.title,
+			scrollY: pageYOffset
+		}
+		$xhr = new XMLHttpRequest()
+		$xhr.addEventListener('readystatechange', readystatechange)
+
+		instantanize(true)
+
+		triggerPageEvent('change')
+
+		addEventListener('popstate', function() {
+			var loc = removeHash(location.href)
+			if (loc == $currentLocationWithoutHash) {
+				return
+			}
+			if (!(loc in $history)) {
+				location.href = location.href // Reloads the page and makes use of cache for assets, unlike location.reload()
+				return
+			}
+			$history[$currentLocationWithoutHash].scrollY = pageYOffset
+			$currentLocationWithoutHash = loc
+			changePage($history[loc].title, $history[loc].body, false, $history[loc].scrollY)
+		})
+	}
+
+	function on(eventType, callback) {
+		$eventsCallbacks[eventType].push(callback)
+	}
+
+	/* The debug function isn't included by default to reduce file size.
+	   To enable it, add a slash at the beginning of the comment englobing
+	   the debug function, and uncomment "debug: debug," in the return
+	   statement below the function. */
+
+	/*
+	function debug() {
+		return {
+			currentLocationWithoutHash: $currentLocationWithoutHash,
+			history: $history,
+			xhr: $xhr,
+			url: $url,
+			title: $title,
+			hasBody: $hasBody,
+			body: $body,
+			timing: $timing,
+			isPreloading: $isPreloading,
+			isWaitingForCompletion: $isWaitingForCompletion
+		}
+	}
+	//*/
+
+
+	return {
+		// debug: debug,
+		supported: supported,
+		init: init,
+		on: on
+	}
+
+}(document, location);
diff --git a/addons/website_instantclick/views/website_instantclick.xml b/addons/website_instantclick/views/website_instantclick.xml
new file mode 100644
index 00000000000..39afa93a323
--- /dev/null
+++ b/addons/website_instantclick/views/website_instantclick.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+
+<template id="show_sign_in_anonymous" inherit_id="website.show_sign_in" name="Show Sign In" groups="base.group_public">
+    <xpath expr="//div[@id='wrapwrap']" position="after">
+        <script type="text/javascript" src="/website_instantclick/static/lib/instantclick/instantclick.js" data-no-instant=""></script>
+        <script data-no-instant="">
+            InstantClick.init();
+        </script>
+    </xpath>
+</template>
+
+
+     </data>
+</openerp>
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 470ca8383f4..c43363b863e 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -664,7 +664,7 @@
                               <td>
                                   <div class="input-group">
                                       <span class="input-group-addon">
-                                          <a t-attf-href="#" class="mb8 js_add_cart_json">
+                                          <a t-attf-href="#" class="mb8 js_add_cart_json" data-no-instant="">
                                               <i class="fa fa-minus"></i>
                                           </a>
                                       </span>
@@ -673,7 +673,7 @@
                                           t-att-data-product-id="line.product_id.id"
                                           t-att-value="int(line.product_uom_qty)"/>
                                       <span class="input-group-addon">
-                                          <a t-attf-href="#" class="mb8 float_left js_add_cart_json">
+                                          <a t-attf-href="#" class="mb8 float_left js_add_cart_json" data-no-instant="">
                                               <i class="fa fa-plus"></i>
                                           </a>
                                       </span>

From f213b7ea655c6c7dbbda8527f0b0b6b166a0a7a2 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 16 Jun 2014 13:39:48 +0200
Subject: [PATCH 18/36] [FIX] new style for default form views

---
 openerp/osv/orm.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 73ad3796418..1ada929482d 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1718,13 +1718,14 @@ class BaseModel(object):
         :rtype: etree._Element
         """
         view = etree.Element('form', string=self._description)
+        group = etree.SubElement(view, 'group', col="4")
         # TODO it seems fields_get can be replaced by _all_columns (no need for translation)
         for field, descriptor in self.fields_get(cr, user, context=context).iteritems():
             if descriptor['type'] in ('one2many', 'many2many'):
                 continue
-            etree.SubElement(view, 'field', name=field)
+            etree.SubElement(group, 'field', name=field)
             if descriptor['type'] == 'text':
-                etree.SubElement(view, 'newline')
+                etree.SubElement(group, 'newline')
         return view
 
     def _get_default_search_view(self, cr, user, context=None):

From ab3231d6c95f9ac9982d9a218f956ce439c655a7 Mon Sep 17 00:00:00 2001
From: Richard Mathot <rim@openerp.com>
Date: Mon, 16 Jun 2014 13:47:58 +0200
Subject: [PATCH 19/36] [REF] website: change URL to new Odoo website

---
 addons/website/views/website_templates.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index e5c1bfc0f86..6fce362e5ed 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -140,8 +140,8 @@
                     </div>
                     <div class="container mt16 mb8">
                         <div class="pull-right" t-ignore="true" t-if="not editable">
-                            Create a <a href="http://openerp.com/apps/website">free website</a> with
-                            <a class="label label-danger" href="https://openerp.com/apps/website">OpenERP</a>
+                            Create a <a href="https://www.odoo.com/page/website-builder">free website</a> with
+                            <a class="label label-danger" href="https://www.odoo.com/">Odoo</a>
                         </div>
                         <div class="pull-left text-muted">
                             Copyright &amp;copy; <span t-field="res_company.name">Company name</span>

From 96f038a6ab74e8f69571a71e477d17e8efc8ed5d Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Mon, 16 Jun 2014 17:16:50 +0200
Subject: [PATCH 20/36] [IMP] product: all left menu item became
 product.template's action

---
 addons/mrp/mrp_view.xml                     | 7 +++----
 addons/point_of_sale/point_of_sale_view.xml | 8 +++-----
 addons/purchase/purchase_view.xml           | 4 +---
 addons/stock/stock_view.xml                 | 2 +-
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 583196684a9..8aae0062a33 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -572,13 +572,12 @@
             </field>
         </record>
         
-        <record id="product_supply_method_produce" model="ir.actions.act_window">
+        <record id="product_template_action" model="ir.actions.act_window">
             <field name="name">Products</field>
-            <field name="res_model">product.product</field>
+            <field name="res_model">product.template</field>
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
             <field name="context">{}</field>
-            <field name="search_view_id" ref="product.product_search_form_view"/>
         </record>
         <!-- BOM menus -->
 
@@ -589,7 +588,7 @@
             sequence="10"/>
        <menuitem name="Products" 
             id="menu_mrp_product_form" 
-            action="product_supply_method_produce"
+            action="product_template_action"
             parent="menu_mrp_bom"/>
         <menuitem
             action="mrp_bom_form_action2"
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 9103cbd8c01..af0a815ad8d 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -160,16 +160,14 @@
         <menuitem parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="2" groups="group_pos_manager,group_pos_user"/>
         <menuitem name="Products" id="menu_point_of_sale_product" parent="menu_point_root" sequence="15" />
 
-        <record id="product_normal_action" model="ir.actions.act_window">
+        <record id="product_template_action" model="ir.actions.act_window">
             <field name="name">Products</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="res_model">product.product</field>
+            <field name="res_model">product.template</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,kanban</field>
             <field name="context" eval="{}"/>
             <field name="domain" eval="[('available_in_pos','&lt;&gt;',False)]"/>
-            <field name="view_id" ref="product.product_product_tree_view"/>
-            <field name="search_view_id" ref="product.product_search_form_view"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
                 Click to add a new product.
@@ -185,7 +183,7 @@
             </field>
         </record>
         <menuitem
-            action="product_normal_action"
+            action="product_template_action"
             id="menu_pos_products"
             parent="menu_point_of_sale_product" sequence="2"/>
 
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 132076440dc..5062ecc3503 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -121,12 +121,10 @@
     <record id="product_normal_action_puchased" model="ir.actions.act_window">
         <field name="name">Products</field>
         <field name="type">ir.actions.act_window</field>
-        <field name="res_model">product.product</field>
+        <field name="res_model">product.template</field>
         <field name="view_type">form</field>
         <field name="view_mode">kanban,tree,form</field>
         <field name="context">{"search_default_filter_to_purchase":1}</field>
-        <field name="view_id" ref="product.product_kanban_view"/>
-        <field name="search_view_id" ref="product.product_search_form_view"/>
         <field name="help" type="html">
           <p class="oe_view_nocontent_create">
             Click to define a new product.
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 66c97aaefbe..fc7a94fc51f 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -12,7 +12,7 @@
         <menuitem id="menu_stock_product" name="Products" parent="menu_stock_root" sequence="6"/>
         <menuitem name="Products by Category" id="menu_product_by_category_stock_form" action="product.product_category_action"
             parent="stock.menu_stock_product" sequence="0" groups="base.group_no_one"/>
-        <menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
+        <menuitem action="product.product_template_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
         <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15" groups="group_stock_manager"/>
         <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="40" groups="base.group_no_one"/>
         <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="2"/>

From e555855f07113fb851f3eb9649b631f9759c69fb Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 17 Jun 2014 11:29:11 +0200
Subject: [PATCH 21/36] [ADD] ability to trigger retrying rendering with an
 updated rendering context

---
 openerp/http.py | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/openerp/http.py b/openerp/http.py
index 98a6556570a..44df279bdb9 100644
--- a/openerp/http.py
+++ b/openerp/http.py
@@ -1037,6 +1037,15 @@ mimetypes.add_type('application/font-woff', '.woff')
 mimetypes.add_type('application/vnd.ms-fontobject', '.eot')
 mimetypes.add_type('application/x-font-ttf', '.ttf')
 
+class Retry(RuntimeError):
+    """ Exception raised during QWeb rendering to signal that the rendering
+    should be retried with the provided ``render_updates`` dict merged into
+    the previous rendering context
+    """
+    def __init__(self, name, render_updates=None):
+        super(Retry, self).__init__(name)
+        self.updates = render_updates or {}
+
 class Response(werkzeug.wrappers.Response):
     """ Response object passed through controller route chain.
 
@@ -1077,7 +1086,13 @@ class Response(werkzeug.wrappers.Response):
     def render(self):
         view_obj = request.registry["ir.ui.view"]
         uid = self.uid or request.uid or openerp.SUPERUSER_ID
-        return view_obj.render(request.cr, uid, self.template, self.qcontext, context=request.context)
+        while True:
+            try:
+                return view_obj.render(
+                    request.cr, uid, self.template, self.qcontext,
+                    context=request.context)
+            except Retry, e:
+                self.qcontext.update(e.updates)
 
     def flatten(self):
         self.response.append(self.render())

From daf8bdf688a8d7c3a8799b45f3c983a589232fa2 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 17 Jun 2014 11:35:29 +0200
Subject: [PATCH 22/36] [ADD] support for multiple value query args in
 keep_query()

---
 openerp/addons/base/ir/ir_ui_view.py | 29 +++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index 77ec010941c..4018d779e53 100644
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -49,15 +49,26 @@ _logger = logging.getLogger(__name__)
 
 MOVABLE_BRANDING = ['data-oe-model', 'data-oe-id', 'data-oe-field', 'data-oe-xpath']
 
-def keep_query(*args, **kw):
-    if not args and not kw:
-        args = ('*',)
-    params = kw.copy()
-    query_params = frozenset(werkzeug.url_decode(request.httprequest.query_string).keys())
-    for keep_param in args:
-        for param in fnmatch.filter(query_params, keep_param):
-            if param not in params and param in request.params:
-                params[param] = request.params[param]
+def keep_query(*keep_params, **additional_params):
+    """
+    Generate a query string keeping the current request querystring's parameters specified
+    in ``keep_params`` and also adds the parameters specified in ``additional_params``.
+
+    Multiple values query string params will be merged into a single one with comma seperated
+    values.
+
+    The ``keep_params`` arguments can use wildcards too, eg:
+
+        keep_query('search', 'shop_*', page=4)
+    """
+    if not keep_params and not additional_params:
+        keep_params = ('*',)
+    params = additional_params.copy()
+    qs_keys = request.httprequest.args.keys()
+    for keep_param in keep_params:
+        for param in fnmatch.filter(qs_keys, keep_param):
+            if param not in additional_params and param in qs_keys:
+                params[param] = ','.join(request.httprequest.args.getlist(param))
     return werkzeug.urls.url_encode(params)
 
 class view_custom(osv.osv):

From 7ad2eb354d89a59970add57feaa1b4945a883f4c Mon Sep 17 00:00:00 2001
From: Richard Mathot <rim@openerp.com>
Date: Tue, 17 Jun 2014 11:45:30 +0200
Subject: [PATCH 23/36] [IMP] base: use current context when evaluation
 ir_actions' context

---
 openerp/addons/base/ir/ir_actions.py | 36 +++++++++++++++-------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index c41eae84ff8..7ae4240cd03 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -320,22 +320,26 @@ class ir_actions_act_window(osv.osv):
             ids = [ids]
         results = super(ir_actions_act_window, self).read(cr, uid, ids, fields=fields, context=context, load=load)
 
-        if not fields or 'help' in fields:
-            context = dict(context or {})
-            eval_dict = {
-                'active_model': context.get('active_model'),
-                'active_id': context.get('active_id'),
-                'active_ids': context.get('active_ids'),
-                'uid': uid,
-            }
-            for res in results:
-                model = res.get('res_model')
-                if model and self.pool.get(model):
-                    try:
-                        with tools.mute_logger("openerp.tools.safe_eval"):
-                            eval_context = eval(res['context'] or "{}", eval_dict) or {}
-                    except Exception:
-                        continue
+        context = dict(context or {})
+        eval_dict = {
+            'active_model': context.get('active_model'),
+            'active_id': context.get('active_id'),
+            'active_ids': context.get('active_ids'),
+            'uid': uid,
+            'context': context,
+        }
+        for res in results:
+            model = res.get('res_model')
+            if model and self.pool.get(model):
+                try:
+                    with tools.mute_logger("openerp.tools.safe_eval"):
+                        eval_context = eval(res['context'] or "{}", eval_dict) or {}
+                        res['context'] = str(eval_context)
+                except Exception:
+                    _logger.warning("ir_actions: Cannot evaluate context = %s with eval_dict = %s"
+                        % (res['context'] or "{}", eval_dict), exc_info=True)
+                    continue
+                if not fields or 'help' in fields:
                     custom_context = dict(context, **eval_context)
                     res['help'] = self.pool.get(model).get_empty_list_help(cr, uid, res.get('help', ""), context=custom_context)
         if ids_int:

From 63a6ba92e2c0bade494ac05910210046e695b787 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 17 Jun 2014 12:00:50 +0200
Subject: [PATCH 24/36] [IMP] no need to compute *all* has_group calls if the
 first one fails

---
 openerp/osv/orm.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 1ada929482d..0a23dda61e3 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1704,8 +1704,8 @@ class BaseModel(object):
            :return: True if the current user is a member of one of the
                     given groups
         """
-        return any([self.pool.get('res.users').has_group(cr, uid, group_ext_id)
-                        for group_ext_id in groups.split(',')])
+        return any(self.pool['res.users'].has_group(cr, uid, group_ext_id)
+                   for group_ext_id in groups.split(','))
 
     def _get_default_form_view(self, cr, user, context=None):
         """ Generates a default single-line form view using all fields

From 79e10200d5cc78d39a139f63eb2a69309878ab04 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 17 Jun 2014 12:01:52 +0200
Subject: [PATCH 25/36] [IMP] prevent edition of page if groups which current
 user doesn't have

If the current view uses @groups attributes (possibly in called templates),
the corresponding elements are rendered to a void (empty string in qweb). If
said user can edit the page, does so and saves a view section in which there's
a @groups to which he has no access, the element[@groups] is completely
removed from the template once saved, losing it.

If QWeb encounters an @groups to which the current user has no right during
rendering, have it request a no-RTE page, so the user can not RTE-edit the
page (or drop snippets in it).
---
 addons/website/static/src/js/website.editor.js | 12 ++++++++++++
 addons/website/static/src/xml/website.xml      |  3 ++-
 addons/website/views/website_templates.xml     |  7 +++++--
 openerp/addons/base/ir/ir_qweb.py              | 14 ++++++++++----
 4 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index fcb957cafda..f8d1a66bc80 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -3,6 +3,7 @@
 
     var website = openerp.website;
     var _t = openerp._t;
+    website.no_editor = !!$(document.documentElement).data('editable-no-editor');
 
     website.add_template_file('/website/static/src/xml/website.editor.xml');
     website.dom_ready.done(function () {
@@ -496,6 +497,17 @@
             this.$('#website-top-edit').hide();
             this.$('#website-top-view').show();
 
+            if (website.no_editor) {
+                var help_text = $(document.documentElement).data('editable-no-editor');
+                this.$('button[data-action=edit]')
+                    .prop('disabled', website.no_editor)
+                    .parent()
+                    // help must be set on form above button because it does
+                    // not appear on disabled button
+                    .attr('title', help_text);
+            }
+
+
             $('.dropdown-toggle').dropdown();
             this.customize_setup();
 
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 4d9c9fcd73d..684a46a9f43 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -14,7 +14,8 @@
                         <span class="icon-bar"></span>
                     </button>
                     <form class="navbar-form navbar-left">
-                        <button type="button" data-action="edit" class="btn btn-primary hidden">Edit</button>
+                        <button type="button" data-action="edit"
+                                class="btn btn-primary hidden">Edit</button>
                     </form>
                 </div>
                 <div class="collapse navbar-collapse navbar-edit-collapse">
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index e5c1bfc0f86..50d4fa8b906 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -59,6 +59,7 @@
     <html t-att-lang="lang and lang.replace('_', '-')"
           t-att-data-website-id="website.id if editable else None"
           t-att-data-editable="'1' if editable else None"
+          t-att-data-editable-no-editor="editable_no_editor or None"
           t-att-data-translatable="'1' if translatable else None"
           t-att-data-view-xmlid="xmlid if editable else None"
           t-att-data-main-object="repr(main_object) if editable else None"
@@ -179,8 +180,10 @@
     <xpath expr="//body" position="inside">
         <div id="website-top-navbar-placeholder" class="navbar navbar-inverse navbar-fixed-top hidden-xs">
             <div class="navbar-header">
-                <form class="navbar-form navbar-left">
-                    <button type="button" class="btn btn-primary">Edit</button>
+                <form class="navbar-form navbar-left" title="editable_no_editor or None">
+                    <button type="button" class="btn btn-primary"
+                            disabled="'disabled' if editable_no_editor else None"
+                        >Edit</button>
                 </form>
             </div>
             <div class="collapse navbar-collapse navbar-edit-collapse">
diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py
index be4bfe190d9..5fb56a2b4a3 100644
--- a/openerp/addons/base/ir/ir_qweb.py
+++ b/openerp/addons/base/ir/ir_qweb.py
@@ -256,9 +256,15 @@ class QWeb(orm.AbstractModel):
                     cr = qwebcontext.get('request') and qwebcontext['request'].cr or None
                     uid = qwebcontext.get('request') and qwebcontext['request'].uid or None
                     can_see = self.user_has_groups(cr, uid, groups=attribute_value) if cr and uid else False
-                    if not can_see:
-                        return ''
-                    continue
+                    if can_see:
+                        continue
+                    if qwebcontext.get('editable') and not qwebcontext.get('editable_no_editor'):
+                        errmsg = _("Editor disabled because some content can not be seen by a user who does not belong to the groups %s")
+                        raise openerp.http.Retry(
+                            _("User does not belong to groups %s") % attribute_value, {
+                                'editable_no_editor': errmsg % attribute_value
+                            })
+                    return ''
 
                 if isinstance(attribute_value, unicode):
                     attribute_value = attribute_value.encode("utf8")
@@ -302,7 +308,7 @@ class QWeb(orm.AbstractModel):
             for current_node in element.childNodes:
                 try:
                     g_inner.append(self.render_node(current_node, qwebcontext))
-                except QWebException:
+                except (QWebException, openerp.http.Retry):
                     raise
                 except Exception:
                     template = qwebcontext.get('__template__')

From dda18249c0fa1b2ac9d6eb39bc7397b71fb26c81 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 17 Jun 2014 12:22:15 +0200
Subject: [PATCH 26/36] [FIX] @groups attribute should not disappear when
 editing

The @groups attribute in qweb views was not rendered (even when matched by the
user), so editing a template with an @groups would either remove the whole
section (if the user didn't have the groups, fixed in previous commit) or only
removed the attribute itself making it visible to everybody (which ought be
fixed-ish by this commit).
---
 addons/website/static/src/js/website.editor.js |  6 +++---
 openerp/addons/base/ir/ir_qweb.py              | 17 ++++++++---------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index f8d1a66bc80..601d3016068 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -497,11 +497,11 @@
             this.$('#website-top-edit').hide();
             this.$('#website-top-view').show();
 
+            var $edit_button = this.$('button[data-action=edit]')
+                    .prop('disabled', website.no_editor);
             if (website.no_editor) {
                 var help_text = $(document.documentElement).data('editable-no-editor');
-                this.$('button[data-action=edit]')
-                    .prop('disabled', website.no_editor)
-                    .parent()
+                $edit_button.parent()
                     // help must be set on form above button because it does
                     // not appear on disabled button
                     .attr('title', help_text);
diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py
index 5fb56a2b4a3..1209e457958 100644
--- a/openerp/addons/base/ir/ir_qweb.py
+++ b/openerp/addons/base/ir/ir_qweb.py
@@ -256,15 +256,14 @@ class QWeb(orm.AbstractModel):
                     cr = qwebcontext.get('request') and qwebcontext['request'].cr or None
                     uid = qwebcontext.get('request') and qwebcontext['request'].uid or None
                     can_see = self.user_has_groups(cr, uid, groups=attribute_value) if cr and uid else False
-                    if can_see:
-                        continue
-                    if qwebcontext.get('editable') and not qwebcontext.get('editable_no_editor'):
-                        errmsg = _("Editor disabled because some content can not be seen by a user who does not belong to the groups %s")
-                        raise openerp.http.Retry(
-                            _("User does not belong to groups %s") % attribute_value, {
-                                'editable_no_editor': errmsg % attribute_value
-                            })
-                    return ''
+                    if not can_see:
+                        if qwebcontext.get('editable') and not qwebcontext.get('editable_no_editor'):
+                            errmsg = _("Editor disabled because some content can not be seen by a user who does not belong to the groups %s")
+                            raise openerp.http.Retry(
+                                _("User does not belong to groups %s") % attribute_value, {
+                                    'editable_no_editor': errmsg % attribute_value
+                                })
+                        return ''
 
                 if isinstance(attribute_value, unicode):
                     attribute_value = attribute_value.encode("utf8")

From c4b1b58ffa7d0a0fb73dd98ee5a58b6c97af9451 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 17 Jun 2014 13:43:57 +0200
Subject: [PATCH 27/36] [FIX] sitemap does not show pages

the /page/ controller was not using the ``page`` converter
---
 addons/website/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index e7a9350f8ba..5d908671a89 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -49,7 +49,7 @@ class Website(openerp.addons.web.controllers.main.Home):
         # TODO: can't we just put auth=public, ... in web client ?
         return super(Website, self).web_login(*args, **kw)
 
-    @http.route('/page/<path:page>', type='http', auth="public", website=True)
+    @http.route('/page/<page:page>', type='http', auth="public", website=True)
     def page(self, page, **opt):
         values = {
             'path': page,

From d2f3bb953df713373e452f7a11ae0a741b8d16c6 Mon Sep 17 00:00:00 2001
From: tpa-odoo <tpa@tinyerp.com>
Date: Mon, 16 Jun 2014 15:38:26 +0530
Subject: [PATCH 28/36] [IMP] move hr timesheet analysis report in to
 hr_timesheet

---
 addons/hr_timesheet/__init__.py               |   1 +
 addons/hr_timesheet/__openerp__.py            |   1 +
 addons/hr_timesheet/report/__init__.py        |   1 +
 .../report/hr_timesheet_report.py             |  76 +++++++++++
 .../report/hr_timesheet_report_view.xml       |  58 +++++++++
 addons/hr_timesheet_sheet/__openerp__.py      |   1 -
 addons/hr_timesheet_sheet/report/__init__.py  |   2 +-
 .../report/hr_timesheet_report.py             |  99 ++++++++-------
 .../report/hr_timesheet_report_view.xml       |  90 ++++++-------
 .../report/timesheet_report.py                | 118 ------------------
 .../report/timesheet_report_view.xml          |  66 ----------
 .../security/ir.model.access.csv              |  17 ++-
 12 files changed, 236 insertions(+), 294 deletions(-)
 create mode 100644 addons/hr_timesheet/report/__init__.py
 create mode 100644 addons/hr_timesheet/report/hr_timesheet_report.py
 create mode 100644 addons/hr_timesheet/report/hr_timesheet_report_view.xml
 delete mode 100644 addons/hr_timesheet_sheet/report/timesheet_report.py
 delete mode 100644 addons/hr_timesheet_sheet/report/timesheet_report_view.xml

diff --git a/addons/hr_timesheet/__init__.py b/addons/hr_timesheet/__init__.py
index 0ba28b1946c..f29aca0a003 100644
--- a/addons/hr_timesheet/__init__.py
+++ b/addons/hr_timesheet/__init__.py
@@ -21,6 +21,7 @@
 
 import hr_timesheet
 import wizard
+import report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index b2e6c9f9cc1..49e65b41753 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -47,6 +47,7 @@ up a management by affair.
         'security/hr_timesheet_security.xml',
         'hr_timesheet_view.xml',
         'wizard/hr_timesheet_sign_in_out_view.xml',
+        'report/hr_timesheet_report_view.xml',
         'hr_timesheet_installer.xml',
         'hr_timesheet_data.xml'
     ],
diff --git a/addons/hr_timesheet/report/__init__.py b/addons/hr_timesheet/report/__init__.py
new file mode 100644
index 00000000000..8728fb520b6
--- /dev/null
+++ b/addons/hr_timesheet/report/__init__.py
@@ -0,0 +1 @@
+import hr_timesheet_report
diff --git a/addons/hr_timesheet/report/hr_timesheet_report.py b/addons/hr_timesheet/report/hr_timesheet_report.py
new file mode 100644
index 00000000000..3ed396feefa
--- /dev/null
+++ b/addons/hr_timesheet/report/hr_timesheet_report.py
@@ -0,0 +1,76 @@
+
+from openerp import tools
+from openerp.osv import fields,osv
+from openerp.addons.decimal_precision import decimal_precision as dp
+
+class hr_timesheet_report(osv.osv):
+    _name = "hr.timesheet.report"
+    _description = "Timesheet"
+    _auto = False
+    _columns = {
+        'year': fields.char('Year',size=64,required=False, readonly=True),
+        'day': fields.char('Day', size=128, readonly=True),
+        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
+            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
+            ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+        'date': fields.date('Date', readonly=True),
+        'name': fields.char('Description', size=64,readonly=True),
+        'product_id' : fields.many2one('product.product', 'Product',readonly=True),
+        'journal_id' : fields.many2one('account.analytic.journal', 'Journal',readonly=True),
+        'general_account_id' : fields.many2one('account.account', 'General Account', readonly=True),
+        'user_id': fields.many2one('res.users', 'User',readonly=True),
+        'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True),
+        'company_id': fields.many2one('res.company', 'Company',readonly=True),
+        'cost': fields.float('#Cost',readonly=True, digits_compute=dp.get_precision('Account')),
+        'quantity': fields.float('Time',readonly=True),
+    }
+
+    def _select(self):
+        select_str = """
+             SELECT min(hat.id) as id,
+                    aal.date as date,
+                    to_char(aal.date, 'YYYY-MM-DD') as day,
+                    to_char(aal.date,'YYYY') as year,
+                    to_char(aal.date,'MM') as month,
+                    sum(aal.amount) as cost,
+                    sum(aal.unit_amount) as quantity,
+                    aal.account_id as account_id,
+                    aal.journal_id as journal_id,
+                    aal.product_id as product_id,
+                    aal.general_account_id as general_account_id,
+                    aal.user_id as user_id,
+                    aal.company_id as company_id,
+                    aal.currency_id as currency_id
+        """
+        return select_str
+
+    def _from(self):
+        from_str = """
+                account_analytic_line as aal
+                    left join hr_analytic_timesheet as hat ON (hat.line_id=aal.id)
+        """
+        return from_str
+
+    def _group_by(self):
+        group_by_str = """
+            GROUP BY aal.date,
+                    aal.account_id,
+                    aal.product_id,
+                    aal.general_account_id,
+                    aal.journal_id,
+                    aal.user_id,
+                    aal.company_id,
+                    aal.currency_id
+        """
+        return group_by_str
+
+    def init(self, cr):
+        # self._table = hr_timesheet_report
+        tools.drop_view_if_exists(cr, self._table)
+        cr.execute("""CREATE or REPLACE VIEW %s as (
+            %s
+            FROM ( %s )
+            %s
+            )""" % (self._table, self._select(), self._from(), self._group_by()))
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet/report/hr_timesheet_report_view.xml
new file mode 100644
index 00000000000..ec97447d7ff
--- /dev/null
+++ b/addons/hr_timesheet/report/hr_timesheet_report_view.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_hr_timesheet_report_graph" model="ir.ui.view">
+            <field name="name">hr.timesheet.report.graph</field>
+            <field name="model">hr.timesheet.report</field>
+            <field name="arch" type="xml">
+                <graph string="Timesheet" type="pivot">
+                    <field name="user_id" type="row"/>
+                    <field name="date" interval="day" type="col"/>
+                    <field name="quantity" type="measure"/>
+                    <field name="cost" type="measure"/>
+                </graph>
+            </field>
+        </record>
+
+        <record id="view_hr_timesheet_report_search" model="ir.ui.view">
+            <field name="name">hr.timesheet.report.search</field>
+            <field name="model">hr.timesheet.report</field>
+            <field name="arch" type="xml">
+                <search string="Timesheet">
+                    <field name="account_id"/>
+                    <field name="user_id"/>
+                    <filter string="This Month" name="month" icon="terp-go-year" domain="[('date','&lt;=', time.strftime('%Y-%m-%d')),('date','&gt;=',time.strftime('%Y-%m-01'))]" help="month"/>
+                    <group expand="0" string="Extended Filters...">
+                        <field name="general_account_id"/>
+                        <field name="product_id"/>
+                        <field name="journal_id"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="date"/>
+                    </group>
+                    <group expand="1" string="Group By">
+                        <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                        <filter string="Product" name="product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                        <filter string="Analytic Account" name="analytic_account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
+                        <filter string="General Account" name="general_account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
+                        <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by day of date"/>
+                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>
+                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="action_hr_timesheet_report_stat_all" model="ir.actions.act_window">
+            <field name="name">Timesheet Analysis</field>
+            <field name="res_model">hr.timesheet.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph</field>
+            <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_group_user_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        </record>
+
+        <menuitem action="action_hr_timesheet_report_stat_all"  id="menu_hr_timesheet_report_all"
+            parent="hr.menu_hr_reporting" groups="base.group_hr_manager" sequence="3"/>
+
+    </data>
+</openerp>
diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index 9448c3fb7c1..7ecae95e141 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -53,7 +53,6 @@ The validation can be configured in the company:
         'hr_timesheet_sheet_view.xml',
         'hr_timesheet_workflow.xml',
         'report/hr_timesheet_report_view.xml',
-        'report/timesheet_report_view.xml',
         'wizard/hr_timesheet_current_view.xml',
         'hr_timesheet_sheet_data.xml',
         'res_config_view.xml',
diff --git a/addons/hr_timesheet_sheet/report/__init__.py b/addons/hr_timesheet_sheet/report/__init__.py
index b06b0608356..9a95bc4a787 100644
--- a/addons/hr_timesheet_sheet/report/__init__.py
+++ b/addons/hr_timesheet_sheet/report/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import timesheet_report
 import hr_timesheet_report
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py
index e15ae99ab5a..7cc59372d0a 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py
@@ -21,55 +21,62 @@
 
 from openerp import tools
 from openerp.osv import fields,osv
-from openerp.addons.decimal_precision import decimal_precision as dp
-
 
 class hr_timesheet_report(osv.osv):
-    _name = "hr.timesheet.report"
-    _description = "Timesheet"
-    _auto = False
+    _inherit = "hr.timesheet.report"
     _columns = {
-        'date': fields.date('Date', readonly=True),
-        'name': fields.char('Description', size=64,readonly=True),
-        'product_id' : fields.many2one('product.product', 'Product',readonly=True),
-        'journal_id' : fields.many2one('account.analytic.journal', 'Journal',readonly=True),
-        'general_account_id' : fields.many2one('account.account', 'General Account', readonly=True),
-        'user_id': fields.many2one('res.users', 'User',readonly=True),
-        'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True),
-        'company_id': fields.many2one('res.company', 'Company',readonly=True),
-        'cost': fields.float('Cost',readonly=True, digits_compute=dp.get_precision('Account')),
-        'quantity': fields.float('Time',readonly=True),
-    }
+        'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing',readonly=True),
+        'nbr': fields.integer('#Nbr',readonly=True),
+        'total_diff': fields.float('#Total Diff',readonly=True),
+        'total_timesheet': fields.float('#Total Timesheet',readonly=True),
+        'total_attendance': fields.float('#Total Attendance',readonly=True),
+        'department_id':fields.many2one('hr.department','Department',readonly=True),
+        'date_from': fields.date('Date from',readonly=True,),
+        'date_to': fields.date('Date to',readonly=True),
+        'date_current': fields.date('Current date', required=True),
+        'state' : fields.selection([
+            ('new', 'New'),
+            ('draft','Draft'),
+            ('confirm','Confirmed'),
+            ('done','Done')], 'Status', readonly=True),
+        }
+
+    def _select(self):
+        return super(hr_timesheet_report, self)._select() + """,
+                        htss.name,
+                        htss.date_from,
+                        htss.date_to,
+                        count(*) as nbr,
+                        (SELECT   sum(day.total_difference)
+                            FROM hr_timesheet_sheet_sheet AS sheet 
+                            LEFT JOIN hr_timesheet_sheet_sheet_day AS day 
+                            ON (sheet.id = day.sheet_id) where sheet.id=htss.id) as total_diff,
+                        (SELECT sum(day.total_timesheet)
+                            FROM hr_timesheet_sheet_sheet AS sheet 
+                            LEFT JOIN hr_timesheet_sheet_sheet_day AS day 
+                            ON (sheet.id = day.sheet_id) where sheet.id=htss.id) as total_timesheet,
+                        (SELECT sum(day.total_attendance)
+                            FROM hr_timesheet_sheet_sheet AS sheet 
+                            LEFT JOIN hr_timesheet_sheet_sheet_day AS day 
+                            ON (sheet.id = day.sheet_id) where sheet.id=htss.id) as total_attendance,
+                        aal.to_invoice,
+                        htss.department_id,
+                        htss.state"""
+
+    def _from(self):
+        return super(hr_timesheet_report, self)._from() + "left join hr_timesheet_sheet_sheet as htss ON (hat.sheet_id=htss.id)"
+
+    def _group_by(self):
+        return super(hr_timesheet_report, self)._group_by() + """,
+                        htss.date_from,
+                        htss.date_to,
+                        aal.unit_amount,
+                        aal.amount,
+                        aal.to_invoice,
+                        htss.name,
+                        htss.state,
+                        htss.id,
+                        htss.department_id"""
 
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'hr_timesheet_report')
-        cr.execute("""
-            create or replace view hr_timesheet_report as (
-                select
-                    min(t.id) as id,
-                    l.date as date,
-                    sum(l.amount) as cost,
-                    sum(l.unit_amount) as quantity,
-                    l.account_id as account_id,
-                    l.journal_id as journal_id,
-                    l.product_id as product_id,
-                    l.general_account_id as general_account_id,
-                    l.user_id as user_id,
-                    l.company_id as company_id,
-                    l.currency_id as currency_id
-                from
-                    hr_analytic_timesheet as t
-                    left join account_analytic_line as l ON (t.line_id=l.id)
-                group by
-                    l.date,
-                    l.account_id,
-                    l.product_id,
-                    l.general_account_id,
-                    l.journal_id,
-                    l.user_id,
-                    l.company_id,
-                    l.currency_id
-            )
-        """)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
index 30757a0b43e..6c735123efe 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -1,65 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="view_hr_timesheet_report_graph" model="ir.ui.view">
-            <field name="name">hr.timesheet.report.graph</field>
+        <record id="view_timesheet_report_graph" model="ir.ui.view">
+            <field name="name">timesheet.report.graph</field>
             <field name="model">hr.timesheet.report</field>
+            <field name="inherit_id" ref="hr_timesheet.view_hr_timesheet_report_graph"/>
             <field name="arch" type="xml">
-                <graph string="Timesheet" type="pivot">
-                    <field name="user_id" type="row"/>
-                    <field name="date" interval="day" type="col"/>
-                    <field name="quantity" type="measure"/>
-                    <field name="cost" type="measure"/>
-                </graph>
-            </field>
-        </record>
-        <record id="view_hr_timesheet_report_search" model="ir.ui.view">
-            <field name="name">hr.timesheet.report.search</field>
-            <field name="model">hr.timesheet.report</field>
-            <field name="arch" type="xml">
-                <search string="Timesheet">
-                    <filter icon="terp-go-year" string="This Month" name="month" domain="[('date','&lt;=', time.strftime('%Y-%m-%d')),('date','&gt;=',time.strftime('%Y-%m-01'))]" help="month"/>
-                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                    <field name="user_id"/>
-                    <group expand="0" string="Extended Filters...">
-                        <field name="general_account_id"/>
-                        <field name="product_id"/>
-                        <field name="journal_id"/>
-                        <field name="company_id" groups="base.group_multi_company"/>
-                        <field name="date" />
-                    </group>
-                    <group expand="1" string="Group By">
-                        <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                        <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                        <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
-                        <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
-                        <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <filter string="Date (day)" context="{'group_by':'date:day'}" help="Group by day of date"/>
-                        <filter string="Date (month)" context="{'group_by':'date:month'}" help="Group by month of date"/>
-                        <filter string="Date (year)" context="{'group_by':'date:year'}" help="Group by year of date"/>
-                    </group>
-                </search>
+                <field name="user_id" position="after">
+                    <field name="state" type="row"/>
+                </field>
+                <field name="cost" position="after">
+                    <field name="total_diff" type="measure"/>
+                    <field name="total_timesheet" type="measure"/>
+                    <field name="total_attendance" type="measure"/>
+                </field>
             </field>
         </record>
 
-        <record id="action_hr_timesheet_report_stat_all" model="ir.actions.act_window">
-            <field name="name">Timesheet Analysis</field>
-            <field name="res_model">hr.timesheet.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph</field>
-            <field name="context">{'search_default_month':1,'search_default_group_user_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
-            <field name="help" type="html">
-              <p>
-                This report performs analysis on timesheets created by your
-                human resources in the system. It allows you to have a full
-                overview of  entries done by your employees. You can group them
-                by specific selection criteria thanks to the search tool.
-              </p>
+        <record id="view_timesheet_report_search" model="ir.ui.view">
+            <field name="name">timesheet.report.search</field>
+            <field name="model">hr.timesheet.report</field>
+            <field name="inherit_id" ref="hr_timesheet.view_hr_timesheet_report_search"/>
+            <field name="arch" type="xml">
+                <field name="account_id"  position="before">
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]"/>
+                    <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
+                </field>
+                <field name="general_account_id" position="after">
+                    <field name="to_invoice"/>
+                    <field name="department_id"/>
+                    <field name="date_to"/>
+                    <field name="date_from"/>
+                </field>
+                <filter name="product" position="before">
+                    <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
+                </filter>
+                <filter name="analytic_account" position="before">
+                    <filter string="Type of Invoicing" icon="terp-stock_symbol-selection" context="{'group_by':'to_invoice'}"/>
+                </filter>
+                <filter name="general_account" position="after">
+                    <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                </filter>
             </field>
         </record>
-        <menuitem
-            action="action_hr_timesheet_report_stat_all"
-            id="menu_hr_timesheet_report_all"
-            parent="hr.menu_hr_reporting" sequence="3"/>
+
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py
deleted file mode 100644
index 6d284ac08c8..00000000000
--- a/addons/hr_timesheet_sheet/report/timesheet_report.py
+++ /dev/null
@@ -1,118 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from openerp import tools
-from openerp.osv import fields,osv
-
-class timesheet_report(osv.osv):
-    _name = "timesheet.report"
-    _description = "Timesheet"
-    _auto = False
-    _columns = {
-        'year': fields.char('Year',size=64,required=False, readonly=True),
-        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
-            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
-            ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
-        'day': fields.char('Day', size=128, readonly=True),
-        'date': fields.date('Date', readonly=True),
-        'name': fields.char('Description', size=64,readonly=True),
-        'product_id' : fields.many2one('product.product', 'Product'),
-        'general_account_id' : fields.many2one('account.account', 'General Account', readonly=True),
-        'user_id': fields.many2one('res.users', 'User',readonly=True),
-        'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing',readonly=True),
-        'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True),
-        'nbr': fields.integer('#Nbr',readonly=True),
-        'total_diff': fields.float('#Total Diff',readonly=True),
-        'total_timesheet': fields.float('#Total Timesheet',readonly=True),
-        'total_attendance': fields.float('#Total Attendance',readonly=True),
-        'company_id': fields.many2one('res.company', 'Company',readonly=True),
-        'department_id':fields.many2one('hr.department','Department',readonly=True),
-        'date_from': fields.date('Date from',readonly=True,),
-        'date_to': fields.date('Date to',readonly=True),
-        'date_current': fields.date('Current date', required=True),
-        'state' : fields.selection([
-            ('new', 'New'),
-            ('draft','Draft'),
-            ('confirm','Confirmed'),
-            ('done','Done')], 'Status', readonly=True),
-        'quantity': fields.float('Time',readonly=True),
-        'cost': fields.float('#Cost',readonly=True),
-        }
-
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'timesheet_report')
-        cr.execute("""
-            create or replace view timesheet_report as (
-                    select
-                        min(aal.id) as id,
-                        htss.name,
-                        aal.date as date,
-                        htss.date_from,
-                        htss.date_to,
-                        to_char(htss.date_from, 'YYYY-MM-DD') as day,
-                        to_char(htss.date_from, 'YYYY') as year,
-                        to_char(htss.date_from, 'MM') as month,
-                        count(*) as nbr,
-                        aal.unit_amount as quantity,
-                        aal.amount as cost,
-                        aal.account_id,
-                        aal.product_id,
-                        (SELECT   sum(day.total_difference)
-                            FROM hr_timesheet_sheet_sheet AS sheet 
-                            LEFT JOIN hr_timesheet_sheet_sheet_day AS day 
-                            ON (sheet.id = day.sheet_id) where sheet.id=htss.id) as total_diff,
-                        (SELECT sum(day.total_timesheet)
-                            FROM hr_timesheet_sheet_sheet AS sheet 
-                            LEFT JOIN hr_timesheet_sheet_sheet_day AS day 
-                            ON (sheet.id = day.sheet_id) where sheet.id=htss.id) as total_timesheet,
-                        (SELECT sum(day.total_attendance)
-                            FROM hr_timesheet_sheet_sheet AS sheet 
-                            LEFT JOIN hr_timesheet_sheet_sheet_day AS day 
-                            ON (sheet.id = day.sheet_id) where sheet.id=htss.id) as total_attendance,
-                        aal.to_invoice,
-                        aal.general_account_id,
-                        htss.user_id,
-                        htss.company_id,
-                        htss.department_id,
-                        htss.state
-                    from account_analytic_line as aal
-                    left join hr_analytic_timesheet as hat ON (hat.line_id=aal.id)
-                    left join hr_timesheet_sheet_sheet as htss ON (hat.sheet_id=htss.id)
-                    group by
-                        aal.account_id,
-                        aal.date,
-                        htss.date_from,
-                        htss.date_to,
-                        aal.unit_amount,
-                        aal.amount,
-                        aal.to_invoice,
-                        aal.product_id,
-                        aal.general_account_id,
-                        htss.name,
-                        htss.company_id,
-                        htss.state,
-                        htss.id,
-                        htss.department_id,
-                        htss.user_id
-            )
-        """)
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
deleted file mode 100644
index 9b45229c2cc..00000000000
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="view_timesheet_report_graph" model="ir.ui.view">
-            <field name="name">timesheet.report.graph</field>
-            <field name="model">timesheet.report</field>
-            <field name="arch" type="xml">
-                <graph string="Timesheet" type="pivot" stacked="True">
-                    <field name="user_id" type="row"/>
-                    <field name="state" type="row"/>
-                    <field name="quantity" type="measure"/>
-                    <field name="cost" type="measure"/>
-                    <field name="total_diff" type="measure"/>
-                    <field name="total_timesheet" type="measure"/>
-                    <field name="total_attendance" type="measure"/>
-                </graph>
-            </field>
-        </record>
-        <record id="view_timesheet_report_search" model="ir.ui.view">
-            <field name="name">timesheet.report.search</field>
-            <field name="model">timesheet.report</field>
-            <field name="arch" type="xml">
-                <search string="Timesheet">
-                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
-                    <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]"/>
-                    <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
-                    <field name="account_id"/>
-                    <field name="user_id" />
-                    <group expand="0" string="Extended Filters...">
-                        <field name="general_account_id"/>
-                        <field name="to_invoice"/>
-                        <field name="product_id"/>
-                        <field name="department_id"/>
-                        <field name="company_id" groups="base.group_multi_company"/>
-                        <field name="date_to"/>
-                        <field name="date_from"/>
-                    </group>
-                    <group expand="1" string="Group By">
-                        <filter string="User" name="User_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                        <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
-                        <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                        <filter string="Type of Invoicing" icon="terp-stock_symbol-selection" context="{'group_by':'to_invoice'}"/>
-                        <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
-                        <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                        <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by day of date"/>
-                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>
-                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-        <record id="action_timesheet_report_stat_all" model="ir.actions.act_window">
-            <field name="name">Timesheet Sheet Analysis</field>
-            <field name="res_model">timesheet.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph</field>
-            <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_User_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
-            <field name="search_view_id" ref="view_timesheet_report_search"/>
-        </record>
-        <menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all"
-                parent="hr.menu_hr_reporting" sequence="4" groups="base.group_hr_manager"/>
-    </data>
-</openerp>
diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv
index 3feb9cf1a92..8eef30b35c4 100644
--- a/addons/hr_timesheet_sheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv
@@ -1,9 +1,8 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_hr_timesheet_sheet_sheet_user,hr_timesheet_sheet.sheet.user,model_hr_timesheet_sheet_sheet,base.group_user,1,1,1,1
-access_hr_timesheet_sheet_sheet_system_employee,hr_timesheet_sheet.sheet.system.employee,model_hr_timesheet_sheet_sheet,base.group_user,1,1,1,0
-access_hr_timesheet_sheet_sheet_day,hr_timesheet_sheet.sheet.day,model_hr_timesheet_sheet_sheet_day,base.group_hr_user,1,1,1,1
-access_hr_timesheet_sheet_sheet_account,hr_timesheet_sheet.sheet.account,model_hr_timesheet_sheet_sheet_account,base.group_hr_user,1,1,1,1
-access_hr_timesheet_report,hr.timesheet.report,model_hr_timesheet_report,base.group_hr_manager,1,1,0,0
-access_hr_analytic_timesheet_system_user,hr.analytic.timesheet.system.user,model_hr_analytic_timesheet,base.group_user,1,0,0,0
-access_hr_timesheet_sheet_sheet_day,hr.timesheet.sheet.sheet.day.user,model_hr_timesheet_sheet_sheet_day,base.group_user,1,1,1,0
-access_timesheet_report,timesheet.report,model_timesheet_report,base.group_hr_manager,1,1,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_timesheet_sheet_sheet_user,hr_timesheet_sheet.sheet.user,model_hr_timesheet_sheet_sheet,base.group_user,1,1,1,1
+access_hr_timesheet_sheet_sheet_system_employee,hr_timesheet_sheet.sheet.system.employee,model_hr_timesheet_sheet_sheet,base.group_user,1,1,1,0
+access_hr_timesheet_sheet_sheet_day,hr_timesheet_sheet.sheet.day,model_hr_timesheet_sheet_sheet_day,base.group_hr_user,1,1,1,1
+access_hr_timesheet_sheet_sheet_account,hr_timesheet_sheet.sheet.account,model_hr_timesheet_sheet_sheet_account,base.group_hr_user,1,1,1,1
+access_hr_timesheet_report,hr.timesheet.report,model_hr_timesheet_report,base.group_hr_manager,1,1,0,0
+access_hr_analytic_timesheet_system_user,hr.analytic.timesheet.system.user,model_hr_analytic_timesheet,base.group_user,1,0,0,0
+access_hr_timesheet_sheet_sheet_day,hr.timesheet.sheet.sheet.day.user,model_hr_timesheet_sheet_sheet_day,base.group_user,1,1,1,0

From 25ca967b9785eca27777c8a2577669ce1f6e0d79 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 17 Jun 2014 14:16:07 +0200
Subject: [PATCH 29/36] [IMP] make attachment data available under public by
 default

Assuming access rights are correctly configured, this allows providing
downloads for any attachment type, not just to display images via
/website/image.

TODO: unify attachment querying, we've got stuff over both web/ and website/
---
 addons/web/controllers/main.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 5b2c7a5e91a..98f65075922 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1114,7 +1114,7 @@ class TreeView(View):
 
 class Binary(http.Controller):
 
-    @http.route('/web/binary/image', type='http', auth="user")
+    @http.route('/web/binary/image', type='http', auth="public")
     def image(self, model, id, field, **kw):
         last_update = '__last_update'
         Model = request.session.model(model)
@@ -1169,7 +1169,7 @@ class Binary(http.Controller):
         addons_path = http.addons_manifest['web']['addons_path']
         return open(os.path.join(addons_path, 'web', 'static', 'src', 'img', image), 'rb').read()
 
-    @http.route('/web/binary/saveas', type='http', auth="user")
+    @http.route('/web/binary/saveas', type='http', auth="public")
     @serialize_exception
     def saveas(self, model, field, id=None, filename_field=None, **kw):
         """ Download link for files stored as binary fields.
@@ -1203,7 +1203,7 @@ class Binary(http.Controller):
                 [('Content-Type', 'application/octet-stream'),
                  ('Content-Disposition', content_disposition(filename))])
 
-    @http.route('/web/binary/saveas_ajax', type='http', auth="user")
+    @http.route('/web/binary/saveas_ajax', type='http', auth="public")
     @serialize_exception
     def saveas_ajax(self, data, token):
         jdata = simplejson.loads(data)

From ba4b203e31a113dde71d28225bcc1f04c636be1f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 17 Jun 2014 15:19:54 +0200
Subject: [PATCH 30/36] [FIX] report rendering should ignore http.Retry

---
 addons/report/models/report.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/report/models/report.py b/addons/report/models/report.py
index cbbee7fcebd..17635688063 100644
--- a/addons/report/models/report.py
+++ b/addons/report/models/report.py
@@ -134,14 +134,15 @@ class Report(osv.Model):
         website = None
         if request and hasattr(request, 'website'):
             website = request.website
-        values.update({
-            'time': time,
-            'translate_doc': translate_doc,
-            'editable': True,  # Will active inherit_branding
-            'user': user,
-            'res_company': user.company_id,
-            'website': website,
-        })
+        values.update(
+            time=time,
+            translate_doc=translate_doc,
+            editable=True,  # Will active inherit_branding
+            user=user,
+            res_company=user.company_id,
+            website=website,
+            editable_no_editor=True,
+        )
         return view_obj.render(cr, uid, template, values, context=context)
 
     #--------------------------------------------------------------------------

From 00c2644783a4b6a905a7d0e7764d6fbd89225af7 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 17 Jun 2014 16:22:28 +0200
Subject: [PATCH 31/36] [IMP] display view's XID *below* the selection

* Looks better
* Allows for a label
* Allows for longer template names and ids without cutting off
* Room to grow more info bits
---
 addons/website/static/src/css/editor.css      |  8 ++++++--
 addons/website/static/src/css/editor.sass     |  8 ++++++--
 addons/website/static/src/js/website.ace.js   | 10 +++++++---
 addons/website/static/src/xml/website.ace.xml |  1 +
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 7d8b1e609e8..f60530c3f0c 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -472,13 +472,14 @@ ul.oe_menu_editor .disclose {
   right: 0;
   z-index: 1000;
   height: 100%;
+  background: #2f3129;
+  color: white;
 }
 .oe_ace_view_editor .oe_ace_view_editor_title {
   width: 100%;
   padding-top: 0;
   padding-left: 0;
   height: 30px;
-  background: #2f3129;
 }
 .oe_ace_view_editor .oe_ace_view_editor_title .oe_view_list {
   width: 50%;
@@ -496,13 +497,16 @@ ul.oe_menu_editor .disclose {
 }
 .oe_ace_view_editor .ace_editor {
   position: absolute;
-  top: 30px;
+  top: 50px;
   right: 0;
   left: 0;
 }
 .oe_ace_view_editor .ace_editor .ace_gutter {
   cursor: ew-resize;
 }
+.oe_ace_view_editor #ace-view-id {
+  padding: 0 1em;
+}
 .oe_ace_view_editor.oe_ace_open {
   filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=97);
   opacity: 0.97;
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index d39b6abd453..07340c62698 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -408,6 +408,7 @@ $highlighted_text_color: #ffffff
 /* ---- ACE EDITOR ---- {{{ */
 
 $editorbar_height: 30px
+$infobar_height: 20px
 // TODO Fix => might break with themes
 
 .oe_ace_view_editor
@@ -416,12 +417,13 @@ $editorbar_height: 30px
     right: 0
     z-index: 1000
     height: 100%
+    background: #2F3129
+    color: white
     .oe_ace_view_editor_title
         width: 100%
         padding-top: 0
         padding-left: 0
         height: $editorbar_height
-        background: #2F3129
         .oe_view_list
             width: 50%
             height: $editorbar_height
@@ -432,12 +434,14 @@ $editorbar_height: 30px
             @include editor-font
     .ace_editor
         position: absolute
-        top: $editorbar_height
+        top: $editorbar_height + $infobar_height
         right: 0
         // bottom property is set programmatically
         left: 0
         .ace_gutter
             cursor: ew-resize
+    #ace-view-id
+        padding: 0 1em
     &.oe_ace_open
         +opacity(0.97)
     &.oe_ace_closed
diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/website.ace.js
index e1c45065c33..72ed6f2df9e 100644
--- a/addons/website/static/src/js/website.ace.js
+++ b/addons/website/static/src/js/website.ace.js
@@ -1,6 +1,7 @@
 (function () {
     'use strict';
 
+    var _t = openerp._t;
     var hash = "#advanced-view-editor";
 
     var website = openerp.website;
@@ -69,9 +70,7 @@
             this.view_name = options.name;
 
             var indent = _.str.repeat("- ", options.level);
-            this.view_name = _.str.sprintf(
-                "%s%s (%s)",
-                indent, options.name, options.xml_id);
+            this.view_name = _.str.sprintf("%s%s", indent, options.name);
             this._super(parent);
         },
     });
@@ -89,6 +88,7 @@
         },
         init: function (parent) {
             this.buffers = {};
+            this.views = {};
             this._super(parent);
         },
         start: function () {
@@ -167,6 +167,7 @@
             _(this.buildViewGraph(views)).each(function (view) {
                 if (!view.id) { return; }
 
+                this.views[view.id] = view;
                 new website.ace.ViewOption(this, view).appendTo($viewList);
                 this.loadView(view.id);
             }.bind(this));
@@ -241,6 +242,9 @@
             var editingSession = this.buffers[viewId];
             if (editingSession) {
                 this.aceEditor.setSession(editingSession);
+                this.$('#ace-view-id').text(_.str.sprintf(
+                    _t("Template ID: %s"),
+                    this.views[viewId].xml_id));
             }
         },
         displaySelectedView: function () {
diff --git a/addons/website/static/src/xml/website.ace.xml b/addons/website/static/src/xml/website.ace.xml
index 6ed823ed10c..23f3ca0c2e4 100644
--- a/addons/website/static/src/xml/website.ace.xml
+++ b/addons/website/static/src/xml/website.ace.xml
@@ -10,6 +10,7 @@
                 <button data-action="format" type="button" class="btn btn-warning">Format</button>
                 <button data-action="close" type="button" class="btn btn-info">Close</button>
             </div>
+            <div id="ace-view-id"/>
             <div id="ace-view-editor"/>
         </div>
     </t>

From 50245476d11160b64291f51093f93778102f8f44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 17 Jun 2014 17:12:21 +0200
Subject: [PATCH 32/36] [FIX] project_mrp: fixed with in which product
 attributes are added, probably due to product and template refactoring

---
 addons/project_mrp/project_mrp_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
index 90ab6682cd5..d2e1027b42e 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -14,7 +14,7 @@
         <record id="view_product_task_form" model="ir.ui.view">
             <field name="name">product.form.view.inherit</field>
             <field name="model">product.template</field>
-            <field name="inherit_id" ref="stock.view_template_property_form"/>
+            <field name="inherit_id" ref="product.product_template_form_view"/>
             <field name="arch" type="xml">
                 <group name="procurement_uom" position="after">
                     <group string="Project Management Information" attrs="{'invisible': [('type', '!=', 'service')]}">

From b0a5e9286de6e7c416dd09508ea870c89aaa0942 Mon Sep 17 00:00:00 2001
From: Amit Vora <avo@openerp.com>
Date: Wed, 21 May 2014 15:57:24 +0530
Subject: [PATCH 33/36] [IMP]rename project_mrp to sale_service

---
 addons/project/res_config.py                                | 4 ++--
 addons/project/res_config_view.xml                          | 4 ++--
 addons/sale/res_config.py                                   | 2 +-
 addons/sale/sale.py                                         | 4 ++--
 addons/{project_mrp => sale_service}/__init__.py            | 2 +-
 addons/{project_mrp => sale_service}/__openerp__.py         | 4 ++--
 .../demo/sale_service_demo.xml}                             | 0
 addons/{project_mrp => sale_service}/i18n/ar.po             | 0
 addons/{project_mrp => sale_service}/i18n/bg.po             | 0
 addons/{project_mrp => sale_service}/i18n/bs.po             | 0
 addons/{project_mrp => sale_service}/i18n/ca.po             | 0
 addons/{project_mrp => sale_service}/i18n/cs.po             | 0
 addons/{project_mrp => sale_service}/i18n/da.po             | 0
 addons/{project_mrp => sale_service}/i18n/de.po             | 0
 addons/{project_mrp => sale_service}/i18n/el.po             | 0
 addons/{project_mrp => sale_service}/i18n/es.po             | 0
 addons/{project_mrp => sale_service}/i18n/es_AR.po          | 0
 addons/{project_mrp => sale_service}/i18n/es_CR.po          | 0
 addons/{project_mrp => sale_service}/i18n/es_EC.po          | 0
 addons/{project_mrp => sale_service}/i18n/es_MX.po          | 0
 addons/{project_mrp => sale_service}/i18n/es_VE.po          | 0
 addons/{project_mrp => sale_service}/i18n/et.po             | 0
 addons/{project_mrp => sale_service}/i18n/fi.po             | 0
 addons/{project_mrp => sale_service}/i18n/fr.po             | 0
 addons/{project_mrp => sale_service}/i18n/gl.po             | 0
 addons/{project_mrp => sale_service}/i18n/gu.po             | 0
 addons/{project_mrp => sale_service}/i18n/hr.po             | 0
 addons/{project_mrp => sale_service}/i18n/hu.po             | 0
 addons/{project_mrp => sale_service}/i18n/id.po             | 0
 addons/{project_mrp => sale_service}/i18n/it.po             | 0
 addons/{project_mrp => sale_service}/i18n/ja.po             | 0
 addons/{project_mrp => sale_service}/i18n/ko.po             | 0
 addons/{project_mrp => sale_service}/i18n/lt.po             | 0
 addons/{project_mrp => sale_service}/i18n/lv.po             | 0
 addons/{project_mrp => sale_service}/i18n/mk.po             | 0
 addons/{project_mrp => sale_service}/i18n/mn.po             | 0
 addons/{project_mrp => sale_service}/i18n/nb.po             | 0
 addons/{project_mrp => sale_service}/i18n/nl.po             | 0
 addons/{project_mrp => sale_service}/i18n/nl_BE.po          | 0
 addons/{project_mrp => sale_service}/i18n/pl.po             | 0
 addons/{project_mrp => sale_service}/i18n/pt.po             | 0
 addons/{project_mrp => sale_service}/i18n/pt_BR.po          | 0
 addons/{project_mrp => sale_service}/i18n/ro.po             | 0
 addons/{project_mrp => sale_service}/i18n/ru.po             | 0
 .../project_mrp.pot => sale_service/i18n/sale_service.pot}  | 0
 addons/{project_mrp => sale_service}/i18n/sl.po             | 0
 addons/{project_mrp => sale_service}/i18n/sq.po             | 0
 addons/{project_mrp => sale_service}/i18n/sv.po             | 0
 addons/{project_mrp => sale_service}/i18n/tlh.po            | 0
 addons/{project_mrp => sale_service}/i18n/tr.po             | 0
 addons/{project_mrp => sale_service}/i18n/uk.po             | 0
 addons/{project_mrp => sale_service}/i18n/vi.po             | 0
 addons/{project_mrp => sale_service}/i18n/zh_CN.po          | 0
 addons/{project_mrp => sale_service}/i18n/zh_TW.po          | 0
 addons/sale_service/models/__init__.py                      | 1 +
 .../project_mrp.py => sale_service/models/sale_service.py}  | 2 +-
 .../security/ir.model.access.csv                            | 0
 .../test/project_task_procurement.yml                       | 0
 .../views/sale_service_view.xml}                            | 4 ++--
 addons/sale_stock/res_config.py                             | 6 +++---
 addons/sale_stock/res_config_view.xml                       | 2 +-
 addons/stock/procurement.py                                 | 2 +-
 openerp/addons/base/res/res_config.py                       | 4 ++--
 63 files changed, 21 insertions(+), 20 deletions(-)
 rename addons/{project_mrp => sale_service}/__init__.py (98%)
 rename addons/{project_mrp => sale_service}/__openerp__.py (95%)
 rename addons/{project_mrp/project_mrp_demo.xml => sale_service/demo/sale_service_demo.xml} (100%)
 rename addons/{project_mrp => sale_service}/i18n/ar.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/bg.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/bs.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/ca.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/cs.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/da.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/de.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/el.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/es.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/es_AR.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/es_CR.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/es_EC.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/es_MX.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/es_VE.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/et.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/fi.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/fr.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/gl.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/gu.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/hr.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/hu.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/id.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/it.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/ja.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/ko.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/lt.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/lv.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/mk.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/mn.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/nb.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/nl.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/nl_BE.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/pl.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/pt.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/pt_BR.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/ro.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/ru.po (100%)
 rename addons/{project_mrp/i18n/project_mrp.pot => sale_service/i18n/sale_service.pot} (100%)
 rename addons/{project_mrp => sale_service}/i18n/sl.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/sq.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/sv.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/tlh.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/tr.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/uk.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/vi.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/zh_CN.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/zh_TW.po (100%)
 create mode 100644 addons/sale_service/models/__init__.py
 rename addons/{project_mrp/project_mrp.py => sale_service/models/sale_service.py} (99%)
 rename addons/{project_mrp => sale_service}/security/ir.model.access.csv (100%)
 rename addons/{project_mrp => sale_service}/test/project_task_procurement.yml (100%)
 rename addons/{project_mrp/project_mrp_view.xml => sale_service/views/sale_service_view.xml} (93%)

diff --git a/addons/project/res_config.py b/addons/project/res_config.py
index e7699a61ec8..187ad0327d8 100644
--- a/addons/project/res_config.py
+++ b/addons/project/res_config.py
@@ -27,11 +27,11 @@ class project_configuration(osv.osv_memory):
     _inherit = 'res.config.settings'
 
     _columns = {
-        'module_project_mrp': fields.boolean('Generate tasks from sale orders',
+        'module_sale_service': fields.boolean('Generate tasks from sale orders',
             help='This feature automatically creates project tasks from service products in sale orders. '
                  'More precisely, tasks are created for procurement lines with product of type \'Service\', '
                  'procurement method \'Make to Order\', and supply method \'Manufacture\'.\n'
-                 '-This installs the module project_mrp.'),
+                 '-This installs the module sale_service.'),
         'module_pad': fields.boolean("Use integrated collaborative note pads on task",
             help='Lets the company customize which Pad installation should be used to link to new pads '
                  '(for example: http://ietherpad.com/).\n'
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index f190fba3b3a..16dce54d88b 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -33,8 +33,8 @@
                                 <label for="module_project_timesheet"/>
                             </div>
                             <div>
-                                <field name="module_project_mrp" class="oe_inline"/>
-                                <label for="module_project_mrp"/>
+                                <field name="module_sale_service" class="oe_inline"/>
+                                <label for="module_sale_service"/>
                             </div>
                             <div>
                                 <field name="module_pad" class="oe_inline"/>
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index 94fd74e035e..f4892598332 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -122,7 +122,7 @@ Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
     def onchange_task_work(self, cr, uid, ids, task_work, context=None):
         return {'value': {
             'module_project_timesheet': task_work,
-            'module_project_mrp': task_work,
+            'module_sale_service': task_work,
         }}
 
     def onchange_timesheet(self, cr, uid, ids, timesheet, context=None):
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 45c32a33b22..964fa1584ba 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -686,7 +686,7 @@ class sale_order(osv.osv):
 
     def procurement_needed(self, cr, uid, ids, context=None):
         #when sale is installed only, there is no need to create procurements, that's only
-        #further installed modules (project_mrp, sale_stock) that will change this.
+        #further installed modules (sale_service, sale_stock) that will change this.
         sale_line_obj = self.pool.get('sale.order.line')
         res = []
         for order in self.browse(cr, uid, ids, context=context):
@@ -839,7 +839,7 @@ class sale_order_line(osv.osv):
 
     def need_procurement(self, cr, uid, ids, context=None):
         #when sale is installed only, there is no need to create procurements, that's only
-        #further installed modules (project_mrp, sale_stock) that will change this.
+        #further installed modules (sale_service, sale_stock) that will change this.
         return False
 
     def _amount_line(self, cr, uid, ids, field_name, arg, context=None):
diff --git a/addons/project_mrp/__init__.py b/addons/sale_service/__init__.py
similarity index 98%
rename from addons/project_mrp/__init__.py
rename to addons/sale_service/__init__.py
index c0c3172c29f..d6bf9f9551c 100644
--- a/addons/project_mrp/__init__.py
+++ b/addons/sale_service/__init__.py
@@ -19,6 +19,6 @@
 #
 ##############################################################################
 
-import project_mrp
+import models
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_mrp/__openerp__.py b/addons/sale_service/__openerp__.py
similarity index 95%
rename from addons/project_mrp/__openerp__.py
rename to addons/sale_service/__openerp__.py
index 3730ec74113..85ea8df0735 100644
--- a/addons/project_mrp/__openerp__.py
+++ b/addons/sale_service/__openerp__.py
@@ -50,8 +50,8 @@ completed.
     'website': 'http://www.openerp.com',
     'images': ['images/product.jpeg', 'images/task_from_SO.jpeg'],
     'depends': ['project', 'procurement', 'sale', 'procurement_jit'],
-    'data': ['project_mrp_view.xml'], #'process/project_mrp_process.xml'
-    'demo': ['project_mrp_demo.xml'],
+    'data': ['views/sale_service_view.xml'],
+    'demo': ['demo/sale_service_demo.xml'],
     'test': ['test/project_task_procurement.yml'],
     'installable': True,
     'auto_install': False,
diff --git a/addons/project_mrp/project_mrp_demo.xml b/addons/sale_service/demo/sale_service_demo.xml
similarity index 100%
rename from addons/project_mrp/project_mrp_demo.xml
rename to addons/sale_service/demo/sale_service_demo.xml
diff --git a/addons/project_mrp/i18n/ar.po b/addons/sale_service/i18n/ar.po
similarity index 100%
rename from addons/project_mrp/i18n/ar.po
rename to addons/sale_service/i18n/ar.po
diff --git a/addons/project_mrp/i18n/bg.po b/addons/sale_service/i18n/bg.po
similarity index 100%
rename from addons/project_mrp/i18n/bg.po
rename to addons/sale_service/i18n/bg.po
diff --git a/addons/project_mrp/i18n/bs.po b/addons/sale_service/i18n/bs.po
similarity index 100%
rename from addons/project_mrp/i18n/bs.po
rename to addons/sale_service/i18n/bs.po
diff --git a/addons/project_mrp/i18n/ca.po b/addons/sale_service/i18n/ca.po
similarity index 100%
rename from addons/project_mrp/i18n/ca.po
rename to addons/sale_service/i18n/ca.po
diff --git a/addons/project_mrp/i18n/cs.po b/addons/sale_service/i18n/cs.po
similarity index 100%
rename from addons/project_mrp/i18n/cs.po
rename to addons/sale_service/i18n/cs.po
diff --git a/addons/project_mrp/i18n/da.po b/addons/sale_service/i18n/da.po
similarity index 100%
rename from addons/project_mrp/i18n/da.po
rename to addons/sale_service/i18n/da.po
diff --git a/addons/project_mrp/i18n/de.po b/addons/sale_service/i18n/de.po
similarity index 100%
rename from addons/project_mrp/i18n/de.po
rename to addons/sale_service/i18n/de.po
diff --git a/addons/project_mrp/i18n/el.po b/addons/sale_service/i18n/el.po
similarity index 100%
rename from addons/project_mrp/i18n/el.po
rename to addons/sale_service/i18n/el.po
diff --git a/addons/project_mrp/i18n/es.po b/addons/sale_service/i18n/es.po
similarity index 100%
rename from addons/project_mrp/i18n/es.po
rename to addons/sale_service/i18n/es.po
diff --git a/addons/project_mrp/i18n/es_AR.po b/addons/sale_service/i18n/es_AR.po
similarity index 100%
rename from addons/project_mrp/i18n/es_AR.po
rename to addons/sale_service/i18n/es_AR.po
diff --git a/addons/project_mrp/i18n/es_CR.po b/addons/sale_service/i18n/es_CR.po
similarity index 100%
rename from addons/project_mrp/i18n/es_CR.po
rename to addons/sale_service/i18n/es_CR.po
diff --git a/addons/project_mrp/i18n/es_EC.po b/addons/sale_service/i18n/es_EC.po
similarity index 100%
rename from addons/project_mrp/i18n/es_EC.po
rename to addons/sale_service/i18n/es_EC.po
diff --git a/addons/project_mrp/i18n/es_MX.po b/addons/sale_service/i18n/es_MX.po
similarity index 100%
rename from addons/project_mrp/i18n/es_MX.po
rename to addons/sale_service/i18n/es_MX.po
diff --git a/addons/project_mrp/i18n/es_VE.po b/addons/sale_service/i18n/es_VE.po
similarity index 100%
rename from addons/project_mrp/i18n/es_VE.po
rename to addons/sale_service/i18n/es_VE.po
diff --git a/addons/project_mrp/i18n/et.po b/addons/sale_service/i18n/et.po
similarity index 100%
rename from addons/project_mrp/i18n/et.po
rename to addons/sale_service/i18n/et.po
diff --git a/addons/project_mrp/i18n/fi.po b/addons/sale_service/i18n/fi.po
similarity index 100%
rename from addons/project_mrp/i18n/fi.po
rename to addons/sale_service/i18n/fi.po
diff --git a/addons/project_mrp/i18n/fr.po b/addons/sale_service/i18n/fr.po
similarity index 100%
rename from addons/project_mrp/i18n/fr.po
rename to addons/sale_service/i18n/fr.po
diff --git a/addons/project_mrp/i18n/gl.po b/addons/sale_service/i18n/gl.po
similarity index 100%
rename from addons/project_mrp/i18n/gl.po
rename to addons/sale_service/i18n/gl.po
diff --git a/addons/project_mrp/i18n/gu.po b/addons/sale_service/i18n/gu.po
similarity index 100%
rename from addons/project_mrp/i18n/gu.po
rename to addons/sale_service/i18n/gu.po
diff --git a/addons/project_mrp/i18n/hr.po b/addons/sale_service/i18n/hr.po
similarity index 100%
rename from addons/project_mrp/i18n/hr.po
rename to addons/sale_service/i18n/hr.po
diff --git a/addons/project_mrp/i18n/hu.po b/addons/sale_service/i18n/hu.po
similarity index 100%
rename from addons/project_mrp/i18n/hu.po
rename to addons/sale_service/i18n/hu.po
diff --git a/addons/project_mrp/i18n/id.po b/addons/sale_service/i18n/id.po
similarity index 100%
rename from addons/project_mrp/i18n/id.po
rename to addons/sale_service/i18n/id.po
diff --git a/addons/project_mrp/i18n/it.po b/addons/sale_service/i18n/it.po
similarity index 100%
rename from addons/project_mrp/i18n/it.po
rename to addons/sale_service/i18n/it.po
diff --git a/addons/project_mrp/i18n/ja.po b/addons/sale_service/i18n/ja.po
similarity index 100%
rename from addons/project_mrp/i18n/ja.po
rename to addons/sale_service/i18n/ja.po
diff --git a/addons/project_mrp/i18n/ko.po b/addons/sale_service/i18n/ko.po
similarity index 100%
rename from addons/project_mrp/i18n/ko.po
rename to addons/sale_service/i18n/ko.po
diff --git a/addons/project_mrp/i18n/lt.po b/addons/sale_service/i18n/lt.po
similarity index 100%
rename from addons/project_mrp/i18n/lt.po
rename to addons/sale_service/i18n/lt.po
diff --git a/addons/project_mrp/i18n/lv.po b/addons/sale_service/i18n/lv.po
similarity index 100%
rename from addons/project_mrp/i18n/lv.po
rename to addons/sale_service/i18n/lv.po
diff --git a/addons/project_mrp/i18n/mk.po b/addons/sale_service/i18n/mk.po
similarity index 100%
rename from addons/project_mrp/i18n/mk.po
rename to addons/sale_service/i18n/mk.po
diff --git a/addons/project_mrp/i18n/mn.po b/addons/sale_service/i18n/mn.po
similarity index 100%
rename from addons/project_mrp/i18n/mn.po
rename to addons/sale_service/i18n/mn.po
diff --git a/addons/project_mrp/i18n/nb.po b/addons/sale_service/i18n/nb.po
similarity index 100%
rename from addons/project_mrp/i18n/nb.po
rename to addons/sale_service/i18n/nb.po
diff --git a/addons/project_mrp/i18n/nl.po b/addons/sale_service/i18n/nl.po
similarity index 100%
rename from addons/project_mrp/i18n/nl.po
rename to addons/sale_service/i18n/nl.po
diff --git a/addons/project_mrp/i18n/nl_BE.po b/addons/sale_service/i18n/nl_BE.po
similarity index 100%
rename from addons/project_mrp/i18n/nl_BE.po
rename to addons/sale_service/i18n/nl_BE.po
diff --git a/addons/project_mrp/i18n/pl.po b/addons/sale_service/i18n/pl.po
similarity index 100%
rename from addons/project_mrp/i18n/pl.po
rename to addons/sale_service/i18n/pl.po
diff --git a/addons/project_mrp/i18n/pt.po b/addons/sale_service/i18n/pt.po
similarity index 100%
rename from addons/project_mrp/i18n/pt.po
rename to addons/sale_service/i18n/pt.po
diff --git a/addons/project_mrp/i18n/pt_BR.po b/addons/sale_service/i18n/pt_BR.po
similarity index 100%
rename from addons/project_mrp/i18n/pt_BR.po
rename to addons/sale_service/i18n/pt_BR.po
diff --git a/addons/project_mrp/i18n/ro.po b/addons/sale_service/i18n/ro.po
similarity index 100%
rename from addons/project_mrp/i18n/ro.po
rename to addons/sale_service/i18n/ro.po
diff --git a/addons/project_mrp/i18n/ru.po b/addons/sale_service/i18n/ru.po
similarity index 100%
rename from addons/project_mrp/i18n/ru.po
rename to addons/sale_service/i18n/ru.po
diff --git a/addons/project_mrp/i18n/project_mrp.pot b/addons/sale_service/i18n/sale_service.pot
similarity index 100%
rename from addons/project_mrp/i18n/project_mrp.pot
rename to addons/sale_service/i18n/sale_service.pot
diff --git a/addons/project_mrp/i18n/sl.po b/addons/sale_service/i18n/sl.po
similarity index 100%
rename from addons/project_mrp/i18n/sl.po
rename to addons/sale_service/i18n/sl.po
diff --git a/addons/project_mrp/i18n/sq.po b/addons/sale_service/i18n/sq.po
similarity index 100%
rename from addons/project_mrp/i18n/sq.po
rename to addons/sale_service/i18n/sq.po
diff --git a/addons/project_mrp/i18n/sv.po b/addons/sale_service/i18n/sv.po
similarity index 100%
rename from addons/project_mrp/i18n/sv.po
rename to addons/sale_service/i18n/sv.po
diff --git a/addons/project_mrp/i18n/tlh.po b/addons/sale_service/i18n/tlh.po
similarity index 100%
rename from addons/project_mrp/i18n/tlh.po
rename to addons/sale_service/i18n/tlh.po
diff --git a/addons/project_mrp/i18n/tr.po b/addons/sale_service/i18n/tr.po
similarity index 100%
rename from addons/project_mrp/i18n/tr.po
rename to addons/sale_service/i18n/tr.po
diff --git a/addons/project_mrp/i18n/uk.po b/addons/sale_service/i18n/uk.po
similarity index 100%
rename from addons/project_mrp/i18n/uk.po
rename to addons/sale_service/i18n/uk.po
diff --git a/addons/project_mrp/i18n/vi.po b/addons/sale_service/i18n/vi.po
similarity index 100%
rename from addons/project_mrp/i18n/vi.po
rename to addons/sale_service/i18n/vi.po
diff --git a/addons/project_mrp/i18n/zh_CN.po b/addons/sale_service/i18n/zh_CN.po
similarity index 100%
rename from addons/project_mrp/i18n/zh_CN.po
rename to addons/sale_service/i18n/zh_CN.po
diff --git a/addons/project_mrp/i18n/zh_TW.po b/addons/sale_service/i18n/zh_TW.po
similarity index 100%
rename from addons/project_mrp/i18n/zh_TW.po
rename to addons/sale_service/i18n/zh_TW.po
diff --git a/addons/sale_service/models/__init__.py b/addons/sale_service/models/__init__.py
new file mode 100644
index 00000000000..d9728749476
--- /dev/null
+++ b/addons/sale_service/models/__init__.py
@@ -0,0 +1 @@
+import sale_service
\ No newline at end of file
diff --git a/addons/project_mrp/project_mrp.py b/addons/sale_service/models/sale_service.py
similarity index 99%
rename from addons/project_mrp/project_mrp.py
rename to addons/sale_service/models/sale_service.py
index 651aa7dda48..bcce63cf66d 100644
--- a/addons/project_mrp/project_mrp.py
+++ b/addons/sale_service/models/sale_service.py
@@ -151,7 +151,7 @@ class sale_order_line(osv.osv):
     _inherit = 'sale.order.line'
 
     def need_procurement(self, cr, uid, ids, context=None):
-        #when sale is installed alone, there is no need to create procurements, but with project_mrp
+        #when sale is installed alone, there is no need to create procurements, but with sale_service
         #we must create a procurement for each service that has the auto_create_task boolean set to True.
         for line in self.browse(cr, uid, ids, context=context):
             if line.product_id and line.product_id.type == 'service' and line.product_id.auto_create_task:
diff --git a/addons/project_mrp/security/ir.model.access.csv b/addons/sale_service/security/ir.model.access.csv
similarity index 100%
rename from addons/project_mrp/security/ir.model.access.csv
rename to addons/sale_service/security/ir.model.access.csv
diff --git a/addons/project_mrp/test/project_task_procurement.yml b/addons/sale_service/test/project_task_procurement.yml
similarity index 100%
rename from addons/project_mrp/test/project_task_procurement.yml
rename to addons/sale_service/test/project_task_procurement.yml
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/sale_service/views/sale_service_view.xml
similarity index 93%
rename from addons/project_mrp/project_mrp_view.xml
rename to addons/sale_service/views/sale_service_view.xml
index d2e1027b42e..0865d95fa0e 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/sale_service/views/sale_service_view.xml
@@ -34,8 +34,8 @@
                 </field>
             </field>
         </record>
-        <record id="view_project_mrp_inherit_form2" model="ir.ui.view">
-            <field name="name">project.mrp.form.view.inherit</field>
+        <record id="view_sale_service_inherit_form2" model="ir.ui.view">
+            <field name="name">sale.service.form.view.inherit</field>
             <field name="model">project.task</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
diff --git a/addons/sale_stock/res_config.py b/addons/sale_stock/res_config.py
index 8c1d5c87f99..f702ca81929 100644
--- a/addons/sale_stock/res_config.py
+++ b/addons/sale_stock/res_config.py
@@ -35,7 +35,7 @@ class sale_configuration(osv.osv_memory):
             help='Lets you transfer the entries under tasks defined for Project Management to '
                  'the Timesheet line entries for particular date and particular user  with the effect of creating, editing and deleting either ways '
                  'and to automatically creates project tasks from procurement lines.\n'
-                 '-This installs the modules project_timesheet and project_mrp.'),
+                 '-This installs the modules project_timesheet and sale_service.'),
         'default_order_policy': fields.selection(
             [('manual', 'Invoice based on sales orders'), ('picking', 'Invoice based on deliveries')],
             'The default invoicing method is', default_model='sale.order',
@@ -50,7 +50,7 @@ class sale_configuration(osv.osv_memory):
             implied_group='sale.group_mrp_properties',
             help="Allows you to tag sales order lines with properties."),
         'module_project_timesheet': fields.boolean("Project Timesheet"),
-        'module_project_mrp': fields.boolean("Project MRP"),
+        'module_sale_service': fields.boolean("Sale Service"),
         'group_route_so_lines': fields.boolean('Choose MTO, drop shipping,... on sales order lines',
             implied_group='sale_stock.group_route_so_lines',
             help="Allows you to choose a delivery route on sales order lines"),
@@ -63,7 +63,7 @@ class sale_configuration(osv.osv_memory):
     def default_get(self, cr, uid, fields, context=None):
         res = super(sale_configuration, self).default_get(cr, uid, fields, context)
         # task_work, time_unit depend on other fields
-        res['task_work'] = res.get('module_project_mrp') and res.get('module_project_timesheet')
+        res['task_work'] = res.get('module_sale_service') and res.get('module_project_timesheet')
         return res
 
     def get_default_sale_config(self, cr, uid, ids, context=None):
diff --git a/addons/sale_stock/res_config_view.xml b/addons/sale_stock/res_config_view.xml
index 89c2f191915..69824ffdd5a 100644
--- a/addons/sale_stock/res_config_view.xml
+++ b/addons/sale_stock/res_config_view.xml
@@ -38,7 +38,7 @@
                      </xpath> 
                      <group name='default_options' position="after">
                          <field name="module_project_timesheet" invisible="1"/>
-                         <field name="module_project_mrp" invisible="1"/>
+                         <field name="module_sale_service" invisible="1"/>
                      </group>
                      <div name='warehouse_features' position='inside'>
                          <div name='default_picking_policy' attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}">
diff --git a/addons/stock/procurement.py b/addons/stock/procurement.py
index f53776d4b9a..a8fc778f2e6 100644
--- a/addons/stock/procurement.py
+++ b/addons/stock/procurement.py
@@ -78,7 +78,7 @@ class procurement_rule(osv.osv):
 class procurement_order(osv.osv):
     _inherit = "procurement.order"
     _columns = {
-        'location_id': fields.many2one('stock.location', 'Procurement Location'),  # not required because task may create procurements that aren't linked to a location with project_mrp
+        'location_id': fields.many2one('stock.location', 'Procurement Location'),  # not required because task may create procurements that aren't linked to a location with sale_service
         'partner_dest_id': fields.many2one('res.partner', 'Customer Address', help="In case of dropshipping, we need to know the destination address more precisely"),
         'move_ids': fields.one2many('stock.move', 'procurement_id', 'Moves', help="Moves created by the procurement"),
         'move_dest_id': fields.many2one('stock.move', 'Destination Move', help="Move which caused (created) the procurement"),
diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py
index 5bbd377f29d..767d9fcd705 100644
--- a/openerp/addons/base/res/res_config.py
+++ b/openerp/addons/base/res/res_config.py
@@ -221,10 +221,10 @@ class res_config_installer(osv.osv_memory, res_config_module_installation_mixin)
 
         _install_if = {
             ('sale','crm'): ['sale_crm'],
-            ('sale','project'): ['project_mrp'],
+            ('sale','project'): ['sale_service'],
         }
 
-    will install both ``sale_crm`` and ``project_mrp`` if all of
+    will install both ``sale_crm`` and ``sale_service`` if all of
     ``sale``, ``crm`` and ``project`` are selected for installation.
 
     Hook methods

From 56009e8804738fb78beb69804877c65354268329 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 18 Jun 2014 16:09:02 +0200
Subject: [PATCH 34/36] [FIX] website: missing timezone conversion back to UTC

In t-field, datetime fields (formatted and not formatted versions) are
converted to the context/user's timezone (through
fields.datetime.context_timestamp) when displayed, but were saved without
converting back so the next display would go forward (or back) of the user's
tzoffset.

Fix that by applying context_timestamp's conversion backwards, from the
context/user's timezone back to UTC, before saving the field's value.
---
 addons/website/models/ir_qweb.py | 29 +++++++++++++++++++++++++----
 openerp/osv/fields.py            |  2 +-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/addons/website/models/ir_qweb.py b/addons/website/models/ir_qweb.py
index 6c466355d07..cb2e8f191ed 100644
--- a/addons/website/models/ir_qweb.py
+++ b/addons/website/models/ir_qweb.py
@@ -15,6 +15,7 @@ import urllib2
 import urlparse
 import re
 
+import pytz
 import werkzeug.urls
 import werkzeug.utils
 from dateutil import parser
@@ -153,15 +154,15 @@ class DateTime(orm.AbstractModel):
     def attributes(self, cr, uid, field_name, record, options,
                    source_element, g_att, t_att, qweb_context,
                    context=None):
-        column = record._model._all_columns[field_name].column
         value = record[field_name]
         if isinstance(value, basestring):
             value = datetime.datetime.strptime(
                 value, DEFAULT_SERVER_DATETIME_FORMAT)
         if value:
+            # convert from UTC (server timezone) to user timezone
             value = fields.datetime.context_timestamp(
                 cr, uid, timestamp=value, context=context)
-            value = value.strftime(openerp.tools.DEFAULT_SERVER_DATETIME_FORMAT)
+            value = value.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
 
         attrs = super(DateTime, self).attributes(
             cr, uid, field_name, record, options, source_element, g_att, t_att,
@@ -171,11 +172,31 @@ class DateTime(orm.AbstractModel):
         ])
 
     def from_html(self, cr, uid, model, column, element, context=None):
+        if context is None: context = {}
         value = element.text_content().strip()
         if not value: return False
 
-        datetime.datetime.strptime(value, DEFAULT_SERVER_DATETIME_FORMAT)
-        return value
+        # parse from string to datetime
+        dt = datetime.datetime.strptime(value, DEFAULT_SERVER_DATETIME_FORMAT)
+
+        # convert back from user's timezone to UTC
+        tz_name = context.get('tz') \
+            or self.pool['res.users'].read(cr, openerp.SUPERUSER_ID, uid, ['tz'], context=context)['tz']
+        if tz_name:
+            try:
+                user_tz = pytz.timezone(tz_name)
+                utc = pytz.utc
+
+                dt = user_tz.localize(dt).astimezone(utc)
+            except Exception:
+                logger.warn(
+                    "Failed to convert the value for a field of the model"
+                    " %s back from the user's timezone (%s) to UTC",
+                    model, tz_name,
+                    exc_info=True)
+
+        # format back to string
+        return dt.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
 
 class Text(orm.AbstractModel):
     _name = 'website.qweb.field.text'
diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index e24d74e0625..57961a1d32c 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -422,7 +422,7 @@ class datetime(_column):
             tz_name = registry.get('res.users').read(cr, SUPERUSER_ID, uid, ['tz'])['tz']
         if tz_name:
             try:
-                utc = pytz.timezone('UTC')
+                utc = pytz.utc
                 context_tz = pytz.timezone(tz_name)
                 utc_timestamp = utc.localize(timestamp, is_dst=False) # UTC = no DST
                 return utc_timestamp.astimezone(context_tz)

From 9e1399d2b3d06e71e6704a569c9d62933abe6c07 Mon Sep 17 00:00:00 2001
From: tfossoul <fossoul.t@gmail.com>
Date: Thu, 19 Jun 2014 09:45:14 +0200
Subject: [PATCH 35/36] vals=vals_line on a create function

Come on !!!!

timesheet_obj.create(cr, uid, vals=vals_line, context=context)
timesheet_obj.create(cr, uid, vals_line, context=context)
---
 addons/project_timesheet/project_timesheet.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 31a396369e2..f6c2321d1f9 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -137,7 +137,7 @@ class project_work(osv.osv):
                 amount = vals_line['unit_amount']
                 prod_id = vals_line['product_id']
                 unit = False
-                timeline_id = timesheet_obj.create(cr, uid, vals=vals_line, context=context)
+                timeline_id = timesheet_obj.create(cr, uid, vals_line, context=context)
 
                 # Compute based on pricetype
                 amount_unit = timesheet_obj.on_change_unit_amount(cr, uid, timeline_id,

From 6a4047f47bc3a998ba9b9601557616b0e30be3f0 Mon Sep 17 00:00:00 2001
From: Richard Mathot <rim@openerp.com>
Date: Thu, 19 Jun 2014 11:49:49 +0200
Subject: [PATCH 36/36] [REV] ir_actions: Partial revert of
 7d4df0b6b2eea31b6378aab0f97030738bc40f8b

---
 openerp/addons/base/ir/ir_actions.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index 7ae4240cd03..d6d96737ca3 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -336,8 +336,6 @@ class ir_actions_act_window(osv.osv):
                         eval_context = eval(res['context'] or "{}", eval_dict) or {}
                         res['context'] = str(eval_context)
                 except Exception:
-                    _logger.warning("ir_actions: Cannot evaluate context = %s with eval_dict = %s"
-                        % (res['context'] or "{}", eval_dict), exc_info=True)
                     continue
                 if not fields or 'help' in fields:
                     custom_context = dict(context, **eval_context)