diff --git a/account_tax_analysis/__init__.py b/account_tax_analysis/__init__.py
index cf3e05bcf..0fe7493b0 100644
--- a/account_tax_analysis/__init__.py
+++ b/account_tax_analysis/__init__.py
@@ -17,5 +17,5 @@
# along with this program. If not, see .
#
##############################################################################
-import account_tax_analysis
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+from . import account_tax_analysis
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/account_tax_analysis/__openerp__.py b/account_tax_analysis/__openerp__.py
index 68bd7184d..2f349b27c 100644
--- a/account_tax_analysis/__openerp__.py
+++ b/account_tax_analysis/__openerp__.py
@@ -17,21 +17,28 @@
# along with this program. If not, see .
#
##############################################################################
-{
- "name" : "Tax analysis",
- "version" : "1.0",
- "depends" : ["base", "account"],
- "author" : "CamptoCamp SA",
- "category": 'Accounting & Finance',
- "description": """Provide with details of your tax form (Allows you to group by move lines by tax account)
- """,
- 'website': 'http://www.openerp.com',
- 'init_xml': [],
- 'update_xml': [
- 'account_tax_analysis_view.xml',
- ],
- 'demo_xml': [],
- 'installable': True,
- 'active': False,
-}
+{"name": "Tax analysis",
+ "version": "1.0",
+ "depends": ["base", "account"],
+ "author": "CamptoCamp SA",
+ "category": 'Accounting & Finance',
+ "description": """
+ Tax analysis view
+=================
+
+This add-on is a must if you want to be able to validate your VAT form.
+
+Thanks to a new menu 'Accounting / Tax / Tax analysis'
+you are able to group accounting entries by Taxes (VAT codes)
+and/or financial accounts.
+
+This way you will find easily differences you may see between
+the OpenERP tax report and what you see in your books.""",
+ "website": "http://www.camptocamp.com",
+ "init_xml": [],
+ "update_xml": ["account_tax_analysis_view.xml"],
+ "demo_xml": [],
+ "installable": True,
+ "active": False,
+ }
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/account_tax_analysis/account_tax_analysis.py b/account_tax_analysis/account_tax_analysis.py
index 44301413d..426487a8b 100644
--- a/account_tax_analysis/account_tax_analysis.py
+++ b/account_tax_analysis/account_tax_analysis.py
@@ -17,35 +17,40 @@
# along with this program. If not, see .
#
##############################################################################
-
from osv import orm, osv, fields
from tools.translate import _
+
class account_tax_declaration_analysis(orm.TransientModel):
_name = 'account.vat.declaration.analysis'
_description = 'Account Vat Declaration'
_columns = {
- 'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscalyear', help='Fiscalyear', required=True),
+ 'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscalyear',
+ help='Fiscalyear to look on', required=True),
+
'period_list': fields.many2many('account.period', 'account_tax_period_rel',
- 'tax_analysis', 'period_id', 'Period _list',required=True),
+ 'tax_analysis', 'period_id',
+ 'Period _list', required=True),
}
def create_vat(self, cr, uid, ids, context=None):
- mod_obj =self.pool.get('ir.model.data')
+ mod_obj = self.pool.get('ir.model.data')
action_obj = self.pool.get('ir.actions.act_window')
domain = []
data = self.read(cr, uid, ids, [])[0]
period_list = data['period_list']
- if period_list :
- domain = [('period_id','in',period_list)]
+ if period_list:
+ domain = [('period_id', 'in', period_list)]
else:
- raise osv.except_osv(_('No period defined'),_("You must selected period "))
+ raise osv.except_osv(_('No period defined'), _("You must selected period "))
##
- actions = mod_obj.get_object_reference(cr, uid, 'account_tax_analysis', 'action_view_tax_analysis')
+ actions = mod_obj.get_object_reference(cr, uid,
+ 'account_tax_analysis', 'action_view_tax_analysis')
id_action = actions and actions[1] or False
- action_mod = action_obj.read(cr,uid,id_action)
+ action_mod = action_obj.read(cr, uid, id_action)
action_mod['domain'] = domain
-
+
return action_mod
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/account_tax_analysis/account_tax_analysis_view.xml b/account_tax_analysis/account_tax_analysis_view.xml
index 1973c7595..53f2f8dc8 100644
--- a/account_tax_analysis/account_tax_analysis_view.xml
+++ b/account_tax_analysis/account_tax_analysis_view.xml
@@ -1,106 +1,121 @@
-
+
+
+ Journal Items Tax
+ account.move.line
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ account.move.line.tree
+ account.move.line
+ tree
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- Journal Items Tax
- account.move.line
- search
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ Recurring Models
+ account.move.line
+ form
+ tree
+
+
+
-
- account.move.line.tree
- account.move.line
- tree
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ Account Vat Declaration
+ account.vat.declaration.analysis
+ form
+
+
+
+
+
+ Account Vat Declaration
+ ir.actions.act_window
+ account.vat.declaration.analysis
+ form
+ form
+ new
+ This menu print a VAT declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter.
+
-
- Recurring Models
- account.move.line
- form
- tree
-
-
-
+
-
- Account Vat Declaration
- account.vat.declaration.analysis
- form
-
-
-
-
-
-
- Account Vat Declaration
- ir.actions.act_window
- account.vat.declaration.analysis
- form
- form
- new
- This menu print a VAT declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter.
-
-
-
-
-
-
\ No newline at end of file
+
+