Merge lp:~noviat/openobject-addons/6.1 into lp:openobject-addons/6.1

[Luc De Meyer (Noviat)]

l10n_be 6.0 forward port of intervat corrections.

[Xavier ALT (dex-phx)]

Hi,

Some problems with your MP:

VAT Declaration
---------------
As for v6.1 "osv_memory" are also stored in the DB,

* using table "account_period_rel" for period_ids is wrong because it's already used by "vat_intra" wizard (will raise IntegrityErrors from PostgreSQL).
* removing "period_id" field is acceptable here, because if user doesn't upgrade his DB it won't be able to run wizard normally (NOT NULL constraints will prevent user to save the wizard data).

Is the multiple periods a legal requirement here ? or is it acceptable to live without it on v6.1 ?

VAT Intra
---------
* You could remove the "hack" for exists(), this is not needed anymore on v6.1.

Regards,
Xavier

review: Needs Fixing

[lp:~noviat/openobject-addons/6.1]

6743. By root <root@oerp61> on 2012-05-02

vat declaration wizards

[Luc De Meyer (Noviat) (luc-demeyer)]

Thanks Xavier,

I included your suggestions into https://code.launchpad.net/~noviat/openobject-addons/6.1/+merge/104342.
I have also attached the two files that have been changed to this email since I didn't update my local 6.1 branch before submitting the merge (with as a consequence a huge and meaningless diff file).

Changes:

>> VAT Declaration
>> ---------------
>> * using table "account_period_rel" for period_ids is wrong because it's already used by "vat_intra" wizard (will raise IntegrityErrors from PostgreSQL).

I have renamed the 'account_period_rel' tables into 'vat_declaration_period_rel' and ' vat_intra_period_rel'

>> * removing "period_id" field is acceptable here, because if user doesn't upgrade his DB it won't be able to run wizard normally (NOT NULL constraints will prevent user to save the wizard data).

>> Is the multiple periods a legal requirement here ? or is it acceptable to live without it on v6.1 ?

Yes and we have (at least) two customers running that way.

>> VAT Intra
>> ---------
>> * You could remove the "hack" for exists(), this is not needed anymore on v6.1.

I have removed the 'exists()' hack.

Regards,
Luc

-----Original Message-----
From: <email address hidden> [mailto:<email address hidden>] On Behalf Of Xavier ALT (OpenERP)
Sent: maandag 30 april 2012 13:24
To: <email address hidden>
Subject: Re: [Merge] lp:~noviat/openobject-addons/6.1 into lp:openobject-addons/6.1

Review: Needs Fixing

Hi,

Some problems with your MP:

VAT Declaration
---------------
As for v6.1 "osv_memory" are also stored in the DB,

* using table "account_period_rel" for period_ids is wrong because it's already used by "vat_intra" wizard (will raise IntegrityErrors from PostgreSQL).
* removing "period_id" field is acceptable here, because if user doesn't upgrade his DB it won't be able to run wizard normally (NOT NULL constraints will prevent user to save the wizard data).

Is the multiple periods a legal requirement here ? or is it acceptable to live without it on v6.1 ?

VAT Intra
---------
* You could remove the "hack" for exists(), this is not needed anymore on v6.1.

Regards,
Xavier
--
https://code.launchpad.net/~noviat/openobject-addons/6.1/+merge/102753
Your team Noviat is subscribed to branch lp:~noviat/openobject-addons/6.1.

Unmerged revisions

6743. By root <root@oerp61> on 2012-05-02

vat declaration wizards

6742. By root <root@oerp61> on 2012-04-19

l10n_be intervat correction

=== modified file 'l10n_be/wizard/l10n_be_account_vat_declaration.py' (properties changed: -x to +x)
--- l10n_be/wizard/l10n_be_account_vat_declaration.py	2012-02-13 11:02:14 +0000
+++ l10n_be/wizard/l10n_be_account_vat_declaration.py	2012-05-02 07:49:19 +0000
@@ -9,6 +9,7 @@
 #     - support negative balance
 #     - assign amount of tax code 71-72 correclty to grid 71 or 72
 #     - support Noviat tax code scheme
