Merge lp:~openerp-dev/openobject-addons/5.0-opw-381491-ado into lp:openobject-addons/5.0

[Amit Dodiya (OpenERP)]

Hello,

Improve the Vat_List.xml file creation from wizard as per the new VAT format.

Thanks,
Amit

[lp:~openerp-dev/openobject-addons/5.0-opw-381491-ado]

2931. By Xavier ALT on 2012-02-29

[MERGE] backport v6.0: allow printing vat subject clients list by calendar date

2932. By Amit Dodiya (OpenERP) on 2012-03-01

[FIX] l10n_be Partner VAT Declaration xml file improvement

Unmerged revisions

2932. By Amit Dodiya (OpenERP) on 2012-03-01

[FIX] l10n_be Partner VAT Declaration xml file improvement

=== modified file 'l10n_be/company.py'
--- l10n_be/company.py	2010-04-06 09:41:18 +0000
+++ l10n_be/company.py	2012-03-01 11:40:31 +0000
@@ -28,7 +28,7 @@
 
 
     def _get_default_ad(self, addresses):
-        city = post_code = address = country_code = ""
+        name = email = phone = city = post_code = address = country_code = ""
         for ads in addresses:
             if ads.type == 'default':
                 city = ads.city or ""
@@ -39,7 +39,10 @@
                     address += " " + ads.street2
                 if ads.country_id:
                     country_code = ads.country_id and ads.country_id.code or ""
-        return city, post_code, address, country_code
+                name = ads.name or ""
+                email = ads.email or ""
+                phone = ads.phone or ""
+        return name, email, phone, city, post_code, address, country_code
 res_company()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'l10n_be/wizard/account_vat_declaration.py'
--- l10n_be/wizard/account_vat_declaration.py	2010-08-23 13:47:14 +0000
+++ l10n_be/wizard/account_vat_declaration.py	2012-03-01 11:40:31 +0000
@@ -28,39 +28,52 @@
 from tools.translate import _
 
 form_fyear = """<?xml version="1.0"?>
-<form string="Select Period">
-    <field name="period" />
-    <field name="ask_resitution"/>
-    <field name="ask_payment"/>
-    <field name="client_nihil"/>
-</form>"""
+            <form string="Periodical VAT Declaration">
+                <group>
+                    <group colspan="4">
+                        <separator string="Declare Periodical VAT" colspan="4"/><newline/>
+                        <field name="period"/>
+                        <field name="tax_code_id" string="Company" groups="base.group_multi_company"/>
+                        <newline/>
+                        <field name="ask_resitution"/>
+                        <field name="ask_payment"/>
+                        <field name="client_nihil" string="Is Last Declaration"/><label/>
+                    </group>
+                        <group colspan="4">
+                        <separator string="Comments" colspan="4"/>
+                        <field colspan="4" name="comments" nolabel="1"/>
+                    </group>
+                </group>
+            </form>"""
 
 fields_fyear = {
     'period': {'string': 'Period', 'type': 'many2one', 'relation': 'account.period', 'required': True,},
     'ask_resitution': {'type': 'boolean', 'string': 'Ask Restitution',},
     'ask_payment': {'type': 'boolean', 'string': 'Ask Payment',},
     'client_nihil': {'type': 'boolean', 'string': 'Last Declaration of Entreprise', 'help': 'Thick this case only if it concerns only the last statement on the civil or cessation of activity'},
+    'tax_code_id': {'string': 'Company', 'type': 'many2one', 'relation': 'account.tax.code', 'required': True, 'help': 'Tick this case only if it concerns only the last statement on the civil or cessation of activity: no clients to be included in the client listing.'},
+    'comments': {'string': 'Comments', 'type': 'text', 'size' : 64},
 }
 
 form = """<?xml version="1.0"?>
 <form string="Notification">
      <separator string="XML Flie has been Created."  colspan="4"/>
      <field name="msg" colspan="4" nolabel="1"/>
