From 9d1fa8c21ddd2bda7324db645fd7e4ab90f9efa1 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 6 Feb 2012 17:19:51 +0100
Subject: [PATCH] [FIX] l10n_be, vat declaration xml wizard

bzr revid: qdp-launchpad@openerp.com-20120206161951-l1qpeamaeoom8ml8
---
 .../wizard/l10n_be_account_vat_declaration.py   | 17 +++++++++++++----
 .../l10n_be_account_vat_declaration_view.xml    | 12 +++++++-----
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
index effd8d995ba..dfa4a717e5d 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
@@ -42,7 +42,7 @@ class l10n_be_vat_declaration(osv.osv_memory):
     _columns = {
         'name': fields.char('File Name', size=32),
         'period_id': fields.many2one('account.period','Period', required=True),
-        'tax_code_id': fields.many2one('account.tax.code', 'Tax Code', domain=[('parent_id', '=', False)], help="Keep empty to use the user's company"),
+        'tax_code_id': fields.many2one('account.tax.code', 'Tax Code', domain=[('parent_id', '=', False)], help="Keep empty to use the user's company", required=True),
         'msg': fields.text('File created', size=64, readonly=True),
         'file_save': fields.binary('Save File'),
         'ask_restitution': fields.boolean('Ask Restitution',help='It indicates whether a resitution is to made or not?'),
@@ -53,12 +53,21 @@ class l10n_be_vat_declaration(osv.osv_memory):
         'identification_type': fields.selection([('tin','TIN'), ('nvat','NVAT'), ('other','Other')], 'Identification Type', required=True),
         'other': fields.char('Other Qlf', size=16, help="Description of a Identification Type"),
     }
+
+    def _get_tax_code(cr, uid, ids, context=None):
+        obj_tax_code = self.pool.get('account.tax.code')
+        obj_user = self.pool.get('res.users')
+        company_id = obj_user.browse(cr, uid, uid, context=context).company_id.id
+        tax_code_ids = obj_tax_code.search(cr, uid, [('company_id', '=', company_id), ('parent_id', '=', False)], context=context)
+        return tax_code_ids and tax_code_ids[0] or False
+
     _defaults = {
         'msg': 'Save the File with '".xml"' extension.',
         'file_save': _get_xml_data,
         'name': 'vat_declaration.xml',
-        'identification_type': 'tin',
-        'vat_declarations_nbr': 0,
+        'identification_type': 'nvat',
+        'vat_declarations_nbr': 1,
+        'tax_code_id': _get_tax_code,
     }
 
     def create_xml(self, cr, uid, ids, context=None):
@@ -82,7 +91,7 @@ class l10n_be_vat_declaration(osv.osv_memory):
         vat_no = vat_no.replace(' ','').upper()
         vat = vat_no[2:]
 
-        tax_code_ids = obj_tax_code.search(cr, uid, [], context=context)
+        tax_code_ids = obj_tax_code.search(cr, uid, [('parent_id','child_of',data_tax.tax_code_id.id), ('company_id','=',obj_company.id)], context=context)
         ctx = context.copy()
         data  = self.read(cr, uid, ids)[0]
         ctx['period_id'] = data['period_id'][0] #added context here
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
index f1309f1afc7..60e64f1a67f 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@@ -15,18 +15,20 @@
                 <form string="Periodical VAT Declaration">
                     <group>
                         <group colspan="4">
-                            <separator string="Declare Periodical VAT" colspan="4"/><newline/>
-                            <field name="vat_declarations_nbr"/>
+                            <separator string="Declare Periodical VAT" colspan="4"/>
                             <field name="period_id" widget="selection"/>
-                            <field name="identification_type"/>
-                            <field name="other" attrs="{'invisible':[('identification_type','!=','other')], 'required':[('identification_type','=','other')]}"/>
                             <field name="tax_code_id" string="Company" widget="selection" groups="base.group_multi_company"/>
                             <newline/>
+                            <separator string="Advanced Options" colspan="4"/>
                             <field name="ask_restitution"/>
                             <field name="ask_payment"/>
                             <field name="client_nihil" string="Is Last Declaration"/><label/>
+                            <field name="vat_declarations_nbr" invisible="1"/>
+                            <!-- should be unused ?
+                            <field name="identification_type"/>
+                            <field name="other" attrs="{'invisible':[('identification_type','!=','other')], 'required':[('identification_type','=','other')]}"/> -->
                         </group>
-                        <group colspan="4">
+                        <group colspan="4" groups="base.group_extended">
                             <separator string="Comments" colspan="4"/>
                             <field colspan="4" name="comments" nolabel="1"/>
                         </group>