+#     - support multiple accounting periods per VAT declaration
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -41,7 +42,7 @@
 
     _columns = {
         'name': fields.char('File Name', size=32),
-        'period_id': fields.many2one('account.period','Period', required=True),
+        'period_ids': fields.many2many('account.period', 'vat_declaration_period_rel', 'acc_id', 'period_id', 'Period (s)', help = 'Select here the period(s) you want to include in your VAT declaration'),
         'tax_code_id': fields.many2one('account.tax.code', 'Tax Code', domain=[('parent_id', '=', False)], required=True),
         'msg': fields.text('File created', size=64, readonly=True),
         'file_save': fields.binary('Save File'),
@@ -77,6 +78,10 @@
 
         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']
         data_tax = self.browse(cr, uid, ids[0])
+        
+        if not data_tax.period_ids:
+            raise osv.except_osv(_('Data Insufficient!'),_('Please select at least one Period.'))
+        
         if data_tax.tax_code_id:
             obj_company = data_tax.tax_code_id.company_id
         else:
@@ -90,22 +95,30 @@
         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]
-        tax_info = obj_tax_code.read(cr, uid, tax_code_ids, ['code','sum_period'], context=ctx)
+        tax_info = {}
+        for period_id in data['period_ids']: 
+            ctx['period_id'] = period_id #added context here
+            tax_period_info = obj_tax_code.read(cr, uid, tax_code_ids, ['code','sum_period'], context=ctx)
+            for c in tax_period_info:
+                tax_info.update({c['code']: tax_info.get(c['code'], 0.0) + c['sum_period']})
 
         name = email = phone = address = post_code = city = country_code = ''
         name, email, phone, city, post_code, address, country_code = self.pool.get('res.company')._get_default_ad(obj_company.partner_id.address)
 
-        account_period = obj_acc_period.browse(cr, uid, data['period_id'][0], context=context)
+        account_periods = obj_acc_period.browse(cr, uid, data['period_ids'], context=context)
         issued_by = vat_no[:2] 
         comments = data['comments'] or ''
-            
-        send_ref = str(obj_company.partner_id.id) + str(account_period.date_start[5:7]) + str(account_period.date_stop[:4])
+
+        period_end_dates = sorted([x.date_stop for x in account_periods])
+        period_start_dates = sorted([x.date_start for x in account_periods])                    
+        send_ref = str(obj_company.partner_id.id) + period_end_dates[0][5:7] + period_end_dates[-1][:4]
         
-        starting_month = account_period.date_start[5:7]
-        ending_month = account_period.date_stop[5:7]
+        starting_month = period_start_dates[0][5:7]
+        ending_month = period_end_dates[-1][5:7]
         quarter = str(((int(starting_month) - 1) / 3) + 1)
-    
+
+        if not country_code:
+            raise osv.except_osv(_('Data Insufficient!'),_('No country associated with the company.'))    
         if not email:
             raise osv.except_osv(_('Data Insufficient!'),_('No email address associated with the company.'))
         if not phone:
@@ -124,7 +137,7 @@
                         'send_ref': send_ref,
                         'quarter': quarter,
                         'month': starting_month,
-                        'year': str(account_period.date_stop[:4]),
+                        'year': period_end_dates[-1][:4],
                         'client_nihil': (data['client_nihil'] and 'YES' or 'NO'),
                         'ask_restitution': (data['ask_restitution'] and 'YES' or 'NO'),
                         'ask_payment': (data['ask_payment'] and 'YES' or 'NO'),
@@ -166,31 +179,31 @@
         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'
+        
+        if tax_info.get('VI') >= 0:
+            tax_info['71'] = tax_info['VI']
+        else:
+            tax_info['72'] = tax_info['VI']
         cases_list = []
         for item in tax_info:
-            if item['code'] == '91' and ending_month != 12:
+            if tax_info['91'] and ending_month != 12:
                 #the tax code 91 can only be send for the declaration of December
                 continue
-            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:
-                    cases_list.append(item)
+            if tax_info[item] and item in list_of_tags: 
+                cases_list.append(item)
         cases_list.sort()
         for item in cases_list:
             grid_amount_data = {
-                    'code': str(int(item['code'])),
-                    'amount': str(abs(item['sum_period'])),
+                    'code': str(int(item)),
+                    'amount': '%.2f' %abs(tax_info[item]),
                     }
             data_of_file += '\n\t\t\t<ns2:Amount GridNumber="%(code)s">%(amount)s</ns2:Amount''>' % (grid_amount_data)
             
         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)
+        if file_data['comments']:
+            data_of_file += '\n\t\t<ns2:Comment>%(comments)s</ns2:Comment>' % (file_data)
         data_of_file += '\n\t</ns2:VATDeclaration> \n</ns2:VATConsignment>'
         model_data_ids = mod_obj.search(cr, uid,[('model','=','ir.ui.view'),('name','=','view_vat_save')], context=context)
         resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']