+     <field name="name"/><newline/>
      <field name="file_save" />
 </form>"""
 
 fields = {
-    'msg': {'string':'File created', 'type':'text', 'size':'100','readonly':True},
-    'file_save':{'string': 'Save File',
-        'type': 'binary',
-        'readonly': True,},
+    'name': {'string': 'File Name', 'type': 'char', 'size': 32, 'default': 'vat_declaration.xml'},
+    'msg': {'string':'File created', 'type':'text', 'size':'100','readonly':True, 'default': 'Save the File with '".xml"' extension.'},
+    'file_save':{'string': 'Save File', 'type': 'binary', 'readonly': True,},
 }
 
 
 class wizard_vat_declaration(wizard.interface):
 
     def _create_xml(self, cr, uid, data, context):
-        list_of_tags=['00','01','02','03','44','45','46','47','48','49','54','55','56','57','59','61','62','63','64','71','81','82','83','84','85','86','87','88','91']
+        list_of_tags = ['00','01','02','03','44','45','46','47','48','49','54','55','56','57','59','61','62','63','64','71','72','81','82','83','84','85','86','87','88','91']
         pool_obj = pooler.get_pool(cr.dbname)
         #obj_company = pool_obj.get('res.company').browse(cr,uid,1)
         obj_company = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid).company_id
@@ -73,48 +86,112 @@
         ctx = context.copy()
         ctx['period_id'] = data['form']['period'] #added context here
         tax_info = pool_obj.get('account.tax.code').read(cr,uid,tax_ids,['code','sum_period'],context=ctx)
-
-        address = post_code = city = country_code = ''
-
-        city, post_code, address, country_code = pooler.get_pool(cr.dbname).get('res.company')._get_default_ad(obj_company.partner_id.address)
+        
+        issued_by = vat_no[:2] 
+        comments = data['form']['comments'] or ''
+        
+        name = email = phone = address = post_code = city = country_code = ''
+        name, email, phone, city, post_code, address, country_code = pooler.get_pool(cr.dbname).get('res.company')._get_default_ad(obj_company.partner_id.address)
 
         obj_fyear = pool_obj.get('account.fiscalyear')
         year_id = obj_fyear.find(cr, uid)
         
         account_period=pool_obj.get('account.period').browse(cr, uid, data['form']['period'])
         period_code = account_period.code
-
-        send_ref = str(obj_company.partner_id.id) + str(account_period.date_start[5:7]) + str(account_period.date_stop[:4])
-
-        data_of_file='<?xml version="1.0"?>\n<VATSENDING xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="MultiDeclarationTVA-NoSignature-16.xml">'
-        data_of_file +='\n\t<DECLARER>\n\t\t<VATNUMBER>'+str(vat_no)+'</VATNUMBER>\n\t\t<NAME>'+ obj_company.name +'</NAME>\n\t\t<ADDRESS>'+address+'</ADDRESS>'
-        data_of_file +='\n\t\t<POSTCODE>'+post_code+'</POSTCODE>\n\t\t<CITY>'+city+'</CITY>\n\t\t<COUNTRY>'+country_code+'</COUNTRY>\n\t\t<SENDINGREFERENCE>'+send_ref+'</SENDINGREFERENCE>\n\t</DECLARER>'
-        data_of_file +='\n\t<VATRECORD>\n\t\t<RECNUM>1</RECNUM>\n\t\t<VATNUMBER>'+str(vat_no[2:])+'</VATNUMBER>\n\t\t<DPERIODE>\n\t\t\t'
-
         starting_month = account_period.date_start[5:7]
         ending_month = account_period.date_stop[5:7]
+        quarter = str(((int(starting_month) - 1) / 3) + 1)
+
+        send_ref = str(obj_company.partner_id.id) + str(account_period.date_start[5:7]) + str(account_period.date_stop[:4])
+        
+        if not email:
+            raise wizard.except_wizard(_('Data Insufficient!'),_('No email address associated with the partner.'))
+        if not phone:
+            raise wizard.except_wizard(_('Data Insufficient!'),_('No phone associated with the partner.'))
+        
+        file_data = {
+                        'issued_by': issued_by,
+                        'vat_no': vat_no,
+                        'only_vat': vat_no[2:],
+                        'cmpny_name': obj_company.name,
+                        'address': address,
+                        'post_code': post_code,
+                        'city': city,
+                        'country_code': country_code,
+                        'email': email,
+                        'phone': phone,
+                        'send_ref': send_ref,
+                        'quarter': quarter,
+                        'month': starting_month,
+                        'year': str(account_period.date_stop[:4]),
+                        'client_nihil': (data['form']['client_nihil'] and 'YES' or 'NO'),
+                        'ask_restitution': (data['form']['ask_resitution'] and 'YES' or 'NO'),
+                        'ask_payment': (data['form']['ask_payment'] and 'YES' or 'NO'),
+                        'comments': comments,
+                     }
+
+        data_of_file="""<?xml version="1.0"?>
+                            <ns2:VATConsignment xmlns="http://www.minfin.fgov.be/InputCommon" xmlns:ns2="http://www.minfin.fgov.be/VATConsignment" VATDeclarationsNbr="1">
+                                <ns2:Representative>
+                                    <RepresentativeID identificationType="NVAT" issuedBy="%(issued_by)s">%(only_vat)s</RepresentativeID>
+                                    <Name>%(cmpny_name)s</Name>
+                                    <Street>%(address)s</Street>
+                                    <PostCode>%(post_code)s</PostCode>
+                                    <City>%(city)s</City>
+                                    <CountryCode>%(country_code)s</CountryCode>
+                                    <EmailAddress>%(email)s</EmailAddress>
+                                    <Phone>%(phone)s</Phone>
+                                </ns2:Representative>
+                                <ns2:VATDeclaration SequenceNumber="1" DeclarantReference="%(send_ref)s">
+                                    <ns2:Declarant>
+                                        <VATNumber xmlns="http://www.minfin.fgov.be/InputCommon">%(only_vat)s</VATNumber>
+                                        <Name>%(cmpny_name)s</Name>
+                                        <Street>%(address)s</Street>
+                                        <PostCode>%(post_code)s</PostCode>
+                                        <City>%(city)s</City>
+                                        <CountryCode>%(country_code)s</CountryCode>
+                                        <EmailAddress>%(email)s</EmailAddress>
+                                        <Phone>%(phone)s</Phone>
+                                    </ns2:Declarant>
+                                    <ns2:Period>
+                                """ % (file_data)
+
         if starting_month != ending_month:
             #starting month and ending month of selected period are not the same 
             #it means that the accounting isn't based on periods of 1 month but on quarters
-            quarter = str(((int(starting_month) - 1) / 3) + 1)
-            data_of_file += '<QUARTER>'+quarter+'</QUARTER>\n\t\t\t'
+            data_of_file += '\t\t<ns2:Quarter>%(quarter)s</ns2:Quarter>\n\t\t' % (file_data)
         else:
-            data_of_file += '<MONTH>'+starting_month+'</MONTH>\n\t\t\t'
-        data_of_file += '<YEAR>' + str(account_period.date_stop[:4]) + '</YEAR>\n\t\t</DPERIODE>\n\t\t<ASK RESTITUTION="NO" PAYMENT="NO"/>'
-        data_of_file += '\n\t\t<ClientListingNihil>'+ (data['form']['client_nihil'] and 'YES' or 'NO') +'</ClientListingNihil>'
-        data_of_file +='\n\t\t<DATA>\n\t\t\t<DATA_ELEM>'
+            data_of_file += '\t\t<ns2:Month>%(month)s</ns2:Month>\n\t\t' % (file_data)
+        data_of_file += '\t<ns2:Year>%(year)s</ns2:Year>' % (file_data)
+        data_of_file += '\n\t\t</ns2:Period>\n'
+        data_of_file += '\t\t<ns2:Data>\t'
 
+        cases_list = []
         for item in tax_info:
             if item['code'] == '91' and ending_month != 12:
                 #the tax code 91 can only be send for the declaration of December
                 continue
-            if item['code']:
-                if item['code'] == '71-72':
-                    item['code']='71'
+            if item['code'] and item['sum_period']:
+                if item['code'] == 'VI':
+                    if item['sum_period'] >= 0:
+                        item['code'] = '71'
+                    else:
+                        item['code'] = '72'
                 if item['code'] in list_of_tags:
-                    data_of_file +='\n\t\t\t\t<D'+str(int(item['code'])) +'>' + str(abs(int(item['sum_period']*100))) +  '</D'+str(int(item['code'])) +'>'
+                    cases_list.append(item)
+        cases_list.sort()
+        for item in cases_list:
+            grid_amount_data = {
+                    'code': str(int(item['code'])),
+                    'amount': str(abs(int(round(item['sum_period']*100)))),
+                    }
+            data_of_file += '\n\t\t\t<Amount GridNumber="%(code)s">%(amount)s</Amount''>' % (grid_amount_data)
 
-        data_of_file +='\n\t\t\t</DATA_ELEM>\n\t\t</DATA>\n\t</VATRECORD>\n</VATSENDING>'
+        data_of_file += '\n\t\t</ns2:Data>'
+        data_of_file += '\n\t\t<ns2:ClientListingNihil>%(client_nihil)s</ns2:ClientListingNihil>' % (file_data)
+        data_of_file += '\n\t\t<ns2:Ask Restitution="%(ask_restitution)s" Payment="%(ask_payment)s"/>' % (file_data)
+        data_of_file += '\n\t\t<ns2:Comment>%(comments)s</ns2:Comment>' % (file_data)
+        data_of_file += '\n\t</ns2:VATDeclaration> \n</ns2:VATConsignment>'
         data['form']['msg']='Save the File with '".xml"' extension.'
         data['form']['file_save'] = base64.encodestring(data_of_file.encode('utf8'))
         return data['form']