=== modified file 'l10n_be/wizard/l10n_be_account_vat_declaration_view.xml' (properties changed: -x to +x)
--- l10n_be/wizard/l10n_be_account_vat_declaration_view.xml	2012-02-13 11:02:14 +0000
+++ l10n_be/wizard/l10n_be_account_vat_declaration_view.xml	2012-05-02 07:49:19 +0000
@@ -2,39 +2,50 @@
 <openerp>
     <data>
 
-        <record id="view_vat_declaration" model="ir.ui.view">
-            <field name="name">Vat Declaraion</field>
-            <field name="model">l1on_be.vat.declaration</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Periodical VAT Declaration">
-                    <group>
-                        <group colspan="4">
-                            <separator string="Declare Periodical VAT" colspan="4"/>
-                            <field name="period_id" widget="selection"/>
-                            <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/>
-                        </group>
-                        <group colspan="4" groups="base.group_extended">
-                            <separator string="Comments" colspan="4"/>
-                            <field colspan="4" name="comments" nolabel="1"/>
-                        </group>
-                        <group>
-                            <separator colspan="4"/>
-                            <newline/>
-                            <button special="cancel" string="Close" icon="gtk-cancel"/>
-                            <button icon="gtk-execute"  name="create_xml" string="Create XML" type="object" default_focus="1" />
-                        </group>
-                    </group>
-                </form>
-            </field>
-        </record>
+      <record id="view_vat_declaration" model="ir.ui.view">
+        <field name="name">Vat Declaraion</field>
+        <field name="model">l1on_be.vat.declaration</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+          <form string="Periodical VAT Declaration">
+            <group>
+              <group colspan="4">
+                <separator string="Declare Periodical VAT" colspan="4"/>
+                <field name="tax_code_id" string="Company" widget="selection" groups="base.group_multi_company"/>
+                <separator string="Periods" colspan="4"/>
+                <field name="period_ids" nolabel="1" colspan="4" height="200" width="550">
+                  <tree colors="blue:state in ('draft');gray:state in ('done') " string="Period">
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="date_start"/>
+                    <field name="date_stop"/>
+                    <field name="special"/>
+                    <field name="state"/>
+                  </tree>
+                </field>
+                <newline/>
+                <separator string="Advanced Options" colspan="4"/>
+                <field name="ask_restitution"/>
+                <field name="ask_payment"/>
+                <field name="client_nihil" string="Is Last Declaration"/>
+                <label/>
+              </group>
+              <group colspan="4" groups="base.group_extended">
+                <separator string="Comments" colspan="4"/>
+                <field colspan="4" name="comments" nolabel="1"/>
+              </group>
+              <group>
+                <separator colspan="4"/>
+                <newline/>
+                <button special="cancel" string="Close" icon="gtk-cancel"/>
+                <button icon="gtk-execute"  name="create_xml" string="Create XML" type="object" default_focus="1" />
+              </group>
+            </group>
+          </form>
+        </field>
+      </record>
 
-        <record id="view_vat_save" model="ir.ui.view">
+      <record id="view_vat_save" model="ir.ui.view">
             <field name="name">Save XML</field>
             <field name="model">l1on_be.vat.declaration</field>
             <field name="type">form</field>

=== modified file 'l10n_be/wizard/l10n_be_vat_intra.py' (properties changed: -x to +x)
--- l10n_be/wizard/l10n_be_vat_intra.py	2012-04-23 16:45:21 +0000
+++ l10n_be/wizard/l10n_be_vat_intra.py	2012-05-02 07:49:19 +0000
@@ -55,7 +55,7 @@
       YYYY stands for the year (4 positions).
     '''
     ),
-        'period_ids': fields.many2many('account.period', 'account_period_rel', 'acc_id', 'period_id', 'Period (s)', help = 'Select here the period(s) you want to include in your intracom declaration'),
+        'period_ids': fields.many2many('account.period', 'vat_intra_period_rel', 'acc_id', 'period_id', 'Period (s)', help = 'Select here the period(s) you want to include in your intracom declaration'),
         'tax_code_id': fields.many2one('account.tax.code', 'Company', domain=[('parent_id', '=', False)], help="Keep empty to use the user's company", required=True),
         'test_xml': fields.boolean('Test XML file', help="Sets the XML output as test file"),
         'mand_id' : fields.char('Reference', size=14, help="Reference given by the Representative of the sending company."),
@@ -95,7 +95,6 @@
         obj_partner_add = self.pool.get('res.partner.address')
 
         xmldict = {}
-        post_code = street = city = country = data_clientinfo = ''
         seq = amount_sum = 0
 
         wiz_data = self.browse(cr, uid, ids[0], context=context)
@@ -111,6 +110,7 @@
         if not company_vat:
             raise osv.except_osv(_('Data Insufficient'),_('No VAT Number Associated with Main Company!'))
         company_vat = company_vat.replace(' ','').upper()
+        SenderId = company_vat[2:]
         issued_by = company_vat[:2]
 
         if len(wiz_data.period_code) != 6:
@@ -126,24 +126,11 @@
         seq_declarantnum = obj_sequence.get(cr, uid, 'declarantnum')
         dnum = company_vat[2:] + seq_declarantnum[-4:]
 
-        addr = obj_partner.address_get(cr, uid, [data_company.partner_id.id], ['invoice'])
-        email = data_company.partner_id.email or ''
-        phone = data_company.partner_id.phone or ''
-
-        if addr.get('invoice',False):
-            ads = obj_partner_add.browse(cr, uid, [addr['invoice']])[0]
-            city = (ads.city or '')
-            post_code = (ads.zip or '')
-            if ads.street:
-                street = ads.street
-            if ads.street2:
-                street += ' '
-                street += ads.street2
-            if ads.country_id:
-                country = ads.country_id.code
-
-        if not country:
-            country = company_vat[:2]
+        name = email = phone = address = post_code = city = country_code = ''
+        name, email, phone, city, post_code, address, country_code = self.pool.get('res.company')._get_default_ad(data_company.partner_id.address)
+
+        if not country_code:
+            raise osv.except_osv(_('Data Insufficient!'),_('No country associated with the company.'))
         if not email:
             raise osv.except_osv(_('Data Insufficient!'),_('No email address associated with the company.'))
         if not phone:
@@ -154,10 +141,10 @@
                         'vatnum':  company_vat[2:],
                         'mand_id': wiz_data.mand_id, 
                         'sender_date': str(time.strftime('%Y-%m-%d')),
-                        'street': street,
+                        'address': address,
                         'city': city,
                         'post_code': post_code,
-                        'country': country,
+                        'country_code': country_code,
                         'email': email,
                         'phone': phone.replace('/','').replace('.','').replace('(','').replace(')','').replace(' ',''),
                         'period': wiz_data.period_code,
@@ -202,12 +189,12 @@
                                         'seq': seq, 
                                         'vatnum': row['vat'][2:].replace(' ','').upper(), 
                                         'vat': row['vat'],
-                                        'country': row['vat'][:2],
-                                        'amount': amt,
+                                        'country_code': row['vat'][:2],
+                                        'amount': '%.2f' %amt,
                                         'intra_code': row['intra_code'],
                                         'code': intra_code})
 
-        xmldict.update({'dnum': dnum, 'clientnbr': str(seq), 'amountsum': amount_sum, 'partner_wo_vat': p_count})
+        xmldict.update({'dnum': dnum, 'clientnbr': str(seq), 'amountsum': '%.2f' %amount_sum, 'partner_wo_vat': p_count})
         return xmldict
 
     def create_xml(self, cursor, user, ids, context=None):
@@ -225,18 +212,18 @@
         data_head = """<?xml version="1.0" encoding="ISO-8859-1"?>
 <ns2:IntraConsignment xmlns="http://www.minfin.fgov.be/InputCommon" xmlns:ns2="http://www.minfin.fgov.be/IntraConsignment" IntraListingsNbr="1">
     <ns2:Representative>
-        <RepresentativeID identificationType="NVAT" issuedBy="%(issued_by)s">%(company_vat)s</RepresentativeID>
+        <RepresentativeID identificationType="NVAT" issuedBy="%(issued_by)s">%(vatnum)s</RepresentativeID>
         <Name>%(company_name)s</Name>
-        <Street>%(street)s</Street>
+        <Street>%(address)s</Street>
         <PostCode>%(post_code)s</PostCode>
         <City>%(city)s</City>
-        <CountryCode>%(country)s</CountryCode>
+        <CountryCode>%(country_code)s</CountryCode>
         <EmailAddress>%(email)s</EmailAddress>
         <Phone>%(phone)s</Phone>
     </ns2:Representative>""" % (xml_data)
         if xml_data['mand_id']:
             data_head += '\n\t\t<ns2:RepresentativeReference>%(mand_id)s</ns2:RepresentativeReference>' % (xml_data)
-        data_comp_period = '\n\t\t<ns2:Declarant>\n\t\t\t<VATNumber>%(vatnum)s</VATNumber>\n\t\t\t<Name>%(company_name)s</Name>\n\t\t\t<Street>%(street)s</Street>\n\t\t\t<PostCode>%(post_code)s</PostCode>\n\t\t\t<City>%(city)s</City>\n\t\t\t<CountryCode>%(country)s</CountryCode>\n\t\t\t<EmailAddress>%(email)s</EmailAddress>\n\t\t\t<Phone>%(phone)s</Phone>\n\t\t</ns2:Declarant>' % (xml_data)
+        data_comp_period = '\n\t\t<ns2:Declarant>\n\t\t\t<VATNumber>%(vatnum)s</VATNumber>\n\t\t\t<Name>%(company_name)s</Name>\n\t\t\t<Street>%(address)s</Street>\n\t\t\t<PostCode>%(post_code)s</PostCode>\n\t\t\t<City>%(city)s</City>\n\t\t\t<CountryCode>%(country_code)s</CountryCode>\n\t\t\t<EmailAddress>%(email)s</EmailAddress>\n\t\t\t<Phone>%(phone)s</Phone>\n\t\t</ns2:Declarant>' % (xml_data)
         if month_quarter.startswith('3'):
             data_comp_period += '\n\t\t<ns2:Period>\n\t\t\t<ns2:Quarter>'+month_quarter[1]+'</ns2:Quarter> \n\t\t\t<ns2:Year>'+year+'</ns2:Year>\n\t\t</ns2:Period>'
         elif month_quarter.startswith('0') and month_quarter.endswith('0'):
@@ -248,11 +235,16 @@
         for client in xml_data['clientlist']:
             if not client['vatnum']:
                 raise osv.except_osv(_('Data Insufficient!'),_('No vat number defined for %s') % client['partner_name'])
-            data_clientinfo +='\n\t\t<ns2:IntraClient SequenceNumber="%(seq)s">\n\t\t\t<ns2:CompanyVATNumber issuedBy="%(country)s">%(vatnum)s</ns2:CompanyVATNumber>\n\t\t\t<ns2:Code>%(code)s</ns2:Code>\n\t\t\t<ns2:Amount>%(amount)s</ns2:Amount>\n\t\t</ns2:IntraClient>' % (client)
+            data_clientinfo +='\n\t\t<ns2:IntraClient SequenceNumber="%(seq)s">\n\t\t\t<ns2:CompanyVATNumber issuedBy="%(country_code)s">%(vatnum)s</ns2:CompanyVATNumber>\n\t\t\t<ns2:Code>%(code)s</ns2:Code>\n\t\t\t<ns2:Amount>%(amount)s</ns2:Amount>\n\t\t</ns2:IntraClient>' % (client)
 
         data_decl = '\n\t<ns2:IntraListing SequenceNumber="1" ClientsNbr="%(clientnbr)s" DeclarantReference="%(dnum)s" AmountSum="%(amountsum)s">' % (xml_data)
 
-        data_file += data_head + data_decl + data_comp_period + data_clientinfo + '\n\t\t<ns2:Comment>%(comments)s</ns2:Comment>\n\t</ns2:IntraListing>\n</ns2:IntraConsignment>' % (xml_data)
+        data_file += data_head + data_decl + data_comp_period + data_clientinfo
+        if xml_data['comments']:
+            data_file += '\n\t\t<ns2:Comment>%(comments)s</ns2:Comment>' % (xml_data)
+        data_file += '\n\t</ns2:IntraListing>\n</ns2:IntraConsignment>' % (xml_data)
+
+        
         context['file_save'] = data_file
 
         model_data_ids = mod_obj.search(cursor, user,[('model','=','ir.ui.view'),('name','=','view_vat_intra_save')], context=context)
@@ -291,7 +283,7 @@
         self.localcontext.update({
             'time': time,
         })
-
+        
 report_sxw.report_sxw('report.partner.vat.intra.print', 'partner.vat.intra', 'addons/l10n_be/wizard/l10n_be_vat_intra_print.rml', parser=vat_intra_print, header="internal")
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: